Release 2.2.2 (#170 )

Merge branch 'backport_162' of gitnex/GitNex into release-2.2
Fix login with email for my repositories
2019-10-25 05:44:53 +00:00 · 2019-10-21 17:31:44 +00:00 · 2019-10-21 18:57:52 +02:00 · 2019-10-18 14:55:15 +00:00 · 2019-10-18 19:51:56 +05:00 · 2019-10-18 13:47:00 +00:00
757 changed files with 23000 additions and 54601 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,104 +1,31 @@
 ---
 kind: pipeline
-type: docker
-name: tests
+name: gitnex-ci-test

 steps:

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

-  - name: check-formatting
-    image: zosiab/eclint:latest
-    depends_on: [ clone ]
-    commands:
-      - git pull origin main
-      - eclint check $(git diff --name-only origin/main)
-
-  # This may be used in the future, because it makes of intellij's native code inspection/formatting capabilities.
-  # Additional information: https://www.jetbrains.com/help/idea/command-line-formatter.html
-  #
-  #  - name: do-or-check-formatting
-  #    image: dlsniper/docker-intellij
-  #    depends_on: [ clone ]
-  #    commands:
-  #      - /opt/intellij/bin/idea.sh inspect/format ...
-  #
-  #  - name: do-or-check-formatting
-  #    image: dlsniper/docker-intellij
-  #    depends_on: [ clone ]
-  #    commands:
-  #      - /opt/intellij/bin/idea.sh format -s .idea/codeStyles/Project.xml -m *.java app/src/main/java
-
 trigger:
  event:
    - pull_request

 ---
 kind: pipeline
-type: docker
-name: code-analysis
-
-steps:
-
-  - name: check-global-formatting
-    image: zosiab/eclint:latest
-    depends_on: [ clone ]
-    commands:
-      - eclint check $(git ls-files)
-
-trigger:
-  event:
-    - push
-  branch:
-    - main
-
---
-kind: pipeline
-type: docker
-name: build
+name: gitnex-ci-build

 steps:

  - name: build
    image: nextcloudci/android:android-49
    commands:
-      - ./gradlew assembleFreeRelease
-
-  - name: sign
-    image: nextcloudci/android:android-49
-    environment:
-      BOT_TOKEN:
-        from_secret: BOT_TOKEN
-      KS_PASS:
-        from_secret: KS_PASS
-      KEY_PASS:
-        from_secret: KEY_PASS
-      OUTPUT: signed.apk
-      INSTANCE: https://codeberg.org
-      KS_FILE: ci_keystore.jks
-      KS_REPO:
-        from_secret: KS_REPO
-    commands:
-      - ./scripts/sign-build.sh
-
-  - name: publish
-    image: vividboarder/drone-webdav
-    environment:
-      WEBDAV_USERNAME: GitNexBot
-      WEBDAV_PASSWORD:
-        from_secret: NC_TOKEN
-      PLUGIN_FILE: 'signed.apk'
-      PLUGIN_TIMEOUT: 180
-      PLUGIN_ATTEMPTS: 5
-      PLUGIN_DESTINATION: 'https://cloud.swatian.com/remote.php/dav/files/GitNexBot/gitnex/builds/latest.apk'
-      PLUGIN_CUSTOM_ARGUMENTS: '--progress-bar'
+      - ./gradlew build

 trigger:
  event:
    - push
  branch:
-    - main
+    - master
--- a/.editorconfig
+++ b/.editorconfig
@ -1,25 +0,0 @@
-[*]
-charset = utf-8
-end_of_line = lf
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true
-max_line_length = 150
-
-[*.java]
-indent_style = tab
-line_comment = //
-block_comment_start = /*
-block_comment = *
-block_comment_end = */
-
-[*.json]
-indent_size = 2
-
-[{*.yml,*.yaml}]
-indent_size = 2
-
-[*.md]
-trim_trailing_whitespace = false
-insert_final_newline = false
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +0,0 @@
-* text=auto eol=lf
--- a/.gitea/issue_template/bug.md
+++ b/.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. -->
--- a/.gitea/issue_template/feature.md
+++ b/.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. -->
--- a/.gitea/issue_template/suggestion.md
+++ b/.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. --> 
--- a/.gitea/pull_request_template.md
+++ b/.gitea/pull_request_template.md
@ -1,9 +0,0 @@
-### Describe what your pull request does and which issue you’re targeting
-<!-- 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. -->
-
- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
- [ ] 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).
--- a/.gitignore
+++ b/.gitignore
@ -8,12 +8,6 @@
 *.ap_
 *.aab

-# Release dir
-app/release/*
-
-# Pro dir
-app/pro/*
-
 # Files for the ART/Dalvik VM
 *.dex

@ -54,7 +48,6 @@ captures/
 .idea/dictionaries
 .idea/libraries
 .idea/caches
-!.idea/codeStyles

 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
@ -195,6 +188,3 @@ crowdin.yml
 !/gradle/wrapper/gradle-wrapper.jar

 # End of https://www.gitignore.io/api/android,androidstudio
-
-# Crowdin Config
-crowdin.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,100 +0,0 @@
-stages:
-  - build
-  - sign
-  - publish
-
-on_setup:
-  image: curlimages/curl:7.77.0
-  stage: .pre
-  only:
-    - main
-    - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: pending
-  script:
-    - ./scripts/add-commit-status.sh
-
-build:
-  image: nextcloudci/android8:android-61
-  stage: build
-  only:
-    - main
-    - tags
-  script:
-    - ./gradlew assembleFreeRelease
-  artifacts:
-    paths:
-      - app/build/outputs/
-    expire_in: 15 minutes
-
-sign:
-  image: nextcloudci/android8:android-61
-  stage: sign
-  only:
-    - main
-    - tags
-  variables:
-    OUTPUT: "signed.apk"
-    INSTANCE: "https://codeberg.org"
-    KS_FILE: "ci_keystore.jks"
-  script:
-    - ./scripts/sign-build.sh
-  artifacts:
-    paths:
-      - signed.apk
-    expire_in: 15 minutes
-
-latest:
-  image: curlimages/curl:7.77.0
-  stage: publish
-  only:
-    - main
-    - tags
-  variables:
-    WEBDAV_USERNAME: "GitNexBot"
-    PLUGIN_FILE: "signed.apk"
-    PLUGIN_DESTINATION: "https://cloud.swatian.com/remote.php/dav/files/GitNexBot/gitnex/builds/latest.apk"
-  script:
-    - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" "$PLUGIN_DESTINATION"
-
-release:
-  image: curlimages/curl:7.77.0
-  stage: publish
-  only:
-    - tags
-  variables:
-    WEBDAV_USERNAME: "GitNexBot"
-    PLUGIN_FILE: "signed.apk"
-  script:
-    - "[[ $CI_COMMIT_REF_NAME == *'-rc'* ]] && echo 'Upload blocked. Build seems to be a release candidate.' && exit 0"
-    - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" 'https://cloud.swatian.com/remote.php/dav/files/GitNexBot/gitnex/releases/'"$CI_COMMIT_REF_NAME"'.apk'
-
-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
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -1,183 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JavaCodeStyleSettings>
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="android" withSubpackages="true" static="false" />
-          <package name="androidx" withSubpackages="true" static="false" />
-          <package name="com" withSubpackages="true" static="false" />
-          <package name="junit" withSubpackages="true" static="false" />
-          <package name="net" withSubpackages="true" static="false" />
-          <package name="org" withSubpackages="true" static="false" />
-          <package name="java" withSubpackages="true" static="false" />
-          <package name="javax" withSubpackages="true" static="false" />
-          <package name="" withSubpackages="true" static="false" />
-          <package name="" withSubpackages="true" static="true" />
-        </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" />
-      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
-      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
-      <option name="BLANK_LINES_BEFORE_METHOD_BODY" value="1" />
-      <option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1" />
-      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
-      <option name="BLANK_LINES_AFTER_ANONYMOUS_CLASS_HEADER" value="1" />
-      <option name="BLANK_LINES_BEFORE_CLASS_END" value="1" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="CATCH_ON_NEW_LINE" value="true" />
-      <option name="FINALLY_ON_NEW_LINE" value="true" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_TRY_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="1" />
-      <option name="THROWS_LIST_WRAP" value="1" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-      <option name="TERNARY_OPERATION_WRAP" value="1" />
-      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-        <option name="SMART_TABS" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,2 +1,2 @@
 # Changelog
-[Check out the release notes](https://codeberg.org/gitnex/GitNex/releases)
+[Check out the release notes](https://gitea.com/gitnex/GitNex/releases)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -2,35 +2,21 @@

 Please take a few minutes to read this document to make the process of contribution more easy and healthy for all involved.

-### General
-> **Be polite and gentle while commenting or creating new issues to maintain a healthy environment in which __everyone__ is able to feel comfortable.**
-<br>
+## Pull Requests
+Patches, enhancements, features are always welcome. The PR should focus on the scope of work and avoid many unnecessary commits. Please provide as much detail and context as possible to explain the work submitted.
+
+Please ask if you are not sure about the scope of work to be submitted to avoid waste of time spent on the work.
+
+**How to submit a PR**  
+Fork this repository. Pull the forked repository from your namespace to your local machine. Create new branch and work on the bug/feature/enhancement you would like to submit. Push it to your forked version. From there create Pull Request(PR) against **master** branch.
+
+**IMPORTANT:** By submitting 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.*

-### Issues and Reports
 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
-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.
+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.

-**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)**  
-1. Fork this repository.
-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.
+**Note:** Please contact the project directly via email(gitnex@swatian.com) if have to share sensitive and security related details.
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -3,35 +3,20 @@ This part lists all PUBLIC individuals having contributed content to the code.

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

 # Translators
 This part lists all PUBLIC individuals having contributed content to the translation.  
 *Entries are in alphabetical order*

 * 6543
- * acrylicpaintboy
- * Antoine GIRARD (sapk)
- * BaRaN6161_TURK
 * ButterflyOfFire (BoFFire)
- * dadosch
- * erardiflorian
 * IndeedNotJames
- * jaqra
- * Lafriks
- * ljoonal
 * Lunny Xiao (xiaolunwen)
- * lxs
- * Marcos de Oliveira (markkrj)
 * mmarif
 * Nadezhda Moiseeva (digitalkiller)
- * Oleg Popenkov (FanHamMer)
 * PsychotherapistSam
 * Rodion Borisov (vintproykt)
- * s4ne
 * valeriezhao1013
- * Vladislav Glinsky (cl0ne)
 * Voyvode

 **Thank you for all your work** :+1:
--- a/63
+++ b/63
@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

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

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

                     END OF TERMS AND CONDITIONS

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

-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.

-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.

-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    Mastalab is a Mastodon client for Android devices
+    Copyright (C) 2017  Thomas Schneider
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    Mastalab  Copyright (C) 2017 Thomas Schneider
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@ -1,97 +1,88 @@
-[![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://gitea.com/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://gitea.com/gitnex/GitNex/releases)
+[![Build Status](https://drone.gitea.com/api/badges/gitnex/GitNex/status.svg)](https://drone.gitea.com/gitnex/GitNex)
+[![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex)

-[<img alt="Become a 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 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='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='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
+[<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex)
+[<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitea.com/gitnex/GitNex/releases)

 ## Note about Gitea version
-Please make sure that you are on latest stable release or later for better app experience.
+Please make sure that you are on Gitea **1.9.x** stable release or later. Below this may not work as one would expect because of the newly added objects to the API at later versions. Please consider updating your Gitea server.

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

 ## Build from source
 Option 1 - Download the source code, open it in Android Studio and build it there.

-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
- File and directory browser
- File viewer
- Create files
- Explore repositories
- Pull requests
- Files diff for PRs
- Notifications
- Drafts
- Repositories / issues / org list
- [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features)
+- My Repositories
+- Repositories list
+- Organizations list
+- Create repository
+- Create organization
+- Issues list
+- [MANY MORE](https://gitea.com/gitnex/GitNex/wiki/Features)

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

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

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

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

 ## Screenshots:

-<img src="https://codeberg.org/gitnex/GitNex/raw/branch/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://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/001.png" alt="001.png" width="200"/>  | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/002.png" alt="002.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/003.png" alt="003.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/004.png" alt="004.png" width="200"/>
 ---|---|---|---
-<img src="https://codeberg.org/gitnex/GitNex/raw/branch/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://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://gitea.com/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.png" width="200"/>
+
+
+## FAQ
+[Faq](https://gitea.com/gitnex/GitNex/wiki/FAQ)

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

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

-[Troubleshoot Guide](https://codeberg.org/gitnex/GitNex/wiki/Troubleshoot-Guide)
+[Website Repository](https://gitlab.com/mmarif4u/gitnex-website)

-[Faq](https://codeberg.org/gitnex/GitNex/wiki/FAQ)
-
-[Release Blog](https://gitnex.codeberg.page)
+[Troubleshoot Guide](https://gitea.com/gitnex/GitNex/wiki/Troubleshoot-Guide)

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

-#### Open source libraries
- [square/retrofit](https://github.com/square/retrofit)
- [google/gson](https://github.com/google/gson)
- [square/okhttp](https://github.com/square/okhttp)
- [square/picasso](https://github.com/square/picasso)
- [wasabeef/picasso-transformations](https://github.com/wasabeef/picasso-transformations)
- [cats-oss/android-gpuimage](https://github.com/cats-oss/android-gpuimage)
- [noties/Markwon](https://github.com/noties/Markwon)
- [noties/Prism4j](https://github.com/noties/Prism4j)
- [ocpsoft/prettytime](https://github.com/ocpsoft/prettytime)
- [amulyakhare/TextDrawable](https://github.com/amulyakhare/TextDrawable)
- [vdurmont/emoji-java](https://github.com/vdurmont/emoji-java)
- [Pes8/android-material-color-picker-dialog](https://github.com/Pes8/android-material-color-picker-dialog)
- [HamidrezaAmz/BreadcrumbsView](https://github.com/HamidrezaAmz/BreadcrumbsView)
- [Baseflow/PhotoView](https://github.com/Baseflow/PhotoView)
- [apache/commons](https://github.com/apache/commons-io)
- [ge0rg/MemorizingTrustManager](https://github.com/ge0rg/MemorizingTrustManager)
- [mikaelhg/urlbuilder](https://github.com/mikaelhg/urlbuilder)
- [ACRA/acra](https://github.com/ACRA/acra)
- [chrisvest/stormpot](https://github.com/chrisvest/stormpot)
-
-#### Icon sets
- [feathericons/feather](https://github.com/feathericons/feather)
- [primer/octicons](https://github.com/primer/octicons)
- [google/material-design-icons](https://github.com/google/material-design-icons)
+Open source libraries
+- Retrofit
+- Gson
+- Okhttp
+- ViHtarb/tooltip
+- Picasso
+- Markwon
+- Prettytime
+- Amulyakhare/textdrawable
+- Vdurmont/emoji-java
+- Abumoallim/android-multi-select-dialog
+- Pes/materialcolorpicker
+- Hendraanggrian/socialview
+- Fython/BreadcrumbsView

 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)
-
-*All trademarks and logos are the properties of their respective owners.*
--- a/app/build.gradle
+++ b/app/build.gradle
@ -1,86 +1,52 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 30
+    compileSdkVersion 28
    defaultConfig {
        applicationId "org.mian.gitnex"
        minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 415
-        versionName "4.2.0"
-        multiDexEnabled true
+        targetSdkVersion 28
+        versionCode 72
+        versionName "2.2.2"
        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
-    }
    buildTypes {
        release {
            minifyEnabled false
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
    lintOptions {
        //checkReleaseBuilds false
        abortOnError false
    }
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    defaultConfig{
-        vectorDrawables.useSupportLibrary = true
-    }
-}
-
-configurations {
-    cleanedAnnotations
-    compile.exclude group: 'org.jetbrains', module: 'annotations'
 }

 dependencies {
-    def lifecycle_version = '2.3.1'
-    def markwon_version = '4.6.2'
-    def work_version = "2.7.0-alpha05"
-    def acra = "5.7.0"
+    def lifecycle_version = "2.2.0-beta01"
+    final def markwon_version = "4.1.1"

    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.4.0-alpha03'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
-    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'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
-    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 'org.ocpsoft.prettytime:prettytime:5.0.0.Final'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0-beta01'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'com.github.vihtarb:tooltip:0.2.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+    implementation 'com.squareup.retrofit2:converter-scalars:2.5.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
+    implementation "com.vdurmont:emoji-java:4.0.0"
    implementation "com.pes.materialcolorpicker:library:1.2.5"
+
    implementation "io.noties.markwon:core:$markwon_version"
    implementation "io.noties.markwon:ext-latex:$markwon_version"
    implementation "io.noties.markwon:ext-strikethrough:$markwon_version"
@ -94,24 +60,14 @@ 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 "io.noties:prism4j:2.0.0"
-    annotationProcessor "io.noties:prism4j-bundler:2.0.0"
-    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 "com.github.chrisbanes:PhotoView:2.3.0"
-    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'
-    annotationProcessor 'androidx.room:room-compiler:2.3.0'
-    implementation "androidx.work:work-runtime:$work_version"
-    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'
+    implementation "com.caverock:androidsvg:1.4"
+    implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.14"

+    implementation "com.hendraanggrian.appcompat:socialview:0.2"
+    implementation "com.hendraanggrian.appcompat:socialview-commons:0.2"
+
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+
+    implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
 }
--- a/app/proguard-rules.pro
+++ b/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
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -1,95 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
    package="org.mian.gitnex">

-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.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
-            android:name=".activities.MergePullRequestActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        android:theme="@style/AppTheme">
        <activity
            android:name=".activities.FileViewActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"></activity>
        <activity
-            android:name=".activities.CreateFileActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:name=".activities.NewFileActivity"
            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:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+            android:name=".activities.AddRemoveAssigneesActivity"
+            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:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+            android:name=".activities.AddRemoveLabelsActivity"
+            android:theme="@style/Theme.AppCompat.Light.Dialog" />
+        <activity android:name=".activities.ProfileEmailActivity" />
+        <activity android:name=".activities.AddCollaboratorToRepositoryActivity" />
+        <activity android:name=".activities.CreateTeamByOrgActivity" />
+        <activity android:name=".activities.OrgTeamMembersActivity" />
        <activity
-            android:name=".activities.EditIssueActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            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/titleActivityOrgDetail"
+            android:name=".activities.OrgDetailActivity"
+            android:label="@string/title_activity_org_detail"
            android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".activities.CreateLabelActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.CreateIssueActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.CreateMilestoneActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity android:name=".activities.SponsorsActivity" />
+        <activity android:name=".activities.CreditsActivity" />
+        <activity android:name=".activities.CreateLabelActivity" />
+        <activity android:name=".activities.CreateIssueActivity" />
+        <activity android:name=".activities.NewMilestoneActivity" />
+        <activity android:name=".activities.ReplyToIssueActivity" />
        <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/titleActivityRepoDetail"
+            android:label="@string/title_activity_repo_detail"
            android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".activities.MainActivity"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-            android:exported="true">
+        <activity android:name=".activities.MainActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@ -98,106 +62,13 @@
        </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"/>
-        <activity
-            android:name=".activities.CreateRepoActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.CreateOrganizationActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.OpenRepoInBrowserActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
-        <activity
-            android:name=".activities.FileDiffActivity"
-            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 -->
-
+            android:launchMode="singleTask" />
+        <activity android:name=".activities.NewRepoActivity" />
+        <activity android:name=".activities.NewOrganizationActivity" />
+        <activity android:name=".activities.OpenRepoInBrowserActivity" />
    </application>
+    <uses-permission android:name="android.permission.INTERNET" />

-</manifest>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+</manifest>
--- a/app/src/main/app_logo-playstore.png
+++ b/app/src/main/app_logo-playstore.png
--- a/app/src/main/app_logo-web.png
+++ b/app/src/main/app_logo-web.png
--- a/app/src/main/assets/fonts/manroperegular.ttf
+++ b/app/src/main/assets/fonts/manroperegular.ttf
--- a/app/src/main/java/org/mian/gitnex/actions/ActionResult.java
+++ b/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);
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java
+++ b/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));
-			}
-		});
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
@ -2,20 +2,18 @@ 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;
 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 org.mian.gitnex.util.TinyDB;
+import androidx.annotation.NonNull;
 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
-                .getApiInterface(context)
-                .deleteCollaborator(Authorization.get(context), repoOwner, repoName, userName);
+        Call<Collaborators> call;
+
+        call = RetrofitClient
+                .getInstance(instanceUrl)
+                .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
-                .getApiInterface(context)
-                .addCollaborator(Authorization.get(context), repoOwner, repoName, userName, permissionString);
+        call = RetrofitClient
+                .getInstance(instanceUrl)
+                .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;
-
-	}
-
 }
--- a/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
@ -1,20 +1,20 @@
 package org.mian.gitnex.actions;

 import android.content.Context;
-import androidx.annotation.NonNull;
+import android.util.Log;
 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.UpdateIssueState;
+import org.mian.gitnex.models.IssueComments;
+import org.mian.gitnex.util.TinyDB;
+import androidx.annotation.NonNull;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;

 /**
 * Author M M Arif
@ -22,306 +22,143 @@ import retrofit2.Response;

 public class IssueActions {

-	public static ActionResult<Response<?>> edit(Context context, String comment, int commentId) {
+    public static void editIssueComment(final Context context, final int commentId, final String commentBody) {

-		ActionResult<Response<?>> actionResult = new ActionResult<>();
+        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];

-		TinyDB tinyDb = TinyDB.getInstance(context);
+        IssueComments commentBodyJson = new IssueComments(commentBody);
+        Call<IssueComments> call;

-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
+        call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .patchIssueComment(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, commentId, commentBodyJson);

-		String repoOwner = parts[0];
-		String repoName = parts[1];
+        call.enqueue(new Callback<IssueComments>() {

-		Call<IssueComments> call = RetrofitClient
-			.getApiInterface(context)
-			.patchIssueComment(Authorization.get(context), repoOwner, repoName, commentId, new IssueComments(comment));
+            @Override
+            public void onResponse(@NonNull Call<IssueComments> call, @NonNull retrofit2.Response<IssueComments> response) {

-		call.enqueue(new Callback<IssueComments>() {
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {

-			@Override
-			public void onResponse(@NonNull Call<IssueComments> call, @NonNull retrofit2.Response<IssueComments> response) {
+                        tinyDb.putBoolean("commentEdited", true);
+                        Toasty.info(context, context.getString(R.string.editCommentUpdatedText));
+                        ((ReplyToIssueActivity)context).finish();

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

-					case 200:
-						actionResult.finish(ActionResult.Status.SUCCESS);
-						break;
+                    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));

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

-					default:
-						actionResult.finish(ActionResult.Status.FAILED, response);
-						break;
+                    Toasty.info(context, context.getString(R.string.authorizeError));

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

-			@Override
-			public void onFailure(@NonNull Call<IssueComments> call, @NonNull Throwable t) {
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

-				actionResult.finish(ActionResult.Status.FAILED);
-			}
-		});
+                }
+                else {

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

-	}
+                }

-	public static void closeReopenIssue(final Context ctx, final int issueIndex, final String issueState) {
+            }

-		final TinyDB tinyDb = TinyDB.getInstance(ctx);
+            @Override
+            public void onFailure(@NonNull Call<IssueComments> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });

-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
+    }

-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
+    public static void closeReopenIssue(final Context context, final int issueIndex, final String issueState) {

-		UpdateIssueState issueStatJson = new UpdateIssueState(issueState);
-		Call<JsonElement> call;
+        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 = RetrofitClient
-			.getApiInterface(ctx)
-			.closeReopenIssue(Authorization.get(ctx), repoOwner, repoName, issueIndex, issueStatJson);
+        UpdateIssueState issueStatJson = new UpdateIssueState(issueState);
+        Call<JsonElement> call;

-		call.enqueue(new Callback<JsonElement>() {
+        call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .closeReopenIssue(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);

-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+        call.enqueue(new Callback<JsonElement>() {

-				if(response.isSuccessful()) {
-					if(response.code() == 201) {
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {

-						tinyDb.putBoolean("resumeIssues", true);
-						tinyDb.putBoolean("resumeClosedIssues", true);
+                if(response.isSuccessful()) {
+                    if(response.code() == 201) {

-						if(issueState.equals("closed")) {
+                        tinyDb.putBoolean("resumeIssues", true);
+                        tinyDb.putBoolean("resumeClosedIssues", true);
+                        if(issueState.equals("closed")) {
+                            Toasty.info(context, context.getString(R.string.issueStateClosed));
+                        }
+                        else if(issueState.equals("open")) {
+                            Toasty.info(context, context.getString(R.string.issueStateReopened));
+                        }

-							Toasty.success(ctx, ctx.getString(R.string.issueStateClosed));
-							tinyDb.putString("issueState", "closed");
+                    }
+                }
+                else if(response.code() == 401) {

-						}
-						else if(issueState.equals("open")) {
+                    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));

-							Toasty.success(ctx, ctx.getString(R.string.issueStateReopened));
-							tinyDb.putString("issueState", "open");
+                }
+                else if(response.code() == 403) {

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

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

-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

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

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

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

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

-				}
-				else {
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });

-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
-
-	}
-
-	public static void subscribe(final Context ctx) {
-
-		final TinyDB tinyDB = TinyDB.getInstance(ctx);
-
-		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
-			.getApiInterface(ctx)
-			.addIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
-
-		call.enqueue(new Callback<Void>() {
-
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
-
-				if(response.isSuccessful()) {
-
-					if(response.code() == 201) {
-
-						Toasty.success(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));
-
-					}
-
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getString(R.string.subscriptionError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
-
-	}
-
-	public static void unsubscribe(final Context ctx) {
-
-		final TinyDB tinyDB = TinyDB.getInstance(ctx);
-
-		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.getApiInterface(ctx).delIssueSubscriber(token, repoFullName[0], repoFullName[1], issueNr, userLogin);
-
-		call.enqueue(new Callback<Void>() {
-
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
-
-				if(response.isSuccessful()) {
-
-					if(response.code() == 201) {
-
-						Toasty.success(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
-						tinyDB.putBoolean("issueSubscribed", false);
-
-					}
-					else if(response.code() == 200) {
-
-						tinyDB.putBoolean("issueSubscribed", false);
-						Toasty.success(ctx, ctx.getString(R.string.alreadyUnsubscribed));
-
-					}
-
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getString(R.string.unSubscriptionError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	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;
-
-	}
+    }

 }
--- a/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
+++ b/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));
-			}
-		});
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
@ -1,135 +0,0 @@
-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.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 retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class MilestoneActions {
-
-	static final private String TAG = "MilestoneActions : ";
-
-	public static void closeMilestone(final Context ctx, int milestoneId_) {
-
-		final TinyDB tinyDB = TinyDB.getInstance(ctx);
-
-		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 token = "token " + tinyDB.getString(loginUid + "-token");
-
-		Milestones milestoneStateJson = new Milestones("closed");
-		Call<JsonElement> call;
-
-		call = RetrofitClient
-				.getApiInterface(ctx)
-				.closeReopenMilestone(token, repoOwner, repoName, milestoneId_, milestoneStateJson);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.isSuccessful()) {
-
-					Toasty.success(ctx, ctx.getString(R.string.milestoneStatusUpdate));
-
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Log.e(TAG, t.toString());
-
-			}
-
-		});
-
-
-	}
-
-	public static void openMilestone(final Context ctx, int milestoneId_) {
-
-		final TinyDB tinyDB = TinyDB.getInstance(ctx);
-
-		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 token = "token " + tinyDB.getString(loginUid + "-token");
-
-		Milestones milestoneStateJson = new Milestones("open");
-		Call<JsonElement> call;
-
-		call = RetrofitClient
-				.getApiInterface(ctx)
-				.closeReopenMilestone(token, repoOwner, repoName, milestoneId_, milestoneStateJson);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.isSuccessful()) {
-
-					Toasty.success(ctx, ctx.getString(R.string.milestoneStatusUpdate));
-
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-				}
-				else {
-
-					Toasty.error(ctx, ctx.getString(R.string.genericError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Log.e(TAG, t.toString());
-
-			}
-
-		});
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/actions/NotificationsActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/NotificationsActions.java
@ -1,56 +0,0 @@
-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 java.io.IOException;
-import java.util.Date;
-import retrofit2.Call;
-
-/**
- * Author opyale
- */
-
-public class NotificationsActions {
-
-	public enum NotificationStatus {READ, UNREAD, PINNED}
-
-	private TinyDB tinyDB;
-	private Context context;
-	private String instanceToken;
-
-	public NotificationsActions(Context context) {
-
-		this.context = context;
-		this.tinyDB = TinyDB.getInstance(context);
-
-		String loginUid = tinyDB.getString("loginUid");
-
-		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
-
-	}
-
-	public void setNotificationStatus(NotificationThread notificationThread, NotificationStatus notificationStatus) throws IOException {
-
-		Call<Void> call = RetrofitClient.getApiInterface(context)
-			.markNotificationThreadAsRead(instanceToken, notificationThread.getId(), notificationStatus.name());
-
-		if(!call.execute().isSuccessful()) {
-
-			throw new IllegalStateException();
-		}
-	}
-
-	public boolean setAllNotificationsRead(Date date) throws IOException {
-
-		Call<Void> call = RetrofitClient.getApiInterface(context)
-			.markNotificationThreadsAsRead(instanceToken, AppUtil.getTimestampFromDate(context, date), true,
-				new String[]{"unread", "pinned"}, "read");
-
-		return call.execute().isSuccessful();
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/actions/PullRequestActions.java
+++ b/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));
-			}
-		});
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java
@ -8,8 +8,8 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.util.TinyDB;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -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)
-                .starRepository(Authorization.get(context), repoOwner, repoName);
+                .getInstance(instanceUrl)
+                .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)
-                .unStarRepository(Authorization.get(context), repoOwner, repoName);
+                .getInstance(instanceUrl)
+                .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)
-                .watchRepository(Authorization.get(context), repoOwner, repoName);
+                .getInstance(instanceUrl)
+                .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)
-                .unWatchRepository(Authorization.get(context), repoOwner, repoName);
+                .getInstance(instanceUrl)
+                .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));

                }

--- a/app/src/main/java/org/mian/gitnex/actions/TeamActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/TeamActions.java
@ -1,144 +0,0 @@
-package org.mian.gitnex.actions;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.AddNewTeamMemberActivity;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class TeamActions {
-
-	public static void removeTeamMember(final Context context, String userName, int teamId) {
-
-		final TinyDB tinyDb = TinyDB.getInstance(context);
-
-		Call<JsonElement> call;
-
-		call = RetrofitClient
-				.getApiInterface(context)
-				.removeTeamMember(Authorization.get(context), teamId, userName);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.isSuccessful()) {
-
-					if(response.code() == 204) {
-
-						tinyDb.putBoolean("teamActionFlag", true);
-						Toasty.success(context, context.getString(R.string.memberRemovedMessage));
-						((AddNewTeamMemberActivity)context).finish();
-
-					}
-
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
-							context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-							context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-				}
-				else if(response.code() == 403) {
-
-					Toasty.error(context, context.getString(R.string.authorizeError));
-
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-
-				}
-				else {
-
-					Toasty.error(context, context.getString(R.string.genericError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-
-			}
-		});
-
-	}
-
-	public static void addTeamMember(final Context context, String userName, int teamId) {
-
-		final TinyDB tinyDb = TinyDB.getInstance(context);
-
-		Call<JsonElement> call = RetrofitClient
-				.getApiInterface(context)
-				.addTeamMember(Authorization.get(context), teamId, userName);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.isSuccessful()) {
-
-					if(response.code() == 204) {
-
-						tinyDb.putBoolean("teamActionFlag", true);
-						Toasty.success(context, context.getString(R.string.memberAddedMessage));
-						((AddNewTeamMemberActivity)context).finish();
-
-					}
-
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
-							context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-							context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
-				}
-				else if(response.code() == 403) {
-
-					Toasty.error(context, context.getString(R.string.authorizeError));
-
-				}
-				else if(response.code() == 404) {
-
-					Toasty.warning(context, context.getString(R.string.apiNotFound));
-
-				}
-				else {
-
-					Toasty.error(context, context.getString(R.string.genericError));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
-
-			}
-		});
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
@ -1,36 +1,40 @@
 package org.mian.gitnex.activities;

-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
-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 java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.UserSearchAdapter;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserSearch;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import java.util.List;

 /**
 * Author M M Arif
 */

-public class AddCollaboratorToRepositoryActivity extends BaseActivity {
+public class AddCollaboratorToRepositoryActivity extends AppCompatActivity {

    private View.OnClickListener onClickListener;
+    final Context ctx = this;
    private TextView addCollaboratorSearch;
    private TextView noData;
    private ProgressBar mProgressBar;
@ -38,65 +42,58 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
    private RecyclerView mRecyclerView;

    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_collaborator_to_repository);

-	    ActivityAddCollaboratorToRepositoryBinding activityAddCollaboratorToRepositoryBinding = ActivityAddCollaboratorToRepositoryBinding.inflate(getLayoutInflater());
-		setContentView(activityAddCollaboratorToRepositoryBinding.getRoot());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-        ImageView closeActivity = activityAddCollaboratorToRepositoryBinding.close;
-        addCollaboratorSearch = activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch;
-        mRecyclerView = activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch;
-        mProgressBar = activityAddCollaboratorToRepositoryBinding.progressBar;
-        noData = activityAddCollaboratorToRepositoryBinding.noData;
-
-        addCollaboratorSearch.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(addCollaboratorSearch, InputMethodManager.SHOW_IMPLICIT);
+        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);

        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

-        addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
-
-            if (actionId == EditorInfo.IME_ACTION_SEND) {
-
-                if(!addCollaboratorSearch.getText().toString().equals("")) {
-
-	                mProgressBar.setVisibility(View.VISIBLE);
-                    loadUserSearchList(addCollaboratorSearch.getText().toString());
+        addCollaboratorSearch.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND) {
+                    if(!addCollaboratorSearch.getText().toString().equals("")) {
+                        loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), getApplicationContext(), loginUid);
+                    }
                }
+                return false;
            }
-
-            return false;
-
        });

    }

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

        Call<UserSearch> call = RetrofitClient
-                .getApiInterface(appCtx)
-                .getUserBySearch(Authorization.get(ctx), searchKeyword, 10, 1);
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .getUserBySearch(Authorization.returnAuthentication(getApplicationContext(), 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.code() == 200) {
-
+                if (response.isSuccessful()) {
                    assert response.body() != null;
-                    getUsersList(response.body().getData(), ctx);
-                }
-                else {
-
+                    getUsersList(response.body().getData(), context);
+                } else {
                    Log.i("onResponse", String.valueOf(response.code()));
                }

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

            @Override
            public void onFailure(@NonNull Call<UserSearch> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.toString());
+                Log.i("onFailure", t.getMessage());
            }

        });
@ -115,7 +112,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
        UserSearchAdapter adapter = new UserSearchAdapter(dataList, context);

        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
                DividerItemDecoration.VERTICAL);
        mRecyclerView.addItemDecoration(dividerItemDecoration);
@ -123,20 +120,25 @@ 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();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

+
 }
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
@ -1,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();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java
@ -1,154 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
-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 java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * Author M M Arif
- */
-
-public class AddNewTeamMemberActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-	private TextView addNewTeamMember;
-	private TextView noData;
-	private ProgressBar mProgressBar;
-
-	private RecyclerView mRecyclerView;
-	private List<UserInfo> dataList;
-	private UserSearchForTeamMemberAdapter adapter;
-
-	private String teamId;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		ActivityAddNewTeamMemberBinding activityAddNewTeamMemberBinding = ActivityAddNewTeamMemberBinding.inflate(getLayoutInflater());
-		setContentView(activityAddNewTeamMemberBinding.getRoot());
-
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-		ImageView closeActivity = activityAddNewTeamMemberBinding.close;
-		addNewTeamMember = activityAddNewTeamMemberBinding.addNewTeamMember;
-		mRecyclerView = activityAddNewTeamMemberBinding.recyclerViewUserSearch;
-		mProgressBar = activityAddNewTeamMemberBinding.progressBar;
-		noData = activityAddNewTeamMemberBinding.noData;
-
-		addNewTeamMember.requestFocus();
-		assert imm != null;
-		imm.showSoftInput(addNewTeamMember, InputMethodManager.SHOW_IMPLICIT);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")) {
-
-			teamId = getIntent().getStringExtra("teamId");
-		}
-		else {
-
-			teamId = "0";
-		}
-
-		mRecyclerView.setHasFixedSize(true);
-		mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),	DividerItemDecoration.VERTICAL);
-		mRecyclerView.addItemDecoration(dividerItemDecoration);
-
-		dataList = new ArrayList<>();
-
-		addNewTeamMember.addTextChangedListener(new TextWatcher() {
-
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-				if(!addNewTeamMember.getText().toString().equals("") && addNewTeamMember.getText().toString().length() > 1) {
-
-					adapter = new UserSearchForTeamMemberAdapter(dataList, ctx, Integer.parseInt(teamId));
-					loadUserSearchList(addNewTeamMember.getText().toString(), teamId);
-				}
-			}
-
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-			}
-
-			@Override
-			public void afterTextChanged(Editable s) {
-			}
-
-		});
-
-	}
-
-	public void loadUserSearchList(String searchKeyword, String teamId) {
-
-		Call<UserSearch> call = RetrofitClient.getApiInterface(ctx).getUserBySearch(Authorization.get(ctx), searchKeyword, 10, 1);
-
-		mProgressBar.setVisibility(View.VISIBLE);
-
-		call.enqueue(new Callback<UserSearch>() {
-
-			@Override
-			public void onResponse(@NonNull Call<UserSearch> call, @NonNull Response<UserSearch> response) {
-
-				if(response.isSuccessful()) {
-
-					assert response.body() != null;
-					if(response.body().getData().size() > 0) {
-
-						dataList.clear();
-						dataList.addAll(response.body().getData());
-						mRecyclerView.setAdapter(adapter);
-						noData.setVisibility(View.GONE);
-					}
-					else {
-
-						noData.setVisibility(View.VISIBLE);
-					}
-
-					mProgressBar.setVisibility(View.GONE);
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<UserSearch> call, @NonNull Throwable t) {
-				Log.e("onFailure", t.toString());
-			}
-
-		});
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
@ -0,0 +1,290 @@
+package org.mian.gitnex.activities;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Window;
+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.Toasty;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.models.MultiSelectModel;
+import org.mian.gitnex.models.UpdateIssueAssignee;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class AddRemoveAssigneesActivity extends AppCompatActivity {
+
+    private ArrayList<MultiSelectModel> listOfCollaborators = new ArrayList<>();
+    private ArrayList<Integer> issueAssigneesIds = new ArrayList<>();
+    private Boolean assigneesFlag = false;
+    private MultiSelectDialog multiSelectDialogAssignees;
+    final Context ctx = this;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.activity_add_remove_assignees);
+
+        getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        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(getApplicationContext());
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), 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)
+                                .getApiInterface()
+                                .getIssueByIndex(Authorization.returnAuthentication(getApplicationContext(), 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(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {
+
+                                                        Log.i("selectedNames", String.valueOf(selectedNames));
+
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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(ArrayList<Integer> selectedIds, ArrayList<String> selectedNames, String dataString) {
+
+                                                        updateIssueAssignees(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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(getApplicationContext(), 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) {
+
+        UpdateIssueAssignee updateAssigneeJson = new UpdateIssueAssignee(issueAssigneesList);
+
+        Call<JsonElement> call3;
+
+        call3 = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .patchIssueAssignee(Authorization.returnAuthentication(getApplicationContext(), 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(getApplicationContext(), getString(R.string.genericError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
@ -0,0 +1,303 @@
+package org.mian.gitnex.activities;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Window;
+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.Toasty;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.MultiSelectModel;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class AddRemoveLabelsActivity extends AppCompatActivity {
+
+    private ArrayList<MultiSelectModel> listOfLabels = new ArrayList<>();
+    private ArrayList<Integer> issueLabelIds = new ArrayList<>();
+    private Boolean labelsFlag = false;
+    private MultiSelectDialog multiSelectDialogLabels;
+    final Context ctx = this;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.activity_add_remove_labels);
+
+        getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        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(getApplicationContext());
+
+        Call<List<Labels>> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .getlabels(Authorization.returnAuthentication(getApplicationContext(), 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)
+                                .getApiInterface()
+                                .getIssueLabels(Authorization.returnAuthentication(getApplicationContext(), 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(ArrayList<Integer> selectedIds, ArrayList<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(getApplicationContext(), 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(ArrayList<Integer> selectedIds, ArrayList<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(getApplicationContext(), 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(getApplicationContext(), 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)
+                .getApiInterface()
+                .updateIssueLabels(Authorization.returnAuthentication(getApplicationContext(), 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(getApplicationContext(), 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();
+    }
+}
--- a/app/src/main/java/org/mian/gitnex/activities/AdminCronTasksActivity.java
+++ b/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();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
@ -1,10 +1,18 @@
 package org.mian.gitnex.activities;

+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.Looper;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@ -12,91 +20,98 @@ import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.AdminGetUsersAdapter;
-import org.mian.gitnex.databinding.ActivityAdminGetUsersBinding;
-import org.mian.gitnex.fragments.BottomSheetAdminUsersFragment;
-import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.fragments.AdminUsersBottomSheetFragment;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.AdminGetUsersViewModel;
+import java.util.List;
+import java.util.Objects;

 /**
 * Author M M Arif
 */

-public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAdminUsersFragment.BottomSheetListener {
+public class AdminGetUsersActivity extends AppCompatActivity implements AdminUsersBottomSheetFragment.BottomSheetListener {

    private View.OnClickListener onClickListener;
+    final Context ctx = this;
    private AdminGetUsersAdapter adapter;
    private RecyclerView mRecyclerView;
    private TextView noDataUsers;
    private Boolean searchFilter = false;

    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_admin_get_users);

-	    ActivityAdminGetUsersBinding activityAdminGetUsersBinding = ActivityAdminGetUsersBinding.inflate(getLayoutInflater());
-	    setContentView(activityAdminGetUsersBinding.getRoot());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-        ImageView closeActivity = activityAdminGetUsersBinding.close;
-        noDataUsers = activityAdminGetUsersBinding.noDataUsers;
-        mRecyclerView = activityAdminGetUsersBinding.recyclerView;
+        ImageView closeActivity = findViewById(R.id.close);
+        noDataUsers = findViewById(R.id.noDataUsers);
+        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();
        closeActivity.setOnClickListener(onClickListener);

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

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

-        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        swipeRefresh.setRefreshing(false);
+                        AdminGetUsersViewModel.loadUsersList(getApplicationContext(), instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken));
+                    }
+                }, 500);
+            }
+        });

-            swipeRefresh.setRefreshing(false);
-            AdminGetUsersViewModel.loadUsersList(ctx, Authorization.get(ctx));
-
-        }, 500));
-
-        fetchDataAsync(ctx, Authorization.get(ctx));
+        fetchDataAsync(getApplicationContext(), instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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);
+        AdminGetUsersViewModel usersModel = ViewModelProviders.of(this).get(AdminGetUsersViewModel.class);

-        usersModel.getUsersList(ctx, instanceToken).observe(this, usersListMain -> {
-
-            adapter = new AdminGetUsersAdapter(ctx, usersListMain);
-            if(adapter.getItemCount() > 0) {
-
-                mRecyclerView.setVisibility(View.VISIBLE);
-                mRecyclerView.setAdapter(adapter);
-                noDataUsers.setVisibility(View.GONE);
-                searchFilter = true;
+        usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, new Observer<List<UserInfo>>() {
+            @Override
+            public void onChanged(@Nullable List<UserInfo> usersListMain) {
+                adapter = new AdminGetUsersAdapter(getApplicationContext(), usersListMain);
+                if(adapter.getItemCount() > 0) {
+                    mRecyclerView.setVisibility(View.VISIBLE);
+                    mRecyclerView.setAdapter(adapter);
+                    noDataUsers.setVisibility(View.GONE);
+                    searchFilter = true;
+                }
+                else {
+                    //adapter.notifyDataSetChanged();
+                    //mRecyclerView.setAdapter(adapter);
+                    mRecyclerView.setVisibility(View.GONE);
+                    noDataUsers.setVisibility(View.VISIBLE);
+                }
            }
-            else {
-
-                mRecyclerView.setVisibility(View.GONE);
-                noDataUsers.setVisibility(View.VISIBLE);
-            }
-
        });

    }
@ -107,37 +122,37 @@ 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(new Runnable() {
+            @Override
+            public void run() {
+                if(searchFilter) {

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

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

-                inflater.inflate(R.menu.search_menu, menu);
+                    MenuItem searchItem = menu.findItem(R.id.action_search);
+                    androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+                    searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);

-                MenuItem searchItem = menu.findItem(R.id.action_search);
-                SearchView searchView = (SearchView) searchItem.getActionView();
-                searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-
-                if(!connToInternet) {
-                    return;
-                }
-
-                searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-
-                    @Override
-                    public boolean onQueryTextSubmit(String query) { return true; }
-
-                    @Override
-                    public boolean onQueryTextChange(String newText) {
-
-                        adapter.getFilter().filter(newText);
-                        return false;
+                    if(!connToInternet) {
+                        return;
                    }

-                });
-            }
+                    searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+                        @Override
+                        public boolean onQueryTextSubmit(String query) {
+                            return true;
+                        }

+                        @Override
+                        public boolean onQueryTextChange(String newText) {
+                            adapter.getFilter().filter(newText);
+                            return false;
+                        }
+                    });
+                }
+            }
        }, 500);

        return true;
@ -148,21 +163,18 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd

        int id = item.getItemId();

-        if(id == android.R.id.home) {
-
-	        finish();
-	        return true;
+        switch (id) {
+            case android.R.id.home:
+                finish();
+                return true;
+            case R.id.genericMenu:
+                AdminUsersBottomSheetFragment bottomSheet = new AdminUsersBottomSheetFragment();
+                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
@ -177,7 +189,12 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
    }

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@ -1,136 +0,0 @@
-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 androidx.core.content.ContextCompat;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.notifications.Notifications;
-import java.util.Locale;
-import java.util.concurrent.Executor;
-
-/**
- * Author M M Arif
- */
-
-public abstract class BaseActivity extends AppCompatActivity {
-
-	protected TinyDB tinyDB;
-
-	protected Context ctx = this;
-	protected Context appCtx;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		this.appCtx = getApplicationContext();
-		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(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);
-
-		}
-
-		String locale = tinyDB.getString("locale");
-		if (locale.isEmpty()) {
-			AppUtil.setAppLocale(getResources(), Locale.getDefault().getLanguage());
-		}
-		else {
-			AppUtil.setAppLocale(getResources(), locale);
-		}
-
-		Notifications.startWorker(appCtx);
-	}
-
-	public void onResume() {
-		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);
-
-		}
-	}
-}
-
-
--- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
@ -1,268 +0,0 @@
-package org.mian.gitnex.activities;
-
-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.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.databinding.ActivityCommitsBinding;
-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.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * Author M M Arif
- */
-
-public class CommitsActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-	private TextView noData;
-	private ProgressBar progressBar;
-	private String TAG = "CommitsActivity";
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
-	private int pageSize = 1;
-
-	private RecyclerView recyclerView;
-	private List<Commits> commitsList;
-	private CommitsAdapter adapter;
-	private ProgressBar progressLoadMore;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		ActivityCommitsBinding activityCommitsBinding = ActivityCommitsBinding.inflate(getLayoutInflater());
-		setContentView(activityCommitsBinding.getRoot());
-
-		Toolbar toolbar = activityCommitsBinding.toolbar;
-		setSupportActionBar(toolbar);
-
-		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;
-		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
-		toolbar_title.setText(branchName);
-
-		ImageView closeActivity = activityCommitsBinding.close;
-		noData = activityCommitsBinding.noDataCommits;
-		progressLoadMore = activityCommitsBinding.progressLoadMore;
-		progressBar = activityCommitsBinding.progressBar;
-		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")) {
-
-			resultLimit = Constants.resultLimitNewGiteaInstances;
-		}
-
-		recyclerView = activityCommitsBinding.recyclerView;
-		commitsList = new ArrayList<>();
-
-		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-
-			swipeRefresh.setRefreshing(false);
-			loadInitial(Authorization.get(ctx), repoOwner, repoName, branchName, resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
-
-		adapter = new CommitsAdapter(ctx, commitsList);
-		adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
-
-			if(commitsList.size() == resultLimit || pageSize == resultLimit) {
-
-				int page = (commitsList.size() + resultLimit) / resultLimit;
-				loadMore(Authorization.get(ctx), repoOwner, repoName, page, branchName, resultLimit);
-			}
-		}));
-
-		recyclerView.setHasFixedSize(true);
-		recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-		recyclerView.setAdapter(adapter);
-
-		loadInitial(Authorization.get(ctx), 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.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>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
-
-				if(response.isSuccessful()) {
-
-					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()));
-				}
-
-				progressLoadMore.setVisibility(View.GONE);
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
-			}
-
-		});
-
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.search_menu, menu);
-
-		MenuItem searchItem = menu.findItem(R.id.action_search);
-		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
-		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-
-		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-
-			@Override
-			public boolean onQueryTextSubmit(String query) {
-
-				return false;
-			}
-
-			@Override
-			public boolean onQueryTextChange(String newText) {
-
-				filter(newText);
-				return true;
-			}
-
-		});
-
-		return super.onCreateOptionsMenu(menu);
-	}
-
-	private void filter(String text) {
-
-		List<Commits> arr = new ArrayList<>();
-
-		for(Commits d : commitsList) {
-
-			if(d.getCommit().getMessage().toLowerCase().contains(text) || d.getSha().toLowerCase().contains(text)) {
-
-				arr.add(d);
-			}
-		}
-
-		adapter.updateList(arr);
-	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> {
-
-			getIntent().removeExtra("branchName");
-			finish();
-		};
-	}
-
-}
-
-
--- a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
@ -1,388 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
-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.Toasty;
-import java.util.ArrayList;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class CreateFileActivity extends BaseActivity {
-
-	private ActivityCreateFileBinding binding;
-
-	public static final int FILE_ACTION_CREATE = 0;
-	public static final int FILE_ACTION_DELETE = 1;
-	public static final int FILE_ACTION_EDIT = 2;
-
-	private int fileAction = FILE_ACTION_CREATE;
-
-	private String filePath;
-	private String fileSha;
-
-    private final List<String> branches = new ArrayList<>();
-
-	private String repoOwner;
-	private String repoName;
-
-    @SuppressLint("ClickableViewAccessibility")
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-        binding = ActivityCreateFileBinding.inflate(getLayoutInflater());
-	    setContentView(binding.getRoot());
-
-        String repoFullName = tinyDB.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        repoOwner = parts[0];
-        repoName = parts[1];
-
-	    TextView toolbarTitle = binding.toolbarTitle;
-
-        binding.newFileName.requestFocus();
-
-	    InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        assert inputMethodManager != null;
-        inputMethodManager.showSoftInput(binding.newFileName, InputMethodManager.SHOW_IMPLICIT);
-
-	    binding.close.setOnClickListener(view -> finish());
-	    binding.newFileContent.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;
-
-	    });
-
-	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", FILE_ACTION_DELETE) == FILE_ACTION_DELETE) {
-
-		    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);
-	    networkStatusObserver.registerNetworkStatusListener(binding.newFileCreate::setEnabled);
-
-	    binding.newFileCreate.setOnClickListener(v -> processNewFile());
-
-    }
-
-    private void processNewFile() {
-
-        String newFileName = binding.newFileName.getText() != null ? binding.newFileName.getText().toString() : "";
-        String newFileContent = binding.newFileContent.getText() != null ? binding.newFileContent.getText().toString() : "";
-        String newFileBranchName = binding.newFileBranches.getText() != null ? binding.newFileBranches.getText().toString() : "";
-        String newFileCommitMessage = binding.newFileCommitMessage.getText() != null ? binding.newFileCommitMessage.getText().toString() : "";
-
-        if(!AppUtil.hasNetworkConnection(appCtx)) {
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-            return;
-        }
-
-        if(((newFileName.isEmpty() || newFileContent.isEmpty()) && fileAction != FILE_ACTION_DELETE) || newFileCommitMessage.isEmpty()) {
-            Toasty.error(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;
-
-        }
-    }
-
-    private void createNewFile(String repoOwner, String repoName, String fileName, String fileContent, String fileCommitMessage, String branchName) {
-
-        NewFile createNewFileJsonStr = branches.contains(branchName) ?
-	        new NewFile(branchName, fileContent, fileCommitMessage, "") :
-	        new NewFile("", fileContent, fileCommitMessage, branchName);
-
-        Call<JsonElement> call = RetrofitClient
-                .getApiInterface(ctx)
-                .createNewFile(Authorization.get(ctx), 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()) {
-
-		            case 201:
-			            enableProcessButton();
-			            Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
-			            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.warning(ctx, getString(R.string.apiNotFound));
-		            	break;
-
-		            default:
-			            enableProcessButton();
-			            Toasty.error(ctx, getString(R.string.orgCreatedError));
-		            	break;
-
-	            }
-            }
-
-            @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) {
-
-    	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)
-                .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.code() == 200) {
-
-                	assert response.body() != null;
-                    for(Branches branch : response.body()) branches.add(branch.getName());
-
-                    ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateFileActivity.this, R.layout.list_spinner_items, branches);
-
-	                binding.newFileBranches.setAdapter(adapter);
-	                binding.newFileBranches.setText(tinyDB.getString("repoBranch"), false);
-
-	                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 enableProcessButton() { binding.newFileCreate.setEnabled(true); }
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
@ -1,262 +1,288 @@
 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.drawable.ColorDrawable;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.Collaborators;
-import org.gitnex.tea4j.models.CreateIssue;
-import org.gitnex.tea4j.models.Labels;
-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.TinyDB;
-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 java.util.Objects;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
+import retrofit2.Response;
+import android.app.DatePickerDialog;
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+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 com.google.gson.JsonElement;
+import com.hendraanggrian.appcompat.socialview.Mention;
+import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
+import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.MultiSelectDialog;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.CreateIssue;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.Milestones;
+import org.mian.gitnex.models.MultiSelectModel;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;

 /**
 * Author M M Arif
 */

-public class CreateIssueActivity extends BaseActivity implements View.OnClickListener, LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener {
+public class CreateIssueActivity extends AppCompatActivity implements View.OnClickListener {

-	private ActivityCreateIssueBinding viewBinding;
-	private CustomLabelsSelectionDialogBinding labelsBinding;
-	private CustomAssigneesSelectionDialogBinding assigneesBinding;
    private View.OnClickListener onClickListener;
-    private int resultLimit = Constants.resultLimitOldGiteaInstances;
-	private Dialog dialogLabels;
-	private Dialog dialogAssignees;
-	private String labelsSetter;
-	private String assigneesSetter;
-	private int milestoneId;
+    MultiSelectDialog multiSelectDialog;
+    MultiSelectDialog multiSelectDialogLabels;
+    private TextView assigneesList;
+    private TextView newIssueLabels;
+    private TextView newIssueDueDate;
+    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 String loginUid;
-	private String repoOwner;
-	private String repoName;
+    List<Milestones> milestonesList = new ArrayList<>();
+    ArrayList<MultiSelectModel> listOfAssignees = new ArrayList<>();
+    ArrayList<MultiSelectModel> listOfLabels= new ArrayList<>();
+    private ArrayAdapter<Mention> defaultMentionAdapter;

-	private LabelsListAdapter labelsAdapter;
-	private AssigneesListAdapter assigneesAdapter;
-
-	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) {
-
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_issue);

-	    viewBinding = ActivityCreateIssueBinding.inflate(getLayoutInflater());
-	    setContentView(viewBinding.getRoot());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        loginUid = tinyDB.getString("loginUid");
-        String repoFullName = tinyDB.getString("repoFullName");
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
-        repoOwner = parts[0];
-        repoName = parts[1];
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-        // require gitea 1.12 or higher
-        if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+        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);

-            resultLimit = Constants.resultLimitNewGiteaInstances;
-        }
+        defaultMentionAdapter = new MentionArrayAdapter<>(this);
+        loadCollaboratorsList();

-	    viewBinding.newIssueTitle.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(viewBinding.newIssueTitle, InputMethodManager.SHOW_IMPLICIT);
-
-	    viewBinding.newIssueDescription.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, CreateIssueActivity.this, labelsIds);
-	    assigneesAdapter = new AssigneesListAdapter(ctx, assigneesList, CreateIssueActivity.this, assigneesListData);
+        newIssueDescription.setMentionAdapter(defaultMentionAdapter);

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

-	    viewBinding.newIssueAssigneesList.setOnClickListener(this);
-	    viewBinding.newIssueLabels.setOnClickListener(this);
-	    viewBinding.newIssueDueDate.setOnClickListener(this);
+        assigneesList.setOnClickListener(this);
+        newIssueLabels.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);
+
+        getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
+        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid);

        disableProcessButton();

-	    viewBinding.newIssueLabels.setOnClickListener(newIssueLabels -> showLabels());
-
-	    viewBinding.newIssueAssigneesList.setOnClickListener(newIssueAssigneesList -> showAssignees());
-
        if(!connToInternet) {

-	        viewBinding.createNewIssueButton.setEnabled(false);
-        }
-        else {
+            createNewIssueButton.setEnabled(false);
+            GradientDrawable shape =  new GradientDrawable();
+            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);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-        String newIssueTitleForm = Objects.requireNonNull(viewBinding.newIssueTitle.getText()).toString();
-        String newIssueDescriptionForm = Objects.requireNonNull(viewBinding.newIssueDescription.getText()).toString();
-        String newIssueDueDateForm = Objects.requireNonNull(viewBinding.newIssueDueDate.getText()).toString();
+        Milestones mModel = (Milestones) newIssueMilestoneSpinner.getSelectedItem();
+
+        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(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;
+
        }

        if (newIssueTitleForm.equals("")) {

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

+        /*if (newIssueDescriptionForm.equals("")) {
+
+            Toasty.info(getApplicationContext(), 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(getApplicationContext());
+
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Collaborators>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+
+                if (response.isSuccessful()) {
+
+                    assert response.body() != null;
+                    String fullName = "";
+                    for (int i = 0; i < response.body().size(); i++) {
+                        if(!response.body().get(i).getFull_name().equals("")) {
+                            fullName = response.body().get(i).getFull_name();
+                        }
+                        defaultMentionAdapter.add(
+                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
+                    }
+
+                } else {
+
+                    Log.i("onResponse", String.valueOf(response.code()));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+                Log.i("onFailure", t.getMessage());
+            }
+
+        });
+    }
+
+    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)
-                .createNewIssue(Authorization.get(ctx), repoOwner, repoName, createNewIssueJson);
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .createNewIssue(Authorization.returnAuthentication(getApplicationContext(), 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);
-                    tinyDb.putBoolean("resumeIssues", true);
+                        //Log.i("isSuccessful1", String.valueOf(response2.body()));
+                        TinyDB tinyDb = new TinyDB(getApplicationContext());
+                        tinyDb.putBoolean("resumeIssues", true);
+
+                        Toasty.info(getApplicationContext(), getString(R.string.issueCreated));
+                        enableProcessButton();
+                        finish();
+
+                    }

-                    Toasty.success(ctx, getString(R.string.issueCreated));
-                    enableProcessButton();
-                    finish();
                }
                else if(response2.code() == 401) {

@ -265,19 +291,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(getApplicationContext(), getString(R.string.issueCreatedError));
                    enableProcessButton();
+                    //Log.i("isSuccessful2", String.valueOf(response2.body()));
+
                }

            }

            @Override
            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-	            Toasty.error(ctx, getString(R.string.genericServerResponseError));
+                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
        });
@ -285,16 +313,21 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
    }

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

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

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

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

@ -302,40 +335,34 @@ 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)));
+                        milestonesList.add(new Milestones(0,"No milestone"));
                        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")) {
+                                //String mStone = getString(R.string.spinnerMilestoneText, milestonesList_.get(i).getTitle(), milestonesList_.get(i).getState());
+                                if(milestonesList_.get(i).getState().equals(getString(R.string.issueStatusOpen))) {
                                    Milestones data = new Milestones(
                                            milestonesList_.get(i).getId(),
                                            milestonesList_.get(i).getTitle()
                                    );
                                    milestonesList.add(data);
                                }
+
                            }
                        }

-                        ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(CreateIssueActivity.this,
-                                R.layout.list_spinner_items, milestonesList);
+                        ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(getApplicationContext(),
+                                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 +370,141 @@ 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) {
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Collaborators>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull 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(ArrayList<Integer> selectedIds, ArrayList<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)
+                .getApiInterface()
+                .getlabels(Authorization.returnAuthentication(getApplicationContext(), 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(ArrayList<Integer> selectedIds, ArrayList<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 +512,23 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis

    @Override
    public void onClick(View v) {
-
-        if (v == viewBinding.newIssueDueDate) {
+        if (v == assigneesList) {
+            if(assigneesFlag) {
+                multiSelectDialog.show(getSupportFragmentManager(), "multiSelectDialog");
+            }
+            else {
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.noAssigneesFound));
+            }
+        }
+        else if (v == newIssueLabels) {
+            if(labelsFlag) {
+                multiSelectDialogLabels.show(getSupportFragmentManager(), "multiSelectDialogLabels");
+            }
+            else {
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.noLabelsFound));
+            }
+        }
+        else if (v == newIssueDueDate) {

            final Calendar c = Calendar.getInstance();
            int mYear = c.get(Calendar.YEAR);
@ -361,22 +536,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);
+
    }
 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
@ -1,226 +1,250 @@
 package org.mian.gitnex.activities;

+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import retrofit2.Call;
+import retrofit2.Callback;
 import android.content.Context;
 import android.graphics.Color;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
-import org.gitnex.tea4j.models.CreateLabel;
-import org.gitnex.tea4j.models.Labels;
+import com.pes.androidmaterialcolorpickerdialog.ColorPickerCallback;
 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.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.LabelsViewModel;
-import org.mian.gitnex.viewmodels.OrganizationLabelsViewModel;
-import java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;

 /**
 * Author M M Arif
 */

-public class CreateLabelActivity extends BaseActivity {
+public class CreateLabelActivity extends AppCompatActivity {

    private View.OnClickListener onClickListener;
    private TextView colorPicker;
    private EditText labelName;
    private Button createLabelButton;
-    private TinyDB tinyDB;
+    final Context ctx = this;

    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_label);

-	    ActivityCreateLabelBinding activityCreateLabelBinding = ActivityCreateLabelBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateLabelBinding.getRoot());
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        tinyDB = TinyDB.getInstance(appCtx);
-        String repoFullName = tinyDB.getString("repoFullName");
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
        final String repoOwner = parts[0];
        final String repoName = parts[1];
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-        if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("delete")) {
+        if(getIntent().getStringExtra("labelAction") != null && getIntent().getStringExtra("labelAction").equals("delete")) {

-            deleteLabel(repoOwner, repoName, Integer.parseInt(Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
+            deleteLabel(instanceUrl, instanceToken, repoOwner, repoName, Integer.valueOf(getIntent().getStringExtra("labelId")), loginUid);
            finish();
            return;
+
        }

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

-        ImageView closeActivity = activityCreateLabelBinding.close;
-        colorPicker = activityCreateLabelBinding.colorPicker;
-        labelName = activityCreateLabelBinding.labelName;
-        createLabelButton = activityCreateLabelBinding.createLabelButton;
-
-        labelName.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(labelName, InputMethodManager.SHOW_IMPLICIT);
+        ImageView closeActivity = findViewById(R.id.close);
+        colorPicker = findViewById(R.id.colorPicker);
+        labelName = findViewById(R.id.labelName);
+        createLabelButton = findViewById(R.id.createLabelButton);

        final ColorPicker cp = new ColorPicker(CreateLabelActivity.this, 235, 113, 33);

        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);
-        colorPicker.setOnClickListener(v -> cp.show());
-
-        cp.setCallback(color -> {
-
-            //Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
-            colorPicker.setBackgroundColor(color);
-	        tinyDB.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
-            cp.dismiss();
+        colorPicker.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                cp.show();
+            }
        });

-        if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("edit")) {
+        cp.setCallback(new ColorPickerCallback() {
+            @Override
+            public void onColorChosen(@ColorInt int color) {
+
+                //Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
+                colorPicker.setBackgroundColor(color);
+                tinyDb.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
+                cp.dismiss();
+
+            }
+        });
+
+        if(getIntent().getStringExtra("labelAction") != null && getIntent().getStringExtra("labelAction").equals("edit")) {

            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);
-        }
-        else {
+            GradientDrawable shape =  new GradientDrawable();
+            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() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        String repoFullName = tinyDB.getString("repoFullName");
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        AppUtil appUtil = new AppUtil();
+        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()) {
-
-            updateLabelColor = tinyDB.getString("labelColorDefault");
+        if(tinyDb.getString("labelColor").isEmpty()) {
+            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(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
            return;
+
        }

        if(updateLabelName.equals("")) {

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

-        if(!AppUtil.checkStrings(updateLabelName)) {
+        if(!appUtil.checkStrings(updateLabelName)) {

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

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

    }

    private void processCreateLabel() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        String repoFullName = tinyDB.getString("repoFullName");
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
        final String repoOwner = parts[0];
        final String repoName = parts[1];
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

        String newLabelName = labelName.getText().toString();
        String newLabelColor;
-
-        if(tinyDB.getString("labelColor").isEmpty()) {
-
-            newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
+        if(tinyDb.getString("labelColor").isEmpty()) {
+            newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(getApplicationContext(), R.color.releasePre)));
        }
        else {
-
-            newLabelColor = tinyDB.getString("labelColor");
+            newLabelColor = tinyDb.getString("labelColor");
        }

        if(!connToInternet) {

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

        if(newLabelName.equals("")) {

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

-        if(!AppUtil.checkStrings(newLabelName)) {
+        if(!appUtil.checkStrings(newLabelName)) {

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

        Call<CreateLabel> call;

-	    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
-
-	    	call = RetrofitClient.getApiInterface(ctx).createOrganizationLabel(Authorization.get(ctx), getIntent().getStringExtra("orgName"), createLabelFunc);
-	    }
-	    else {
-
-		    call = RetrofitClient.getApiInterface(ctx).createLabel(Authorization.get(ctx), repoOwner, repoName, createLabelFunc);
-	    }
+        call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .createLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, createLabelFunc);

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

@ -229,10 +253,11 @@ public class CreateLabelActivity extends BaseActivity {

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

-                    Toasty.success(ctx, getString(R.string.labelCreated));
-	                tinyDB.putString("labelColor", "");
-	                tinyDB.putBoolean("labelsRefresh", true);
+                    Toasty.info(getApplicationContext(), getString(R.string.labelCreated));
+                    tinyDb.putString("labelColor", "");
+                    tinyDb.putBoolean("labelsRefresh", true);
                    finish();
+
                }
                else if(response.code() == 401) {

@ -241,19 +266,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", "");
-                    Toasty.error(ctx, getString(R.string.labelGeneralError));
+                    tinyDb.putString("labelColor", "");
+                    Toasty.info(getApplicationContext(), 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 +288,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(getApplicationContext());

        Call<CreateLabel> call;

-	    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
-
-		    call = RetrofitClient.getApiInterface(ctx).patchOrganizationLabel(Authorization.get(ctx), getIntent().getStringExtra("orgName"), labelId, createLabelFunc);
-	    }
-	    else {
-
-		    call = RetrofitClient.getApiInterface(appCtx).patchLabel(Authorization.get(ctx), repoOwner, repoName, labelId, createLabelFunc);
-	    }
+        call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .patchLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId, createLabelFunc);

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

@ -282,19 +306,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));
-	                    tinyDB.putString("labelColor", "");
-	                    tinyDB.putBoolean("labelsRefresh", true);
-	                    tinyDB.putString("labelColorDefault", "");
+                        Toasty.info(getApplicationContext(), getString(R.string.labelUpdated));
+                        tinyDb.putString("labelColor", "");
+                        tinyDb.putBoolean("labelsRefresh", true);
+                        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 +327,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("labelColorDefault", "");
-                    Toasty.error(ctx, getString(R.string.labelGeneralError));
+                    tinyDb.putString("labelColor", "");
+                    tinyDb.putString("labelColorDefault", "");
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+
                }
+
            }

            @Override
            public void onFailure(@NonNull Call<CreateLabel> call, @NonNull Throwable t) {
-
-	            tinyDB.putString("labelColor", "");
-	            tinyDB.putString("labelColorDefault", "");
+                tinyDb.putString("labelColor", "");
+                tinyDb.putString("labelColorDefault", "");
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -327,30 +352,26 @@ public class CreateLabelActivity extends BaseActivity {
    }

    private void initCloseListener() {
-
-        onClickListener = view -> {
-
-            getIntent().removeExtra("labelAction");
-            getIntent().removeExtra("labelId");
-            getIntent().removeExtra("labelTitle");
-            getIntent().removeExtra("labelColor");
-	        getIntent().removeExtra("type");
-            finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getIntent().removeExtra("labelAction");
+                getIntent().removeExtra("labelId");
+                getIntent().removeExtra("labelTitle");
+                getIntent().removeExtra("labelColor");
+                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.getApiInterface(appCtx).deleteOrganizationLabel(Authorization.get(ctx), getIntent().getStringExtra("orgName"), labelId);
-	    }
-	    else {
-
-		    call = RetrofitClient.getApiInterface(appCtx).deleteLabel(Authorization.get(ctx), repoOwner, repoName, labelId);
-	    }
+        call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .deleteLabel(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, labelId);

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

@ -358,21 +379,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));
-	                    if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
-
-	                    	OrganizationLabelsViewModel.loadOrgLabelsList(Authorization.get(ctx), getIntent().getStringExtra("orgName"), ctx, null, null);
-	                    }
-	                    else {
-
-		                    LabelsViewModel.loadLabelsList(Authorization.get(ctx), repoOwner, repoName, ctx);
-	                    }
+                        Toasty.info(getApplicationContext(), getString(R.string.labelDeleteText));
+                        LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName);
                        getIntent().removeExtra("labelAction");
                        getIntent().removeExtra("labelId");
-	                    getIntent().removeExtra("type");
+
                    }
                }
                else if(response.code() == 401) {
@ -381,11 +394,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(getApplicationContext(), getString(R.string.labelDeleteErrorText));
+
                }
+
            }

            @Override
@ -399,11 +415,21 @@ public class CreateLabelActivity extends BaseActivity {
    private void disableProcessButton() {

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

    private void enableProcessButton() {

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

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

+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
 import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.Patterns;
 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.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.Toasty;
-import retrofit2.Call;
-import retrofit2.Callback;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;

 /**
 * Author M M Arif
 */

-public class CreateNewUserActivity extends BaseActivity {
+public class CreateNewUserActivity extends AppCompatActivity {

    private View.OnClickListener onClickListener;
    private EditText fullName;
@ -33,29 +34,22 @@ public class CreateNewUserActivity extends BaseActivity {
    private EditText userEmail;
    private EditText userPassword;
    private Button createUserButton;
+    final Context ctx = this;

    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_new_user);

-	    ActivityCreateNewUserBinding activityCreateNewUserBinding = ActivityCreateNewUserBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateNewUserBinding.getRoot());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        ImageView closeActivity = activityCreateNewUserBinding.close;
-        createUserButton = activityCreateNewUserBinding.createUserButton;
-        fullName = activityCreateNewUserBinding.fullName;
-        userUserName = activityCreateNewUserBinding.userUserName;
-        userEmail = activityCreateNewUserBinding.userEmail;
-        userPassword = activityCreateNewUserBinding.userPassword;
-
-        fullName.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(fullName, InputMethodManager.SHOW_IMPLICIT);
+        ImageView closeActivity = findViewById(R.id.close);
+        createUserButton = findViewById(R.id.createUserButton);
+        fullName = findViewById(R.id.fullName);
+        userUserName = findViewById(R.id.userUserName);
+        userEmail = findViewById(R.id.userEmail);
+        userPassword = findViewById(R.id.userPassword);

        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);
@ -63,16 +57,23 @@ public class CreateNewUserActivity extends BaseActivity {
        if(!connToInternet) {

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

            createUserButton.setOnClickListener(createNewUserListener);
+
        }
+
    }

    private void processCreateNewUser() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        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 +82,53 @@ public class CreateNewUserActivity extends BaseActivity {

        if(!connToInternet) {

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

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

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

-        if(!AppUtil.checkStrings(newFullName)) {
+        if(!appUtil.checkStrings(newFullName)) {

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

-        if(!AppUtil.checkStringsWithAlphaNumeric(newUserName)) {
+        if(!appUtil.checkStringsWithAlphaNumeric(newUserName)) {

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

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

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

        disableProcessButton();
-        createNewUser(Authorization.get(ctx), newFullName, newUserName, newUserEmail, newUserPassword);
+        createNewUser(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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)
+                .getApiInterface()
                .createNewUser(instanceToken, createUser);

        call.enqueue(new Callback<UserInfo>() {
@ -130,9 +138,10 @@ public class CreateNewUserActivity extends BaseActivity {

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

-                    Toasty.success(ctx, getString(R.string.userCreatedText));
+                    Toasty.info(getApplicationContext(), getString(R.string.userCreatedText));
                    enableProcessButton();
                    finish();
+
                }
                else if(response.code() == 401) {

@ -141,32 +150,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(getApplicationContext(), getString(R.string.genericError));
+
                }
+
            }

            @Override
            public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -174,21 +188,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 = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

    private void disableProcessButton() {

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

    private void enableProcessButton() {

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java
+++ b/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);
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
@ -1,164 +1,171 @@
 package org.mian.gitnex.activities;

-import android.annotation.SuppressLint;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
 import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.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 androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.Releases;
+import android.widget.Spinner;
 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.Toasty;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.Releases;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;

 /**
 * Author M M Arif
 */

-public class CreateReleaseActivity extends BaseActivity {
+public class CreateReleaseActivity extends AppCompatActivity {

    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;
-
-	private String repoOwner;
-	private String repoName;
+    final Context ctx = this;

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

-    @SuppressLint("ClickableViewAccessibility")
    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_release);

-	    ActivityCreateReleaseBinding activityCreateReleaseBinding = ActivityCreateReleaseBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateReleaseBinding.getRoot());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        String repoFullName = tinyDB.getString("repoFullName");
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
-        repoOwner = parts[0];
-        repoName = parts[1];
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];

-        closeActivity = activityCreateReleaseBinding.close;
-        releaseTagName = activityCreateReleaseBinding.releaseTagName;
-        releaseTitle = activityCreateReleaseBinding.releaseTitle;
-        releaseContent = activityCreateReleaseBinding.releaseContent;
-        releaseType = activityCreateReleaseBinding.releaseType;
-        releaseDraft = activityCreateReleaseBinding.releaseDraft;
-
-	    releaseTitle.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(releaseTitle, 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;
-	    });
+        closeActivity = findViewById(R.id.close);
+        releaseTagName = findViewById(R.id.releaseTagName);
+        releaseTitle = findViewById(R.id.releaseTitle);
+        releaseContent = findViewById(R.id.releaseContent);
+        releaseType = findViewById(R.id.releaseType);
+        releaseDraft = findViewById(R.id.releaseDraft);

        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

-        releaseBranch = activityCreateReleaseBinding.releaseBranch;
-        getBranches(Authorization.get(ctx), repoOwner, repoName);
+        releaseBranch = findViewById(R.id.releaseBranch);
+        releaseBranch.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getBranches(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+        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);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        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(getApplicationContext(), 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(getApplicationContext(), getString(R.string.tagNameErrorEmpty));
            return;
+
        }

-	    if(checkBranch == null) {
+        if(newReleaseTitle.equals("")) {

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

        disableProcessButton();
-        createNewReleaseFunc(Authorization.get(ctx), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, selectedBranch, newReleaseType, newReleaseDraft);
+        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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)
+                .getApiInterface()
                .createNewRelease(token, repoOwner, repoName, createReleaseJson);

        call.enqueue(new Callback<Releases>() {
@ -168,10 +175,12 @@ public class CreateReleaseActivity extends BaseActivity {

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

-                    tinyDB.putBoolean("updateReleases", true);
-                    Toasty.success(ctx, getString(R.string.releaseCreatedText));
+                    TinyDB tinyDb = new TinyDB(getApplicationContext());
+                    tinyDb.putBoolean("updateReleases", true);
+                    Toasty.info(getApplicationContext(), getString(R.string.releaseCreatedText));
                    enableProcessButton();
                    finish();
+
                }
                else if(response.code() == 401) {

@ -180,27 +189,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 +221,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)
+                .getApiInterface()
                .getBranches(instanceToken, repoOwner, repoName);

        call.enqueue(new Callback<List<Branches>>() {
@ -220,27 +234,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,
-		                    R.layout.list_spinner_items, branchesList);
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(getApplicationContext(),
+                                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 +265,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 +279,32 @@ public class CreateReleaseActivity extends BaseActivity {
    }

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @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);
+
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
@ -1,303 +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.util.Log;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-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 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 java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Pattern;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class CreateRepoActivity extends BaseActivity {
-
-    public ImageView closeActivity;
-    private View.OnClickListener onClickListener;
-    private AutoCompleteTextView spinner;
-    private Button createRepo;
-    private EditText repoName;
-    private EditText repoDesc;
-    private CheckBox repoAccess;
-
-	private String loginUid;
-	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
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-	    ActivityCreateRepoBinding activityCreateRepoBinding = ActivityCreateRepoBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateRepoBinding.getRoot());
-
-        boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
-
-        loginUid = tinyDB.getString("loginUid");
-        userLogin = tinyDB.getString("userLogin");
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        closeActivity = activityCreateRepoBinding.close;
-        repoName = activityCreateRepoBinding.newRepoName;
-        repoDesc = activityCreateRepoBinding.newRepoDescription;
-        repoAccess = activityCreateRepoBinding.newRepoPrivate;
-
-        repoName.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(repoName, InputMethodManager.SHOW_IMPLICIT);
-
-        initCloseListener();
-        closeActivity.setOnClickListener(onClickListener);
-
-        spinner = activityCreateRepoBinding.ownerSpinner;
-        getOrganizations(Authorization.get(ctx), userLogin);
-
-        createRepo = activityCreateRepoBinding.createNewRepoButton;
-        disableProcessButton();
-
-        if(!connToInternet) {
-
-            disableProcessButton();
-        }
-        else {
-
-            createRepo.setOnClickListener(createRepoListener);
-        }
-    }
-
-    private final View.OnClickListener createRepoListener = v -> processNewRepo();
-
-    private void processNewRepo() {
-
-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        String newRepoName = repoName.getText().toString();
-        String newRepoDesc = repoDesc.getText().toString();
-        boolean newRepoAccess = repoAccess.isChecked();
-
-        if(!connToInternet) {
-
-            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-            return;
-        }
-
-        if(!newRepoDesc.equals("")) {
-
-            if (newRepoDesc.length() > 255) {
-
-                Toasty.warning(ctx, getString(R.string.repoDescError));
-                return;
-            }
-        }
-
-        if(newRepoName.equals("")) {
-
-            Toasty.error(ctx, getString(R.string.repoNameErrorEmpty));
-        }
-        else if(!AppUtil.checkStrings(newRepoName)) {
-
-            Toasty.warning(ctx, getString(R.string.repoNameErrorInvalid));
-        }
-        else if (reservedRepoNames.contains(newRepoName)) {
-
-            Toasty.warning(ctx, getString(R.string.repoNameErrorReservedName));
-        }
-        else if (reservedRepoPatterns.matcher(newRepoName).find()) {
-
-            Toasty.warning(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);
-        }
-    }
-
-    private void createNewRepository(final String token, String loginUid, String repoName, String repoDesc, String selectedOwner, boolean isPrivate) {
-
-        OrganizationRepository createRepository = new OrganizationRepository(true, repoDesc, null, null, repoName, isPrivate, "Default");
-
-        Call<OrganizationRepository> call;
-        if(selectedOwner.equals(loginUid)) {
-
-            call = RetrofitClient
-                    .getApiInterface(ctx)
-                    .createNewUserRepository(token, createRepository);
-        }
-        else {
-
-            call = RetrofitClient
-                    .getApiInterface(ctx)
-                    .createNewUserOrgRepository(token, selectedOwner, createRepository);
-        }
-
-        call.enqueue(new Callback<OrganizationRepository>() {
-
-            @Override
-            public void onResponse(@NonNull Call<OrganizationRepository> call, @NonNull retrofit2.Response<OrganizationRepository> response) {
-
-                if(response.code() == 201) {
-
-                    TinyDB tinyDb = TinyDB.getInstance(appCtx);
-                    tinyDb.putBoolean("repoCreated", true);
-                    Toasty.success(ctx, getString(R.string.repoCreated));
-                    enableProcessButton();
-                    finish();
-                }
-                else if(response.code() == 401) {
-
-                    enableProcessButton();
-                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-                }
-                else if(response.code() == 409) {
-
-                    enableProcessButton();
-                    Toasty.warning(ctx, getString(R.string.repoExistsError));
-                }
-                else {
-
-                    enableProcessButton();
-                    Toasty.error(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) {
-
-        Call<List<OrgOwner>> call = RetrofitClient
-                .getApiInterface(ctx)
-                .getOrgOwners(instanceToken, 1, 50);
-
-        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) {
-
-		            int organizationId = 0;
-
-		            List<OrgOwner> organizationsList_ = response.body();
-
-		            organizationsList.add(new OrgOwner(userLogin));
-		            assert organizationsList_ != null;
-
-		            if(organizationsList_.size() > 0) {
-
-			            for(int i = 0; i < organizationsList_.size(); i++) {
-
-				            if(!tinyDB.getString("organizationId").isEmpty()) {
-
-					            if(Integer.parseInt(tinyDB.getString("organizationId")) == organizationsList_.get(i).getId()) {
-						            organizationId = i + 1;
-					            }
-				            }
-
-				            OrgOwner data = new OrgOwner(organizationsList_.get(i).getUsername());
-				            organizationsList.add(data);
-			            }
-		            }
-
-		            ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(CreateRepoActivity.this, R.layout.list_spinner_items, organizationsList);
-
-		            spinner.setAdapter(adapter);
-
-		            spinner.setOnItemClickListener ((parent, view, position, id) -> selectedOwner = organizationsList.get(position).getUsername());
-
-		            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();
-            }
-        });
-    }
-
-    private void initCloseListener() {
-
-        onClickListener = view -> finish();
-    }
-
-    private void disableProcessButton() {
-
-        createRepo.setEnabled(false);
-    }
-
-    private void enableProcessButton() {
-
-        createRepo.setEnabled(true);
-    }
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
@ -1,38 +1,38 @@
 package org.mian.gitnex.activities;

+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import 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 org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
+import android.util.Log;

 /**
 * Author M M Arif
 */

-public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener {
+public class CreateTeamByOrgActivity extends AppCompatActivity implements View.OnClickListener {

+    final Context ctx = CreateTeamByOrgActivity.this;
    private View.OnClickListener onClickListener;
    private TextView teamName;
    private TextView teamDesc;
@ -41,10 +41,10 @@ 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[] {
+    private String[] accessControlsList = new String[] {
            "Code",
            "Issues",
            "Pull Request",
@ -56,7 +56,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,
@ -67,142 +67,152 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
    };

    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_team_by_org);

-	    ActivityCreateTeamByOrgBinding activityCreateTeamByOrgBinding = ActivityCreateTeamByOrgBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateTeamByOrgBinding.getRoot());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        ImageView closeActivity = activityCreateTeamByOrgBinding.close;
-        teamName = activityCreateTeamByOrgBinding.teamName;
-        teamDesc = activityCreateTeamByOrgBinding.teamDesc;
-        teamPermission = activityCreateTeamByOrgBinding.teamPermission;
-        teamPermissionDetail = activityCreateTeamByOrgBinding.teamPermissionDetail;
-        teamAccessControls = activityCreateTeamByOrgBinding.teamAccessControls;
-        teamAccessControlsArray = activityCreateTeamByOrgBinding.teamAccessControlsArray;
-        createTeamButton = activityCreateTeamByOrgBinding.createTeamButton;
-
-        teamName.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(teamName, InputMethodManager.SHOW_IMPLICIT);
+        ImageView closeActivity = findViewById(R.id.close);
+        teamName = findViewById(R.id.teamName);
+        teamDesc = findViewById(R.id.teamDesc);
+        teamPermission = findViewById(R.id.teamPermission);
+        teamPermissionDetail = findViewById(R.id.teamPermissionDetail);
+        teamAccessControls = findViewById(R.id.teamAccessControls);
+        teamAccessControlsArray = findViewById(R.id.teamAccessControlsArray);
+        createTeamButton = findViewById(R.id.createTeamButton);

        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, R.style.confirmDialog);

-            pBuilder.setTitle(R.string.newTeamPermission);
-	        pBuilder.setCancelable(permissionSelectedChoice != -1);
+                pBuilder.setTitle(R.string.newTeamPermission);
+                if(permissionSelectedChoice != -1) {
+                    pBuilder.setCancelable(true);
+                }
+                else {
+                    pBuilder.setCancelable(false);
+                }
+                pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {

-            pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, (dialogInterface, i) -> {
+                        permissionSelectedChoice = i;
+                        teamPermission.setText(permissionList[i]);

-                permissionSelectedChoice = i;
-                teamPermission.setText(permissionList[i]);
-
-	            switch(permissionList[i]) {
-		            case "Read":
-
-			            teamPermissionDetail.setVisibility(View.VISIBLE);
-			            teamPermissionDetail.setText(R.string.newTeamPermissionRead);
-			            break;
-		            case "Write":
-
-			            teamPermissionDetail.setVisibility(View.VISIBLE);
-			            teamPermissionDetail.setText(R.string.newTeamPermissionWrite);
-			            break;
-		            case "Admin":
-
-			            teamPermissionDetail.setVisibility(View.VISIBLE);
-			            teamPermissionDetail.setText(R.string.newTeamPermissionAdmin);
-			            break;
-		            default:
-
-			            teamPermissionDetail.setVisibility(View.GONE);
-			            break;
-	            }
-
-                dialogInterface.dismiss();
-            });
-
-            AlertDialog pDialog = pBuilder.create();
-            pDialog.show();
-        });
-
-        teamAccessControls.setOnClickListener(v -> {
-
-            teamAccessControls.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(permissionList[i].equals("Read")) {
+                            teamPermissionDetail.setVisibility(View.VISIBLE);
+                            teamPermissionDetail.setText(R.string.newTeamPermissionRead);
                        }
-                        if(selectedVal == 1) {
-                            repoCode = "repo.issues";
+                        else if(permissionList[i].equals("Write")) {
+                            teamPermissionDetail.setVisibility(View.VISIBLE);
+                            teamPermissionDetail.setText(R.string.newTeamPermissionWrite);
                        }
-                        if(selectedVal == 2) {
-                            repoCode = "repo.pulls";
+                        else if(permissionList[i].equals("Admin")) {
+                            teamPermissionDetail.setVisibility(View.VISIBLE);
+                            teamPermissionDetail.setText(R.string.newTeamPermissionAdmin);
                        }
-                        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";
+                        else {
+                            teamPermissionDetail.setVisibility(View.GONE);
                        }

-                        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();
-            aDialog.show();
+                AlertDialog pDialog = pBuilder.create();
+                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, R.style.confirmDialog);
+
+                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,26 +220,30 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
        if(!connToInternet) {

            createTeamButton.setEnabled(false);
-            GradientDrawable shape = new GradientDrawable();
-            shape.setCornerRadius(8);
-            shape.setColor(ResourcesCompat.getColor(getResources(), R.color.hintColor, null));
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            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(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
        final String orgName = tinyDb.getString("orgName");;

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

        if(!connToInternet) {

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

        if (newTeamName.equals("")) {

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

-        if(!AppUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
+        if(!appUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {

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

        if(!newTeamDesc.equals("")) {

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

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

        if (newTeamPermission.equals("")) {

-            Toasty.error(ctx, getString(R.string.teamPermissionEmpty));
+            Toasty.info(getApplicationContext(), 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)
-                .createTeamsByOrg(Authorization.get(ctx), orgName, createNewTeamJson);
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .createTeamsByOrg(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), orgName, createNewTeamJson);

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

@ -300,19 +318,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(getApplicationContext());
                        tinyDb.putBoolean("resumeTeams", true);

-                        Toasty.success(ctx, getString(R.string.teamCreated));
+                        Toasty.info(getApplicationContext(), getString(R.string.teamCreated));
                        finish();
+
                    }
+
                }
                else if(response2.code() == 404) {

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

@ -320,11 +340,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(getApplicationContext(), getString(R.string.teamCreatedError));
+
                }
+
            }

            @Override
@ -337,16 +360,19 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic

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

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
@ -0,0 +1,43 @@
+package org.mian.gitnex.activities;
+
+import androidx.appcompat.app.AppCompatActivity;
+import android.os.Bundle;
+import android.text.method.LinkMovementMethod;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+
+/**
+ * Author M M Arif
+ */
+
+public class CreditsActivity extends AppCompatActivity {
+
+    private View.OnClickListener onClickListener;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_credits);
+
+        TextView creditKasun = findViewById(R.id.creditKasun);
+        ImageView closeActivity = findViewById(R.id.close);
+
+        creditKasun.setMovementMethod(LinkMovementMethod.getInstance());
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+}
--- a/app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java
+++ b/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();
-			});
-		}
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
@ -1,117 +1,97 @@
 package org.mian.gitnex.activities;

+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
-import android.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 org.gitnex.tea4j.models.Issues;
-import org.gitnex.tea4j.models.Milestones;
+import com.hendraanggrian.appcompat.socialview.Mention;
+import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
+import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.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.Toasty;
-import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.CreateIssue;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.models.Milestones;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;

 /**
 * Author M M Arif
 */

-public class EditIssueActivity extends BaseActivity implements View.OnClickListener {
+public class EditIssueActivity extends AppCompatActivity implements View.OnClickListener {

+    final Context ctx = this;
    private View.OnClickListener onClickListener;
-    private int resultLimit = Constants.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;
-	private String instanceToken;
-	private String repoOwner;
-	private String repoName;
-	private int issueIndex;
-
-    @SuppressLint("ClickableViewAccessibility")
    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_edit_issue);

-	    ActivityEditIssueBinding activityEditIssueBinding = ActivityEditIssueBinding.inflate(getLayoutInflater());
-	    setContentView(activityEditIssueBinding.getRoot());
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());

-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        loginUid = tinyDB.getString("loginUid");
-        instanceToken = "token " + tinyDB.getString(loginUid + "-token");
-        String repoFullName = tinyDB.getString("repoFullName");
+        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];
-        repoName = parts[1];
-        issueIndex = Integer.parseInt(tinyDB.getString("issueNumber"));
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));

-        ImageView closeActivity = activityEditIssueBinding.close;
-        editIssueButton = activityEditIssueBinding.editIssueButton;
-        TextView toolbar_title = activityEditIssueBinding.toolbarTitle;
-        editIssueTitle = activityEditIssueBinding.editIssueTitle;
-        editIssueDescription = activityEditIssueBinding.editIssueDescription;
-        editIssueDueDate = activityEditIssueBinding.editIssueDueDate;
+        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")) {
-
-            resultLimit = Constants.resultLimitNewGiteaInstances;
-        }
-
-        editIssueTitle.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(editIssueTitle, InputMethodManager.SHOW_IMPLICIT);
-
-	    editIssueDescription.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;
-	    });
+        defaultMentionAdapter = new MentionArrayAdapter<>(this);
+        loadCollaboratorsList();

        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 +99,91 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
        editIssueDueDate.setOnClickListener(this);
        editIssueButton.setOnClickListener(this);

-        if(!tinyDB.getString("issueNumber").isEmpty()) {
-
-            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)));
-            }
+        if(!tinyDb.getString("issueNumber").isEmpty()) {
+            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);
+
+
+    }
+
+    public void loadCollaboratorsList() {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Collaborators>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+
+                if (response.isSuccessful()) {
+
+                    assert response.body() != null;
+                    String fullName = "";
+                    for (int i = 0; i < response.body().size(); i++) {
+                        if(!response.body().get(i).getFull_name().equals("")) {
+                            fullName = response.body().get(i).getFull_name();
+                        }
+                        defaultMentionAdapter.add(
+                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
+                    }
+
+                } else {
+
+                    Log.i("onResponse", String.valueOf(response.code()));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+                Log.i("onFailure", t.getMessage());
+            }
+
+        });
    }

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

    private void processEditIssue() {

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        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 +191,47 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe

        if(!connToInternet) {

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

        if (editIssueTitleForm.equals("")) {

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

+        /*if (editIssueDescriptionForm.equals("")) {
+
+            Toasty.info(getApplicationContext(), 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(getApplicationContext());
+
+        CreateIssue issueData = new CreateIssue(title, description, dueDate, editIssueMilestoneId);

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

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

@ -188,18 +240,11 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe

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

-                    if(tinyDB.getString("issueType").equalsIgnoreCase("Pull")) {
-
-                        Toasty.success(ctx, getString(R.string.editPrSuccessMessage));
-                    }
-                    else {
-
-                        Toasty.success(ctx, getString(R.string.editIssueSuccessMessage));
-                    }
-
-                    tinyDB.putBoolean("issueEdited", true);
-                    tinyDB.putBoolean("resumeIssues", true);
+                    Toasty.info(getApplicationContext(), getString(R.string.editIssueSuccessMessage));
+                    tinyDb.putBoolean("issueEdited", true);
+                    tinyDb.putBoolean("resumeIssues", true);
                    finish();
+
                }
                else if(response.code() == 401) {

@ -208,17 +253,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(getApplicationContext(), getString(R.string.genericError));
+
                }
+
            }

            @Override
            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -226,6 +273,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe

    }

+
    @Override
    public void onClick(View v) {

@ -237,21 +285,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) {

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

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

@ -264,27 +322,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) {
-
-	                    currentMilestoneId = response.body().getMilestone().getId();
+                        msId = response.body().getMilestone().getId();
                    }

                    // get milestones list
                    if(response.body().getId() > 0) {

                        Call<List<Milestones>> call_ = RetrofitClient
-                                .getApiInterface(ctx)
-                                .getMilestones(Authorization.get(ctx), repoOwner, repoName, 1, resultLimit, msState);
+                                .getInstance(instanceUrl)
+                                .getApiInterface()
+                                .getMilestones(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, 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 +350,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()) {
-	                                            getSelectedMilestoneId = i + 1;
+                                            Milestones data = new Milestones(
+                                                    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,
-                                            R.layout.list_spinner_items, milestonesList);
+                                    ArrayAdapter<Milestones> adapter_ = new ArrayAdapter<>(getApplicationContext(),
+                                            R.layout.spinner_item, milestonesList);

-                                    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);
+                                    adapter_.setDropDownViewResource(R.layout.spinner_dropdown_item);
+                                    editIssueMilestoneSpinner.setAdapter(adapter_);

+                                    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 +395,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 +406,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(getApplicationContext(), getString(R.string.genericError));
+
                }
+
            }

            @Override
            public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
            }
        });
@ -367,11 +427,21 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
    private void disableProcessButton() {

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

    private void enableProcessButton() {

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
@ -1,146 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-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.ParseDiff;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
-import java.io.IOException;
-import java.util.List;
-import okhttp3.ResponseBody;
-import retrofit2.Call;
-import retrofit2.Response;
-
-/**
- * Author M M Arif
- */
-
-public class FileDiffActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-	private TextView toolbarTitle;
-	private ListView mListView;
-	private ProgressBar mProgressBar;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		ActivityFileDiffBinding activityFileDiffBinding = ActivityFileDiffBinding.inflate(getLayoutInflater());
-		setContentView(activityFileDiffBinding.getRoot());
-
-		Toolbar toolbar = activityFileDiffBinding.toolbar;
-		setSupportActionBar(toolbar);
-
-		final TinyDB tinyDb = TinyDB.getInstance(appCtx);
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-
-		ImageView closeActivity = activityFileDiffBinding.close;
-		toolbarTitle = activityFileDiffBinding.toolbarTitle;
-		mListView = activityFileDiffBinding.listView;
-		mProgressBar = activityFileDiffBinding.progressBar;
-
-		mListView.setDivider(null);
-
-		toolbarTitle.setText(R.string.processingText);
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		mProgressBar.setVisibility(View.VISIBLE);
-
-		String pullIndex = tinyDb.getString("issueNumber");
-
-		boolean apiCall = !new Version(tinyDb.getString("giteaVersion")).less("1.13.0");
-		getPullDiffContent(repoOwner, repoName, pullIndex, apiCall);
-
-	}
-
-	private void getPullDiffContent(String owner, String repo, String pullIndex, boolean apiCall) {
-
-		Thread thread = new Thread(() -> {
-
-			Call<ResponseBody> call = apiCall ?
-				RetrofitClient.getApiInterface(ctx).getPullDiffContent(Authorization.get(ctx), owner, repo, pullIndex) :
-				RetrofitClient.getWebInterface(ctx).getPullDiffContent(Authorization.getWeb(ctx), owner, repo, pullIndex);
-
-			try {
-
-				Response<ResponseBody> response = call.execute();
-				assert response.body() != null;
-
-				switch(response.code()) {
-
-					case 200:
-						List<FileDiffView> fileDiffViews = ParseDiff.getFileDiffViewArray(response.body().string());
-
-						int filesCount = fileDiffViews.size();
-
-						String toolbarTitleText = (filesCount > 1) ?
-							getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)) :
-							getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount));
-
-						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, getSupportFragmentManager(), fileDiffViews);
-
-						runOnUiThread(() -> {
-							toolbarTitle.setText(toolbarTitleText);
-							mListView.setAdapter(adapter);
-							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) {}
-
-		});
-
-		thread.start();
-
-	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> {
-
-			getIntent().removeExtra("singleFileName");
-			finish();
-
-		};
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
@ -1,398 +1,149 @@
 package org.mian.gitnex.activities;

-import android.app.Activity;
-import android.app.NotificationManager;
 import android.content.Context;
-import android.content.Intent;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.text.method.ScrollingMovementMethod;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
+import android.util.Log;
 import android.view.View;
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.core.app.NotificationCompat;
-import com.vdurmont.emoji.EmojiParser;
-import org.apache.commons.io.FileUtils;
-import org.gitnex.tea4j.models.Files;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import 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.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 java.io.IOException;
-import java.io.OutputStream;
-import java.util.Arrays;
-import okhttp3.ResponseBody;
+import org.mian.gitnex.models.Files;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import retrofit2.Call;
-import retrofit2.Response;
+import retrofit2.Callback;

 /**
 * Author M M Arif
 */

-public class FileViewActivity extends BaseActivity implements BottomSheetFileViewerFragment.BottomSheetListener {
+public class FileViewActivity extends AppCompatActivity {

-	private ActivityFileViewBinding binding;
-	private Files file;
+    private View.OnClickListener onClickListener;
+    private TextView singleFileContents;
+    final Context ctx = this;
+    private ProgressBar mProgressBar;

-	@Override
-	public void onCreate(Bundle savedInstanceState) {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {

-		super.onCreate(savedInstanceState);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_file_view);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);

-		binding = ActivityFileViewBinding.inflate(getLayoutInflater());
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-		setContentView(binding.getRoot());
-		setSupportActionBar(binding.toolbar);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-		tinyDB.putBoolean("enableMarkdownInFileView", false);
+        ImageView closeActivity = findViewById(R.id.close);
+        singleFileContents = findViewById(R.id.singleFileContents);
+        singleFileContents.setVisibility(View.GONE);
+        mProgressBar = findViewById(R.id.progress_bar);

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

-		binding.close.setOnClickListener(view -> finish());
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+        toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+        toolbar_title.setText(singleFileName);

-		binding.toolbarTitle.setMovementMethod(new ScrollingMovementMethod());
-		binding.toolbarTitle.setText(file.getPath());
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);

-		String repoFullName = tinyDB.getString("repoFullName");
-		String repoBranch = tinyDB.getString("repoBranch");
-		String[] parts = repoFullName.split("/");
-		String repoOwner = parts[0];
-		String repoName = parts[1];
+        if(connToInternet) {
+            getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);
+        }
+        else {
+            Toasty.info(getApplicationContext(), getString(R.string.checkNetConnection));
+        }

-		getSingleFileContents(repoOwner, repoName, file.getPath(), repoBranch);
+    }

-	}
+    private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {

-	@Override
-	public void onResume() {
+        Call<Files> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .getSingleFileContents(token, owner, repo, filename);

-		super.onResume();
+        call.enqueue(new Callback<Files>() {

-		if(tinyDB.getBoolean("fileModified")) {
-			String repoFullName = tinyDB.getString("repoFullName");
-			String repoBranch = tinyDB.getString("repoBranch");
-			String[] parts = repoFullName.split("/");
-			String repoOwner = parts[0];
-			String repoName = parts[1];
+            @Override
+            public void onResponse(@NonNull Call<Files> call, @NonNull retrofit2.Response<Files> response) {

-			getSingleFileContents(repoOwner, repoName, file.getPath(), repoBranch);
-			tinyDB.putBoolean("fileModified", false);
-		}
-	}
+                if (response.code() == 200) {

-	private void getSingleFileContents(final String owner, String repo, final String filename, String ref) {
+                    AppUtil appUtil = new AppUtil();
+                    assert response.body() != null;

-		Thread thread = new Thread(() -> {
+                    if(!response.body().getContent().equals("")) {
+                        singleFileContents.setVisibility(View.VISIBLE);
+                        mProgressBar.setVisibility(View.GONE);
+                        singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
+                    }
+                    else {
+                        singleFileContents.setText("");
+                        mProgressBar.setVisibility(View.GONE);
+                    }

-			Call<ResponseBody> call = RetrofitClient
-				.getWebInterface(ctx)
-				.getFileContents(Authorization.getWeb(ctx), owner, repo, ref, filename);
+                }
+                else if(response.code() == 401) {

-			try {
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));

-				Response<ResponseBody> response = call.execute();
+                }
+                else if(response.code() == 403) {

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

-					ResponseBody responseBody = response.body();
+                }
+                else if(response.code() == 404) {

-					if(responseBody != null) {
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

-						runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
-						String fileExtension = FileUtils.getExtension(filename);
+                }
+                else {

-						boolean processable = false;
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));

-						switch(AppUtil.getFileType(fileExtension)) {
+                }

-							case IMAGE:
+            }

-								// See https://developer.android.com/guide/topics/media/media-formats#core
-								if(Arrays.asList("bmp", "gif", "jpg", "jpeg", "png", "webp", "heic", "heif").contains(fileExtension.toLowerCase())) {
+            @Override
+            public void onFailure(@NonNull Call<Files> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });

-									processable = true;
+    }

-									byte[] pictureBytes = responseBody.bytes();
-
-									runOnUiThread(() -> {
-										binding.contents.setVisibility(View.GONE);
-										binding.markdownFrame.setVisibility(View.GONE);
-
-										binding.photoView.setVisibility(View.VISIBLE);
-										binding.photoView.setImageBitmap(Images.scaleImage(pictureBytes, 1920));
-									});
-								}
-								break;
-
-							case UNKNOWN:
-							case TEXT:
-
-								if(file.getSize() > Constants.maximumFileViewerSize) {
-									break;
-								}
-
-								processable = true;
-								String text = responseBody.string();
-
-								runOnUiThread(() -> {
-									binding.photoView.setVisibility(View.GONE);
-
-									binding.contents.setContent(text, fileExtension);
-
-									if(tinyDB.getBoolean("enableMarkdownInFileView")) {
-										Markdown.render(ctx, EmojiParser.parseToUnicode(text), binding.markdown);
-
-										binding.contents.setVisibility(View.GONE);
-										binding.markdownFrame.setVisibility(View.VISIBLE);
-									} else {
-										binding.markdownFrame.setVisibility(View.GONE);
-										binding.contents.setVisibility(View.VISIBLE);
-									}
-								});
-								break;
-
-						}
-
-						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 {
-
-					switch(response.code()) {
-
-						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) {}
-
-		});
-
-		thread.start();
-
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-
-		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;
-	}
-
-	@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) {
-
-			BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
-			bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
-			return true;
-
-		} 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);
-
-		intent.addCategory(Intent.CATEGORY_OPENABLE);
-		intent.putExtra(Intent.EXTRA_TITLE, file.getName());
-		intent.setType("*/*");
-
-		activityResultLauncher.launch(intent);
-
-	}
-
-	ActivityResultLauncher<Intent> activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-
-		if (result.getResultCode() == Activity.RESULT_OK) {
-
-			assert result.getData() != null;
-
-			try {
-
-				OutputStream outputStream = getContentResolver().openOutputStream(result.getData().getData());
-
-				NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx, ctx.getPackageName())
-					.setContentTitle(getString(R.string.fileViewerNotificationTitleStarted))
-					.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);
-
-				NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);;
-				notificationManager.notify(notificationId, builder.build());
-
-				String repoFullName = tinyDB.getString("repoFullName");
-				String repoBranch = tinyDB.getString("repoBranch");
-				String[] parts = repoFullName.split("/");
-				String repoOwner = parts[0];
-				String repoName = parts[1];
-
-				Thread thread = new Thread(() -> {
-
-					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 = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getIntent().removeExtra("singleFileName");
+                finish();
+            }
+        };
+    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
@ -1,39 +1,35 @@
 package org.mian.gitnex.activities;

+import android.annotation.SuppressLint;
 import android.content.Intent;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import android.content.res.Resources;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
-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.RadioGroup;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import org.gitnex.tea4j.models.GiteaVersion;
-import org.gitnex.tea4j.models.UserInfo;
-import org.gitnex.tea4j.models.UserTokens;
-import org.mian.gitnex.R;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import com.tooltip.Tooltip;
 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.PathsHelper;
-import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.UrlHelper;
-import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.UserTokens;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.R;
+import org.mian.gitnex.util.TinyDB;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
+import java.net.URISyntaxException;
 import java.util.List;
-import java.util.UUID;
-import io.mikael.urlbuilder.UrlBuilder;
+import java.util.Objects;
 import okhttp3.Credentials;
+import okhttp3.Headers;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -41,620 +37,404 @@ import retrofit2.Callback;
 * Author M M Arif
 */

-public class LoginActivity extends BaseActivity {
+public class LoginActivity extends AppCompatActivity implements View.OnClickListener {

-	private enum Protocol {HTTPS, HTTP}
+    private Button login_button;
+    private EditText instance_url, login_uid, login_passwd, otpCode;
+    private Spinner protocolSpinner;

-	private enum LoginType {BASIC, TOKEN}
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {

-	private Button loginButton;
-	private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode;
-	private AutoCompleteTextView protocolSpinner;
-	private RadioGroup loginMethod;
-	private String device_id = "token";
-	private String selectedProtocol;
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);

-	@Override
-	public void onCreate(Bundle savedInstanceState) {
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-		super.onCreate(savedInstanceState);
+        login_button = findViewById(R.id.login_button);
+        instance_url = findViewById(R.id.instance_url);
+        login_uid = findViewById(R.id.login_uid);
+        login_passwd = findViewById(R.id.login_passwd);
+        otpCode = findViewById(R.id.otpCode);
+        ImageView info_button = findViewById(R.id.info);
+        final TextView viewTextGiteaVersion = findViewById(R.id.appVersion);
+        protocolSpinner = findViewById(R.id.httpsSpinner);

-		ActivityLoginBinding activityLoginBinding = ActivityLoginBinding.inflate(getLayoutInflater());
-		setContentView(activityLoginBinding.getRoot());
+        viewTextGiteaVersion.setText(AppUtil.getAppVersion(getApplicationContext()));

-		NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
+        Resources res = getResources();
+        String[] allProtocols = res.getStringArray(R.array.protocolValues);

-		loginButton = activityLoginBinding.loginButton;
-		instanceUrlET = activityLoginBinding.instanceUrl;
-		loginUidET = activityLoginBinding.loginUid;
-		loginPassword = activityLoginBinding.loginPasswd;
-		otpCode = activityLoginBinding.otpCode;
-		protocolSpinner = activityLoginBinding.httpsSpinner;
-		loginMethod = activityLoginBinding.loginMethod;
-		loginTokenCode = activityLoginBinding.loginTokenCode;
+        final ArrayAdapter<String> adapterProtocols = new ArrayAdapter<String>(Objects.requireNonNull(getApplicationContext()),
+                R.layout.spinner_item, allProtocols);

-		activityLoginBinding.appVersion.setText(AppUtil.getAppVersion(appCtx));
+        adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item);
+        protocolSpinner.setAdapter(adapterProtocols);

-		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.list_spinner_items, Protocol.values());
+        protocolSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {

-		instanceUrlET.setText(getIntent().getStringExtra("instanceUrl"));
+                String value = getResources().getStringArray(R.array.protocolValues)[pos];
+                if(value.toLowerCase().equals("http")) {
+                    Toasty.info(getApplicationContext(), getResources().getString(R.string.protocolError));
+                }

-		protocolSpinner.setAdapter(adapterProtocols);
-		protocolSpinner.setSelection(0);
-		protocolSpinner.setOnItemClickListener((parent, view, position, id) -> {
+            }
+            public void onNothingSelected(AdapterView<?> parent) {
+            }
+        });

-			selectedProtocol = String.valueOf(parent.getItemAtPosition(position));
+        info_button.setOnClickListener(infoListener);

-			if(selectedProtocol.equals(String.valueOf(Protocol.HTTP))) {
+        if(!connToInternet) {

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

-		if(R.id.loginToken == loginMethod.getCheckedRadioButtonId()) {
+        }

-			AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
-			findViewById(R.id.loginTokenCodeLayout).setVisibility(View.VISIBLE);
-		}
-		else {
+        //login_button.setOnClickListener(this);
+        if(!tinyDb.getString("instanceUrlRaw").isEmpty()) {
+            instance_url.setText(tinyDb.getString("instanceUrlRaw"));
+        }
+        if(!tinyDb.getString("loginUid").isEmpty()) {
+            login_uid.setText(tinyDb.getString("loginUid"));
+        }

-			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);
-		}
+        if(tinyDb.getBoolean("loggedInMode")) {

-		loginMethod.setOnCheckedChangeListener((group, checkedId) -> {
+            startActivity(new Intent(LoginActivity.this, MainActivity.class));
+            finish();

-			if(checkedId == R.id.loginToken) {
+        }

-				AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
-				findViewById(R.id.loginTokenCodeLayout).setVisibility(View.VISIBLE);
-			}
-			else {
+        login_button.setOnClickListener(loginListener);

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

-		Handler handler = new Handler(getMainLooper());
+    @Override
+    public void onClick(View v) {

-		networkStatusObserver.registerNetworkStatusListener(hasNetworkConnection -> {
+        switch(v.getId()) {

-			handler.post(() -> {
+            case R.id.login_button:
+                login();
+                break;
+            default:

-				if(hasNetworkConnection) {
+        }

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

-					disableProcessButton();
-					loginButton.setText(getResources().getString(R.string.btnLogin));
-					Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-				}
+    private View.OnClickListener loginListener = new View.OnClickListener() {
+        public void onClick(View v) {

-			});
-		});
+            disableProcessButton();
+            login_button.setText(R.string.processingText);
+            login();

-		loadDefaults();
+        }
+    };

-		loginButton.setOnClickListener(view -> {
+    private View.OnClickListener infoListener = new View.OnClickListener() {
+        public void onClick(View v) {
+        new Tooltip.Builder(v)
+            .setText(R.string.urlInfoTooltip)
+            .setTextColor(getResources().getColor(R.color.white))
+            .setBackgroundColor(getResources().getColor(R.color.tooltipBackground))
+            .setCancelable(true)
+            .setDismissOnClick(true)
+            .setPadding(30)
+            .setCornerRadius(R.dimen.tooltipCornor)
+            .setGravity(Gravity.BOTTOM)
+            .show();
+        }
+    };

-			disableProcessButton();
-			login();
-		});
-	}
+    @SuppressLint("ResourceAsColor")
+    private void login() {

-	private void login() {
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        AppUtil appUtil = new AppUtil();
+        boolean connToInternet = AppUtil.haveNetworkConnection(LoginActivity.this);

-		try {
+        String instanceUrl = instance_url.getText().toString().trim();
+        String loginUid = login_uid.getText().toString();
+        String loginPass = login_passwd.getText().toString();
+        String protocol = protocolSpinner.getSelectedItem().toString();
+        String loginOTP_ = otpCode.getText().toString().trim();

-			if(selectedProtocol == null) {
+        if(instanceUrl.contains("@")) {

-				Toasty.error(ctx, getResources().getString(R.string.protocolEmptyError));
-				enableProcessButton();
-				return;
-			}
+            String[] urlForHttpAuth = instanceUrl.split("@");

-			String loginUid = loginUidET.getText().toString();
-			String loginPass = loginPassword.getText().toString();
-			String loginToken = loginTokenCode.getText().toString().trim();
+            tinyDb.putString("basicAuthPassword", loginPass);
+            tinyDb.putBoolean("basicAuthFlag", true);

-			LoginType loginType = (loginMethod.getCheckedRadioButtonId() == R.id.loginUsernamePassword) ? LoginType.BASIC : LoginType.TOKEN;
+            instanceUrl = urlForHttpAuth[1];
+            loginUid = urlForHttpAuth[0];

-			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/"))
-				.toUri();
+        String instanceHost;
+        if(AppUtil.httpCheck(instanceUrl)) {

-			tinyDB.putString("loginType", loginType.name().toLowerCase());
-			tinyDB.putString("instanceUrlRaw", instanceUrlET.getText().toString());
-			tinyDB.putString("instanceUrl", instanceUrl.toString());
+            URI uri = null;
+            try {
+                uri = new URI(instanceUrl);
+            } catch (URISyntaxException e) {
+                e.printStackTrace();
+            }
+            assert uri != null;
+            instanceHost = uri.getHost();

-			if(instanceUrlET.getText().toString().equals("")) {
+        }
+        else {
+            instanceHost = instanceUrl;
+        }

-				Toasty.error(ctx, getResources().getString(R.string.emptyFieldURL));
-				enableProcessButton();
-				return;
-			}
+        String instanceUrlWithProtocol;
+        if(protocol.toLowerCase().equals("https")) {
+            instanceUrl = "https://" + instanceHost + "/api/v1/";
+            instanceUrlWithProtocol = "https://" + instanceHost;
+        }
+        else {
+            instanceUrl = "http://" + instanceHost + "/api/v1/";
+            instanceUrlWithProtocol = "https://" + instanceHost;
+        }

-			if(loginType == LoginType.BASIC) {
+        tinyDb.putString("instanceUrlRaw", instanceHost);
+        tinyDb.putString("loginUid", loginUid);
+        tinyDb.putString("instanceUrl", instanceUrl);
+        tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol);

-				if(otpCode.length() != 0 && otpCode.length() != 6) {
+        if(connToInternet) {

-					Toasty.warning(ctx, getResources().getString(R.string.loginOTPTypeError));
-					enableProcessButton();
-					return;
-				}
+            if(instance_url.getText().toString().equals("")) {

-				if(rawInstanceUrl.getUserInfo() != null) {
+                Toasty.info(getApplicationContext(), getString(R.string.emptyFieldURL));
+                enableProcessButton();
+                login_button.setText(R.string.btnLogin);
+                return;

-					tinyDB.putString("basicAuthPassword", loginPass);
-					tinyDB.putBoolean("basicAuthFlag", true);
-				}
+            }
+            if(loginUid.equals("")) {

-				if(loginUid.equals("")) {
+                Toasty.info(getApplicationContext(), getString(R.string.emptyFieldUsername));
+                enableProcessButton();
+                login_button.setText(R.string.btnLogin);
+                return;
+
+            }
+            if(login_passwd.getText().toString().equals("")) {

-					Toasty.error(ctx, getResources().getString(R.string.emptyFieldUsername));
-					enableProcessButton();
-					return;
-				}
+                Toasty.info(getApplicationContext(), getString(R.string.emptyFieldPassword));
+                enableProcessButton();
+                login_button.setText(R.string.btnLogin);
+                return;

-				if(loginPass.equals("")) {
+            }

-					Toasty.error(ctx, getResources().getString(R.string.emptyFieldPassword));
-					enableProcessButton();
-					return;
-				}
+            int loginOTP = 0;
+            if(loginOTP_.length() == 6) {

-				int loginOTP = (otpCode.length() > 0) ? Integer.parseInt(otpCode.getText().toString().trim()) : 0;
-				tinyDB.putString("loginUid", loginUid);
+                if(appUtil.checkIntegers(loginOTP_)) {

-				versionCheck(loginUid, loginPass, loginOTP, loginToken, loginType);
+                    loginOTP = Integer.valueOf(loginOTP_);
+                }
+                else {

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

-				if(loginToken.equals("")) {
+                }

-					Toasty.error(ctx, getResources().getString(R.string.loginTokenError));
-					enableProcessButton();
-					return;
-				}
+            }

-				versionCheck(loginUid, loginPass, 123, loginToken, loginType);
-			}
+            letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);

-		}
-		catch(Exception e) {
+        }
+        else {

-			Log.e("onFailure-login", e.toString());
-			Toasty.error(ctx, getResources().getString(R.string.malformedUrl));
-			enableProcessButton();
-		}
-	}
+            Toasty.info(getApplicationContext(), getString(R.string.checkNetConnection));

-	private void versionCheck(final String loginUid, final String loginPass, final int loginOTP, final String loginToken,
-		final LoginType loginType) {
+        }

-		Call<GiteaVersion> callVersion;
+    }

-		if(!loginToken.equals("")) {
+    private void letTheUserIn(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP) {

-			callVersion = RetrofitClient.getApiInterface(appCtx).getGiteaVersionWithToken("token " + loginToken);
-		}
-		else {
+        final String credential = Credentials.basic(loginUid, loginPass);

-			String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
+        Call<List<UserTokens>> call;
+        if(loginOTP != 0) {
+            call = RetrofitClient
+                    .getInstance(instanceUrl)
+                    .getApiInterface()
+                    .getUserTokensWithOTP(credential, loginOTP, loginUid);
+        }
+        else {
+            call = RetrofitClient
+                    .getInstance(instanceUrl)
+                    .getApiInterface()
+                    .getUserTokens(credential, loginUid);
+        }

-			callVersion =
-				(loginOTP != 0) ? RetrofitClient.getApiInterface(appCtx).getGiteaVersionWithOTP(credential, loginOTP) :
-					RetrofitClient.getApiInterface(appCtx).getGiteaVersionWithBasic(credential);
-		}
+        call.enqueue(new Callback<List<UserTokens>>() {

-		callVersion.enqueue(new Callback<GiteaVersion>() {
+            @Override
+            public void onResponse(@NonNull Call<List<UserTokens>> call, @NonNull retrofit2.Response<List<UserTokens>> response) {

-			@Override
-			public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
+                List<UserTokens> userTokens = response.body();
+                final TinyDB tinyDb = new TinyDB(getApplicationContext());
+                Headers responseHeaders = response.headers();

-				if(responseVersion.code() == 200) {
+                if (response.isSuccessful()) {

-					GiteaVersion version = responseVersion.body();
-					assert version != null;
+                    if (response.code() == 200) {

-					if(!Version.valid(version.getVersion())) {
+                        boolean setTokenFlag = false;

-						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
-						enableProcessButton();
-						return;
-					}
+                        assert userTokens != null;
+                        if (userTokens.size() > 0) {
+                            for (int i = 0; i < userTokens.size(); i++) {
+                                if (userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) {
+                                    setTokenFlag = true;
+                                    break;
+                                }
+                                //Log.i("Tokens: ", userTokens.get(i).getSha1());
+                            }
+                        }

-					tinyDB.putString("giteaVersion", version.getVersion());
-					Version gitea_version = new Version(version.getVersion());
+                        if(tinyDb.getString(loginUid + "-token").isEmpty() || !setTokenFlag) {

-					if(gitea_version.less(getString(R.string.versionLow))) {
+                            UserTokens createUserToken = new UserTokens("gitnex-app-token");

-						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);
+                            Call<UserTokens> callCreateToken;
+                            if(loginOTP != 0) {
+                                callCreateToken = RetrofitClient
+                                        .getInstance(instanceUrl)
+                                        .getApiInterface()
+                                        .createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken);
+                            }
+                            else {
+                                callCreateToken = RetrofitClient
+                                        .getInstance(instanceUrl)
+                                        .getApiInterface()
+                                        .createNewToken(credential, loginUid, createUserToken);
+                            }

-						alertDialogBuilder.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
+                            callCreateToken.enqueue(new Callback<UserTokens>() {

-							dialog.dismiss();
-							enableProcessButton();
-						});
+                                @Override
+                                public void onResponse(@NonNull Call<UserTokens> callCreateToken, @NonNull retrofit2.Response<UserTokens> responseCreate) {

-						alertDialogBuilder.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
+                                    if (responseCreate.isSuccessful()) {

-							dialog.dismiss();
-							login(loginType, loginUid, loginPass, loginOTP, loginToken);
-						});
+                                        if(responseCreate.code() == 201) {

-						alertDialogBuilder.create().show();
+                                            UserTokens newToken = responseCreate.body();
+                                            assert newToken != null;
+                                            //Log.i("Tokens-NEW", "new:" + newToken.getSha1());

-					}
-					else if(gitea_version.lessOrEqual(getString(R.string.versionHigh))) {
+                                            if (!newToken.getSha1().equals("")) {

-						login(loginType, loginUid, loginPass, loginOTP, loginToken);
-					}
-					else {
+                                                tinyDb.remove("loginPass");
+                                                tinyDb.putBoolean("loggedInMode", true);
+                                                tinyDb.putString(loginUid + "-token", newToken.getSha1());
+                                                //Log.i("Tokens", "new:" + newToken.getSha1() + " old:" + tinyDb.getString(loginUid + "-token"));

-						Toasty.warning(ctx, getResources().getString(R.string.versionUnsupportedNew));
-						login(loginType, loginUid, loginPass, loginOTP, loginToken);
+                                                startActivity(new Intent(LoginActivity.this, MainActivity.class));
+                                                finish();

-					}
+                                            }

-				}
-				else if(responseVersion.code() == 403) {
+                                        }

-					login(loginType, loginUid, loginPass, loginOTP, loginToken);
-				}
-			}
+                                    }
+                                    else if(responseCreate.code() == 500) {

-			private void login(LoginType loginType, String loginUid, String loginPass, int loginOTP, String loginToken) {
+                                        String toastError = getResources().getString(R.string.genericApiStatusError) + String.valueOf(responseCreate.code());
+                                        Toasty.info(getApplicationContext(), toastError);
+                                        enableProcessButton();
+                                        login_button.setText(R.string.btnLogin);

-				// 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(loginUid, loginPass, loginOTP);
-				}
-				else if(loginType == LoginType.TOKEN) { // Token
+                                @Override
+                                public void onFailure(@NonNull Call<UserTokens> createUserToken, Throwable t) {

-					setupUsingExistingToken(loginToken);
-				}
-			}
+                                }

-			@Override
-			public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
+                            });
+                        }
+                        else {

-				Log.e("onFailure-versionCheck", t.toString());
-				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
-				enableProcessButton();
-			}
-		});
-	}
+                            //Log.i("Current Token", tinyDb.getString(loginUid + "-token"));
+                            tinyDb.putBoolean("loggedInMode", true);
+                            startActivity(new Intent(LoginActivity.this, MainActivity.class));
+                            finish();

-	private void setupUsingExistingToken(final String loginToken) {
+                        }

-		Call<UserInfo> call = RetrofitClient.getApiInterface(appCtx).getUserInfo("token " + loginToken);
+                    }

-		call.enqueue(new Callback<UserInfo>() {
+                }
+                else if(response.code() == 500) {

-			@Override
-			public void onResponse(@NonNull Call<UserInfo> call, @NonNull retrofit2.Response<UserInfo> response) {
+                    String toastError = getResources().getString(R.string.genericApiStatusError) + String.valueOf(response.code());
+                    Toasty.info(getApplicationContext(), toastError);
+                    enableProcessButton();
+                    login_button.setText(R.string.btnLogin);

-				UserInfo userDetails = response.body();
+                }
+                else {

-				switch(response.code()) {
+                    String toastError = getResources().getString(R.string.genericApiStatusError) + String.valueOf(response.code());
+                    //Log.i("error message else4", String.valueOf(response.code()));

-					case 200:
+                    Toasty.info(getApplicationContext(), toastError);
+                    enableProcessButton();
+                    login_button.setText(R.string.btnLogin);

-						assert userDetails != null;
-						tinyDB.putBoolean("loggedInMode", true);
-						tinyDB.putString(userDetails.getLogin() + "-token", loginToken);
-						tinyDB.putString("loginUid", userDetails.getLogin());
-						tinyDB.putString("userLogin", userDetails.getUsername());
+                }

-						// insert new account to db if does not exist
-						String accountName = userDetails.getUsername() + "@" + TinyDB.getInstance(ctx).getString("instanceUrl");
-						UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
-						boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
-						long accountId;
+            }

-						if(!userAccountExists) {
+            @Override
+            public void onFailure(@NonNull Call<List<UserTokens>> call, @NonNull Throwable t) {
+                Log.e("onFailure-login", t.toString());
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.malformedJson));
+                enableProcessButton();
+                login_button.setText(R.string.btnLogin);
+            }
+        });

-							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());
-						}
+    private void disableProcessButton() {

-						enableProcessButton();
-						startActivity(new Intent(LoginActivity.this, MainActivity.class));
-						finish();
-						break;
-					case 401:
+        login_button.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        login_button.setBackground(shape);

-						Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
-						enableProcessButton();
-						break;
-					default:
+    }

-						Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
-						enableProcessButton();
-				}
-			}
+    private void enableProcessButton() {

-			@Override
-			public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
+        login_button.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        login_button.setBackground(shape);

-				Log.e("onFailure", t.toString());
-				Toasty.error(ctx, getResources().getString(R.string.genericError));
-				enableProcessButton();
-			}
-		});
-
-	}
-
-	private void setup(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;
-
-		Call<List<UserTokens>> call;
-		if(loginOTP != 0) {
-
-			call = RetrofitClient.getApiInterface(appCtx).getUserTokensWithOTP(credential, loginOTP, loginUid);
-		}
-		else {
-
-			call = RetrofitClient.getApiInterface(appCtx).getUserTokens(credential, loginUid);
-		}
-
-		call.enqueue(new Callback<List<UserTokens>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<UserTokens>> call, @NonNull retrofit2.Response<List<UserTokens>> response) {
-
-				List<UserTokens> userTokens = response.body();
-
-				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
-							// -> since it looks like GitNex forgot the secret we have to delete it first
-
-							Call<Void> delcall;
-							if(loginOTP != 0) {
-
-								delcall = RetrofitClient.getApiInterface(ctx)
-									.deleteTokenWithOTP(credential, loginOTP, loginUid, t.getId());
-							}
-							else {
-
-								delcall = RetrofitClient.getApiInterface(ctx).deleteToken(credential, loginUid, t.getId());
-							}
-
-							delcall.enqueue(new Callback<Void>() {
-
-								@Override
-								public void onResponse(@NonNull Call<Void> delcall, @NonNull retrofit2.Response<Void> response) {
-
-									if(response.code() == 204) {
-
-										setupToken(loginUid, loginPass, loginOTP, tokenName);
-									}
-									else {
-
-										Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
-										enableProcessButton();
-									}
-								}
-
-								@Override
-								public void onFailure(@NonNull Call<Void> delcall, @NonNull Throwable t) {
-
-									Log.e("onFailure-login", t.toString());
-									Toasty.error(ctx, getResources().getString(R.string.malformedJson));
-									enableProcessButton();
-								}
-							});
-							return;
-						}
-					}
-
-					setupToken(loginUid, loginPass, loginOTP, tokenName);
-				}
-				else {
-
-					Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
-					enableProcessButton();
-				}
-			}
-
-			@Override
-			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));
-				enableProcessButton();
-			}
-		});
-
-	}
-
-	private void setupToken(final String loginUid, final String loginPass, final int loginOTP, final String tokenName) {
-
-		final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
-
-		UserTokens createUserToken = new UserTokens(tokenName);
-		Call<UserTokens> callCreateToken;
-
-		if(loginOTP != 0) {
-
-			callCreateToken = RetrofitClient.getApiInterface(ctx)
-				.createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken);
-		}
-		else {
-
-			callCreateToken = RetrofitClient.getApiInterface(ctx)
-				.createNewToken(credential, loginUid, createUserToken);
-		}
-
-		callCreateToken.enqueue(new Callback<UserTokens>() {
-
-			@Override
-			public void onResponse(@NonNull Call<UserTokens> callCreateToken, @NonNull retrofit2.Response<UserTokens> responseCreate) {
-
-				if(responseCreate.code() == 201) {
-
-					UserTokens newToken = responseCreate.body();
-					assert newToken != null;
-
-					if(!newToken.getSha1().equals("")) {
-
-						Call<UserInfo> call = RetrofitClient.getApiInterface(ctx)
-							.getUserInfo("token " + newToken.getSha1());
-
-						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;
-										tinyDB.remove("loginPass");
-										tinyDB.putBoolean("loggedInMode", true);
-										tinyDB.putString("userLogin", userDetails.getUsername());
-										tinyDB.putString(loginUid + "-token", newToken.getSha1());
-										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");
-										UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
-										boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
-										long accountId;
-
-										if(!userAccountExists) {
-
-											accountId = userAccountsApi
-												.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));
-										enableProcessButton();
-										break;
-									default:
-
-										Toasty.error(ctx, 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));
-								enableProcessButton();
-							}
-						});
-					}
-				}
-				else if(responseCreate.code() == 500) {
-
-					Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + responseCreate.code());
-					enableProcessButton();
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<UserTokens> createUserToken, @NonNull Throwable t) {
-
-				Log.e("onFailure-token", t.toString());
-			}
-		});
-	}
-
-
-	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"));
-		}
-
-		if(tinyDB.getBoolean("loggedInMode")) {
-
-			startActivity(new Intent(LoginActivity.this, MainActivity.class));
-			finish();
-		}
-
-		if(!tinyDB.getString("uniqueAppId").isEmpty()) {
-
-			device_id = tinyDB.getString("uniqueAppId");
-		}
-		else {
-
-			device_id = UUID.randomUUID().toString();
-			tinyDB.putString("uniqueAppId", device_id);
-		}
-	}
-
-	private void disableProcessButton() {
-
-		loginButton.setText(R.string.processingText);
-		loginButton.setEnabled(false);
-	}
-
-	private void enableProcessButton() {
-
-		loginButton.setText(R.string.btnLogin);
-		loginButton.setEnabled(true);
-	}
+    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
--- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
@ -1,267 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
-import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.MergePullRequest;
-import org.gitnex.tea4j.models.MergePullRequestSpinner;
-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.Toasty;
-import org.mian.gitnex.helpers.Version;
-import java.util.ArrayList;
-import java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author M M Arif
- */
-
-public class MergePullRequestActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-
-	private String repoOwner;
-	private String repoName;
-	private int prIndex;
-
-	private ActivityMergePullRequestBinding viewBinding;
-
-	private String Do;
-
-	@SuppressLint("SetTextI18n")
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		viewBinding = ActivityMergePullRequestBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
-
-		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);
-
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-		viewBinding.mergeTitle.requestFocus();
-		assert imm != null;
-		imm.showSoftInput(viewBinding.mergeTitle, InputMethodManager.SHOW_IMPLICIT);
-
-		setMergeAdapter();
-
-		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")) {
-
-			viewBinding.deleteBranch.setVisibility(View.VISIBLE);
-		}
-
-		if(tinyDB.getString("prMergeable").equals("false")) {
-
-			disableProcessButton();
-			viewBinding.mergeInfoDisabledMessage.setVisibility(View.VISIBLE);
-		}
-		else {
-
-			viewBinding.mergeInfoDisabledMessage.setVisibility(View.GONE);
-		}
-
-		if(tinyDB.getString("prIsFork").equals("true")) {
-
-			viewBinding.deleteBranchForkInfo.setVisibility(View.VISIBLE);
-		}
-		else {
-
-			viewBinding.deleteBranchForkInfo.setVisibility(View.GONE);
-		}
-
-		if(!connToInternet) {
-
-			disableProcessButton();
-		}
-		else {
-
-			viewBinding.mergeButton.setOnClickListener(mergePullRequest);
-		}
-
-	}
-
-	private void setMergeAdapter() {
-
-		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")) {
-
-			mergeList.add(new MergePullRequestSpinner("squash", getResources().getString(R.string.mergeOptionSquash)));
-		}
-
-		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.list_spinner_items, mergeList);
-		viewBinding.mergeSpinner.setAdapter(adapter);
-
-		viewBinding.mergeSpinner.setOnItemClickListener ((parent, view, position, id) -> {
-
-			Do = mergeList.get(position).getId();
-		});
-
-	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> finish();
-	}
-
-	private final View.OnClickListener mergePullRequest = v -> processMergePullRequest();
-
-	private void processMergePullRequest() {
-
-		String mergePRDesc = Objects.requireNonNull(viewBinding.mergeDescription.getText()).toString();
-		String mergePRTitle = Objects.requireNonNull(viewBinding.mergeTitle.getText()).toString();
-		boolean deleteBranch = viewBinding.deleteBranch.isChecked();
-
-		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-		if(!connToInternet) {
-
-			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-			return;
-		}
-
-		if(Do == null) {
-
-			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) {
-
-		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);
-
-		Call<Void> call = RetrofitClient.getApiInterface(ctx).mergePullRequest(Authorization.get(ctx), repoOwner, repoName, prIndex, mergePR);
-
-		call.enqueue(new Callback<Void>() {
-
-			@Override
-			public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
-
-				if(response.code() == 200) {
-
-					if(deleteBranch) {
-
-						if(tinyDB.getString("prIsFork").equals("true")) {
-
-							String repoFullName = tinyDB.getString("prForkFullName");
-							String[] parts = repoFullName.split("/");
-							final String repoOwner = parts[0];
-							final String repoName = parts[1];
-
-							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, tinyDB.getString("prHeadBranch"), false);
-
-							Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
-							tinyDB.putBoolean("prMerged", true);
-							tinyDB.putBoolean("resumePullRequests", true);
-							finish();
-						}
-						else {
-
-							String repoFullName = tinyDB.getString("repoFullName");
-							String[] parts = repoFullName.split("/");
-							final String repoOwner = parts[0];
-							final String repoName = parts[1];
-
-							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, tinyDB.getString("prHeadBranch"), false);
-
-							Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
-							tinyDB.putBoolean("prMerged", true);
-							tinyDB.putBoolean("resumePullRequests", true);
-							finish();
-						}
-
-					}
-					else {
-
-						Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
-						tinyDB.putBoolean("prMerged", true);
-						tinyDB.putBoolean("resumePullRequests", true);
-						finish();
-					}
-
-				}
-				else if(response.code() == 401) {
-
-					enableProcessButton();
-					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-				}
-				else if(response.code() == 404) {
-
-					enableProcessButton();
-					Toasty.warning(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));
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
-
-				Log.e("onFailure", t.toString());
-				enableProcessButton();
-			}
-
-		});
-
-	}
-
-	private void disableProcessButton() {
-
-		viewBinding.mergeButton.setEnabled(false);
-	}
-
-	private void enableProcessButton() {
-
-		viewBinding.mergeButton.setEnabled(true);
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java
@ -0,0 +1,335 @@
+package org.mian.gitnex.activities;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import com.google.gson.JsonElement;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.NewFile;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class NewFileActivity extends AppCompatActivity {
+
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;
+    private Button newFileCreate;
+
+    private EditText newFileName;
+    private EditText newFileContent;
+    private EditText newFileBranchName;
+    private EditText newFileCommitMessage;
+    private Spinner newFileBranchesSpinner;
+    final Context ctx = this;
+
+    List<Branches> branchesList = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new_file);
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        closeActivity = findViewById(R.id.close);
+        newFileName = findViewById(R.id.newFileName);
+        newFileContent = findViewById(R.id.newFileContent);
+        newFileBranchName = findViewById(R.id.newFileBranchName);
+        newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        newFileCreate = findViewById(R.id.newFileCreate);
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
+        newFileBranchesSpinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getBranches(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
+
+        newFileBranchesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
+        {
+            public void onItemSelected(AdapterView<?> arg0,
+                                       View arg1, int arg2, long arg3)
+            {
+                Branches bModelValue = (Branches) newFileBranchesSpinner.getSelectedItem();
+                Log.i("bModelSelected", bModelValue.toString());
+
+                if(bModelValue.toString().equals("No branch")) {
+                    newFileBranchName.setEnabled(true);
+                }
+                else {
+                    newFileBranchName.setEnabled(false);
+                    newFileBranchName.setText("");
+                }
+
+            }
+
+            public void onNothingSelected(AdapterView<?> arg0) {}
+        });
+
+        disableProcessButton();
+
+        if(!connToInternet) {
+
+            newFileCreate.setEnabled(false);
+            GradientDrawable shape =  new GradientDrawable();
+            shape.setCornerRadius( 8 );
+            shape.setColor(getResources().getColor(R.color.hintColor));
+            newFileCreate.setBackground(shape);
+
+        } else {
+
+            newFileCreate.setOnClickListener(createFileListener);
+
+        }
+
+    }
+
+    private View.OnClickListener createFileListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewFile();
+        }
+    };
+
+    private void processNewFile() {
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        String newFileName_ = newFileName.getText().toString();
+        String newFileContent_ = newFileContent.getText().toString();
+        String newFileBranchName_ = newFileBranchName.getText().toString();
+        String newFileCommitMessage_ = newFileCommitMessage.getText().toString();
+
+        Branches currentBranch = (Branches) newFileBranchesSpinner.getSelectedItem();
+
+        if(!connToInternet) {
+
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            return;
+
+        }
+
+        if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFields));
+            return;
+
+        }
+
+        if(currentBranch.toString().equals("No branch")) {
+
+            if(newFileBranchName_.equals("")) {
+                Toasty.info(getApplicationContext(), getString(R.string.newFileRequiredFieldNewBranchName));
+                return;
+            }
+            else {
+                if(!appUtil.checkStringsWithDash(newFileBranchName_)) {
+
+                    Toasty.info(getApplicationContext(), getString(R.string.newFileInvalidBranchName));
+                    return;
+
+                }
+            }
+
+        }
+
+        if(appUtil.charactersLength(newFileCommitMessage_) > 255) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.newFileCommitMessageError));
+
+        }
+        else {
+
+            disableProcessButton();
+            createNewFile(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newFileName_, appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
+
+        }
+
+    }
+
+    private void createNewFile(final String instanceUrl, final String token, String repoOwner, String repoName, String fileName, String fileContent, String fileBranchName, String fileCommitMessage, String currentBranch) {
+
+        NewFile createNewFileJsonStr;
+        if(currentBranch.equals("No branch")) {
+            createNewFileJsonStr = new NewFile("", fileContent, fileCommitMessage, fileBranchName);
+        }
+        else {
+            createNewFileJsonStr = new NewFile(currentBranch, fileContent, fileCommitMessage, "");
+        }
+
+        Call<JsonElement> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .createNewFile(token, repoOwner, repoName, fileName, createNewFileJsonStr);
+
+        call.enqueue(new Callback<JsonElement>() {
+
+            @Override
+            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+                if(response.code() == 201) {
+
+                    enableProcessButton();
+                    Toasty.info(getApplicationContext(), getString(R.string.newFileSuccessMessage));
+                    finish();
+
+                }
+                else if(response.code() == 401) {
+
+                    enableProcessButton();
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else {
+
+                    if(response.code() == 404) {
+                        enableProcessButton();
+                        Toasty.info(getApplicationContext(), getString(R.string.apiNotFound));
+                    }
+                    else {
+                        enableProcessButton();
+                        Toasty.info(getApplicationContext(), getString(R.string.orgCreatedError));
+                    }
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+                enableProcessButton();
+            }
+        });
+
+    }
+
+    private void getBranches(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
+
+        Call<List<Branches>> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .getBranches(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Branches>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {
+
+                if(response.isSuccessful()) {
+                    if(response.code() == 200) {
+
+                        List<Branches> branchesList_ = response.body();
+
+                        branchesList.add(new Branches("No branch"));
+                        assert branchesList_ != null;
+                        if(branchesList_.size() > 0) {
+                            for (int i = 0; i < branchesList_.size(); i++) {
+
+                                Branches data = new Branches(
+                                        branchesList_.get(i).getName()
+                                );
+                                branchesList.add(data);
+
+                            }
+                        }
+
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(getApplicationContext(),
+                                R.layout.spinner_item, branchesList);
+
+                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+                        newFileBranchesSpinner.setAdapter(adapter);
+                        enableProcessButton();
+
+                    }
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+
+    private void disableProcessButton() {
+
+        newFileCreate.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        newFileCreate.setBackground(shape);
+
+    }
+
+    private void enableProcessButton() {
+
+        newFileCreate.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        newFileCreate.setBackground(shape);
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
@ -1,76 +1,54 @@
 package org.mian.gitnex.activities;

-import android.annotation.SuppressLint;
-import android.app.DatePickerDialog;
-import android.content.Context;
-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.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 java.util.Calendar;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
+import android.app.DatePickerDialog;
+import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.ImageView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Milestones;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import java.util.Calendar;

 /**
 * Author M M Arif
 */

-public class CreateMilestoneActivity extends BaseActivity implements View.OnClickListener {
+public class NewMilestoneActivity extends AppCompatActivity implements View.OnClickListener {

    private EditText milestoneDueDate;
    private View.OnClickListener onClickListener;
    private EditText milestoneTitle;
    private EditText milestoneDescription;
    private Button createNewMilestoneButton;
+    final Context ctx = this;

-    @SuppressLint("ClickableViewAccessibility")
    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new_milestone);

-	    ActivityCreateMilestoneBinding activityCreateMilestoneBinding = ActivityCreateMilestoneBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateMilestoneBinding.getRoot());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        milestoneDueDate = activityCreateMilestoneBinding.milestoneDueDate;
-        ImageView closeActivity = activityCreateMilestoneBinding.close;
-        createNewMilestoneButton = activityCreateMilestoneBinding.createNewMilestoneButton;
-        milestoneTitle = activityCreateMilestoneBinding.milestoneTitle;
-        milestoneDescription = activityCreateMilestoneBinding.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;
-	    });
+        milestoneDueDate = findViewById(R.id.milestoneDueDate);
+        ImageView closeActivity = findViewById(R.id.close);
+        createNewMilestoneButton = findViewById(R.id.createNewMilestoneButton);
+        milestoneTitle = findViewById(R.id.milestoneTitle);
+        milestoneDescription = findViewById(R.id.milestoneDescription);

        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);
@ -79,25 +57,38 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
        if(!connToInternet) {

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

            createNewMilestoneButton.setOnClickListener(createMilestoneListener);
+
        }

    }

-    private 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);
-
-        TinyDB tinyDb = TinyDB.getInstance(appCtx);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
        final String repoOwner = parts[0];
        final String repoName = parts[1];
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        //String appLocale = tinyDb.getString("locale");

        String newMilestoneTitle = milestoneTitle.getText().toString();
        String newMilestoneDescription = milestoneDescription.getText().toString();
@ -105,50 +96,49 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic

        if(!connToInternet) {

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

        if(newMilestoneTitle.equals("")) {

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

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

-            if (newMilestoneDescription.length() > 255) {
-
-                Toasty.warning(ctx, getString(R.string.milestoneDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.milestoneDescError));
                return;
+
            }
        }

-        String finalMilestoneDueDate = null;
+        if(newMilestoneDueDate.equals("")) {

-        if(!newMilestoneDueDate.isEmpty()) {
-
-            finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
-        }
-        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(getApplicationContext(), getString(R.string.milestoneDateEmpty));
            return;
+
        }

        disableProcessButton();
-        createNewMilestone(Authorization.get(ctx), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
+        String finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
+        createNewMilestone(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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)
+                .getApiInterface()
                .createMilestone(token, repoOwner, repoName, createMilestone);

        call.enqueue(new Callback<Milestones>() {
@ -157,14 +147,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(getApplicationContext());
                        tinyDb.putBoolean("milestoneCreated", true);
-                        Toasty.success(ctx, getString(R.string.milestoneCreated));
+                        Toasty.info(getApplicationContext(), getString(R.string.milestoneCreated));
                        enableProcessButton();
                        finish();
+
                    }
                }
                else if(response.code() == 401) {
@ -174,17 +164,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(getApplicationContext(), getString(R.string.milestoneCreatedError));
+
                }
+
            }

            @Override
            public void onFailure(@NonNull Call<Milestones> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -203,25 +195,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 = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
    }

    private void disableProcessButton() {

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

    private void enableProcessButton() {

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
+++ b/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 androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 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 org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -27,7 +25,7 @@ import retrofit2.Callback;
 * Author M M Arif
 */

-public class CreateOrganizationActivity extends BaseActivity {
+public class NewOrganizationActivity extends AppCompatActivity {

    public ImageView closeActivity;
    private View.OnClickListener onClickListener;
@ -35,106 +33,109 @@ public class CreateOrganizationActivity extends BaseActivity {

    private EditText orgName;
    private EditText orgDesc;
+    final Context ctx = this;

-    @SuppressLint("ClickableViewAccessibility")
    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new_organization);

-	    ActivityCreateOrganizationBinding activityCreateOrganizationBinding = ActivityCreateOrganizationBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateOrganizationBinding.getRoot());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        closeActivity = activityCreateOrganizationBinding.close;
-        orgName = activityCreateOrganizationBinding.newOrganizationName;
-        orgDesc = activityCreateOrganizationBinding.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;
-	    });
+        closeActivity = findViewById(R.id.close);
+        orgName = findViewById(R.id.newOrganizationName);
+        orgDesc = findViewById(R.id.newOrganizationDescription);

        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

-        createOrganizationButton = activityCreateOrganizationBinding.createNewOrganizationButton;
+        createOrganizationButton = findViewById(R.id.createNewOrganizationButton);

        if(!connToInternet) {

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

            createOrganizationButton.setOnClickListener(createOrgListener);
+
        }

    }

    private void initCloseListener() {
-
-        onClickListener = view -> finish();
+        onClickListener = new View.OnClickListener() {
+            @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);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

        String newOrgName = orgName.getText().toString();
        String newOrgDesc = orgDesc.getText().toString();

        if(!connToInternet) {

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

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

-            if (newOrgDesc.length() > 255) {
-
-                Toasty.warning(ctx, getString(R.string.orgDescError));
+                Toasty.info(getApplicationContext(), getString(R.string.orgDescError));
                return;
+
            }
        }

        if(newOrgName.equals("")) {

-            Toasty.error(ctx, getString(R.string.orgNameErrorEmpty));
-        }
-        else if(!AppUtil.checkStrings(newOrgName)) {
+            Toasty.info(getApplicationContext(), getString(R.string.orgNameErrorEmpty));
+
+        }
+        else if(!appUtil.checkStrings(newOrgName)) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.orgNameErrorInvalid));

-            Toasty.warning(ctx, getString(R.string.orgNameErrorInvalid));
        }
        else {

            disableProcessButton();
-            createNewOrganization(Authorization.get(ctx), newOrgName, newOrgDesc);
+            createNewOrganization(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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)
+            .getApiInterface()
            .createNewOrganization(token, createOrganization);

        call.enqueue(new Callback<UserOrganizations>() {
@ -144,11 +145,12 @@ public class CreateOrganizationActivity extends BaseActivity {

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

-                    TinyDB tinyDb = TinyDB.getInstance(appCtx);
+                    TinyDB tinyDb = new TinyDB(getApplicationContext());
                    tinyDb.putBoolean("orgCreated", true);
                    enableProcessButton();
-                    Toasty.success(ctx, getString(R.string.orgCreated));
+                    Toasty.info(getApplicationContext(), getString(R.string.orgCreated));
                    finish();
+
                }
                else if(response.code() == 401) {

@ -157,35 +159,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(getApplicationContext(), getString(R.string.orgExistsError));
+
                }
                else if(response.code() == 422) {

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

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

            @Override
            public void onFailure(@NonNull Call<UserOrganizations> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -196,11 +200,21 @@ public class CreateOrganizationActivity extends BaseActivity {
    private void disableProcessButton() {

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

    private void enableProcessButton() {

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
@ -0,0 +1,314 @@
+package org.mian.gitnex.activities;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.OrgOwner;
+import org.mian.gitnex.models.OrganizationRepository;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class NewRepoActivity extends AppCompatActivity {
+
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;
+    private Spinner spinner;
+    private Button createRepo;
+    private EditText repoName;
+    private EditText repoDesc;
+    private CheckBox repoAccess;
+    final Context ctx = this;
+
+    List<OrgOwner> orgsList = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new_repo);
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        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");
+
+        closeActivity = findViewById(R.id.close);
+        repoName = findViewById(R.id.newRepoName);
+        repoDesc = findViewById(R.id.newRepoDescription);
+        repoAccess = findViewById(R.id.newRepoPrivate);
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        spinner = findViewById(R.id.ownerSpinner);
+        spinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+        getOrgs(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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();
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
+        createRepo = findViewById(R.id.createNewRepoButton);
+        disableProcessButton();
+
+        if(!connToInternet) {
+
+            disableProcessButton();
+
+        }
+        else {
+
+            createRepo.setOnClickListener(createRepoListener);
+
+        }
+
+    }
+
+    private View.OnClickListener createRepoListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewRepo();
+        }
+    };
+
+    private void processNewRepo() {
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        String newRepoName = repoName.getText().toString();
+        String newRepoDesc = repoDesc.getText().toString();
+        String repoOwner = spinner.getSelectedItem().toString();
+        boolean newRepoAccess = repoAccess.isChecked();
+
+        if(!connToInternet) {
+
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            return;
+
+        }
+
+        if(!newRepoDesc.equals("")) {
+            if (appUtil.charactersLength(newRepoDesc) > 255) {
+
+                Toasty.info(getApplicationContext(), getString(R.string.repoDescError));
+                return;
+
+            }
+        }
+
+        if(newRepoName.equals("")) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorEmpty));
+
+        }
+        else if(!appUtil.checkStrings(newRepoName)) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorInvalid));
+
+        }
+        else {
+
+            //Log.i("repoOwner", String.valueOf(repoOwner));
+            disableProcessButton();
+            createNewRepository(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
+
+        }
+
+    }
+
+    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(repoOwner.equals(loginUid)) {
+
+            call = RetrofitClient
+                    .getInstance(instanceUrl)
+                    .getApiInterface()
+                    .createNewUserRepository(token, createRepository);
+
+        }
+        else {
+
+            call = RetrofitClient
+                    .getInstance(instanceUrl)
+                    .getApiInterface()
+                    .createNewUserOrgRepository(token, repoOwner, createRepository);
+
+        }
+
+        call.enqueue(new Callback<OrganizationRepository>() {
+
+            @Override
+            public void onResponse(@NonNull Call<OrganizationRepository> call, @NonNull retrofit2.Response<OrganizationRepository> response) {
+
+                if(response.code() == 201) {
+
+                    TinyDB tinyDb = new TinyDB(getApplicationContext());
+                    tinyDb.putBoolean("repoCreated", true);
+                    Toasty.info(getApplicationContext(), getString(R.string.repoCreated));
+                    enableProcessButton();
+                    finish();
+                }
+                else if(response.code() == 401) {
+
+                    enableProcessButton();
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else if(response.code() == 409) {
+
+                    enableProcessButton();
+                    Toasty.info(getApplicationContext(), getString(R.string.repoExistsError));
+
+                }
+                else {
+
+                    enableProcessButton();
+                    Toasty.info(getApplicationContext(), getString(R.string.repoCreatedError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<OrganizationRepository> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+                enableProcessButton();
+            }
+        });
+
+    }
+
+    private void getOrgs(String instanceUrl, String instanceToken, final String userLogin) {
+
+        Call<List<OrgOwner>> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .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.isSuccessful()) {
+                    if(response.code() == 200) {
+
+                        List<OrgOwner> orgsList_ = response.body();
+
+                        orgsList.add(new OrgOwner(userLogin));
+                        assert orgsList_ != null;
+                        if(orgsList_.size() > 0) {
+                            for (int i = 0; i < orgsList_.size(); i++) {
+
+                                OrgOwner data = new OrgOwner(
+                                        orgsList_.get(i).getUsername()
+                                );
+                                orgsList.add(data);
+
+                            }
+                        }
+
+                        ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(getApplicationContext(),
+                                R.layout.spinner_item, orgsList);
+
+                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+                        spinner.setAdapter(adapter);
+                        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();
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+
+    private void disableProcessButton() {
+
+        createRepo.setEnabled(false);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.hintColor));
+        createRepo.setBackground(shape);
+
+    }
+
+    private void enableProcessButton() {
+
+        createRepo.setEnabled(true);
+        GradientDrawable shape =  new GradientDrawable();
+        shape.setCornerRadius( 8 );
+        shape.setColor(getResources().getColor(R.color.btnBackground));
+        createRepo.setBackground(shape);
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OpenRepoInBrowserActivity.java
@ -1,17 +1,10 @@
 package org.mian.gitnex.activities;

-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.PathsHelper;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Toasty;
-import java.net.URI;
-import java.net.URISyntaxException;
-import io.mikael.urlbuilder.UrlBuilder;
+import org.mian.gitnex.util.TinyDB;

 /**
 * Author M M Arif
@ -19,37 +12,24 @@ import io.mikael.urlbuilder.UrlBuilder;

 public class OpenRepoInBrowserActivity extends AppCompatActivity {

-    private Context appCtx;

    @Override
    protected void onCreate(Bundle savedInstanceState) {

-	    super.onCreate(savedInstanceState);
+        super.onCreate(savedInstanceState);

-	    appCtx = getApplicationContext();
-	    TinyDB tinyDb = TinyDB.getInstance(appCtx);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw");
+        if (!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) {
+            instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol");
+        }

-	    try {
+        String repoFullNameBrowser = getIntent().getStringExtra("repoFullNameBrowser");
+        Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullNameBrowser);
+        Intent i = new Intent(Intent.ACTION_VIEW, url);
+        startActivity(i);
+        finish();

-		    URI instanceUrl = new URI(UrlBuilder.fromString(tinyDb.getString("instanceUrl"))
-			    .withPath("/")
-			    .toString());
-
-		    String browserPath = PathsHelper.join(instanceUrl.getPath(), getIntent().getStringExtra("repoFullNameBrowser"));
-
-		    String browserUrl = UrlBuilder.fromUri(instanceUrl)
-			    .withPath(browserPath)
-			    .toString();
-
-		    Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(browserUrl));
-		    startActivity(i);
-		    finish();
-
-	    }
-	    catch(URISyntaxException e) {
-
-		    Toasty.error(appCtx, getString(R.string.genericError));
-	    }
    }

 }
--- a/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java
@ -0,0 +1,134 @@
+package org.mian.gitnex.activities;
+
+import com.google.android.material.tabs.TabLayout;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import org.mian.gitnex.R;
+import org.mian.gitnex.fragments.MembersByOrgFragment;
+import org.mian.gitnex.fragments.OrgBottomSheetFragment;
+import org.mian.gitnex.fragments.OrganizationInfoFragment;
+import org.mian.gitnex.fragments.RepositoriesByOrgFragment;
+import org.mian.gitnex.fragments.TeamsByOrgFragment;
+import org.mian.gitnex.util.TinyDB;
+import java.util.Objects;
+
+/**
+ * Author M M Arif
+ */
+
+public class OrgDetailActivity extends AppCompatActivity implements OrgBottomSheetFragment.BottomSheetListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_org_detail);
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        String orgName = tinyDb.getString("orgName");
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        Objects.requireNonNull(getSupportActionBar()).setTitle(orgName);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        OrgDetailActivity.SectionsPagerAdapter mSectionsPagerAdapter = new OrgDetailActivity.SectionsPagerAdapter(getSupportFragmentManager());
+
+        ViewPager mViewPager = findViewById(R.id.container);
+        mViewPager.setAdapter(mSectionsPagerAdapter);
+
+        TabLayout tabLayout = findViewById(R.id.tabs);
+
+        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;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        int id = item.getItemId();
+
+        switch (id) {
+            case android.R.id.home:
+                finish();
+                return true;
+            case R.id.repoMenu:
+                OrgBottomSheetFragment bottomSheet = new OrgBottomSheetFragment();
+                bottomSheet.show(getSupportFragmentManager(), "orgBottomSheet");
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+
+    }
+
+    @Override
+    public void onButtonClicked(String text) {
+
+        switch (text) {
+            case "team":
+                startActivity(new Intent(OrgDetailActivity.this, CreateTeamByOrgActivity.class));
+                break;
+        }
+        //Log.i("clicked", text);
+
+    }
+
+    public class SectionsPagerAdapter extends FragmentPagerAdapter {
+
+        SectionsPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @NonNull
+        @Override
+        public Fragment getItem(int position) {
+
+            TinyDB tinyDb = new TinyDB(getApplicationContext());
+            String orgName;
+            if(getIntent().getStringExtra("orgName") != null || !getIntent().getStringExtra("orgName").equals("")) {
+                orgName = getIntent().getStringExtra("orgName");
+            }
+            else {
+                orgName = tinyDb.getString("orgName");
+            }
+
+            Fragment fragment = null;
+            switch (position) {
+                case 0: // info
+                    return OrganizationInfoFragment.newInstance(orgName);
+                case 1: // repos
+                    return RepositoriesByOrgFragment.newInstance(orgName);
+                case 2: // teams
+                    return TeamsByOrgFragment.newInstance(orgName);
+                case 3: // members
+                    return MembersByOrgFragment.newInstance(orgName);
+            }
+            return fragment;
+
+        }
+
+        @Override
+        public int getCount() {
+            return 4;
+        }
+    }
+}
--- a/app/src/main/java/org/mian/gitnex/activities/OrgTeamMembersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrgTeamMembersActivity.java
@ -0,0 +1,101 @@
+package org.mian.gitnex.activities;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.adapters.TeamMembersByOrgAdapter;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.viewmodels.TeamMembersByOrgViewModel;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class OrgTeamMembersActivity extends AppCompatActivity {
+
+    private TextView noDataMembers;
+    private View.OnClickListener onClickListener;
+    private TeamMembersByOrgAdapter adapter;
+    private GridView mGridView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_org_team_members);
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataMembers = findViewById(R.id.noDataMembers);
+        mGridView = findViewById(R.id.gridView);
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        if(getIntent().getStringExtra("teamTitle") != null && !getIntent().getStringExtra("teamTitle").equals("")) {
+            toolbarTitle.setText(getIntent().getStringExtra("teamTitle"));
+        }
+        else {
+            toolbarTitle.setText(R.string.orgTeamMembers);
+        }
+
+        String teamId;
+        if(getIntent().getStringExtra("teamId") != null && !getIntent().getStringExtra("teamId").equals("")){
+            teamId = getIntent().getStringExtra("teamId");
+        }
+        else {
+            teamId = "0";
+        }
+
+        getIntent().getStringExtra("teamId");
+        //Log.i("teamId", getIntent().getStringExtra("teamId"));
+
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId));
+
+    }
+
+    private void fetchDataAsync(String instanceUrl, String instanceToken, int teamId) {
+
+        TeamMembersByOrgViewModel teamMembersModel = new ViewModelProvider(this).get(TeamMembersByOrgViewModel.class);
+
+        teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId).observe(this, new Observer<List<UserInfo>>() {
+            @Override
+            public void onChanged(@Nullable List<UserInfo> teamMembersListMain) {
+                adapter = new TeamMembersByOrgAdapter(getApplicationContext(), teamMembersListMain);
+                if(adapter.getCount() > 0) {
+                    mGridView.setAdapter(adapter);
+                    noDataMembers.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mGridView.setAdapter(adapter);
+                    noDataMembers.setVisibility(View.VISIBLE);
+                }
+            }
+        });
+
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+}
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
@ -1,218 +0,0 @@
-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;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-import com.google.android.material.tabs.TabLayout;
-import org.mian.gitnex.R;
-import org.mian.gitnex.fragments.BottomSheetOrganizationFragment;
-import org.mian.gitnex.fragments.MembersByOrgFragment;
-import org.mian.gitnex.fragments.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 java.util.Objects;
-import io.mikael.urlbuilder.UrlBuilder;
-
-/**
- * Author M M Arif
- */
-
-public class OrganizationDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-	    setContentView(R.layout.activity_org_detail);
-
-        String orgName = tinyDB.getString("orgName");
-
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        TextView toolbarTitle = findViewById(R.id.toolbar_title);
-
-        setSupportActionBar(toolbar);
-        Objects.requireNonNull(getSupportActionBar()).setTitle(orgName);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        OrganizationDetailActivity.SectionsPagerAdapter mSectionsPagerAdapter = new OrganizationDetailActivity.SectionsPagerAdapter(getSupportFragmentManager());
-
-        ViewPager mViewPager = findViewById(R.id.container);
-        mViewPager.setAdapter(mSectionsPagerAdapter);
-
-        TabLayout tabLayout = findViewById(R.id.tabs);
-
-        Typeface myTypeface;
-
-        switch(tinyDB.getInt("customFontId", -1)) {
-
-            case 0:
-
-                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
-                break;
-            case 2:
-
-                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
-                break;
-            default:
-
-                myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
-                break;
-        }
-
-        toolbarTitle.setTypeface(myTypeface);
-        toolbarTitle.setText(orgName);
-
-        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
-        int tabsCount = vg.getChildCount();
-
-        for (int j = 0; j < tabsCount; j++) {
-
-            ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
-            int tabChildCount = vgTab.getChildCount();
-
-            for (int i = 0; i < tabChildCount; i++) {
-
-                View tabViewChild = vgTab.getChildAt(i);
-
-                if (tabViewChild instanceof TextView) {
-
-                    ((TextView) tabViewChild).setTypeface(myTypeface);
-                }
-            }
-        }
-
-        mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
-        tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
-    }
-
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.repo_dotted_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        int id = item.getItemId();
-
-        if(id == android.R.id.home) {
-
-	        finish();
-	        return true;
-        }
-        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) {
-
-        switch (text) {
-            case "repository":
-
-                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;
-        }
-    }
-
-    public class SectionsPagerAdapter extends FragmentPagerAdapter {
-
-        SectionsPagerAdapter(FragmentManager fm) {
-            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-        }
-
-        @NonNull
-        @Override
-        public Fragment getItem(int position) {
-
-            String orgName;
-            if(getIntent().getStringExtra("orgName") != null || !Objects.equals(getIntent().getStringExtra("orgName"), "")) {
-
-                orgName = getIntent().getStringExtra("orgName");
-            }
-            else {
-
-                orgName = tinyDB.getString("orgName");
-            }
-
-            Fragment fragment = null;
-            switch (position) {
-
-                case 0: // info
-
-                    return OrganizationInfoFragment.newInstance(orgName);
-                case 1: // repos
-
-	                return RepositoriesByOrgFragment.newInstance(orgName);
-	            case 2: // labels
-
-                    return OrganizationLabelsFragment.newInstance(orgName);
-                case 3: // teams
-
-                    return TeamsByOrgFragment.newInstance(orgName);
-                case 4: // members
-
-                    return MembersByOrgFragment.newInstance(orgName);
-            }
-            return fragment;
-        }
-
-        @Override
-        public int getCount() {
-            return 5;
-        }
-    }
-}
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java
@ -1,161 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.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;
-import org.mian.gitnex.viewmodels.TeamMembersByOrgViewModel;
-import java.util.Objects;
-
-/**
- * Author M M Arif
- */
-
-public class OrganizationTeamMembersActivity extends BaseActivity implements BottomSheetOrganizationTeamsFragment.BottomSheetListener {
-
-    private TextView noDataMembers;
-    private View.OnClickListener onClickListener;
-    private TeamMembersByOrgAdapter adapter;
-    private GridView mGridView;
-	private ProgressBar progressBar;
-
-    private String teamId;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
-
-	    ActivityOrgTeamMembersBinding activityOrgTeamMembersBinding = ActivityOrgTeamMembersBinding.inflate(getLayoutInflater());
-	    setContentView(activityOrgTeamMembersBinding.getRoot());
-
-        Toolbar toolbar = activityOrgTeamMembersBinding.toolbar;
-        setSupportActionBar(toolbar);
-
-        ImageView closeActivity = activityOrgTeamMembersBinding.close;
-        TextView toolbarTitle = activityOrgTeamMembersBinding.toolbarTitle;
-        noDataMembers = activityOrgTeamMembersBinding.noDataMembers;
-        mGridView = activityOrgTeamMembersBinding.gridView;
-	    progressBar = activityOrgTeamMembersBinding.progressBar;
-
-        initCloseListener();
-        closeActivity.setOnClickListener(onClickListener);
-
-        if(getIntent().getStringExtra("teamTitle") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamTitle")).equals("")) {
-
-        	toolbarTitle.setText(getIntent().getStringExtra("teamTitle"));
-        }
-        else {
-
-        	toolbarTitle.setText(R.string.orgTeamMembers);
-        }
-
-        if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){
-
-        	teamId = getIntent().getStringExtra("teamId");
-        }
-        else {
-
-        	teamId = "0";
-        }
-
-        assert teamId != null;
-        fetchDataAsync(Authorization.get(ctx), Integer.parseInt(teamId));
-    }
-
-    @Override
-    public void onResume() {
-
-        super.onResume();
-        TinyDB tinyDb = TinyDB.getInstance(appCtx);
-
-        if(tinyDb.getBoolean("teamActionFlag")) {
-
-            fetchDataAsync(Authorization.get(ctx), Integer.parseInt(teamId));
-            tinyDb.putBoolean("teamActionFlag", false);
-        }
-    }
-
-    private void fetchDataAsync(String instanceToken, int teamId) {
-
-        TeamMembersByOrgViewModel teamMembersModel = new ViewModelProvider(this).get(TeamMembersByOrgViewModel.class);
-
-        teamMembersModel.getMembersByOrgList(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
-    public boolean onCreateOptionsMenu(Menu menu) {
-
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        int id = item.getItemId();
-
-	    if(id == android.R.id.home) {
-
-		    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)) {
-
-            Intent intent = new Intent(OrganizationTeamMembersActivity.this, AddNewTeamMemberActivity.class);
-            intent.putExtra("teamId", teamId);
-            startActivity(intent);
-        }
-    }
-
-    private void initCloseListener() {
-        onClickListener = view -> finish();
-    }
-}
--- a/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java
+++ b/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);
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java
@ -1,60 +1,52 @@
 package org.mian.gitnex.activities;

+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
 import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.Patterns;
 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 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 org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;

 /**
 * Author M M Arif
 */

-public class MyProfileEmailActivity extends BaseActivity {
+public class ProfileEmailActivity extends AppCompatActivity {

    private View.OnClickListener onClickListener;
    private EditText userEmail;
+    final Context ctx = this;
    private Button addEmailButton;

    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_profile_email);

-	    ActivityProfileEmailBinding activityProfileEmailBinding = ActivityProfileEmailBinding.inflate(getLayoutInflater());
-	    setContentView(activityProfileEmailBinding.getRoot());
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

-        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        ImageView closeActivity = activityProfileEmailBinding.close;
-        userEmail = activityProfileEmailBinding.userEmail;
-        addEmailButton = activityProfileEmailBinding.addEmailButton;
-
-        userEmail.requestFocus();
-        assert imm != null;
-        imm.showSoftInput(userEmail, InputMethodManager.SHOW_IMPLICIT);
+        ImageView closeActivity = findViewById(R.id.close);
+        userEmail = findViewById(R.id.userEmail);
+        addEmailButton = findViewById(R.id.addEmailButton);

        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);
@ -62,53 +54,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);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

        String newUserEmail = userEmail.getText().toString().trim();

        if(!connToInternet) {

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

        if(newUserEmail.equals("")) {

-            Toasty.error(ctx, getString(R.string.emailErrorEmpty));
+            Toasty.info(getApplicationContext(), getString(R.string.emailErrorEmpty));
            return;
+
        }
        else if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {

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

        List<String> newEmailList = new ArrayList<>(Arrays.asList(newUserEmail.split(",")));

        disableProcessButton();
-        addNewEmail(Authorization.get(ctx), newEmailList);
+        addNewEmail(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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(getApplicationContext());

        Call<JsonElement> call;

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

        call.enqueue(new Callback<JsonElement>() {
@ -118,10 +125,11 @@ public class MyProfileEmailActivity extends BaseActivity {

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

-                    Toasty.success(ctx, getString(R.string.emailAddedText));
+                    Toasty.info(getApplicationContext(), getString(R.string.emailAddedText));
                    tinyDb.putBoolean("emailsRefresh", true);
                    enableProcessButton();
                    finish();
+
                }
                else if(response.code() == 401) {

@ -130,32 +138,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(getApplicationContext(), getString(R.string.labelGeneralError));
+
                }
+
            }

            @Override
            public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
                Log.e("onFailure", t.toString());
                enableProcessButton();
            }
@ -164,18 +177,32 @@ public class MyProfileEmailActivity extends BaseActivity {
    }

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

    private void disableProcessButton() {

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

    private void enableProcessButton() {

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
@ -0,0 +1,278 @@
+package org.mian.gitnex.activities;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import com.hendraanggrian.appcompat.socialview.Mention;
+import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
+import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.actions.IssueActions;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.util.AppUtil;
+import org.mian.gitnex.util.TinyDB;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class ReplyToIssueActivity extends AppCompatActivity {
+
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;
+
+    final Context ctx = this;
+
+    private SocialAutoCompleteTextView addComment;
+    private ArrayAdapter<Mention> defaultMentionAdapter;
+    private Button replyButton;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_reply_to_issue);
+
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        addComment = findViewById(R.id.addComment);
+        addComment.setShowSoftInputOnFocus(true);
+
+        defaultMentionAdapter = new MentionArrayAdapter<>(this);
+        loadCollaboratorsList();
+
+        addComment.setMentionAdapter(defaultMentionAdapter);
+
+        closeActivity = findViewById(R.id.close);
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+
+        if(!tinyDb.getString("issueTitle").isEmpty()) {
+            toolbar_title.setText(tinyDb.getString("issueTitle"));
+        }
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        replyButton = findViewById(R.id.replyButton);
+
+        if(getIntent().getStringExtra("commentAction") != null && getIntent().getStringExtra("commentAction").equals("edit")) {
+
+            addComment.setText(getIntent().getStringExtra("commentBody"));
+            final String commentId = getIntent().getStringExtra("commentId");
+
+            toolbar_title.setText(getResources().getString(R.string.editCommentTitle));
+            replyButton.setText(getResources().getString(R.string.editCommentButtonText));
+
+            replyButton.setOnClickListener(new View.OnClickListener() {
+                public void onClick(View v) {
+                    IssueActions.editIssueComment(ctx, Integer.valueOf(commentId), addComment.getText().toString());
+                }
+
+            });
+
+            return;
+
+        }
+
+        if(!connToInternet) {
+
+            disableProcessButton();
+
+        } else {
+
+            replyButton.setOnClickListener(replyToIssue);
+
+        }
+
+    }
+
+    public void loadCollaboratorsList() {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        Call<List<Collaborators>> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+
+        call.enqueue(new Callback<List<Collaborators>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+
+                if (response.isSuccessful()) {
+
+                    assert response.body() != null;
+                    String fullName = "";
+                    for (int i = 0; i < response.body().size(); i++) {
+                        if(!response.body().get(i).getFull_name().equals("")) {
+                            fullName = response.body().get(i).getFull_name();
+                        }
+                        defaultMentionAdapter.add(
+                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
+                    }
+
+                } else {
+
+                    Log.i("onResponse", String.valueOf(response.code()));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+                Log.i("onFailure", t.getMessage());
+            }
+
+        });
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+
+    private View.OnClickListener replyToIssue = new View.OnClickListener() {
+        public void onClick(View v) {
+            processNewCommentReply();
+        }
+    };
+
+    private void processNewCommentReply() {
+
+        String newReplyDT = addComment.getText().toString();
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+
+        if(!connToInternet) {
+
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            return;
+
+        }
+
+        if(newReplyDT.equals("")) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.commentEmptyError));
+
+        }
+        else {
+
+            disableProcessButton();
+            replyComment(newReplyDT);
+
+        }
+
+    }
+
+    private void replyComment(String newReplyDT) {
+
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
+        Issues issueComment = new Issues(newReplyDT);
+
+        Call<Issues> call = RetrofitClient
+                .getInstance(instanceUrl)
+                .getApiInterface()
+                .replyCommentToIssue(Authorization.returnAuthentication(getApplicationContext(), 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(getApplicationContext(), getString(R.string.commentSuccess));
+                    tinyDb.putBoolean("commentPosted", true);
+                    tinyDb.putBoolean("resumeIssues", true);
+                    finish();
+
+                }
+                else if(response.code() == 401) {
+
+                    enableProcessButton();
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else {
+
+                    enableProcessButton();
+                    Toasty.info(getApplicationContext(), getString(R.string.commentError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+                enableProcessButton();
+            }
+        });
+
+    }
+
+    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);
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
--- a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
@ -1,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();
-		};
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
@ -1,23 +1,28 @@
 package org.mian.gitnex.activities;

 import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import 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.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.RepoStargazersViewModel;
+import java.util.List;

 /**
 * Author M M Arif
 */

-public class RepoStargazersActivity extends BaseActivity {
+public class RepoStargazersActivity extends AppCompatActivity {

    private TextView noDataStargazers;
    private View.OnClickListener onClickListener;
@ -26,18 +31,20 @@ public class RepoStargazersActivity extends BaseActivity {
    private ProgressBar mProgressBar;

    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_repo_stargazers);

-	    super.onCreate(savedInstanceState);
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-	    ActivityRepoStargazersBinding activityRepoStargazersBinding = ActivityRepoStargazersBinding.inflate(getLayoutInflater());
-	    setContentView(activityRepoStargazersBinding.getRoot());
-
-        ImageView closeActivity = activityRepoStargazersBinding.close;
-        TextView toolbarTitle = activityRepoStargazersBinding.toolbarTitle;
-        noDataStargazers = activityRepoStargazersBinding.noDataStargazers;
-        mGridView = activityRepoStargazersBinding.gridView;
-        mProgressBar = activityRepoStargazersBinding.progressBar;
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataStargazers = findViewById(R.id.noDataStargazers);
+        mGridView = findViewById(R.id.gridView);
+        mProgressBar = findViewById(R.id.progress_bar);

        String repoFullNameForStars = getIntent().getStringExtra("repoFullNameForStars");
        String[] parts = repoFullNameForStars.split("/");
@ -49,37 +56,40 @@ public class RepoStargazersActivity extends BaseActivity {

        toolbarTitle.setText(R.string.repoStargazersInMenu);

-        fetchDataAsync(Authorization.get(ctx), repoOwner, repoName);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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 -> {
-
-            adapter = new RepoStargazersAdapter(ctx, stargazersListMain);
-
-            if(adapter.getCount() > 0) {
-
-                mGridView.setAdapter(adapter);
-                noDataStargazers.setVisibility(View.GONE);
+        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName).observe(this, new Observer<List<UserInfo>>() {
+            @Override
+            public void onChanged(@Nullable List<UserInfo> stargazersListMain) {
+                adapter = new RepoStargazersAdapter(getApplicationContext(), stargazersListMain);
+                if(adapter.getCount() > 0) {
+                    mGridView.setAdapter(adapter);
+                    noDataStargazers.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mGridView.setAdapter(adapter);
+                    noDataStargazers.setVisibility(View.VISIBLE);
+                }
+                mProgressBar.setVisibility(View.GONE);
            }
-            else {
-
-                adapter.notifyDataSetChanged();
-                mGridView.setAdapter(adapter);
-                noDataStargazers.setVisibility(View.VISIBLE);
-            }
-
-            mProgressBar.setVisibility(View.GONE);
        });

    }

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

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

 import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import 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.models.UserInfo;
+import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.RepoWatchersViewModel;
+import java.util.List;

 /**
 * Author M M Arif
 */

-public class RepoWatchersActivity extends BaseActivity {
+public class RepoWatchersActivity extends AppCompatActivity {

    private TextView noDataWatchers;
    private View.OnClickListener onClickListener;
@ -26,18 +31,20 @@ public class RepoWatchersActivity extends BaseActivity {
    private ProgressBar mProgressBar;

    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_repo_watchers);

-	    ActivityRepoWatchersBinding activityRepoWatchersBinding = ActivityRepoWatchersBinding.inflate(getLayoutInflater());
-	    setContentView(activityRepoWatchersBinding.getRoot());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-        ImageView closeActivity = activityRepoWatchersBinding.close;
-        TextView toolbarTitle = activityRepoWatchersBinding.toolbarTitle;
-        noDataWatchers = activityRepoWatchersBinding.noDataWatchers;
-        mGridView = activityRepoWatchersBinding.gridView;
-        mProgressBar = activityRepoWatchersBinding.progressBar;
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataWatchers = findViewById(R.id.noDataWatchers);
+        mGridView = findViewById(R.id.gridView);
+        mProgressBar = findViewById(R.id.progress_bar);

        String repoFullNameForWatchers = getIntent().getStringExtra("repoFullNameForWatchers");
        String[] parts = repoFullNameForWatchers.split("/");
@ -49,37 +56,40 @@ public class RepoWatchersActivity extends BaseActivity {

        toolbarTitle.setText(R.string.repoWatchersInMenu);

-        fetchDataAsync(Authorization.get(ctx), repoOwner, repoName);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), 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 -> {
-
-            adapter = new RepoWatchersAdapter(ctx, watchersListMain);
-
-            if(adapter.getCount() > 0) {
-
-                mGridView.setAdapter(adapter);
-                noDataWatchers.setVisibility(View.GONE);
+        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName).observe(this, new Observer<List<UserInfo>>() {
+            @Override
+            public void onChanged(@Nullable List<UserInfo> watchersListMain) {
+                adapter = new RepoWatchersAdapter(getApplicationContext(), watchersListMain);
+                if(adapter.getCount() > 0) {
+                    mGridView.setAdapter(adapter);
+                    noDataWatchers.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mGridView.setAdapter(adapter);
+                    noDataWatchers.setVisibility(View.VISIBLE);
+                }
+                mProgressBar.setVisibility(View.GONE);
            }
-            else {
-
-                adapter.notifyDataSetChanged();
-                mGridView.setAdapter(adapter);
-                noDataWatchers.setVisibility(View.VISIBLE);
-            }
-
-            mProgressBar.setVisibility(View.GONE);
        });

    }

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java
+++ b/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();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
@ -1,252 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.app.Dialog;
-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 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;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsAppearanceActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-
-	private static String[] timeList;
-	private static int timeSelectedChoice = 0;
-
-	private static String[] customFontList;
-	private static int customFontSelectedChoice = 0;
-
-	private static String[] themeList;
-	private static int themeSelectedChoice = 0;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		ActivitySettingsAppearanceBinding activitySettingsAppearanceBinding = ActivitySettingsAppearanceBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsAppearanceBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsAppearanceBinding.close;
-
-		LinearLayout timeFrame = activitySettingsAppearanceBinding.timeFrame;
-		LinearLayout customFontFrame = activitySettingsAppearanceBinding.customFontFrame;
-		LinearLayout themeFrame = activitySettingsAppearanceBinding.themeSelectionFrame;
-		LinearLayout lightTimeFrame = activitySettingsAppearanceBinding.lightThemeTimeSelectionFrame;
-		LinearLayout darkTimeFrame = activitySettingsAppearanceBinding.darkThemeTimeSelectionFrame;
-
-		SwitchMaterial counterBadgesSwitch = activitySettingsAppearanceBinding.switchCounterBadge;
-
-		timeList = getResources().getStringArray(R.array.timeFormats);
-		customFontList = getResources().getStringArray(R.array.fonts);
-		themeList = getResources().getStringArray(R.array.themes);
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		String lightMinute = String.valueOf(tinyDB.getInt("lightThemeTimeMinute"));
-		String lightHour = String.valueOf(tinyDB.getInt("lightThemeTimeHour"));
-		if(lightMinute.length() == 1) lightMinute = "0" + lightMinute;
-		if(lightHour.length() == 1) lightHour = "0" + lightHour;
-
-		String darkMinute = String.valueOf(tinyDB.getInt("darkThemeTimeMinute"));
-		String darkHour = String.valueOf(tinyDB.getInt("darkThemeTimeHour"));
-		if(darkMinute.length() == 1) darkMinute = "0" + darkMinute;
-		if(darkHour.length() == 1) darkHour = "0" + darkHour;
-
-		activitySettingsAppearanceBinding.lightThemeSelectedTime.setText(ctx.getResources().getString(R.string.settingsThemeTimeSelectedHint, lightHour,
-			lightMinute));
-		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")) {
-			darkTimeFrame.setVisibility(View.VISIBLE);
-			lightTimeFrame.setVisibility(View.VISIBLE);
-		}
-		else {
-			darkTimeFrame.setVisibility(View.GONE);
-			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);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-		});
-
-		// theme selection dialog
-		themeFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			tsBuilder.setTitle(getResources().getString(R.string.themeSelectorDialogTitle));
-			tsBuilder.setCancelable(themeSelectedChoice != -1);
-
-			tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {
-
-				themeSelectedChoice = i;
-				activitySettingsAppearanceBinding.themeSelected.setText(themeList[i]);
-				tinyDB.putString("themeStr", themeList[i]);
-				tinyDB.putInt("themeId", i);
-
-				tinyDB.putBoolean("refreshParent", true);
-				this.recreate();
-				this.overridePendingTransition(0, 0);
-				dialogInterfaceTheme.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			});
-
-			AlertDialog cfDialog = tsBuilder.create();
-			cfDialog.show();
-		});
-
-		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
-		customFontFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder cfBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
-			cfBuilder.setCancelable(customFontSelectedChoice != -1);
-
-			cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {
-
-				customFontSelectedChoice = i;
-				activitySettingsAppearanceBinding.customFontSelected.setText(customFontList[i]);
-				tinyDB.putString("customFontStr", customFontList[i]);
-				tinyDB.putInt("customFontId", i);
-
-				tinyDB.putBoolean("refreshParent", true);
-				this.recreate();
-				this.overridePendingTransition(0, 0);
-				dialogInterfaceCustomFont.dismiss();
-				Toasty.success(appCtx, appCtx.getResources().getString(R.string.settingsSave));
-			});
-
-			AlertDialog cfDialog = cfBuilder.create();
-			cfDialog.show();
-		});
-
-		// time and date dialog
-		timeFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder tBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
-			tBuilder.setCancelable(timeSelectedChoice != -1);
-
-			tBuilder.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {
-
-				timeSelectedChoice = i;
-				activitySettingsAppearanceBinding.tvDateTimeSelected.setText(timeList[i]);
-				tinyDB.putString("timeStr", timeList[i]);
-				tinyDB.putInt("timeId", i);
-
-				switch(i) {
-					case 0:
-						tinyDB.putString("dateFormat", "pretty");
-						break;
-					case 1:
-						tinyDB.putString("dateFormat", "normal");
-						break;
-				}
-
-				dialogInterfaceTime.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			});
-
-			AlertDialog tDialog = tBuilder.create();
-			tDialog.show();
-		});
-
-	}
-
-	private void initCloseListener() {
-		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();
-		}
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsDraftsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsDraftsActivity.java
@ -1,44 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsDraftsBinding;
-import org.mian.gitnex.helpers.Toasty;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsDraftsActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		ActivitySettingsDraftsBinding activitySettingsDraftsBinding = ActivitySettingsDraftsBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsDraftsBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsDraftsBinding.close;
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		activitySettingsDraftsBinding.commentsDeletionSwitch.setChecked(tinyDB.getBoolean("draftsCommentsDeletionEnabled"));
-
-		// delete comments on submit switcher
-		activitySettingsDraftsBinding.commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("draftsCommentsDeletionEnabled", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-		});
-
-	}
-
-	private void initCloseListener() { onClickListener = view -> finish(); }
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
+++ b/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(); }
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java
+++ b/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));
-
-		});
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
@ -1,45 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsReportsBinding;
-import org.mian.gitnex.helpers.Toasty;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsReportsActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		ActivitySettingsReportsBinding activitySettingsReportsBinding = ActivitySettingsReportsBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsReportsBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsReportsBinding.close;
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		activitySettingsReportsBinding.crashReportsSwitch.setChecked(tinyDB.getBoolean("crashReportingEnabled"));
-
-		// crash reports switcher
-		activitySettingsReportsBinding.crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-
-			tinyDB.putBoolean("crashReportingEnabled", isChecked);
-			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-		});
-	}
-
-	private void initCloseListener() {
-		onClickListener = view -> finish();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
@ -1,257 +0,0 @@
-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.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.Toasty;
-import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
-import java.io.File;
-import java.io.IOException;
-import static androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG;
-import static androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsSecurityActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-
-	private static String[] cacheSizeDataList;
-	private static int cacheSizeDataSelectedChoice = 0;
-
-	private static String[] cacheSizeImagesList;
-	private static int cacheSizeImagesSelectedChoice = 0;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		ActivitySettingsSecurityBinding activitySettingsSecurityBinding = ActivitySettingsSecurityBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsSecurityBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsSecurityBinding.close;
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		TextView cacheSizeDataSelected = activitySettingsSecurityBinding.cacheSizeDataSelected; // setter for data cache size
-		TextView cacheSizeImagesSelected = activitySettingsSecurityBinding.cacheSizeImagesSelected; // setter for images cache size
-		TextView clearCacheSelected = activitySettingsSecurityBinding.clearCacheSelected; // setter for clear cache
-
-		LinearLayout certsFrame = activitySettingsSecurityBinding.certsFrame;
-		LinearLayout cacheSizeDataFrame = activitySettingsSecurityBinding.cacheSizeDataSelectionFrame;
-		LinearLayout cacheSizeImagesFrame = activitySettingsSecurityBinding.cacheSizeImagesSelectionFrame;
-		LinearLayout clearCacheFrame = activitySettingsSecurityBinding.clearCacheSelectionFrame;
-
-		SwitchMaterial switchBiometric = activitySettingsSecurityBinding.switchBiometric;
-
-		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()) {
-
-			cacheSizeImagesSelected.setText(tinyDB.getString("cacheSizeImagesStr"));
-		}
-
-		if(cacheSizeDataSelectedChoice == 0) {
-
-			cacheSizeDataSelectedChoice = tinyDB.getInt("cacheSizeId");
-		}
-
-		if(cacheSizeImagesSelectedChoice == 0) {
-
-			cacheSizeImagesSelectedChoice = tinyDB.getInt("cacheSizeImagesId");
-		}
-
-		switchBiometric.setChecked(tinyDB.getBoolean("biometricStatus"));
-
-		// biometric switcher
-		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)));
-
-		// clear cache
-		clearCacheFrame.setOnClickListener(v1 -> {
-
-			AlertDialog.Builder builder = new AlertDialog.Builder(SettingsSecurityActivity.this);
-
-			builder.setTitle(getResources().getString(R.string.clearCacheDialogHeader));
-			builder.setMessage(getResources().getString(R.string.clearCacheDialogMessage));
-			builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
-
-				try {
-
-					FileUtils.deleteDirectory(cacheDir);
-					FileUtils.mkdir(cacheDir.getAbsolutePath());
-					this.recreate();
-					this.overridePendingTransition(0, 0);
-				}
-				catch (IOException e) {
-
-					Log.e("SettingsSecurity", e.toString());
-				}
-			});
-
-			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
-			builder.create().show();
-
-		});
-
-		// cache size images selection dialog
-		cacheSizeImagesFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
-
-			tsBuilder.setTitle(getResources().getString(R.string.cacheSizeImagesDialogHeader));
-			tsBuilder.setCancelable(cacheSizeImagesSelectedChoice != -1);
-
-			tsBuilder.setSingleChoiceItems(cacheSizeImagesList, cacheSizeImagesSelectedChoice, (dialogInterfaceTheme, i) -> {
-
-				cacheSizeImagesSelectedChoice = i;
-				cacheSizeImagesSelected.setText(cacheSizeImagesList[i]);
-				tinyDB.putString("cacheSizeImagesStr", cacheSizeImagesList[i]);
-				tinyDB.putInt("cacheSizeImagesId", i);
-
-				dialogInterfaceTheme.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			});
-
-			AlertDialog cfDialog = tsBuilder.create();
-			cfDialog.show();
-		});
-
-		// cache size data selection dialog
-		cacheSizeDataFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
-
-			tsBuilder.setTitle(getResources().getString(R.string.cacheSizeDataDialogHeader));
-			tsBuilder.setCancelable(cacheSizeDataSelectedChoice != -1);
-
-			tsBuilder.setSingleChoiceItems(cacheSizeDataList, cacheSizeDataSelectedChoice, (dialogInterfaceTheme, i) -> {
-
-				cacheSizeDataSelectedChoice = i;
-				cacheSizeDataSelected.setText(cacheSizeDataList[i]);
-				tinyDB.putString("cacheSizeStr", cacheSizeDataList[i]);
-				tinyDB.putInt("cacheSizeId", i);
-
-				dialogInterfaceTheme.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			});
-
-			AlertDialog cfDialog = tsBuilder.create();
-			cfDialog.show();
-		});
-
-		// certs deletion
-		certsFrame.setOnClickListener(v1 -> {
-
-			AlertDialog.Builder builder = new AlertDialog.Builder(SettingsSecurityActivity.this);
-
-			builder.setTitle(getResources().getString(R.string.settingsCertsPopupTitle));
-			builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage));
-			builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
-
-				appCtx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply();
-
-				tinyDB.putBoolean("loggedInMode", false);
-				tinyDB.remove("basicAuthPassword");
-				tinyDB.putBoolean("basicAuthFlag", false);
-
-				Intent loginActivityIntent = new Intent().setClass(appCtx, LoginActivity.class);
-				loginActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				appCtx.startActivity(loginActivityIntent);
-			});
-
-			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
-			builder.create().show();
-		});
-	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> finish();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
@ -1,106 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.appcompat.app.AlertDialog;
-import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsTranslationBinding;
-import org.mian.gitnex.helpers.Toasty;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.TreeMap;
-
-/**
- * Author M M Arif
- */
-
-public class SettingsTranslationActivity extends BaseActivity {
-
-	private View.OnClickListener onClickListener;
-
-	private static int langSelectedChoice = 0;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		LinkedHashMap<String, String> langs = new LinkedHashMap<>();
-		langs.put("", getString(R.string.settingsLanguageSystem));
-		for(String langCode : getResources().getStringArray(R.array.languages)) {
-			langs.put(langCode, getLanguageDisplayName(langCode));
-		}
-
-		ActivitySettingsTranslationBinding activitySettingsTranslationBinding = ActivitySettingsTranslationBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsTranslationBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsTranslationBinding.close;
-
-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
-
-		final TextView tvLanguageSelected = activitySettingsTranslationBinding.tvLanguageSelected; // setter for en, fr
-		TextView helpTranslate = activitySettingsTranslationBinding.helpTranslate;
-
-		LinearLayout langFrame = activitySettingsTranslationBinding.langFrame;
-
-		helpTranslate.setOnClickListener(v12 -> {
-
-			Intent intent = new Intent();
-			intent.setAction(Intent.ACTION_VIEW);
-			intent.addCategory(Intent.CATEGORY_BROWSABLE);
-			intent.setData(Uri.parse(getResources().getString(R.string.crowdInLink)));
-			startActivity(intent);
-
-		});
-
-		tvLanguageSelected.setText(tinyDB.getString("localeStr"));
-
-		langSelectedChoice = tinyDB.getInt("langId");
-
-		// language dialog
-		langFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder lBuilder = new AlertDialog.Builder(SettingsTranslationActivity.this);
-
-			lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
-			lBuilder.setCancelable(langSelectedChoice != -1);
-
-			lBuilder.setSingleChoiceItems(langs.values().toArray(new String[0]), langSelectedChoice, (dialogInterface, i) -> {
-
-				String selectedLanguage = langs.keySet().toArray(new String[0])[i];
-				tinyDB.putString("localeStr", langs.get(selectedLanguage));
-				tinyDB.putInt("langId", i);
-				tinyDB.putString("locale", selectedLanguage);
-
-				tinyDB.putBoolean("refreshParent", true);
-				this.overridePendingTransition(0, 0);
-				dialogInterface.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-				this.recreate();
-			});
-
-			lBuilder.setNeutralButton(getString(R.string.cancelButton), null);
-
-			AlertDialog lDialog = lBuilder.create();
-			lDialog.show();
-		});
-	}
-
-	private void initCloseListener() {
-
-		onClickListener = view -> 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));
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
@ -0,0 +1,42 @@
+package org.mian.gitnex.activities;
+
+import androidx.appcompat.app.AppCompatActivity;
+import android.os.Bundle;
+import android.text.method.LinkMovementMethod;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+
+/**
+ * Author M M Arif
+ */
+
+public class SponsorsActivity extends AppCompatActivity {
+
+    private View.OnClickListener onClickListener;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sponsors);
+
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView liberaPaySponsorsThomas = findViewById(R.id.liberaPaySponsorsThomas);
+
+        liberaPaySponsorsThomas.setMovementMethod(LinkMovementMethod.getInstance());
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+    }
+
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        };
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
+++ b/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();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
+++ b/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 com.squareup.picasso.Picasso;
 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 final Context context;
-    private final List<UserInfo> usersListFull;
+    private List<UserInfo> usersList;
+    private Context mCtx;
+    private List<UserInfo> usersListFull;

-    class UsersViewHolder extends RecyclerView.ViewHolder {
+    static class UsersViewHolder extends RecyclerView.ViewHolder {

-	    private String userLoginId;
-
-        private final ImageView userAvatar;
-        private final TextView userFullName;
-        private final TextView userEmail;
-        private final ImageView userRole;
-        private final TextView userName;
+        private ImageView userAvatar;
+        private TextView userFullName;
+        private TextView userEmail;
+        private ImageView userRole;
+        private 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) {
-
-        this.context = ctx;
+    public AdminGetUsersAdapter(Context mCtx, List<UserInfo> usersListMain) {
+        this.mCtx = mCtx;
        this.usersList = usersListMain;
        usersListFull = new ArrayList<>(usersList);
    }
@ -76,8 +57,7 @@ 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);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.admin_users_list, 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(Html.fromHtml(currentItem.getFullname()));
-            holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userFullName.setText(currentItem.getFullname());
+            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
        }
        else {
-
-            holder.userFullName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userFullName.setText(mCtx.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);
+        Picasso.get().load(currentItem.getAvatar()).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();
--- a/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java
+++ b/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();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
@ -0,0 +1,83 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.util.TinyDB;
+import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * 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 TextView branchCommitHash;
+
+        private BranchesViewHolder(View itemView) {
+            super(itemView);
+
+            branchNameTv = itemView.findViewById(R.id.branchName);
+            branchCommitAuthor = itemView.findViewById(R.id.branchCommitAuthor);
+            branchCommitHash = itemView.findViewById(R.id.branchCommitHash);
+
+        }
+    }
+
+    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.branches_list, 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()));
+        }
+
+        holder.branchCommitHash.setText(
+                Html.fromHtml("<a href='" + currentItem.getCommit().getUrl() + "'>" + mCtx.getResources().getString(R.string.commitLinkBranchesTab) + "</a> "));
+        holder.branchCommitHash.setMovementMethod(LinkMovementMethod.getInstance());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return branchesList.size();
+    }
+
+}
+
+
--- a/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
@ -0,0 +1,289 @@
+package org.mian.gitnex.adapters;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.squareup.picasso.Picasso;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.IssueDetailActivity;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.util.TinyDB;
+import org.ocpsoft.prettytime.PrettyTime;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * Author M M Arif
+ */
+
+public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
+
+    private Context context;
+    private final int TYPE_LOAD = 0;
+    private List<Issues> issuesList;
+    private List<Issues> issuesListFull;
+    private ClosedIssuesAdapter.OnLoadMoreListener loadMoreListener;
+    private boolean isLoading = false, isMoreDataAvailable = true;
+
+    public ClosedIssuesAdapter(Context context, List<Issues> issuesListMain) {
+
+        this.context = context;
+        this.issuesList = issuesListMain;
+        issuesListFull = new ArrayList<>(issuesList);
+
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+        LayoutInflater inflater = LayoutInflater.from(context);
+
+        if(viewType == TYPE_LOAD){
+            return new ClosedIssuesAdapter.IssuesHolder(inflater.inflate(R.layout.repo_detail_issues_list, parent,false));
+        }
+        else {
+            return new ClosedIssuesAdapter.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) {
+
+            ((ClosedIssuesAdapter.IssuesHolder)holder).bindData(issuesList.get(position));
+
+        }
+
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+
+        if(issuesList.get(position).getTitle() != null) {
+            return TYPE_LOAD;
+        }
+        else {
+            return 1;
+        }
+
+    }
+
+    @Override
+    public int getItemCount() {
+
+        return issuesList.size();
+
+    }
+
+    class IssuesHolder extends RecyclerView.ViewHolder {
+
+        private TextView issueNumber;
+        private ImageView issueAssigneeAvatar;
+        private TextView issueTitle;
+        private TextView issueCreatedTime;
+        private TextView issueCommentsCount;
+        private ImageView issueType;
+
+        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);
+            issueType = itemView.findViewById(R.id.issueType);
+
+            issueTitle.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    Context context = v.getContext();
+                    //Log.i("issueNumber", issueNumber.getText().toString());
+
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", issueNumber.getText());
+
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    context.startActivity(intent);
+
+                }
+            });
+            frameCommentsCount.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    Context context = v.getContext();
+                    //Log.i("issueNumber", issueNumber.getText().toString());
+
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", issueNumber.getText());
+
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    context.startActivity(intent);
+
+                }
+            });
+
+        }
+
+        @SuppressLint("SetTextI18n")
+        void bindData(Issues issuesModel){
+
+            final TinyDB tinyDb = new TinyDB(context);
+            final String locale = tinyDb.getString("locale");
+            final String timeFormat = tinyDb.getString("dateFormat");
+
+            if (!issuesModel.getUser().getFull_name().equals("")) {
+                issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
+            } else {
+                issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
+            }
+
+            if (issuesModel.getUser().getAvatar_url() != null) {
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+            } else {
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+            }
+
+            if (issuesModel.getPull_request() == null) {
+                issueType.setImageResource(R.drawable.ic_issues);
+                issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypeIssue), context));
+            } else {
+                issueType.setImageResource(R.drawable.ic_merge);
+                issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypePullRequest), context));
+            }
+
+            String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
+            issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
+
+            issueNumber.setText(String.valueOf(issuesModel.getNumber()));
+            issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
+
+            switch (timeFormat) {
+                case "pretty": {
+                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
+                    String createdTime = prettyTime.format(issuesModel.getCreated_at());
+                    issueCreatedTime.setText(createdTime);
+                    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", new Locale(locale));
+                    String createdTime = formatter.format(issuesModel.getCreated_at());
+                    issueCreatedTime.setText(createdTime);
+                    break;
+                }
+                case "normal1": {
+                    DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+                    String createdTime = formatter.format(issuesModel.getCreated_at());
+                    issueCreatedTime.setText(createdTime);
+                    break;
+                }
+            }
+
+        }
+
+    }
+
+    static class LoadHolder extends RecyclerView.ViewHolder {
+
+        LoadHolder(View itemView) {
+            super(itemView);
+        }
+
+    }
+
+    public void setMoreDataAvailable(boolean moreDataAvailable) {
+
+        isMoreDataAvailable = moreDataAvailable;
+
+    }
+
+    public void notifyDataChanged() {
+
+        notifyDataSetChanged();
+        isLoading = false;
+
+    }
+
+    public interface OnLoadMoreListener {
+
+        void onLoadMore();
+
+    }
+
+    public void setLoadMoreListener(ClosedIssuesAdapter.OnLoadMoreListener loadMoreListener) {
+
+        this.loadMoreListener = loadMoreListener;
+
+    }
+
+    @Override
+    public Filter getFilter() {
+        return issuesFilter;
+    }
+
+    private Filter issuesFilter = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<Issues> filteredList = new ArrayList<>();
+
+            if (constraint == null || constraint.length() == 0) {
+                filteredList.addAll(issuesList);
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (Issues item : issuesList) {
+                    if (item.getTitle().toLowerCase().contains(filterPattern) || item.getBody().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            issuesList.clear();
+            issuesList.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
+++ b/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 com.squareup.picasso.Picasso;
 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 final Context context;
+    private List<Collaborators> collaboratorsList;
+    private Context mCtx;

    private class ViewHolder {

-	    private String userLoginId;
-
-        private final ImageView collaboratorAvatar;
-        private final TextView collaboratorName;
+        private ImageView collaboratorAvatar;
+        private 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) {
-
-        this.context = ctx;
+    public CollaboratorsAdapter(Context mCtx, List<Collaborators> collaboratorsListMain) {
+        this.mCtx = mCtx;
        this.collaboratorsList = collaboratorsListMain;
    }

@ -80,35 +61,28 @@ public class CollaboratorsAdapter extends BaseAdapter  {
        ViewHolder viewHolder = null;

        if (finalView == null) {
-
-            finalView = LayoutInflater.from(context).inflate(R.layout.list_collaborators, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.collaborators_list, 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);
-
-	    viewHolder.userLoginId = currentItem.getLogin();
+        Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);

        if(!currentItem.getFull_name().equals("")) {
-
-            viewHolder.collaboratorName.setText(Html.fromHtml(currentItem.getFull_name()));
+            viewHolder.collaboratorName.setText(currentItem.getFull_name());
        }
        else {
-
            viewHolder.collaboratorName.setText(currentItem.getLogin());
        }

--- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
@ -1,150 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import com.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 java.util.List;
-import java.util.Locale;
-
-/**
- * Author M M Arif
- */
-
-public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    private final Context context;
-    private final int TYPE_LOAD = 0;
-    private List<Commits> commitsList;
-    private CommitsAdapter.OnLoadMoreListener loadMoreListener;
-    private boolean isLoading = false;
-    private boolean isMoreDataAvailable = true;
-
-    public CommitsAdapter(Context ctx, List<Commits> commitsListMain) {
-
-        this.context = ctx;
-        this.commitsList = commitsListMain;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-        LayoutInflater inflater = LayoutInflater.from(context);
-
-        if(viewType == TYPE_LOAD) {
-            return new CommitsHolder(inflater.inflate(R.layout.list_commits, parent, false));
-        }
-        else {
-            return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-        }
-    }
-
-    @Override
-    public 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
-    public int getItemViewType(int position) {
-
-        if(commitsList.get(position).getSha() != null) {
-            return TYPE_LOAD;
-        }
-        else {
-            return 1;
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-
-        return commitsList.size();
-    }
-
-    class CommitsHolder extends RecyclerView.ViewHolder {
-
-        TextView commitTitle;
-        TextView commitCommitter;
-        TextView commitDate;
-        Button commitHtmlUrl;
-
-        CommitsHolder(View itemView) {
-
-            super(itemView);
-
-            commitTitle = itemView.findViewById(R.id.commitTitleVw);
-            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);
-	        Locale locale = context.getResources().getConfiguration().locale;
-            final String timeFormat = tinyDb.getString("dateFormat");
-
-            commitTitle.setText(EmojiParser.parseToUnicode(commitsModel.getCommit().getMessage()));
-            commitCommitter.setText(context.getString(R.string.commitCommittedBy, commitsModel.getCommit().getCommitter().getName()));
-            commitDate.setText(TimeHelper.formatTime(commitsModel.getCommit().getCommitter().getDate(), locale, timeFormat, context));
-
-            if(timeFormat.equals("pretty")) {
-                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), context));
-            }
-            commitHtmlUrl.setOnClickListener(v -> context.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
-        }
-
-    }
-
-    static class LoadHolder extends RecyclerView.ViewHolder {
-
-        LoadHolder(View itemView) {
-            super(itemView);
-        }
-    }
-
-    public void setMoreDataAvailable(boolean moreDataAvailable) {
-        isMoreDataAvailable = moreDataAvailable;
-    }
-
-    public void notifyDataChanged() {
-        notifyDataSetChanged();
-        isLoading = false;
-    }
-
-    public interface OnLoadMoreListener {
-        void onLoadMore();
-    }
-
-    public void setLoadMoreListener(CommitsAdapter.OnLoadMoreListener loadMoreListener) {
-        this.loadMoreListener = loadMoreListener;
-    }
-
-    public void updateList(List<Commits> list) {
-        commitsList = list;
-        notifyDataSetChanged();
-    }
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
@ -1,151 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-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.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;
-
-/**
- * Author M M Arif
- */
-
-public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsViewHolder> {
-
-    private List<DraftWithRepository> draftsList;
-    private final FragmentManager fragmentManager;
-    private final Context context;
-
-    class DraftsViewHolder extends RecyclerView.ViewHolder {
-
-    	private DraftWithRepository draftWithRepository;
-
-        private final TextView draftText;
-        private final TextView repoInfo;
-	    private final ImageView editCommentStatus;
-
-        private DraftsViewHolder(View itemView) {
-
-            super(itemView);
-
-            draftText = itemView.findViewById(R.id.draftText);
-            repoInfo = itemView.findViewById(R.id.repoInfo);
-            ImageView deleteDraft = itemView.findViewById(R.id.deleteDraft);
-	        editCommentStatus = itemView.findViewById(R.id.editCommentStatus);
-
-            deleteDraft.setOnClickListener(itemDelete -> {
-
-                int getDraftId = draftWithRepository.getDraftId();
-                deleteDraft(getAdapterPosition());
-
-	            DraftsApi draftsApi = BaseApi.getInstance(context, DraftsApi.class);
-	            assert draftsApi != null;
-	            draftsApi.deleteSingleDraft(getDraftId);
-
-            });
-
-	        itemView.setOnClickListener(itemEdit -> {
-
-		        Bundle bundle = new Bundle();
-
-                bundle.putString("commentBody", draftWithRepository.getDraftText());
-                bundle.putString("issueNumber", String.valueOf(draftWithRepository.getIssueId()));
-                bundle.putString("repositoryId", String.valueOf(draftWithRepository.getRepositoryId()));
-                bundle.putString("draftTitle", repoInfo.getText().toString());
-		        bundle.putString("commentId", draftWithRepository.getCommentId());
-		        bundle.putString("draftId", String.valueOf(draftWithRepository.getDraftId()));
-
-                if(!draftWithRepository.getCommentId().isEmpty()) {
-	                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) {
-        this.context = ctx;
-        this.fragmentManager = fragmentManager;
-        this.draftsList = draftsListMain;
-    }
-
-    private void deleteDraft(int position) {
-
-        draftsList.remove(position);
-        notifyItemRemoved(position);
-        notifyItemRangeChanged(position, draftsList.size());
-        Toasty.success(context, context.getResources().getString(R.string.draftsSingleDeleteSuccess));
-    }
-
-    @NonNull
-    @Override
-    public DraftsAdapter.DraftsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_drafts, parent, false);
-        return new DraftsViewHolder(v);
-    }
-
-    @SuppressLint("DefaultLocale")
-    @Override
-    public void onBindViewHolder(@NonNull DraftsAdapter.DraftsViewHolder holder, int position) {
-
-        DraftWithRepository currentItem = draftsList.get(position);
-
-	    String issueNumber = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
-	    Spanned headTitle = HtmlCompat
-		    .fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName(), HtmlCompat.FROM_HTML_MODE_LEGACY);
-
-	    holder.repoInfo.setText(headTitle);
-	    holder.draftWithRepository = currentItem;
-
-	    Markdown.render(context, currentItem.getDraftText(), holder.draftText);
-
-	    if(!currentItem.getCommentId().equalsIgnoreCase("new")) {
-		    holder.editCommentStatus.setVisibility(View.VISIBLE);
-	    }
-	    else {
-	    	holder.editCommentStatus.setVisibility(View.GONE);
-	    }
-    }
-
-    @Override
-    public int getItemCount() {
-        return draftsList.size();
-    }
-
-	public void updateList(List<DraftWithRepository> list) {
-
-		draftsList = list;
-		notifyDataSetChanged();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java
+++ b/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();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/ExplorePublicOrganizationsAdapter.java
+++ b/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();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@ -1,301 +1,216 @@
 package org.mian.gitnex.adapters;

-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 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.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
+import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
-import org.mian.gitnex.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.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 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 java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.util.TinyDB;
+import java.lang.reflect.Field;
 import java.util.List;
-import java.util.Locale;
-import retrofit2.Call;
-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) {
-		this.context = ctx;
-		this.reposList = dataList;
-		this.tinyDb = TinyDB.getInstance(context);
-	}
+    private List<UserRepositories> searchedReposList;
+    private Context mCtx;

-	@NonNull
-	@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));
-		}
-	}
+    public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context mCtx) {
+        this.mCtx = mCtx;
+        this.searchedReposList = dataList;
+    }

-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
-			isLoading = true;
-			loadMoreListener.onLoadMore();
-		}
+    static class ReposSearchViewHolder extends RecyclerView.ViewHolder {

-		if(getItemViewType(position) == TYPE_LOAD) {
-			((ExploreRepositoriesAdapter.RepositoriesHolder) holder).bindData(reposList.get(position));
-		}
-	}
+        private ImageView image;
+        private TextView mTextView1;
+        private TextView mTextView2;
+        private TextView fullName;
+        private ImageView repoPrivatePublic;
+        private TextView repoStars;
+        private TextView repoForks;
+        private TextView repoOpenIssuesCount;

-	@Override
-	public int getItemViewType(int position) {
-		if(reposList.get(position).getFullName() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
+        private ReposSearchViewHolder(View itemView) {
+            super(itemView);

-	@Override
-	public int getItemCount() {
-		return reposList.size();
-	}
+            mTextView1 = itemView.findViewById(R.id.repoName);
+            mTextView2 = itemView.findViewById(R.id.repoDescription);
+            image = itemView.findViewById(R.id.imageAvatar);
+            fullName = itemView.findViewById(R.id.repoFullName);
+            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
+            repoStars = itemView.findViewById(R.id.repoStars);
+            repoForks = itemView.findViewById(R.id.repoForks);
+            repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);

-	class RepositoriesHolder extends RecyclerView.ViewHolder {
-		private UserRepositories userRepositories;
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {

-		private final ImageView image;
-		private final TextView repoName;
-		private final TextView orgName;
-		private final TextView repoDescription;
-		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
-		private final TextView repoLastUpdated;
-		private final View spacerView;
+                    Context context = v.getContext();
+                    TextView repoFullName = v.findViewById(R.id.repoFullName);

-		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);
-			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
-			spacerView = itemView.findViewById(R.id.spacerView);
+                    Intent intent = new Intent(context, RepoDetailActivity.class);
+                    intent.putExtra("repoFullName", repoFullName.getText().toString());

-			itemView.setOnClickListener(v -> {
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("repoFullName", repoFullName.getText().toString());
+                    tinyDb.putBoolean("resumeIssues", true);
+                    context.startActivity(intent);

-				Context context = v.getContext();
-				Intent intent = new Intent(context, RepoDetailActivity.class);
-				intent.putExtra("repoFullName", userRepositories.getFullName());
+                }
+            });

-				tinyDb.putString("repoFullName", userRepositories.getFullName());
-				tinyDb.putBoolean("resumeIssues", true);
-				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-				tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+            reposDropdownMenu.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {

-				if(userRepositories.getPrivateFlag()) {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-				}
-				else {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-				}
+                    final Context context = v.getContext();
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);

-				String[] parts = userRepositories.getFullName().split("/");
-				final String repoOwner = parts[0];
-				final String repoName = parts[1];
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    popupMenu.inflate(R.menu.repo_dotted_list_menu);

-				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {

-				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-				assert repositoryData != null;
-				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                        fMenuHelper.setAccessible(true);
+                        menuHelper = fMenuHelper.get(popupMenu);
+                        argTypes = new Class[] { boolean.class };
+                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
+                                argTypes).invoke(menuHelper, true);

-				if(count == 0) {
+                    } catch (Exception e) {

-					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
-					tinyDb.putLong("repositoryId", id);
-				}
-				else {
+                        popupMenu.show();
+                        return;

-					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
-					tinyDb.putLong("repositoryId", data.getRepositoryId());
-				}
+                    }

-				//store if user is watching this repo
-				{
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.repoStargazers:

-					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
+                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                                    context.startActivity(intent);
+                                    break;

-					WatchInfo watch = new WatchInfo();
-					Call<WatchInfo> call;
-					call = RetrofitClient.getApiInterface(context).checkRepoWatchStatus(token, repoOwner, repoName);
+                                case R.id.repoWatchers:

-					call.enqueue(new Callback<WatchInfo>() {
-						@Override
-						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
+                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+                                    context.startActivity(intentW);
+                                    break;

-							if(response.isSuccessful()) {
-								assert response.body() != null;
-								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
-							}
-							else {
-								tinyDb.putBoolean("repoWatch", false);
-								if(response.code() != 404) {
-									Toasty.error(context, context.getString(R.string.genericApiStatusError));
-								}
-							}
-						}
+                                case R.id.repoOpenInBrowser:

-						@Override
-						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
-							tinyDb.putBoolean("repoWatch", false);
-							Toasty.error(context, context.getString(R.string.genericApiStatusError));
-						}
-					});
-				}
-				context.startActivity(intent);
+                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+                                    context.startActivity(intentOpenInBrowser);
+                                    break;

-			});
-		}
+                            }
+                            return false;
+                        }
+                    });

-		@SuppressLint("SetTextI18n")
-		void bindData(UserRepositories userRepositories) {
-			this.userRepositories = userRepositories;
+                    popupMenu.show();

-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-			Locale locale = context.getResources().getConfiguration().locale;
-			String timeFormat = tinyDb.getString("dateFormat");
+                }
+            });

-			orgName.setText(userRepositories.getFullName().split("/")[0]);
-			repoName.setText(userRepositories.getFullName().split("/")[1]);
-			repoStars.setText(userRepositories.getStars_count());
+        }

-			ColorGenerator generator = ColorGenerator.MATERIAL;
-			int color = generator.getColor(userRepositories.getName());
-			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);
+    @NonNull
+    @Override
+    public ExploreRepositoriesAdapter.ReposSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.repos_list, parent, false);
+        return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
+    }

-			if(userRepositories.getAvatar_url() != null) {
-				if(!userRepositories.getAvatar_url().equals("")) {
-					PicassoService.getInstance(context).get().load(userRepositories.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(image);
-				}
-				else {
-					image.setImageDrawable(drawable);
-				}
-			}
-			else {
-				image.setImageDrawable(drawable);
-			}
+    @Override
+    public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int position) {

-			if(userRepositories.getUpdated_at() != null) {
+        final UserRepositories currentItem = searchedReposList.get(position);

-				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);
-			}
+        holder.mTextView2.setVisibility(View.GONE);

-			if(isRepoAdmin == null) {
-				isRepoAdmin = new CheckBox(context);
-			}
-			isRepoAdmin.setChecked(userRepositories.getPermissions().isAdmin());
-		}
-	}
+        ColorGenerator generator = ColorGenerator.MATERIAL;
+        int color = generator.getColor(currentItem.getName());
+        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));

-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
+        TextDrawable drawable = TextDrawable.builder()
+                .beginConfig()
+                .useFont(Typeface.DEFAULT)
+                .fontSize(18)
+                .toUpperCase()
+                .width(28)
+                .height(28)
+                .endConfig()
+                .buildRoundRect(firstCharacter, color, 3);

-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
+        if (currentItem.getAvatar_url() != null) {
+            if (!currentItem.getAvatar_url().equals("")) {
+                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
+            } else {
+                holder.image.setImageDrawable(drawable);
+            }
+        }
+        else {
+            holder.image.setImageDrawable(drawable);
+        }

-	@SuppressLint("NotifyDataSetChanged")
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
+        holder.mTextView1.setText(currentItem.getName());
+        if (!currentItem.getDescription().equals("")) {
+            holder.mTextView2.setVisibility(View.VISIBLE);
+            holder.mTextView2.setText(currentItem.getDescription());
+        }
+        holder.fullName.setText(currentItem.getFullname());
+        if(currentItem.getPrivateFlag()) {
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+        }
+        else {
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+        }
+        holder.repoStars.setText(currentItem.getStars_count());
+        holder.repoForks.setText(currentItem.getForks_count());
+        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());

-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
+    }

-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<UserRepositories> list) {
-		reposList = list;
-		notifyDataChanged();
-	}
+    @Override
+    public int getItemCount() {
+        return searchedReposList.size();
+    }
 }
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreUsersAdapter.java
+++ b/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();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
@ -7,14 +7,12 @@ 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.Toasty;
+import org.mian.gitnex.models.Files;
 import java.util.ArrayList;
 import java.util.List;

@ -24,39 +22,52 @@ import java.util.List;

 public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHolder> implements Filterable {

-	private final List<Files> originalFiles = new ArrayList<>();
-	private final List<Files> alteredFiles = new ArrayList<>();
+    private List<Files> filesList;
+    private Context mCtx;
+    private List<Files> filesListFull;

-    private final Context context;
-
-    private final FilesAdapterListener filesListener;
+    private FilesAdapterListener filesListener;

    public interface FilesAdapterListener {
-
-        void onClickFile(Files file);
+        void onClickDir(String str);
+        void onClickFile(String str);
    }

-	class FilesViewHolder extends RecyclerView.ViewHolder {
+    class FilesViewHolder extends RecyclerView.ViewHolder {

-    	private Files file;
-
-		private final ImageView fileTypeIs;
-        private final TextView fileName;
-        private final TextView fileInfo;
+        private ImageView fileTypeImage;
+        private TextView fileName;
+        private TextView fileType;

        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);
-            fileInfo = itemView.findViewById(R.id.fileInfo);
-
-	        fileFrame.setOnClickListener(v -> filesListener.onClickFile(file));
+            fileTypeImage = itemView.findViewById(R.id.fileImage);
+            fileType = itemView.findViewById(R.id.fileType);

            //ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);

+            fileName.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    Context context = v.getContext();
+
+                    if(fileType.getText().toString().equals("file")) {
+                        filesListener.onClickFile(fileName.getText().toString());
+                    }
+                    else if(fileType.getText().toString().equals("dir")) {
+                        filesListener.onClickDir(fileName.getText().toString());
+                    }
+                    else {
+                        Toasty.info(context, context.getString(R.string.filesGenericError));
+                    }
+
+                }
+            });
+
+
            /*filesDropdownMenu.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
@ -123,71 +134,43 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
        }
    }

-    public FilesAdapter(Context ctx, FilesAdapterListener filesListener) {
-
-        this.context = ctx;
+    public FilesAdapter(Context mCtx, List<Files> filesListMain, FilesAdapterListener filesListener) {
+        this.mCtx = mCtx;
+        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) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_files, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.files_list, parent, false);
        return new FilesAdapter.FilesViewHolder(v);
    }

    @Override
    public void onBindViewHolder(@NonNull FilesAdapter.FilesViewHolder holder, int position) {

-        Files currentItem = alteredFiles.get(position);
+        Files currentItem = filesList.get(position);

-        holder.file = currentItem;
+        holder.fileType.setText(currentItem.getType());
        holder.fileName.setText(currentItem.getName());

-        switch(currentItem.getType()) {
-
-	        case "file":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_file));
-		        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));
-
+        if(currentItem.getType().equals("file")) {
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file_new));
        }
+        else if(currentItem.getType().equals("dir")) {
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_folder_24));
+        }
+        else {
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question_mark_24));
+        }
+
    }

    @Override
    public int getItemCount() {
-        return alteredFiles.size();
+        return filesList.size();
    }

    @Override
@ -195,19 +178,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 +199,14 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
            results.values = filteredList;

            return results;
-
        }

        @Override
        protected void publishResults(CharSequence constraint, FilterResults results) {
-
-            alteredFiles.clear();
-	        alteredFiles.addAll((List) results.values);
-
+            filesList.clear();
+            filesList.addAll((List) results.values);
            notifyDataSetChanged();
-
        }
-
    };

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
@ -1,252 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-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.helpers.AppUtil;
-import org.mian.gitnex.views.DiffTextView;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentSkipListMap;
-
-/**
- * Author opyale
- */
-
-public class FilesDiffAdapter extends BaseAdapter {
-
-	private static Map<Long, View> selectedViews;
-	private static final int MAXIMUM_LINES = 5000;
-
-	private static int COLOR_ADDED;
-	private static int COLOR_REMOVED;
-	private static int COLOR_NORMAL;
-	private static int COLOR_SELECTED;
-	private static int COLOR_FONT;
-
-	private final Context context;
-	private final FragmentManager fragmentManager;
-	private final List<FileDiffView> fileDiffViews;
-
-	public FilesDiffAdapter(Context context, FragmentManager fragmentManager, List<FileDiffView> fileDiffViews) {
-
-		this.context = context;
-		this.fragmentManager = fragmentManager;
-		this.fileDiffViews = fileDiffViews;
-
-		selectedViews = new ConcurrentSkipListMap<>();
-
-		COLOR_ADDED = AppUtil.getColorFromAttribute(context, R.attr.diffAddedColor);
-		COLOR_REMOVED = AppUtil.getColorFromAttribute(context, R.attr.diffRemovedColor);
-		COLOR_NORMAL = AppUtil.getColorFromAttribute(context, R.attr.primaryBackgroundColor);
-		COLOR_SELECTED = AppUtil.getColorFromAttribute(context, R.attr.diffSelectedColor);
-		COLOR_FONT = AppUtil.getColorFromAttribute(context, R.attr.inputTextColor);
-	}
-
-	@Override
-	public int getCount() {
-
-		return fileDiffViews.size();
-	}
-
-	@Override
-	public Object getItem(int position) {
-
-		return fileDiffViews.get(position);
-	}
-
-	@Override
-	public long getItemId(int position) {
-
-		return position;
-	}
-
-	@SuppressLint({"ViewHolder", "InflateParams"})
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-
-		convertView = LayoutInflater.from(context).inflate(R.layout.list_files_diffs, null, false);
-
-		TextView headerFileName = convertView.findViewById(R.id.headerFileName);
-		TextView headerFileInfo = convertView.findViewById(R.id.headerFileInfo);
-		ImageView footerImage = convertView.findViewById(R.id.footerImage);
-		LinearLayout diffStats = convertView.findViewById(R.id.diff_stats);
-		LinearLayout diffLines = convertView.findViewById(R.id.diffLines);
-
-		FileDiffView data = (FileDiffView) getItem(position);
-		headerFileName.setText(data.getFileName());
-
-		if(data.isFileBinary()) {
-
-			diffStats.setVisibility(View.GONE);
-			diffLines.addView(getMessageView(context.getResources().getString(R.string.binaryFileError)));
-		}
-		else {
-
-			diffStats.setVisibility(View.VISIBLE);
-			headerFileInfo.setText(data.getFileInfo());
-
-			String[] codeLines = getLines(data.toString());
-
-			if(MAXIMUM_LINES > codeLines.length) {
-
-				for(int l=0; l<codeLines.length; l++) {
-
-					if(codeLines[l].length() > 0) {
-
-						int uniquePosition = l + (position * MAXIMUM_LINES);
-
-						DiffTextView diffTextView = new DiffTextView(context);
-
-						diffTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
-						diffTextView.setPadding(15, 2, 15, 2);
-						diffTextView.setTypeface(Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf"));
-						diffTextView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-						diffTextView.setPosition(uniquePosition);
-
-						boolean isSelected = false;
-
-						for(View view : selectedViews.values()) {
-
-							if(((DiffTextView) view).getPosition() == uniquePosition) {
-
-								diffTextView.setBackgroundColor(COLOR_SELECTED);
-								isSelected = true;
-								break;
-
-							}
-
-						}
-
-
-						if(codeLines[l].startsWith("+")) {
-
-							diffTextView.setText(codeLines[l]);
-							diffTextView.setTextColor(COLOR_FONT);
-
-							if(!isSelected) {
-
-								diffTextView.setInitialBackgroundColor(COLOR_ADDED);
-							}
-
-						}
-						else if(codeLines[l].startsWith("-")) {
-
-							diffTextView.setText(codeLines[l]);
-							diffTextView.setTextColor(COLOR_FONT);
-
-							if(!isSelected) {
-
-								diffTextView.setInitialBackgroundColor(COLOR_REMOVED);
-							}
-
-						}
-						else {
-
-							diffTextView.setText(codeLines[l]);
-							diffTextView.setTextColor(COLOR_FONT);
-
-							if(!isSelected) {
-
-								diffTextView.setInitialBackgroundColor(COLOR_NORMAL);
-							}
-
-						}
-
-						diffTextView.setOnClickListener(v -> {
-
-							if(((DiffTextView) v).getCurrentBackgroundColor() != COLOR_SELECTED) {
-
-								selectedViews.put(((DiffTextView) v).getPosition(), v);
-								v.setBackgroundColor(COLOR_SELECTED);
-
-							}
-							else {
-
-								selectedViews.remove(((DiffTextView) v).getPosition());
-								v.setBackgroundColor(((DiffTextView) v).getInitialBackgroundColor());
-
-							}
-
-						});
-
-						diffTextView.setOnLongClickListener(v -> {
-
-							if(((DiffTextView) v).getCurrentBackgroundColor() == COLOR_SELECTED) {
-
-								StringBuilder stringBuilder = new StringBuilder();
-								stringBuilder.append("```\n");
-
-								for(View view : selectedViews.values()) {
-
-									stringBuilder.append(((DiffTextView) view).getText());
-									stringBuilder.append("\n");
-								}
-
-								stringBuilder.append("```\n\n");
-
-								selectedViews.clear();
-
-								Bundle bundle = new Bundle();
-								bundle.putString("commentBody", stringBuilder.toString());
-								bundle.putBoolean("cursorToEnd", true);
-
-								BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
-							}
-
-							return true;
-
-						});
-
-						diffLines.addView(diffTextView);
-
-					}
-
-				}
-
-			}
-			else {
-
-				diffLines.addView(getMessageView(context.getResources().getString(R.string.fileTooLarge)));
-			}
-
-		}
-
-		return convertView;
-
-	}
-
-	private TextView getMessageView(String message) {
-
-		TextView textView = new TextView(context);
-
-		textView.setTextColor(COLOR_FONT);
-		textView.setBackgroundColor(COLOR_NORMAL);
-		textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-		textView.setPadding(15, 15, 15, 15);
-		textView.setTypeface(Typeface.DEFAULT);
-		textView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-		textView.setText(message);
-
-		return textView;
-	}
-
-	private String[] getLines(String content) {
-
-		return content.split("\\R");
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@ -1,45 +1,57 @@
 package org.mian.gitnex.adapters;

 import android.annotation.SuppressLint;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Gravity;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.text.Spanned;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 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.squareup.picasso.Picasso;
 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.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.Markdown;
-import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.activities.ReplyToIssueActivity;
 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.views.ReactionSpinner;
+import org.mian.gitnex.helpers.UserMentions;
+import org.mian.gitnex.models.IssueComments;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.helpers.ClickListener;
+import org.ocpsoft.prettytime.PrettyTime;
+import java.lang.reflect.Field;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.recyclerview.widget.RecyclerView;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.core.CorePlugin;
+import io.noties.markwon.core.MarkwonTheme;
+import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
+import io.noties.markwon.ext.tables.TablePlugin;
+import io.noties.markwon.ext.tasklist.TaskListPlugin;
+import io.noties.markwon.html.HtmlPlugin;
+import io.noties.markwon.image.AsyncDrawable;
+import io.noties.markwon.image.DefaultMediaDecoder;
+import io.noties.markwon.image.ImageItem;
+import io.noties.markwon.image.ImagesPlugin;
+import io.noties.markwon.image.SchemeHandler;
+import io.noties.markwon.image.gif.GifMediaDecoder;
+import io.noties.markwon.image.svg.SvgMediaDecoder;
+import io.noties.markwon.linkify.LinkifyPlugin;

 /**
 * Author M M Arif
@ -47,329 +59,232 @@ import retrofit2.Callback;

 public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdapter.IssueCommentViewHolder> {

-	private final Context context;
-	private final TinyDB tinyDB;
-	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) {
-
-		this.context = ctx;
-		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 IssueComments issueComment;
-
-		private final ImageView avatar;
-		private final TextView author;
-		private final TextView information;
-		private final TextView comment;
-		private final LinearLayout commentReactionBadges;
-
-		private IssueCommentViewHolder(View view) {
-
-			super(view);
-
-			avatar = view.findViewById(R.id.avatar);
-			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 String loginUid = tinyDB.getString("loginUid");
-
-				@SuppressLint("InflateParams") View vw = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_issue_comments, null);
-
-				TextView commentMenuEdit = vw.findViewById(R.id.commentMenuEdit);
-				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()) {
-					commentMenuCopy.setVisibility(View.GONE);
-				}
-
-				BottomSheetDialog dialog = new BottomSheetDialog(context);
-				dialog.setContentView(vw);
-				dialog.show();
-
-				LinearLayout linearLayout = vw.findViewById(R.id.commentReactionButtons);
-				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();
-				bundle1.putAll(bundle);
-				bundle1.putInt("commentId", issueComment.getId());
-
-				ReactionSpinner reactionSpinner = new ReactionSpinner(context, bundle1);
-				reactionSpinner.setOnInteractedListener(() -> {
-					tinyDB.putBoolean("commentEdited", true);
-
-					onInteractedListener.onInteracted();
-					dialog.dismiss();
-				});
-
-				Handler handler = new Handler();
-				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();
-
-					// 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");
-					sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, intentHeader);
-					sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, commentUrl);
-					context.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.append("@").append(commenterName).append("\n\n");
-					}
-
-					String[] lines = issueComment.getBody().split("\\R");
-
-					for(String line : lines) {
-						stringBuilder.append(">").append(line).append("\n");
-					}
-
-					stringBuilder.append("\n");
-
-					Bundle bundle = new Bundle();
-					bundle.putString("commentBody", stringBuilder.toString());
-					bundle.putBoolean("cursorToEnd", true);
-
-					dialog.dismiss();
-					BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
-				});
-
-				commentMenuCopy.setOnClickListener(v1 -> {
-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
-					assert clipboard != null;
-
-					ClipData clip = ClipData.newPlainText("Comment on issue #" + tinyDB.getString("issueNumber"), issueComment.getBody());
-					clipboard.setPrimaryClip(clip);
-
-					dialog.dismiss();
-					Toasty.success(context, context.getString(R.string.copyIssueCommentToastMsg));
-				});
-
-				commentMenuDelete.setOnClickListener(v1 -> {
-					deleteIssueComment(context, issueComment.getId(), 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) {
-
-		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 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
-				.getApiInterface(ctx)
-				.deleteComment(instanceToken, repoOwner, repoName, commentId);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				switch(response.code()) {
-
-					case 204:
-						updateAdapter(position);
-						Toasty.success(ctx, ctx.getResources().getString(R.string.deleteCommentSuccess));
-						break;
-
-					case 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));
-
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
-			}
-		});
-	}
-
-	@NonNull
-	@Override
-	public IssueCommentsAdapter.IssueCommentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issue_comments, parent, false);
-		return new IssueCommentsAdapter.IssueCommentViewHolder(v);
-	}
-	@Override
-	public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
-
-		String timeFormat = tinyDB.getString("dateFormat");
-		IssueComments issueComment = issuesComments.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-		holder.userLoginId = issueComment.getUser().getLogin();
-
-		holder.issueComment = issueComment;
-		holder.author.setText(issueComment.getUser().getUsername());
-
-		PicassoService.getInstance(context).get()
-			.load(issueComment.getUser().getAvatar_url())
-			.placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(imgRadius, 0))
-			.resize(AppUtil.getPixelsFromDensity(context, 35), AppUtil.getPixelsFromDensity(context, 35))
-			.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);
-
-		Bundle bundle1 = new Bundle();
-		bundle1.putAll(bundle);
-		bundle1.putInt("commentId", issueComment.getId());
-
-		ReactionList reactionList = new ReactionList(context, bundle1);
-
-		holder.commentReactionBadges.addView(reactionList);
-		reactionList.setOnReactionAddedListener(() -> {
-
-			if(holder.commentReactionBadges.getVisibility() != View.VISIBLE) {
-				holder.commentReactionBadges.post(() -> holder.commentReactionBadges.setVisibility(View.VISIBLE));
-			}
-		});
-
-	}
-
-	@Override
-	public int getItemCount() {
-		return issuesComments.size();
-	}
+    private List<IssueComments> issuesComments;
+    private Context mCtx;
+
+    static class IssueCommentViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView issueNumber;
+        private TextView commendId;
+        private ImageView issueCommenterAvatar;
+        private TextView issueComment;
+        private TextView issueCommentDate;
+        private ImageView commentsOptionsMenu;
+        private TextView commendBodyRaw;
+        private TextView commentModified;
+
+        private IssueCommentViewHolder(View itemView) {
+            super(itemView);
+
+            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);
+            commentsOptionsMenu = itemView.findViewById(R.id.commentsOptionsMenu);
+            commendBodyRaw = itemView.findViewById(R.id.commendBodyRaw);
+            commentModified = itemView.findViewById(R.id.commentModified);
+
+            commentsOptionsMenu.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    final Context context = v.getContext();
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    popupMenu.inflate(R.menu.issue_comment_menu);
+
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {
+
+                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                        fMenuHelper.setAccessible(true);
+                        menuHelper = fMenuHelper.get(popupMenu);
+                        argTypes = new Class[] { boolean.class };
+                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
+                                argTypes).invoke(menuHelper, true);
+
+                    } catch (Exception e) {
+
+                        popupMenu.show();
+                        return;
+
+                    }
+
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.commentMenuEdit:
+
+                                    Intent intent = new Intent(context, ReplyToIssueActivity.class);
+                                    intent.putExtra("commentId", commendId.getText());
+                                    intent.putExtra("commentAction", "edit");
+                                    intent.putExtra("commentBody", commendBodyRaw.getText());
+                                    context.startActivity(intent);
+                                    break;
+
+                                case R.id.commentMenuDelete:
+
+                                    break;
+
+                            }
+                            return false;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
+            });
+
+        }
+    }
+
+    public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
+        this.mCtx = mCtx;
+        this.issuesComments = issuesCommentsMain;
+    }
+
+    @NonNull
+    @Override
+    public IssueCommentsAdapter.IssueCommentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.issue_comments, parent, false);
+        return new IssueCommentsAdapter.IssueCommentViewHolder(v);
+    }
+
+    @SuppressLint("SetTextI18n")
+    @Override
+    public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
+
+        final TinyDB tinyDb = new TinyDB(mCtx);
+        final String locale = tinyDb.getString("locale");
+        final String timeFormat = tinyDb.getString("dateFormat");
+        final String loginUid = tinyDb.getString("loginUid");
+
+        IssueComments currentItem = issuesComments.get(position);
+
+        if(!loginUid.equals(currentItem.getUser().getUsername())) {
+            holder.commentsOptionsMenu.setVisibility(View.INVISIBLE);
+        }
+        holder.commendId.setText(String.valueOf(currentItem.getId()));
+        holder.commendBodyRaw.setText(currentItem.getBody());
+
+        if (!currentItem.getUser().getFull_name().equals("")) {
+            holder.issueCommenterAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCommenter) + currentItem.getUser().getFull_name(), mCtx));
+        } else {
+            holder.issueCommenterAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCommenter) + currentItem.getUser().getLogin(), mCtx));
+        }
+
+        if (currentItem.getUser().getAvatar_url() != null) {
+            Picasso.get().load(currentItem.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueCommenterAvatar);
+        } else {
+            Picasso.get().load(currentItem.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueCommenterAvatar);
+        }
+
+        String cleanIssueComments = currentItem.getBody().trim();
+
+        final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx))
+                .usePlugin(CorePlugin.create())
+                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
+                    @Override
+                    public void configureImages(@NonNull ImagesPlugin plugin) {
+                        plugin.addSchemeHandler(new SchemeHandler() {
+                            @NonNull
+                            @Override
+                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+
+                                final int resourceId = mCtx.getResources().getIdentifier(
+                                        raw.substring("drawable://".length()),
+                                        "drawable",
+                                        mCtx.getPackageName());
+
+                                final Drawable drawable = mCtx.getDrawable(resourceId);
+
+                                assert drawable != null;
+                                return ImageItem.withResult(drawable);
+                            }
+
+                            @NonNull
+                            @Override
+                            public Collection<String> supportedSchemes() {
+                                return Collections.singleton("drawable");
+                            }
+                        });
+                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
+                            @Nullable
+                            @Override
+                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
+                                return null;
+                            }
+                        });
+                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
+                        plugin.addMediaDecoder(SvgMediaDecoder.create());
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
+                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+                    }
+                }))
+                .usePlugin(new AbstractMarkwonPlugin() {
+                    @Override
+                    public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
+                        builder
+                                .codeTextColor(tinyDb.getInt("codeBlockColor"))
+                                .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
+                                .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);
+        }
+
+        switch (timeFormat) {
+            case "pretty": {
+                PrettyTime prettyTime = new PrettyTime(new Locale(locale));
+                String createdTime = prettyTime.format(currentItem.getCreated_at());
+                holder.issueCommentDate.setText(createdTime);
+                holder.issueCommentDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getCreated_at()), mCtx));
+                break;
+            }
+            case "normal": {
+                DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+                String createdTime = formatter.format(currentItem.getCreated_at());
+                holder.issueCommentDate.setText(createdTime);
+                break;
+            }
+            case "normal1": {
+                DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+                String createdTime = formatter.format(currentItem.getCreated_at());
+                holder.issueCommentDate.setText(createdTime);
+                break;
+            }
+        }
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return issuesComments.size();
+    }

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@ -3,217 +3,287 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.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 com.squareup.picasso.Picasso;
 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.mian.gitnex.util.TinyDB;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;

 /**
 * Author M M Arif
 */

-public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {

-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<Issues> issuesList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
+    private Context context;
+    private final int TYPE_LOAD = 0;
+    private List<Issues> issuesList;
+    private List<Issues> issuesListFull;
+    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.issuesList = issuesListMain;
-	}
+        this.context = context;
+        this.issuesList = issuesListMain;
+        issuesListFull = new ArrayList<>(issuesList);

-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    }

-		LayoutInflater inflater = LayoutInflater.from(context);
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

-		if(viewType == TYPE_LOAD) {
-			return new IssuesHolder(inflater.inflate(R.layout.list_issues, parent, false));
-		}
-		else {
-			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
-	}
+        LayoutInflater inflater = LayoutInflater.from(context);

-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        if(viewType == TYPE_LOAD){
+            return new IssuesHolder(inflater.inflate(R.layout.repo_detail_issues_list, parent,false));
+        }
+        else {
+            return new LoadHolder(inflater.inflate(R.layout.row_load,parent,false));
+        }

-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+    }

-			isLoading = true;
-			loadMoreListener.onLoadMore();
-		}
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {

-		if(getItemViewType(position) == TYPE_LOAD) {
+        if(position >= getItemCount()-1 && isMoreDataAvailable && !isLoading && loadMoreListener!=null) {

-			((IssuesHolder) holder).bindData(issuesList.get(position));
-		}
-	}
+            isLoading = true;
+            loadMoreListener.onLoadMore();

-	@Override
-	public int getItemViewType(int position) {
+        }

-		if(issuesList.get(position).getTitle() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
+        if(getItemViewType(position) == TYPE_LOAD) {

-	@Override
-	public int getItemCount() {
+            ((IssuesHolder)holder).bindData(issuesList.get(position));

-		return issuesList.size();
-	}
+        }

-	class IssuesHolder extends RecyclerView.ViewHolder {
+    }

-		private Issues issue;
+    @Override
+    public int getItemViewType(int position) {

-		private final ImageView issueAssigneeAvatar;
-		private final TextView issueTitle;
-		private final TextView issueCreatedTime;
-		private final TextView issueCommentsCount;
+        if(issuesList.get(position).getTitle() != null) {
+            return TYPE_LOAD;
+        }
+        else {
+            return 1;
+        }

-		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);
+    @Override
+    public int getItemCount() {

-			itemView.setOnClickListener(layoutView -> {
-				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issue.getNumber());
+        return issuesList.size();

-				TinyDB tinyDb = TinyDB.getInstance(context);
-				tinyDb.putString("issueNumber", String.valueOf(issue.getNumber()));
-				tinyDb.putString("issueType", "Issue");
-				context.startActivity(intent);
-			});
+    }

-			issueAssigneeAvatar.setOnClickListener(v -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", issue.getUser().getLogin());
-				context.startActivity(intent);
-			});
+    class IssuesHolder extends RecyclerView.ViewHolder {

-			issueAssigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, issue.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issue.getUser().getLogin()));
-				return true;
-			});
-		}
+        private TextView issueNumber;
+        private ImageView issueAssigneeAvatar;
+        private TextView issueTitle;
+        private TextView issueCreatedTime;
+        private TextView issueCommentsCount;
+        private ImageView issueType;

-		@SuppressLint("SetTextI18n")
-		void bindData(Issues issue) {
+        IssuesHolder(View itemView) {

-			TinyDB tinyDb = TinyDB.getInstance(context);
-			Locale locale = context.getResources().getConfiguration().locale;
-			String timeFormat = tinyDb.getString("dateFormat");
+            super(itemView);

-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+            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);
+            issueType = itemView.findViewById(R.id.issueType);

-			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);
+            issueTitle.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {

-			String issueNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + issue.getNumber() + "</font>";
-			issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(issue.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
+                    Context context = v.getContext();
+                    //Log.i("issueNumber", issueNumber.getText().toString());

-			this.issue = issue;
-			this.issueCommentsCount.setText(String.valueOf(issue.getComments()));
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", issueNumber.getText());

-			switch(timeFormat) {
-				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
-					String createdTime = prettyTime.format(issue.getCreated_at());
-					this.issueCreatedTime.setText(createdTime);
-					this.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());
-					this.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());
-					this.issueCreatedTime.setText(createdTime);
-					break;
-				}
-			}
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    context.startActivity(intent);

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

-	}
+                    Context context = v.getContext();
+                    //Log.i("issueNumber", issueNumber.getText().toString());

-	static class LoadHolder extends RecyclerView.ViewHolder {
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", issueNumber.getText());

-		LoadHolder(View itemView) {
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    context.startActivity(intent);

-			super(itemView);
-		}
-	}
+                }
+            });

-	public void setMoreDataAvailable(boolean moreDataAvailable) {
+        }

-		isMoreDataAvailable = moreDataAvailable;
-	}
+        @SuppressLint("SetTextI18n")
+        void bindData(Issues issuesModel){

-	public void notifyDataChanged() {
+            final TinyDB tinyDb = new TinyDB(context);
+            final String locale = tinyDb.getString("locale");
+            final String timeFormat = tinyDb.getString("dateFormat");

-		notifyDataSetChanged();
-		isLoading = false;
-	}
+            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));
+            }

-	public interface OnLoadMoreListener {
+            if (issuesModel.getUser().getAvatar_url() != null) {
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+            } else {
+                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+            }

-		void onLoadMore();
-	}
+            if (issuesModel.getPull_request() == null) {
+                issueType.setImageResource(R.drawable.ic_issues);
+                issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypeIssue), context));
+            } else {
+                issueType.setImageResource(R.drawable.ic_merge);
+                issueType.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueTypePullRequest), context));
+            }

-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+            String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
+            issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));

-		this.loadMoreListener = loadMoreListener;
-	}
+            issueNumber.setText(String.valueOf(issuesModel.getNumber()));
+            issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));

-	public void updateList(List<Issues> list) {
+            switch (timeFormat) {
+                case "pretty": {
+                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
+                    String createdTime = prettyTime.format(issuesModel.getCreated_at());
+                    issueCreatedTime.setText(createdTime);
+                    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", new Locale(locale));
+                    String createdTime = formatter.format(issuesModel.getCreated_at());
+                    issueCreatedTime.setText(createdTime);
+                    break;
+                }
+                case "normal1": {
+                    DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+                    String createdTime = formatter.format(issuesModel.getCreated_at());
+                    issueCreatedTime.setText(createdTime);
+                    break;
+                }
+            }

-		issuesList = list;
-		notifyDataSetChanged();
-	}
+        }
+
+    }
+
+    static class LoadHolder extends RecyclerView.ViewHolder {
+
+        LoadHolder(View itemView) {
+            super(itemView);
+        }
+
+    }
+
+    public void setMoreDataAvailable(boolean moreDataAvailable) {
+
+        isMoreDataAvailable = moreDataAvailable;
+
+    }
+
+    public void notifyDataChanged() {
+
+        notifyDataSetChanged();
+        isLoading = false;
+
+    }
+
+    public interface OnLoadMoreListener {
+
+        void onLoadMore();
+
+    }
+
+    public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
+
+        this.loadMoreListener = loadMoreListener;
+
+    }
+
+    @Override
+    public Filter getFilter() {
+        return issuesFilter;
+    }
+
+    private Filter issuesFilter = new Filter() {
+        @Override
+        protected FilterResults performFiltering(CharSequence constraint) {
+            List<Issues> filteredList = new ArrayList<>();
+
+            if (constraint == null || constraint.length() == 0) {
+                filteredList.addAll(issuesList);
+            } else {
+                String filterPattern = constraint.toString().toLowerCase().trim();
+
+                for (Issues item : issuesList) {
+                    if (item.getTitle().toLowerCase().contains(filterPattern) || item.getBody().toLowerCase().contains(filterPattern)) {
+                        filteredList.add(item);
+                    }
+                }
+            }
+
+            FilterResults results = new FilterResults();
+            results.values = filteredList;
+
+            return results;
+        }
+
+        @Override
+        protected void publishResults(CharSequence constraint, FilterResults results) {
+            issuesList.clear();
+            issuesList.addAll((List) results.values);
+            notifyDataSetChanged();
+        }
+    };

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@ -1,26 +1,29 @@
 package org.mian.gitnex.adapters;

-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.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 com.amulyakhare.textdrawable.TextDrawable;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateLabelActivity;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ColorInverter;
+import org.mian.gitnex.helpers.LabelWidthCalculator;
+import org.mian.gitnex.models.Labels;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.recyclerview.widget.RecyclerView;

 /**
 * Author M M Arif
@ -28,82 +31,99 @@ import java.util.List;

 public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsViewHolder>  {

-    private final List<Labels> labelsList;
-    private static String type;
-	private static String orgName;
+    private List<Labels> labelsList;
+    final private Context mCtx;
+    private ArrayList<Integer> labelsArray = new ArrayList<>();

    static class LabelsViewHolder extends RecyclerView.ViewHolder {

-    	private Labels labels;
-
-        private final CardView labelView;
-        private final ImageView labelIcon;
-        private final TextView labelName;
+        private TextView labelTitle;
+        private TextView labelId;
+        private TextView labelColor;
+        private ImageView labelsView;

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

-            labelView = itemView.findViewById(R.id.labelView);
-            labelIcon = itemView.findViewById(R.id.labelIcon);
-            labelName = itemView.findViewById(R.id.labelName);
+            labelsView = itemView.findViewById(R.id.labelsView);
            ImageView labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
+            labelTitle = itemView.findViewById(R.id.labelTitle);
+            labelId = itemView.findViewById(R.id.labelId);
+            labelColor = itemView.findViewById(R.id.labelColor);

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

-                final Context context = v.getContext();
+                    final Context context = v.getContext();
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);

-                @SuppressLint("InflateParams")
-                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_labels_in_list, null);
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    popupMenu.inflate(R.menu.labels_menu);

-                TextView labelMenuEdit = view.findViewById(R.id.labelMenuEdit);
-                TextView labelMenuDelete = view.findViewById(R.id.labelMenuDelete);
-                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {

-                bottomSheetHeader.setText(labels.getName());
-                BottomSheetDialog dialog = new BottomSheetDialog(context);
-                dialog.setContentView(view);
-                dialog.show();
+                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                        fMenuHelper.setAccessible(true);
+                        menuHelper = fMenuHelper.get(popupMenu);
+                        argTypes = new Class[] { boolean.class };
+                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
+                                argTypes).invoke(menuHelper, true);

-                labelMenuEdit.setOnClickListener(editLabel -> {
+                    } catch (Exception e) {

-                    Intent intent = new Intent(context, CreateLabelActivity.class);
-                    intent.putExtra("labelId", String.valueOf(labels.getId()));
-                    intent.putExtra("labelTitle", labels.getName());
-                    intent.putExtra("labelColor", labels.getColor());
-                    intent.putExtra("labelAction", "edit");
-	                intent.putExtra("type", type);
-	                intent.putExtra("orgName", orgName);
-                    context.startActivity(intent);
-                    dialog.dismiss();
-                });
+                        popupMenu.show();
+                        return;

-                labelMenuDelete.setOnClickListener(deleteLabel -> {
+                    }

-                    AlertDialogs.labelDeleteDialog(context, labels.getName(), String.valueOf(labels.getId()),
-                            context.getResources().getString(R.string.labelDeleteTitle),
-                            context.getResources().getString(R.string.labelDeleteMessage),
-                            context.getResources().getString(R.string.labelDeleteTitle),
-                            context.getResources().getString(R.string.labelDeleteNegativeButton),
-	                        type, orgName);
-                    dialog.dismiss();
-                });
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.labelMenuEdit:

+                                    Intent intent = new Intent(context, CreateLabelActivity.class);
+                                    intent.putExtra("labelId", labelId.getText());
+                                    intent.putExtra("labelTitle", labelTitle.getText());
+                                    intent.putExtra("labelColor", labelColor.getText());
+                                    intent.putExtra("labelAction", "edit");
+                                    context.startActivity(intent);
+                                    break;
+
+                                case R.id.labelMenuDelete:
+
+                                    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.labelDeletePositiveButton),
+                                            context.getResources().getString(R.string.labelDeleteNegativeButton));
+                                    break;
+
+                            }
+                            return false;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
            });

        }
    }

-    public LabelsAdapter(Context ctx, List<Labels> labelsMain, String type, String orgName) {
-
-	    this.labelsList = labelsMain;
-        LabelsAdapter.type = type;
-        LabelsAdapter.orgName = orgName;
+    public LabelsAdapter(Context mCtx, List<Labels> labelsMain) {
+        this.mCtx = mCtx;
+        this.labelsList = labelsMain;
    }

    @NonNull
    @Override
    public LabelsAdapter.LabelsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_labels, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.labels_list, parent, false);
        return new LabelsAdapter.LabelsViewHolder(v);
    }

@ -111,19 +131,41 @@ 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;
+        int width = 33;
+
+        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();
-
        int color = Color.parseColor("#" + labelColor);
-        int contrastColor = new ColorInverter().getContrastColor(color);

-	    ImageViewCompat.setImageTintList(holder.labelIcon, ColorStateList.valueOf(contrastColor));
+        TextDrawable drawable = TextDrawable.builder()
+                .beginConfig()
+                //.useFont(Typeface.DEFAULT)
+                .bold()
+                .textColor(new ColorInverter().getContrastColor(color))
+                .fontSize(36)
+                .width(LabelWidthCalculator.customWidth(getMaxLabelLength()))
+                .height(60)
+                .endConfig()
+                .buildRoundRect(labelName, color, 8);
+        holder.labelsView.setImageDrawable(drawable);
+
+    }
+
+    private int getMaxLabelLength() {
+
+        for(int i = 0; i < labelsList.size(); i++) {
+
+            Labels labelItem = labelsList.get(i);
+            labelsArray.add(labelItem.getName().length());
+
+        }
+
+        return Collections.max(labelsArray);

-        holder.labelName.setTextColor(contrastColor);
-        holder.labelName.setText(labelName);
-        holder.labelView.setCardBackgroundColor(color);
    }

    @Override
@ -131,4 +173,4 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
        return labelsList.size();
    }

-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
M M Arif	5999b8ed4a	Release 2.2.2 (#170 )	2019-10-25 05:44:53 +00:00
M M Arif	2cba285076	Merge branch 'backport_162' of gitnex/GitNex into release-2.2	2019-10-21 17:31:44 +00:00
M M Arif	24a552f0a9	Fix login with email for my repositories	2019-10-21 18:57:52 +02:00
M M Arif	d9a7fa4e44	Merge branch 'bugfix-release-2.2.1' of gitnex/GitNex into release-2.2	2019-10-18 14:55:15 +00:00
M M Arif	9950d4ea65	prepare release 2.2.1	2019-10-18 19:51:56 +05:00
M M Arif	98054b89cc	Merge branch 'fix-empty-repo-bug' of gitnex/GitNex into release-2.2	2019-10-18 13:47:00 +00:00