Release 3.3.0 (#780 )

Release 3.3.0 Co-authored-by: M M Arif <mmarif@swatian.com> Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/780
Fix add new account (#778 )
2020-11-18 08:19:52 +01:00 · 2020-11-17 19:55:49 +01:00 · 2020-11-17 14:53:50 +01:00 · 2020-11-17 05:40:14 +01:00
479 changed files with 16691 additions and 17434 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -15,8 +15,8 @@ steps:
    image: zosiab/eclint:latest
    depends_on: [ clone ]
    commands:
-      - git pull origin main
-      - eclint check $(git diff --name-only origin/main)
+      - git pull origin master
+      - eclint check $(git diff --name-only origin/master)

  # This may be used in the future, because it makes of intellij's native code inspection/formatting capabilities.
  # Additional information: https://www.jetbrains.com/help/idea/command-line-formatter.html
@ -54,7 +54,7 @@ trigger:
  event:
    - push
  branch:
-    - main
+    - master

 ---
 kind: pipeline
@ -101,4 +101,4 @@ trigger:
  event:
    - push
  branch:
-    - main
+    - master
--- a/.gitea/issue_template/bug.md
+++ b/.gitea/issue_template/bug.md
@ -1,22 +1,22 @@
---
+## # What do you want to address?
+<!-- This step is required; examples are shown below -->

-name: "Bug"
-about: "Something isn't working"
-labels:
-
- Bug
-
---
+- [ ] Bug
+- [ ] Feature
+- [ ] Suggestion

 ## # Describe your matter briefly
+<!-- This step is required. -->
 <br><br>

-##### What did you expect?
+##### What did you expect? <!-- Useful when addressing bugs -->
 ---
+<!-- This step is optional. -->
 <br><br>

-##### Some additional details
+##### Some additional details <!-- Useful, when we are trying to reproduce a bug -->
 ---
+<!-- This step is optional; an example is shown below -->

 * The version of **Gitea** you are using: 
 * The version of **GitNex** you are using: 
@ -31,7 +31,7 @@ labels:
 <!-- 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).
+- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/master/CONTRIBUTING.md).
 <br>

-<!-- Thank you for your time. -->
+#### 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
@ -2,8 +2,8 @@
 <!-- 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. -->
+<!-- Make sure you are targeting the master 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 carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/master/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).
+- [ ] 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/master/LICENSE).
--- a/.gitignore
+++ b/.gitignore
@ -195,6 +195,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,26 +1,23 @@
 stages:
+  - test
  - build
  - sign
  - publish

-on_setup:
-  image: curlimages/curl:7.77.0
-  stage: .pre
+test:
+  image: nextcloudci/android:android-49
+  stage: test
  only:
-    - main
+    - master
    - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: pending
  script:
-    - ./scripts/add-commit-status.sh
+    - ./gradlew test

 build:
-  image: nextcloudci/android8:android-61
+  image: nextcloudci/android:android-49
  stage: build
  only:
-    - main
+    - master
    - tags
  script:
    - ./gradlew assembleFreeRelease
@ -30,10 +27,10 @@ build:
    expire_in: 15 minutes

 sign:
-  image: nextcloudci/android8:android-61
+  image: nextcloudci/android:android-49
  stage: sign
  only:
-    - main
+    - master
    - tags
  variables:
    OUTPUT: "signed.apk"
@ -47,10 +44,10 @@ sign:
    expire_in: 15 minutes

 latest:
-  image: curlimages/curl:7.77.0
+  image: tutum/curl
  stage: publish
  only:
-    - main
+    - master
    - tags
  variables:
    WEBDAV_USERNAME: "GitNexBot"
@ -60,7 +57,7 @@ latest:
    - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" "$PLUGIN_DESTINATION"

 release:
-  image: curlimages/curl:7.77.0
+  image: tutum/curl
  stage: publish
  only:
    - tags
@ -70,31 +67,3 @@ release:
  script:
    - "[[ $CI_COMMIT_REF_NAME == *'-rc'* ]] && echo 'Upload blocked. Build seems to be a release candidate.' && exit 0"
    - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" 'https://cloud.swatian.com/remote.php/dav/files/GitNexBot/gitnex/releases/'"$CI_COMMIT_REF_NAME"'.apk'
-
-on_success:
-  image: curlimages/curl:7.77.0
-  stage: .post
-  only:
-    - main
-    - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: success
-  script:
-    - ./scripts/add-commit-status.sh
-  when: on_success
-
-on_failure:
-  image: curlimages/curl:7.77.0
-  stage: .post
-  only:
-    - main
-    - tags
-  variables:
-    INSTANCE: "https://codeberg.org"
-    MAIN_REPO: gitnex/GitNex
-    STATE: failure
-  script:
-    - ./scripts/add-commit-status.sh
-  when: on_failure
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -180,4 +180,4 @@
      </arrangement>
    </codeStyleSettings>
  </code_scheme>
-</component>
+</component>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -29,7 +29,7 @@ It is documented in the Wiki: [Code-Standards](https://codeberg.org/gitnex/GitNe
 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.
+5. You can now create a PR using the web interface against **master** branch.

 For more information, click [here](http://makeapullrequest.com/).

--- a/README.md
+++ b/README.md
@ -1,17 +1,17 @@
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Pipeline status](https://img.shields.io/gitlab/pipeline/mmarif4u/gitnex-ci/main)](https://gitlab.com/mmarif4u/gitnex-ci/-/pipelines) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Pipeline status](https://img.shields.io/gitlab/pipeline/opyale/gitnex/master)](https://gitlab.com/opyale/gitnex/-/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)

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

 # 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 licensed under GPLv3 License. See the LICENSE file for the full license text. **No trackers are used** and source code is available here for anyone to audit.
+GitNex is licensed under GPLv3 License. See the LICENSE file for the full license text. No trackers are used and source code is available here for anyone to audit.

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

 ## Note about Gitea version
 Please make sure that you are on latest stable release or later for better app experience.
@ -37,7 +37,7 @@ Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew assemb
 - [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features)

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

 ## Translation
 Help us translate GitNex to your native language.
@ -48,50 +48,46 @@ We use [Crowdin](https://crowdin.com/project/gitnex) for translation. If your la

 ## Screenshots:

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

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

 [Wiki](https://codeberg.org/gitnex/GitNex/wiki/Home)

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

-[Faq](https://codeberg.org/gitnex/GitNex/wiki/FAQ)
-
-[Release Blog](https://gitnex.codeberg.page)
-
 ## Thanks
 Thanks to all the open source libraries, contributors and donators.

 #### Open source libraries
- [square/retrofit](https://github.com/square/retrofit)
- [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)
+- Retrofit
+- Gson
+- Okhttp
+- Picasso
+- Markwon
+- Prism4j
+- Prettytime
+- Amulyakhare/textdrawable
+- Vdurmont/emoji-java
+- Pes/materialcolorpicker
+- HamidrezaAmz/BreadcrumbsView
+- Chrisbanes/PhotoView
+- Pddstudio/highlightjs-android
+- Apache/commons-io
+- Caverock/androidsvg
+- Droidsonroids.gif/android-gif-drawable
+- Barteksc/androidPdfViewer
+- Ge0rg/memorizingTrustManager
+- Dimezis/blurView
+- Mikaelhg/urlbuilder

 [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
@ -6,8 +6,8 @@ android {
        applicationId "org.mian.gitnex"
        minSdkVersion 21
        targetSdkVersion 30
-        versionCode 415
-        versionName "4.2.0"
+        versionCode 330
+        versionName "3.3.0"
        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@ -24,13 +24,13 @@ android {
        }
    }
    buildFeatures {
-        viewBinding true
+        viewBinding = true
    }
    buildTypes {
        release {
            minifyEnabled false
            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
    lintOptions {
@ -54,32 +54,29 @@ configurations {
 }

 dependencies {
-    def lifecycle_version = '2.3.1'
-    def markwon_version = '4.6.2'
-    def work_version = "2.7.0-alpha05"
+    def lifecycle_version = '2.3.0-beta01'
+    def markwon_version = '4.6.0'
+    def work_version = "2.4.0"
    def acra = "5.7.0"

    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.appcompat:appcompat:1.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
    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'
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
    implementation "com.google.code.gson:gson:2.8.6"
    implementation "com.squareup.picasso:picasso:2.71828"
-    implementation 'jp.wasabeef:picasso-transformations:2.4.0'
-    implementation 'jp.co.cyberagent.android:gpuimage:2.1.0'
    implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
    implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2'
-    implementation 'org.ocpsoft.prettytime:prettytime:5.0.0.Final'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.6.Final'
    implementation "com.pes.materialcolorpicker:library:1.2.5"
    implementation "io.noties.markwon:core:$markwon_version"
    implementation "io.noties.markwon:ext-latex:$markwon_version"
@ -97,21 +94,22 @@ dependencies {
    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.caverock:androidsvg:1.4"
+    implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.21"
    implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
    implementation "commons-io:commons-io:20030203.000550"
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.apache.commons:commons-lang3:3.11'
    implementation "com.github.chrisbanes:PhotoView:2.3.0"
+    implementation "com.github.barteksc:android-pdf-viewer:3.2.0-beta.1"
    implementation "ch.acra:acra-mail:$acra"
    implementation "ch.acra:acra-limiter:$acra"
    implementation "ch.acra:acra-notification:$acra"
-    implementation 'androidx.room:room-runtime:2.3.0'
-    annotationProcessor 'androidx.room:room-compiler:2.3.0'
+    implementation "androidx.room:room-runtime:2.2.5"
+    annotationProcessor "androidx.room:room-compiler:2.2.5"
    implementation "androidx.work:work-runtime:$work_version"
+    implementation "com.eightbitlab:blurview:1.6.4"
    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'
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.0"

 }
--- 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
@ -6,13 +6,11 @@
    <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"
@ -51,7 +49,7 @@
            android:name=".activities.CreateNewUserActivity"
            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
        <activity
-            android:name=".activities.MyProfileEmailActivity"
+            android:name=".activities.ProfileEmailActivity"
            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
        <activity
            android:name=".activities.AddCollaboratorToRepositoryActivity"
@ -65,7 +63,7 @@
        <activity
            android:name=".activities.OrganizationDetailActivity"
            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-            android:label="@string/titleActivityOrgDetail"
+            android:label="@string/title_activity_org_detail"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".activities.CreateLabelActivity"
@ -83,13 +81,12 @@
        <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">
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@ -124,7 +121,7 @@
            android:name=".activities.SettingsAppearanceActivity"
            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
        <activity
-            android:name=".activities.ProfileActivity"
+            android:name=".activities.SettingsFileViewerActivity"
            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
        <activity
            android:name=".activities.SettingsSecurityActivity"
@ -160,10 +157,6 @@
            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 -->
@ -174,8 +167,7 @@
            android:name=".activities.DeepLinksActivity"
            android:theme="@android:style/Theme.Translucent.NoTitleBar"
            android:noHistory="true"
-            android:launchMode="singleTask"
-            android:exported="true">
+            android:launchMode="singleTask">

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

-					Toasty.error(ctx, ctx.getString(R.string.unSubscriptionError));
+					Toasty.error(ctx, ctx.getString(R.string.unsubscriptionError));

 				}

--- a/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
@ -5,13 +5,13 @@ 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 org.mian.gitnex.models.Labels;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
--- a/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
@ -4,12 +4,12 @@ import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Milestones;
 import retrofit2.Call;
 import retrofit2.Callback;

--- a/app/src/main/java/org/mian/gitnex/actions/NotificationsActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/NotificationsActions.java
@ -1,12 +1,13 @@
 package org.mian.gitnex.actions;

 import android.content.Context;
-import org.gitnex.tea4j.models.NotificationThread;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.NotificationThread;
 import java.io.IOException;
 import java.util.Date;
+import okhttp3.ResponseBody;
 import retrofit2.Call;

 /**
@ -34,7 +35,7 @@ public class NotificationsActions {

 	public void setNotificationStatus(NotificationThread notificationThread, NotificationStatus notificationStatus) throws IOException {

-		Call<Void> call = RetrofitClient.getApiInterface(context)
+		Call<ResponseBody> call = RetrofitClient.getApiInterface(context)
 			.markNotificationThreadAsRead(instanceToken, notificationThread.getId(), notificationStatus.name());

 		if(!call.execute().isSuccessful()) {
@ -45,7 +46,7 @@ public class NotificationsActions {

 	public boolean setAllNotificationsRead(Date date) throws IOException {

-		Call<Void> call = RetrofitClient.getApiInterface(context)
+		Call<ResponseBody> call = RetrofitClient.getApiInterface(context)
 			.markNotificationThreadsAsRead(instanceToken, AppUtil.getTimestampFromDate(context, date), true,
 				new String[]{"unread", "pinned"}, "read");

--- 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/activities/AddCollaboratorToRepositoryActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
@ -13,12 +13,12 @@ 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.R;
 import org.mian.gitnex.adapters.UserSearchAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityAddCollaboratorToRepositoryBinding;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.models.UserSearch;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
@ -37,21 +37,23 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {

    private RecyclerView mRecyclerView;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_collaborator_to_repository;
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityAddCollaboratorToRepositoryBinding activityAddCollaboratorToRepositoryBinding = ActivityAddCollaboratorToRepositoryBinding.inflate(getLayoutInflater());
-		setContentView(activityAddCollaboratorToRepositoryBinding.getRoot());
-
        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

-        ImageView closeActivity = activityAddCollaboratorToRepositoryBinding.close;
-        addCollaboratorSearch = activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch;
-        mRecyclerView = activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch;
-        mProgressBar = activityAddCollaboratorToRepositoryBinding.progressBar;
-        noData = activityAddCollaboratorToRepositoryBinding.noData;
+        ImageView closeActivity = findViewById(R.id.close);
+        addCollaboratorSearch = findViewById(R.id.addCollaboratorSearch);
+        mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
+        mProgressBar = findViewById(R.id.progressBar);
+        noData = findViewById(R.id.noData);

        addCollaboratorSearch.requestFocus();
        assert imm != null;
@ -81,7 +83,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {

        Call<UserSearch> call = RetrofitClient
                .getApiInterface(appCtx)
-                .getUserBySearch(Authorization.get(ctx), searchKeyword, 10, 1);
+                .getUserBySearch(Authorization.get(ctx), searchKeyword, 10);

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

--- a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
@ -8,11 +8,8 @@ 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;
@ -20,6 +17,8 @@ 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 org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.UserInfo;
 import java.net.URI;
 import io.mikael.urlbuilder.UrlBuilder;
 import retrofit2.Call;
@ -37,24 +36,31 @@ public class AddNewAccountActivity extends BaseActivity {
 	private enum Protocol {HTTPS, HTTP}
 	private String spinnerSelectedValue;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_add_new_account;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

 		viewBinding = ActivityAddNewAccountBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);

 		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);
@ -116,7 +122,9 @@ public class AddNewAccountActivity extends BaseActivity {
 	private void versionCheck(final String instanceUrl, final String loginToken) {

 		Call<GiteaVersion> callVersion;
-		callVersion = RetrofitClient.getApiInterface(ctx, instanceUrl).getGiteaVersionWithToken("token " + loginToken);
+
+		callVersion = RetrofitClient.getApiInterface(ctx).getGiteaVersionWithToken("token " + loginToken);
+
 		callVersion.enqueue(new Callback<GiteaVersion>() {

 			@Override
@ -143,7 +151,7 @@ public class AddNewAccountActivity extends BaseActivity {
 							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning)
 							.setCancelable(true);

-						alertDialogBuilder.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
+						alertDialogBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {

 							dialog.dismiss();
 						});
@ -205,15 +213,14 @@ public class AddNewAccountActivity extends BaseActivity {
 						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);
+						UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
+						int checkAccount = userAccountsApi.getCount(accountName);

-						if(!userAccountExists) {
+						if(checkAccount == 0) {

-							userAccountsApi.createNewAccount(accountName, instanceUrl, userDetails.getUsername(), loginToken, "");
+							userAccountsApi.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), loginToken, "");
 							Toasty.success(ctx, getResources().getString(R.string.accountAddedMessage));
 							finish();
-
 						}
 						else {

--- a/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewTeamMemberActivity.java
@ -14,12 +14,12 @@ 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.R;
 import org.mian.gitnex.adapters.UserSearchForTeamMemberAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityAddNewTeamMemberBinding;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.models.UserSearch;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@ -44,21 +44,23 @@ public class AddNewTeamMemberActivity extends BaseActivity {

 	private String teamId;

+	@Override
+	protected int getLayoutResourceId() {
+		return R.layout.activity_add_new_team_member;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		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;
+		ImageView closeActivity = findViewById(R.id.close);
+		addNewTeamMember = findViewById(R.id.addNewTeamMember);
+		mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
+		mProgressBar = findViewById(R.id.progress_bar);
+		noData = findViewById(R.id.noData);

 		addNewTeamMember.requestFocus();
 		assert imm != null;
@ -110,7 +112,7 @@ public class AddNewTeamMemberActivity extends BaseActivity {

 	public void loadUserSearchList(String searchKeyword, String teamId) {

-		Call<UserSearch> call = RetrofitClient.getApiInterface(ctx).getUserBySearch(Authorization.get(ctx), searchKeyword, 10, 1);
+		Call<UserSearch> call = RetrofitClient.getApiInterface(ctx).getUserBySearch(Authorization.get(ctx), searchKeyword, 10);

 		mProgressBar.setVisibility(View.VISIBLE);

--- 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
@ -21,7 +21,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.AdminGetUsersAdapter;
-import org.mian.gitnex.databinding.ActivityAdminGetUsersBinding;
 import org.mian.gitnex.fragments.BottomSheetAdminUsersFragment;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
@ -39,21 +38,23 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
    private TextView noDataUsers;
    private Boolean searchFilter = false;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_admin_get_users;
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityAdminGetUsersBinding activityAdminGetUsersBinding = ActivityAdminGetUsersBinding.inflate(getLayoutInflater());
-	    setContentView(activityAdminGetUsersBinding.getRoot());
+        ImageView closeActivity = findViewById(R.id.close);
+        noDataUsers = findViewById(R.id.noDataUsers);
+        mRecyclerView = findViewById(R.id.recyclerView);

-        ImageView closeActivity = activityAdminGetUsersBinding.close;
-        noDataUsers = activityAdminGetUsersBinding.noDataUsers;
-        mRecyclerView = activityAdminGetUsersBinding.recyclerView;
+        final SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);

-        final SwipeRefreshLayout swipeRefresh = activityAdminGetUsersBinding.pullToRefresh;
-
-        Toolbar toolbar = activityAdminGetUsersBinding.toolbar;
+        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);

        initCloseListener();
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@ -1,23 +1,39 @@
 package org.mian.gitnex.activities;

+import android.annotation.SuppressLint;
 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.acra.ACRA;
+import org.acra.BuildConfig;
+import org.acra.annotation.AcraCore;
+import org.acra.annotation.AcraNotification;
+import org.acra.config.CoreConfigurationBuilder;
+import org.acra.config.LimiterConfigurationBuilder;
+import org.acra.config.MailSenderConfigurationBuilder;
+import org.acra.data.StringFormat;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.FontsOverride;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 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;
+import org.mian.gitnex.notifications.NotificationsMaster;
+import static org.acra.ReportField.ANDROID_VERSION;
+import static org.acra.ReportField.PHONE_MODEL;
+import static org.acra.ReportField.STACK_TRACE;

 /**
 * Author M M Arif
 */

+@SuppressLint("NonConstantResourceId")
+@AcraNotification(resIcon = R.drawable.gitnex_transparent,
+		resTitle = R.string.crashTitle,
+		resChannelName = R.string.setCrashReports,
+		resText = R.string.crashMessage)
+@AcraCore(reportContent = { ANDROID_VERSION, PHONE_MODEL, STACK_TRACE })
+
 public abstract class BaseActivity extends AppCompatActivity {

 	protected TinyDB tinyDB;
@ -28,109 +44,130 @@ public abstract class BaseActivity extends AppCompatActivity {
 	@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"))) {
-
+				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
 					tinyDB.putString("currentTheme", "dark");
 					setTheme(R.style.AppTheme);
-				}
-				else {
-
+				} else {
 					tinyDB.putString("currentTheme", "light");
 					setTheme(R.style.AppThemeLight);
 				}
 				break;
-			case 3:

+			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"))) {

+			case 4:
+				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
 					tinyDB.putString("currentTheme", "dark");
 					setTheme(R.style.AppTheme);
-				}
-				else {
-
+				} 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);
+		String appLocale = tinyDB.getString("locale");
+		AppUtil.setAppLocale(getResources(), appLocale);
+
+		super.onCreate(savedInstanceState);
+		setContentView(getLayoutResourceId());
+
+		// FIXME Performance nightmare
+		switch(tinyDB.getInt("customFontId", -1)) {
+
+			case 0:
+				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
+				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
+				FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
+				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
+				break;
+
+			case 2:
+				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf");
+				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf");
+				FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf");
+				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf");
+				break;
+
+			default:
+				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf");
+				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf");
+				FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf");
+				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf");
+
 		}

-		Notifications.startWorker(appCtx);
-	}
+		if(tinyDB.getInt("pollingDelayMinutes", 0) <= 0) {

-	public void onResume() {
-		super.onResume();
+			tinyDB.putInt("pollingDelayMinutes", StaticGlobalVariables.defaultPollingDelay);
+        }

-		if(tinyDB.getBoolean("biometricStatus") && !tinyDB.getBoolean("biometricLifeCycle")) {
+		// FIXME Performance nightmare
+        NotificationsMaster.hireWorker(appCtx);

-			Executor executor = ContextCompat.getMainExecutor(this);
+        // enabling counter badges by default
+        if(tinyDB.getString("enableCounterBadgesInit").isEmpty()) {

-			BiometricPrompt biometricPrompt = new BiometricPrompt(this, executor, new BiometricPrompt.AuthenticationCallback() {
+            tinyDB.putBoolean("enableCounterBadges", true);
+            tinyDB.putString("enableCounterBadgesInit", "yes");
+        }

-				@Override
-				public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
+		// enable crash reports by default
+		if(tinyDB.getString("crashReportingEnabledInit").isEmpty()) {

-					super.onAuthenticationError(errorCode, errString);
+			tinyDB.putBoolean("crashReportingEnabled", true);
+			tinyDB.putString("crashReportingEnabledInit", "yes");
+		}

-					// Authentication error, close the app
-					if(errorCode == BiometricPrompt.ERROR_USER_CANCELED ||
-						errorCode == BiometricPrompt.ERROR_NEGATIVE_BUTTON) {
-						finish();
-					}
-				}
+		// default cache setter
+		if(tinyDB.getString("cacheSizeStr").isEmpty()) {

-				// Authentication succeeded, continue to app
-				@Override public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) { super.onAuthenticationSucceeded(result); tinyDB.putBoolean("biometricLifeCycle", true); }
+			tinyDB.putString("cacheSizeStr", getResources().getString(R.string.cacheSizeDataSelectionSelectedText));
+		}
+		if(tinyDB.getString("cacheSizeImagesStr").isEmpty()) {

-				// Authentication failed, close the app
-				@Override public void onAuthenticationFailed() { super.onAuthenticationFailed(); }
+			tinyDB.putString("cacheSizeImagesStr", getResources().getString(R.string.cacheSizeImagesSelectionSelectedText));
+		}

-			});
+		// enable comment drafts by default
+		if(tinyDB.getString("draftsCommentsDeletionEnabledInit").isEmpty()) {

-			BiometricPrompt.PromptInfo biometricPromptBuilder = new BiometricPrompt.PromptInfo.Builder()
-				.setTitle(getString(R.string.biometricAuthTitle))
-				.setSubtitle(getString(R.string.biometricAuthSubTitle))
-				.setNegativeButtonText(getString(R.string.cancelButton)).build();
+			tinyDB.putBoolean("draftsCommentsDeletionEnabled", true);
+			tinyDB.putString("draftsCommentsDeletionEnabledInit", "yes");
+		}

-			biometricPrompt.authenticate(biometricPromptBuilder);
+		// FIXME Performance nightmare
+		if (tinyDB.getBoolean("crashReportingEnabled")) {

+			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);
+			ACRABuilder.setBuildConfigClass(BuildConfig.class).setReportFormat(StringFormat.KEY_VALUE_LIST);
+			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo(getResources().getString(R.string.appEmail)).setSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(getApplicationContext()))).setEnabled(true);
+			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
+			ACRA.init(getApplication(), ACRABuilder);
 		}
 	}
+
+	protected abstract int getLayoutResourceId();
+
 }


--- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
@ -18,15 +18,14 @@ 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.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Commits;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@ -43,7 +42,7 @@ public class CommitsActivity extends BaseActivity {
 	private TextView noData;
 	private ProgressBar progressBar;
 	private String TAG = "CommitsActivity";
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private int pageSize = 1;

 	private RecyclerView recyclerView;
@ -51,15 +50,17 @@ public class CommitsActivity extends BaseActivity {
 	private CommitsAdapter adapter;
 	private ProgressBar progressLoadMore;

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

 		super.onCreate(savedInstanceState);
-
-		ActivityCommitsBinding activityCommitsBinding = ActivityCommitsBinding.inflate(getLayoutInflater());
-		setContentView(activityCommitsBinding.getRoot());
-
-		Toolbar toolbar = activityCommitsBinding.toolbar;
+		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);

 		String repoFullName = tinyDB.getString("repoFullName");
@ -69,15 +70,15 @@ public class CommitsActivity extends BaseActivity {

 		String branchName = getIntent().getStringExtra("branchName");

-		TextView toolbar_title = activityCommitsBinding.toolbarTitle;
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
 		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
 		toolbar_title.setText(branchName);

-		ImageView closeActivity = activityCommitsBinding.close;
-		noData = activityCommitsBinding.noDataCommits;
-		progressLoadMore = activityCommitsBinding.progressLoadMore;
-		progressBar = activityCommitsBinding.progressBar;
-		SwipeRefreshLayout swipeRefresh = activityCommitsBinding.pullToRefresh;
+		ImageView closeActivity = findViewById(R.id.close);
+		noData = findViewById(R.id.noDataCommits);
+		progressLoadMore = findViewById(R.id.progressLoadMore);
+		progressBar = findViewById(R.id.progress_bar);
+		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);

 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
@ -85,10 +86,10 @@ public class CommitsActivity extends BaseActivity {
 		// if gitea is 1.12 or higher use the new limit (resultLimitNewGiteaInstances)
 		if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12")) {

-			resultLimit = Constants.resultLimitNewGiteaInstances;
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
 		}

-		recyclerView = activityCommitsBinding.recyclerView;
+		recyclerView = findViewById(R.id.recyclerView);
 		commitsList = new ArrayList<>();

 		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
--- a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
@ -8,21 +8,23 @@ 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.EditText;
+import android.widget.ImageView;
 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 org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.DeleteFile;
+import org.mian.gitnex.models.EditFile;
+import org.mian.gitnex.models.NewFile;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@ -34,21 +36,32 @@ import retrofit2.Callback;

 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;
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;
+    private Button newFileCreate;

+    private EditText newFileName;
+    private EditText newFileContent;
+    private EditText newFileBranchName;
+    private EditText newFileCommitMessage;
+    private AutoCompleteTextView newFileBranchesSpinner;
 	private String filePath;
 	private String fileSha;
+	private int fileAction = 0; // 0 = create, 1 = delete, 2 = edit

-    private final List<String> branches = new ArrayList<>();
+    List<Branches> branchesList = new ArrayList<>();

+	private String loginUid;
 	private String repoOwner;
 	private String repoName;
+	private String instanceToken;
+
+	private String selectedBranch;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_file;
+    }

    @SuppressLint("ClickableViewAccessibility")
    @Override
@ -56,168 +69,219 @@ public class CreateFileActivity extends BaseActivity {

        super.onCreate(savedInstanceState);

-        binding = ActivityCreateFileBinding.inflate(getLayoutInflater());
-	    setContentView(binding.getRoot());
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
+        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");

-	    TextView toolbarTitle = binding.toolbarTitle;
+        closeActivity = findViewById(R.id.close);
+        newFileName = findViewById(R.id.newFileName);
+        newFileContent = findViewById(R.id.newFileContent);
+        newFileBranchName = findViewById(R.id.newFileBranchName);
+        newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
+	    TextView toolbarTitle = findViewById(R.id.toolbarTitle);

-        binding.newFileName.requestFocus();
+        newFileName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(newFileName, InputMethodManager.SHOW_IMPLICIT);

-	    InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        assert inputMethodManager != null;
-        inputMethodManager.showSoftInput(binding.newFileName, InputMethodManager.SHOW_IMPLICIT);
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);

-	    binding.close.setOnClickListener(view -> finish());
-	    binding.newFileContent.setOnTouchListener((touchView, motionEvent) -> {
+        newFileCreate = findViewById(R.id.newFileCreate);
+
+	    newFileContent.setOnTouchListener((touchView, motionEvent) -> {

 		    touchView.getParent().requestDisallowInterceptTouchEvent(true);

-		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 &&
-			    (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
+		    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) {
+	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 1) == 1) {
+
+		    fileAction = getIntent().getIntExtra("fileAction", 1);

-		    fileAction = getIntent().getIntExtra("fileAction", FILE_ACTION_DELETE);
 		    filePath = getIntent().getStringExtra("filePath");
+		    String fileContents = getIntent().getStringExtra("fileContents");
 		    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);
+		    newFileCreate.setText(R.string.deleteFile);
+		    newFileName.setText(filePath);
+		    newFileName.setEnabled(false);
+		    newFileName.setFocusable(false);

+		    newFileContent.setText(fileContents);
+		    newFileContent.setEnabled(false);
+		    newFileContent.setFocusable(false);
 	    }

-	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", FILE_ACTION_EDIT) == FILE_ACTION_EDIT) {
+	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 2) == 2) {
+
+		    fileAction = getIntent().getIntExtra("fileAction", 2);

-		    fileAction = getIntent().getIntExtra("fileAction", FILE_ACTION_EDIT);
 		    filePath = getIntent().getStringExtra("filePath");
+		    String fileContents = getIntent().getStringExtra("fileContents");
 		    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"));
+		    newFileCreate.setText(R.string.editFile);
+		    newFileName.setText(filePath);
+		    newFileName.setEnabled(false);
+		    newFileName.setFocusable(false);

+		    newFileContent.setText(fileContents);
 	    }

-        getBranches(repoOwner, repoName);
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
+        getBranches(instanceToken, repoOwner, repoName, loginUid);

        disableProcessButton();

-	    NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
-	    networkStatusObserver.registerNetworkStatusListener(binding.newFileCreate::setEnabled);
+        if(!connToInternet) {

-	    binding.newFileCreate.setOnClickListener(v -> processNewFile());
+            newFileCreate.setEnabled(false);
+        }
+        else {
+
+            newFileCreate.setOnClickListener(createFileListener);
+        }

    }

+    private final View.OnClickListener createFileListener = 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() : "";
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
+
+        String newFileName_ = newFileName.getText().toString();
+        String newFileContent_ = newFileContent.getText().toString();
+        String newFileBranchName_ = newFileBranchName.getText().toString();
+        String newFileCommitMessage_ = newFileCommitMessage.getText().toString();
+
+        if(!connToInternet) {

-        if(!AppUtil.hasNetworkConnection(appCtx)) {
            Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
            return;
        }

-        if(((newFileName.isEmpty() || newFileContent.isEmpty()) && fileAction != FILE_ACTION_DELETE) || newFileCommitMessage.isEmpty()) {
+        if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) {
+
            Toasty.error(ctx, getString(R.string.newFileRequiredFields));
            return;
        }

-	    if(!AppUtil.checkStringsWithDash(newFileBranchName)) {
-		    Toasty.error(ctx, getString(R.string.newFileInvalidBranchName));
-		    return;
-	    }
+        if(selectedBranch.equals("No branch")) {
+
+            if(newFileBranchName_.equals("")) {
+
+                Toasty.error(ctx, getString(R.string.newFileRequiredFieldNewBranchName));
+                return;
+            }
+            else {
+
+                if(!appUtil.checkStringsWithDash(newFileBranchName_)) {
+
+                    Toasty.error(ctx, getString(R.string.newFileInvalidBranchName));
+                    return;
+                }
+            }
+
+        }
+
+        if(appUtil.charactersLength(newFileCommitMessage_) > 255) {

-        if(newFileCommitMessage.length() > 255) {
            Toasty.warning(ctx, getString(R.string.newFileCommitMessageError));
-            return;
+        }
+        else {
+
+            disableProcessButton();
+
+            if(fileAction == 1) {
+
+	            deleteFile(Authorization.get(ctx), repoOwner, repoName, filePath,
+		            newFileBranchName_, newFileCommitMessage_, selectedBranch, fileSha);
+            }
+            else if(fileAction == 2) {
+
+	            editFile(Authorization.get(ctx), repoOwner, repoName, filePath,
+		           appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, selectedBranch, fileSha);
+            }
+            else {
+
+	            createNewFile(Authorization.get(ctx), repoOwner, repoName, newFileName_,
+		            appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, selectedBranch);
+            }
+
        }

-        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) {
+    private void createNewFile(final String token, String repoOwner, String repoName, String fileName, String fileContent, String fileBranchName, String fileCommitMessage, String currentBranch) {

-        NewFile createNewFileJsonStr = branches.contains(branchName) ?
-	        new NewFile(branchName, fileContent, fileCommitMessage, "") :
-	        new NewFile("", fileContent, fileCommitMessage, branchName);
+        NewFile createNewFileJsonStr;
+        if(currentBranch.equals("No branch")) {
+
+            createNewFileJsonStr = new NewFile("", fileContent, fileCommitMessage, fileBranchName);
+        }
+        else {
+
+            createNewFileJsonStr = new NewFile(currentBranch, fileContent, fileCommitMessage, "");
+        }

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

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

            @Override
            public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {

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

-		            case 201:
-			            enableProcessButton();
-			            Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
-			            finish();
-		            	break;
+                    enableProcessButton();
+                    Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
+                    finish();
+                }
+                else if(response.code() == 401) {

-		            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;
+                    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 {

-		            case 404:
-			            enableProcessButton();
-			            Toasty.warning(ctx, getString(R.string.apiNotFound));
-		            	break;
+                    if(response.code() == 404) {

-		            default:
-			            enableProcessButton();
-			            Toasty.error(ctx, getString(R.string.orgCreatedError));
-		            	break;
+                        enableProcessButton();
+                        Toasty.warning(ctx, getString(R.string.apiNotFound));
+                    }
+                    else {

-	            }
+                        enableProcessButton();
+                        Toasty.error(ctx, getString(R.string.orgCreatedError));
+                    }
+                }
            }

            @Override
@ -225,56 +289,65 @@ public class CreateFileActivity extends BaseActivity {

                Log.e("onFailure", t.toString());
                enableProcessButton();
-
            }
        });

    }

-	private void deleteFile(String repoOwner, String repoName, String fileName, String fileCommitMessage, String branchName, String fileSha) {
+	private void deleteFile(final String token, String repoOwner, String repoName, String fileName, String fileBranchName, String fileCommitMessage, String currentBranch, String fileSha) {

-    	DeleteFile deleteFileJsonStr = branches.contains(branchName) ?
-		    new DeleteFile(branchName, fileCommitMessage, "", fileSha) :
-		    new DeleteFile("", fileCommitMessage, branchName, fileSha);
+    	String branchName;
+		DeleteFile deleteFileJsonStr;
+
+		if(currentBranch.equals("No branch")) {
+
+			branchName = fileBranchName;
+			deleteFileJsonStr = new DeleteFile("", fileCommitMessage, fileBranchName, fileSha);
+		}
+		else {
+
+			branchName = currentBranch;
+			deleteFileJsonStr = new DeleteFile(currentBranch, fileCommitMessage, "", fileSha);
+		}

 		Call<JsonElement> call = RetrofitClient
 			.getApiInterface(ctx)
-			.deleteFile(Authorization.get(ctx), repoOwner, repoName, fileName, deleteFileJsonStr);
+			.deleteFile(token, 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()) {
+				if(response.code() == 200) {

-					case 200:
-						enableProcessButton();
-						Toasty.info(ctx, getString(R.string.deleteFileMessage, tinyDB.getString("repoBranch")));
-						getIntent().removeExtra("filePath");
-						getIntent().removeExtra("fileSha");
-						getIntent().removeExtra("fileContents");
-						finish();
-						break;
+					enableProcessButton();
+					Toasty.info(ctx, getString(R.string.deleteFileMessage, branchName));
+					getIntent().removeExtra("filePath");
+					getIntent().removeExtra("fileSha");
+					getIntent().removeExtra("fileContents");
+					finish();
+				}
+				else if(response.code() == 401) {

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

-					case 404:
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.apiNotFound));
-						break;
+					}
+					else {

-					default:
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.genericError));
-						break;
-
+					}
 				}
 			}

@ -288,51 +361,61 @@ public class CreateFileActivity extends BaseActivity {

 	}

-	private void editFile(String repoOwner, String repoName, String fileName, String fileContent, String fileCommitMessage, String branchName, String fileSha) {
+	private void editFile(final String token, String repoOwner, String repoName, String fileName, String fileContent, String fileBranchName, String fileCommitMessage, String currentBranch, String fileSha) {

-		EditFile editFileJsonStr = branches.contains(branchName) ?
-			new EditFile(branchName, fileCommitMessage, "", fileSha, fileContent) :
-			new EditFile("", fileCommitMessage, branchName, fileSha, fileContent);
+		String branchName;
+		EditFile editFileJsonStr;
+
+		if(currentBranch.equals("No branch")) {
+
+			branchName = fileBranchName;
+			editFileJsonStr = new EditFile("", fileCommitMessage, fileBranchName, fileSha, fileContent);
+		}
+		else {
+
+			branchName = currentBranch;
+			editFileJsonStr = new EditFile(currentBranch, fileCommitMessage, "", fileSha, fileContent);
+		}

 		Call<JsonElement> call = RetrofitClient
 			.getApiInterface(ctx)
-			.editFile(Authorization.get(ctx), repoOwner, repoName, fileName, editFileJsonStr);
+			.editFile(token, 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()) {
+				if(response.code() == 200) {

-					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;
+					enableProcessButton();
+					Toasty.info(ctx, getString(R.string.editFileMessage, branchName));
+					getIntent().removeExtra("filePath");
+					getIntent().removeExtra("fileSha");
+					getIntent().removeExtra("fileContents");
+					tinyDB.putBoolean("fileModified", true);
+					finish();
+				}
+				else if(response.code() == 401) {

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

-					case 404:
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.apiNotFound));
-						break;
+					}
+					else {

-					default:
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.genericError));
-						break;
-
+					}
 				}
 			}

@ -341,13 +424,12 @@ public class CreateFileActivity extends BaseActivity {

 				Log.e("onFailure", t.toString());
 				enableProcessButton();
-
 			}
 		});

 	}

-    private void getBranches(String repoOwner, String repoName) {
+    private void getBranches(String instanceToken, String repoOwner, String repoName, String loginUid) {

        Call<List<Branches>> call = RetrofitClient
                .getApiInterface(ctx)
@ -358,18 +440,48 @@ public class CreateFileActivity extends BaseActivity {
            @Override
            public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {

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

-                	assert response.body() != null;
-                    for(Branches branch : response.body()) branches.add(branch.getName());
+                    if(response.code() == 200) {

-                    ArrayAdapter<String> adapter = new ArrayAdapter<>(CreateFileActivity.this, R.layout.list_spinner_items, branches);
+                        List<Branches> branchesList_ = response.body();

-	                binding.newFileBranches.setAdapter(adapter);
-	                binding.newFileBranches.setText(tinyDB.getString("repoBranch"), false);
+                        branchesList.add(new Branches("No branch"));
+                        assert branchesList_ != null;

-	                enableProcessButton();
+                        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<>(CreateFileActivity.this,
+                                R.layout.list_spinner_items, branchesList);
+
+                        newFileBranchesSpinner.setAdapter(adapter);
+                        enableProcessButton();
+
+	                    newFileBranchesSpinner.setOnItemClickListener ((parent, view, position, id) -> {
+
+		                    selectedBranch = branchesList.get(position).getName();
+
+		                    if(selectedBranch.equals("No branch")) {
+
+			                    newFileBranchName.setEnabled(true);
+			                    newFileBranchName.setVisibility(View.VISIBLE);
+		                    }
+		                    else {
+
+			                    newFileBranchName.setEnabled(false);
+			                    newFileBranchName.setVisibility(View.GONE);
+			                    newFileBranchName.setText("");
+		                    }
+
+	                    });
+                    }
                }
            }

@ -382,7 +494,19 @@ public class CreateFileActivity extends BaseActivity {

    }

-    private void disableProcessButton() { binding.newFileCreate.setEnabled(false); }
-    private void enableProcessButton() { binding.newFileCreate.setEnabled(true); }
+    private void initCloseListener() {
+
+        onClickListener = view -> finish();
+    }
+
+    private void disableProcessButton() {
+
+        newFileCreate.setEnabled(false);
+    }
+
+    private void enableProcessButton() {
+
+        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
@ -14,10 +14,6 @@ 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;
@ -30,10 +26,14 @@ 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.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.CreateIssue;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.Milestones;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@ -51,7 +51,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 	private CustomLabelsSelectionDialogBinding labelsBinding;
 	private CustomAssigneesSelectionDialogBinding assigneesBinding;
    private View.OnClickListener onClickListener;
-    private int resultLimit = Constants.resultLimitOldGiteaInstances;
+    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private Dialog dialogLabels;
 	private Dialog dialogAssignees;
 	private String labelsSetter;
@ -71,6 +71,11 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 	private List<Collaborators> assigneesList = new ArrayList<>();
 	private List<String> assigneesListData = new ArrayList<>();

+    @Override
+    protected int getLayoutResourceId() {
+        return R.layout.activity_create_issue;
+    }
+
    @SuppressLint("ClickableViewAccessibility")
    @Override
    public void onCreate(Bundle savedInstanceState) {
@ -78,7 +83,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
        super.onCreate(savedInstanceState);

 	    viewBinding = ActivityCreateIssueBinding.inflate(getLayoutInflater());
-	    setContentView(viewBinding.getRoot());
+	    View view = viewBinding.getRoot();
+	    setContentView(view);

        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

@ -93,7 +99,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
        // require gitea 1.12 or higher
        if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {

-            resultLimit = Constants.resultLimitNewGiteaInstances;
+            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
        }

 	    viewBinding.newIssueTitle.requestFocus();
--- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
@ -13,18 +13,16 @@ 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 org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateLabelBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.CreateLabel;
+import org.mian.gitnex.models.Labels;
 import org.mian.gitnex.viewmodels.LabelsViewModel;
-import org.mian.gitnex.viewmodels.OrganizationLabelsViewModel;
 import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
@ -39,37 +37,41 @@ public class CreateLabelActivity extends BaseActivity {
    private TextView colorPicker;
    private EditText labelName;
    private Button createLabelButton;
-    private TinyDB tinyDB;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_label;
+    }

    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    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 = TinyDB.getInstance(appCtx);
+        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
        final String repoOwner = parts[0];
        final String repoName = parts[1];
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

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

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

        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

-        ImageView closeActivity = activityCreateLabelBinding.close;
-        colorPicker = activityCreateLabelBinding.colorPicker;
-        labelName = activityCreateLabelBinding.labelName;
-        createLabelButton = activityCreateLabelBinding.createLabelButton;
+        ImageView closeActivity = findViewById(R.id.close);
+        colorPicker = findViewById(R.id.colorPicker);
+        labelName = findViewById(R.id.labelName);
+        createLabelButton = findViewById(R.id.createLabelButton);

        labelName.requestFocus();
        assert imm != null;
@ -85,7 +87,7 @@ public class CreateLabelActivity extends BaseActivity {

            //Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
            colorPicker.setBackgroundColor(color);
-	        tinyDB.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
+            tinyDb.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
            cp.dismiss();
        });

@ -94,9 +96,9 @@ public class CreateLabelActivity extends BaseActivity {
            labelName.setText(getIntent().getStringExtra("labelTitle"));
            int labelColor_ = Color.parseColor("#" + getIntent().getStringExtra("labelColor"));
            colorPicker.setBackgroundColor(labelColor_);
-	        tinyDB.putString("labelColorDefault", "#" + getIntent().getStringExtra("labelColor"));
+            tinyDb.putString("labelColorDefault", "#" + getIntent().getStringExtra("labelColor"));

-            TextView toolbar_title = activityCreateLabelBinding.toolbarTitle;
+            TextView toolbar_title = findViewById(R.id.toolbar_title);
            toolbar_title.setText(getResources().getString(R.string.pageTitleLabelUpdate));
            createLabelButton.setText(getResources().getString(R.string.newUpdateButtonCopy));

@ -121,23 +123,26 @@ public class CreateLabelActivity extends BaseActivity {

    private void processUpdateLabel() {

+        final TinyDB tinyDb = TinyDB.getInstance(appCtx);
        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
-        String repoFullName = tinyDB.getString("repoFullName");
+        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 loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

        String updateLabelName = labelName.getText().toString();

        String updateLabelColor;
-        if(tinyDB.getString("labelColor").isEmpty()) {
+        if(tinyDb.getString("labelColor").isEmpty()) {

-            updateLabelColor = tinyDB.getString("labelColorDefault");
+            updateLabelColor = tinyDb.getString("labelColorDefault");
        }
        else {

-            updateLabelColor = tinyDB.getString("labelColor");
+            updateLabelColor = tinyDb.getString("labelColor");
        }

        if(!connToInternet) {
@ -152,37 +157,40 @@ public class CreateLabelActivity extends BaseActivity {
            return;
        }

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

            Toasty.error(ctx, getString(R.string.labelNameError));
            return;
        }

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

    }

    private void processCreateLabel() {

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

        String newLabelName = labelName.getText().toString();
        String newLabelColor;

-        if(tinyDB.getString("labelColor").isEmpty()) {
+        if(tinyDb.getString("labelColor").isEmpty()) {

            newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
        }
        else {

-            newLabelColor = tinyDB.getString("labelColor");
+            newLabelColor = tinyDb.getString("labelColor");
        }

        if(!connToInternet) {
@ -197,30 +205,26 @@ public class CreateLabelActivity extends BaseActivity {
            return;
        }

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

            Toasty.error(ctx, getString(R.string.labelNameError));
            return;
        }

        disableProcessButton();
-        createNewLabel(repoOwner, repoName, newLabelName, newLabelColor);
+        createNewLabel(instanceToken, repoOwner, repoName, newLabelName, newLabelColor, loginUid);
    }

-    private void createNewLabel(String repoOwner, String repoName, String newLabelName, String newLabelColor) {
+    private void createNewLabel(final String instanceToken, String repoOwner, String repoName, String newLabelName, String newLabelColor, String loginUid) {

        CreateLabel createLabelFunc = new CreateLabel(newLabelName, newLabelColor);
+        final TinyDB tinyDb = TinyDB.getInstance(appCtx);

        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
+                .getApiInterface(ctx)
+                .createLabel(Authorization.get(ctx), repoOwner, repoName, createLabelFunc);

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

@ -230,8 +234,8 @@ public class CreateLabelActivity extends BaseActivity {
                if(response.code() == 201) {

                    Toasty.success(ctx, getString(R.string.labelCreated));
-	                tinyDB.putString("labelColor", "");
-	                tinyDB.putBoolean("labelsRefresh", true);
+                    tinyDb.putString("labelColor", "");
+                    tinyDb.putBoolean("labelsRefresh", true);
                    finish();
                }
                else if(response.code() == 401) {
@ -245,7 +249,7 @@ public class CreateLabelActivity extends BaseActivity {
                else {

                    enableProcessButton();
-	                tinyDB.putString("labelColor", "");
+                    tinyDb.putString("labelColor", "");
                    Toasty.error(ctx, getString(R.string.labelGeneralError));
                }
            }
@ -253,7 +257,7 @@ public class CreateLabelActivity extends BaseActivity {
            @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 +265,16 @@ public class CreateLabelActivity extends BaseActivity {

    }

-    private void patchLabel(String repoOwner, String repoName, String updateLabelName, String updateLabelColor, int labelId) {
+    private void patchLabel(final String instanceToken, String repoOwner, String repoName, String updateLabelName, String updateLabelColor, int labelId, String loginUid) {

        CreateLabel createLabelFunc = new CreateLabel(updateLabelName, updateLabelColor);
+        final TinyDB tinyDb = TinyDB.getInstance(appCtx);

        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
+                .getApiInterface(appCtx)
+                .patchLabel(Authorization.get(ctx), repoOwner, repoName, labelId, createLabelFunc);

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

@ -286,14 +286,13 @@ public class CreateLabelActivity extends BaseActivity {
                    if(response.code() == 200) {

                        Toasty.success(ctx, getString(R.string.labelUpdated));
-	                    tinyDB.putString("labelColor", "");
-	                    tinyDB.putBoolean("labelsRefresh", true);
-	                    tinyDB.putString("labelColorDefault", "");
+                        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();
                    }
                }
@ -308,8 +307,8 @@ public class CreateLabelActivity extends BaseActivity {
                else {

                    enableProcessButton();
-	                tinyDB.putString("labelColor", "");
-	                tinyDB.putString("labelColorDefault", "");
+                    tinyDb.putString("labelColor", "");
+                    tinyDb.putString("labelColorDefault", "");
                    Toasty.error(ctx, getString(R.string.labelGeneralError));
                }
            }
@ -317,8 +316,8 @@ public class CreateLabelActivity extends BaseActivity {
            @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();
            }
@ -334,23 +333,17 @@ public class CreateLabelActivity extends BaseActivity {
            getIntent().removeExtra("labelId");
            getIntent().removeExtra("labelTitle");
            getIntent().removeExtra("labelColor");
-	        getIntent().removeExtra("type");
            finish();
        };
    }

-    private void deleteLabel(final String repoOwner, final String repoName, int labelId) {
+    private void deleteLabel(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
+                .getApiInterface(appCtx)
+                .deleteLabel(Authorization.get(ctx), repoOwner, repoName, labelId);

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

@ -362,17 +355,9 @@ public class CreateLabelActivity extends BaseActivity {
                    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);
-	                    }
+                        LabelsViewModel.loadLabelsList(instanceToken, repoOwner, repoName, ctx);
                        getIntent().removeExtra("labelAction");
                        getIntent().removeExtra("labelId");
-	                    getIntent().removeExtra("type");
                    }
                }
                else if(response.code() == 401) {
--- a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
@ -12,16 +12,15 @@ 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 org.mian.gitnex.models.Milestones;
 import java.util.Calendar;
 import retrofit2.Call;
 import retrofit2.Callback;
@ -38,24 +37,26 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
    private EditText milestoneDescription;
    private Button createNewMilestoneButton;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_milestone;
+    }
+
    @SuppressLint("ClickableViewAccessibility")
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityCreateMilestoneBinding activityCreateMilestoneBinding = ActivityCreateMilestoneBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateMilestoneBinding.getRoot());
-
        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;
+        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);

        milestoneTitle.requestFocus();
        assert imm != null;
@ -92,7 +93,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
    private void processNewMilestone() {

        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-
+        AppUtil appUtil = new AppUtil();
        TinyDB tinyDb = TinyDB.getInstance(appCtx);
        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
@ -117,7 +118,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic

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

-            if (newMilestoneDescription.length() > 255) {
+            if (appUtil.charactersLength(newMilestoneDescription) > 255) {

                Toasty.warning(ctx, getString(R.string.milestoneDescError));
                return;
--- a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
@ -10,14 +10,14 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateNewUserBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserInfo;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -34,24 +34,26 @@ public class CreateNewUserActivity extends BaseActivity {
    private EditText userPassword;
    private Button createUserButton;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_new_user;
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityCreateNewUserBinding activityCreateNewUserBinding = ActivityCreateNewUserBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateNewUserBinding.getRoot());
-
        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

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

-        ImageView closeActivity = activityCreateNewUserBinding.close;
-        createUserButton = activityCreateNewUserBinding.createUserButton;
-        fullName = activityCreateNewUserBinding.fullName;
-        userUserName = activityCreateNewUserBinding.userUserName;
-        userEmail = activityCreateNewUserBinding.userEmail;
-        userPassword = activityCreateNewUserBinding.userPassword;
+        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);

        fullName.requestFocus();
        assert imm != null;
@ -73,6 +75,8 @@ public class CreateNewUserActivity extends BaseActivity {
    private void processCreateNewUser() {

        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = TinyDB.getInstance(appCtx);

        String newFullName = fullName.getText().toString().trim();
        String newUserName = userUserName.getText().toString().trim();
@ -91,13 +95,13 @@ public class CreateNewUserActivity extends BaseActivity {
            return;
        }

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

            Toasty.error(ctx, getString(R.string.userInvalidFullName));
            return;
        }

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

            Toasty.error(ctx, getString(R.string.userInvalidUserName));
            return;
--- a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
@ -11,15 +11,14 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
-import org.gitnex.tea4j.models.UserOrganizations;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateOrganizationBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.UserOrganizations;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -36,22 +35,24 @@ public class CreateOrganizationActivity extends BaseActivity {
    private EditText orgName;
    private EditText orgDesc;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_organization;
+    }
+
    @SuppressLint("ClickableViewAccessibility")
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityCreateOrganizationBinding activityCreateOrganizationBinding = ActivityCreateOrganizationBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateOrganizationBinding.getRoot());
-
        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

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

-        closeActivity = activityCreateOrganizationBinding.close;
-        orgName = activityCreateOrganizationBinding.newOrganizationName;
-        orgDesc = activityCreateOrganizationBinding.newOrganizationDescription;
+        closeActivity = findViewById(R.id.close);
+        orgName = findViewById(R.id.newOrganizationName);
+        orgDesc = findViewById(R.id.newOrganizationDescription);

        orgName.requestFocus();
        assert imm != null;
@ -71,7 +72,7 @@ public class CreateOrganizationActivity extends BaseActivity {
        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

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

        if(!connToInternet) {

@ -94,6 +95,8 @@ public class CreateOrganizationActivity extends BaseActivity {
    private void processNewOrganization() {

        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();
+        TinyDB tinyDb = TinyDB.getInstance(appCtx);

        String newOrgName = orgName.getText().toString();
        String newOrgDesc = orgDesc.getText().toString();
@ -106,7 +109,7 @@ public class CreateOrganizationActivity extends BaseActivity {

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

-            if (newOrgDesc.length() > 255) {
+            if (appUtil.charactersLength(newOrgDesc) > 255) {

                Toasty.warning(ctx, getString(R.string.orgDescError));
                return;
@ -117,7 +120,7 @@ public class CreateOrganizationActivity extends BaseActivity {

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

            Toasty.warning(ctx, getString(R.string.orgNameErrorInvalid));
        }
--- a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java
@ -12,10 +12,6 @@ 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;
@ -24,12 +20,17 @@ 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.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.CreatePullRequest;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.Milestones;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -42,7 +43,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 	private View.OnClickListener onClickListener;
 	private ActivityCreatePrBinding viewBinding;
 	private CustomLabelsSelectionDialogBinding labelsBinding;
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private Dialog dialogLabels;
 	private String labelsSetter;
 	private List<Integer> labelsIds = new ArrayList<>();
@ -60,6 +61,14 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 	List<Branches> branchesList = new ArrayList<>();
 	List<Labels> labelsList = new ArrayList<>();

+	public CreatePullRequestActivity() {
+	}
+
+	@Override
+	protected int getLayoutResourceId(){
+		return R.layout.activity_create_pr;
+	}
+
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@ -67,7 +76,8 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 		super.onCreate(savedInstanceState);

 		viewBinding = ActivityCreatePrBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);

 		loginUid = tinyDB.getString("loginUid");
 		String repoFullName = tinyDB.getString("repoFullName");
@ -79,7 +89,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 		// require gitea 1.12 or higher
 		if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {

-			resultLimit = Constants.resultLimitNewGiteaInstances;
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
 		}

 		viewBinding.prBody.setOnTouchListener((touchView, motionEvent) -> {
@ -164,14 +174,14 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis

 		CreatePullRequest createPullRequest = new CreatePullRequest(prTitle, prDescription, loginUid, mergeInto, pullFrom, milestoneId, dueDate, assignees, labelsIds);

-		Call<Void> transferCall = RetrofitClient
+		Call<ResponseBody> transferCall = RetrofitClient
 			.getApiInterface(appCtx)
 			.createPullRequest(instanceToken, repoOwner, repoName, createPullRequest);

-		transferCall.enqueue(new Callback<Void>() {
+		transferCall.enqueue(new Callback<ResponseBody>() {

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

 				disableProcessButton();

@ -198,7 +208,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
 			}

 			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {

 				enableProcessButton();
 				Toasty.error(ctx, getString(R.string.genericServerResponseError));
--- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
@ -14,15 +14,14 @@ 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 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 java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@ -50,15 +49,17 @@ public class CreateReleaseActivity extends BaseActivity {

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

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_release;
+    }
+
    @SuppressLint("ClickableViewAccessibility")
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityCreateReleaseBinding activityCreateReleaseBinding = ActivityCreateReleaseBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateReleaseBinding.getRoot());
-
        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
@ -68,12 +69,12 @@ public class CreateReleaseActivity extends BaseActivity {
        repoOwner = parts[0];
        repoName = parts[1];

-        closeActivity = activityCreateReleaseBinding.close;
-        releaseTagName = activityCreateReleaseBinding.releaseTagName;
-        releaseTitle = activityCreateReleaseBinding.releaseTitle;
-        releaseContent = activityCreateReleaseBinding.releaseContent;
-        releaseType = activityCreateReleaseBinding.releaseType;
-        releaseDraft = activityCreateReleaseBinding.releaseDraft;
+        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);

 	    releaseTitle.requestFocus();
        assert imm != null;
@ -93,10 +94,10 @@ public class CreateReleaseActivity extends BaseActivity {
        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

-        releaseBranch = activityCreateReleaseBinding.releaseBranch;
+        releaseBranch = findViewById(R.id.releaseBranch);
        getBranches(Authorization.get(ctx), repoOwner, repoName);

-        createNewRelease = activityCreateReleaseBinding.createNewRelease;
+        createNewRelease = findViewById(R.id.createNewRelease);
        disableProcessButton();

        if(!connToInternet) {
--- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
@ -14,16 +14,15 @@ 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 org.mian.gitnex.models.OrgOwner;
+import org.mian.gitnex.models.OrganizationRepository;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@ -56,14 +55,16 @@ public class CreateRepoActivity extends BaseActivity {
    final List<String> reservedRepoNames = Arrays.asList(".", "..");
    final Pattern reservedRepoPatterns = Pattern.compile("\\.(git|wiki)$");

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_repo;
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityCreateRepoBinding activityCreateRepoBinding = ActivityCreateRepoBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateRepoBinding.getRoot());
-
        boolean connToInternet = AppUtil.hasNetworkConnection(ctx);

        loginUid = tinyDB.getString("loginUid");
@ -71,10 +72,10 @@ public class CreateRepoActivity extends BaseActivity {

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

-        closeActivity = activityCreateRepoBinding.close;
-        repoName = activityCreateRepoBinding.newRepoName;
-        repoDesc = activityCreateRepoBinding.newRepoDescription;
-        repoAccess = activityCreateRepoBinding.newRepoPrivate;
+        closeActivity = findViewById(R.id.close);
+        repoName = findViewById(R.id.newRepoName);
+        repoDesc = findViewById(R.id.newRepoDescription);
+        repoAccess = findViewById(R.id.newRepoPrivate);

        repoName.requestFocus();
        assert imm != null;
@ -83,10 +84,10 @@ public class CreateRepoActivity extends BaseActivity {
        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

-        spinner = activityCreateRepoBinding.ownerSpinner;
+        spinner = findViewById(R.id.ownerSpinner);
        getOrganizations(Authorization.get(ctx), userLogin);

-        createRepo = activityCreateRepoBinding.createNewRepoButton;
+        createRepo = findViewById(R.id.createNewRepoButton);
        disableProcessButton();

        if(!connToInternet) {
@ -104,6 +105,7 @@ public class CreateRepoActivity extends BaseActivity {
    private void processNewRepo() {

        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
+        AppUtil appUtil = new AppUtil();

        String newRepoName = repoName.getText().toString();
        String newRepoDesc = repoDesc.getText().toString();
@ -117,7 +119,7 @@ public class CreateRepoActivity extends BaseActivity {

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

-            if (newRepoDesc.length() > 255) {
+            if (appUtil.charactersLength(newRepoDesc) > 255) {

                Toasty.warning(ctx, getString(R.string.repoDescError));
                return;
@ -128,7 +130,7 @@ public class CreateRepoActivity extends BaseActivity {

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

            Toasty.warning(ctx, getString(R.string.repoNameErrorInvalid));
        }
@ -215,7 +217,7 @@ public class CreateRepoActivity extends BaseActivity {

        Call<List<OrgOwner>> call = RetrofitClient
                .getApiInterface(ctx)
-                .getOrgOwners(instanceToken, 1, 50);
+                .getOrgOwners(instanceToken);

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

--- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
@ -11,16 +11,14 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.res.ResourcesCompat;
-import org.gitnex.tea4j.models.Teams;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityCreateTeamByOrgBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Teams;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@ -44,6 +42,11 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
    private final String[] permissionList = {"Read", "Write", "Admin"};
    public int permissionSelectedChoice = -1;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_team_by_org;
+    }
+
    private final String[] accessControlsList = new String[] {
            "Code",
            "Issues",
@ -71,21 +74,18 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic

        super.onCreate(savedInstanceState);

-	    ActivityCreateTeamByOrgBinding activityCreateTeamByOrgBinding = ActivityCreateTeamByOrgBinding.inflate(getLayoutInflater());
-	    setContentView(activityCreateTeamByOrgBinding.getRoot());
-
        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

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

-        ImageView closeActivity = activityCreateTeamByOrgBinding.close;
-        teamName = activityCreateTeamByOrgBinding.teamName;
-        teamDesc = activityCreateTeamByOrgBinding.teamDesc;
-        teamPermission = activityCreateTeamByOrgBinding.teamPermission;
-        teamPermissionDetail = activityCreateTeamByOrgBinding.teamPermissionDetail;
-        teamAccessControls = activityCreateTeamByOrgBinding.teamAccessControls;
-        teamAccessControlsArray = activityCreateTeamByOrgBinding.teamAccessControlsArray;
-        createTeamButton = activityCreateTeamByOrgBinding.createTeamButton;
+        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);

        teamName.requestFocus();
        assert imm != null;
@ -210,9 +210,9 @@ 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 {
@ -224,6 +224,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic

    private void processCreateTeam() {

+        AppUtil appUtil = new AppUtil();
        final TinyDB tinyDb = TinyDB.getInstance(appCtx);
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -247,7 +248,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
            return;
        }

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

            Toasty.warning(ctx, getString(R.string.teamNameError));
            return;
@ -255,7 +256,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic

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

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

                Toasty.warning(ctx, getString(R.string.teamDescError));
                return;
--- a/app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/DeepLinksActivity.java
@ -9,31 +9,22 @@ 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 org.mian.gitnex.models.PullRequests;
+import org.mian.gitnex.models.UserRepositories;
 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
@ -49,8 +40,12 @@ public class DeepLinksActivity extends BaseActivity {
 	private Intent mainIntent;
 	private Intent issueIntent;
 	private Intent repoIntent;
-	private Intent orgIntent;
-	private Intent userIntent;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_deeplinks;
+	}

 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@ -58,13 +53,12 @@ public class DeepLinksActivity extends BaseActivity {
 		super.onCreate(savedInstanceState);

 		viewBinding = ActivityDeeplinksBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);

 		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();
@ -72,14 +66,13 @@ public class DeepLinksActivity extends BaseActivity {

 		// check for login
 		if(!tinyDB.getBoolean("loggedInMode")) {
-			Intent loginIntent = new Intent(ctx, LoginActivity.class);
-			loginIntent.putExtra("instanceUrl", data.getHost());
-			ctx.startActivity(loginIntent);
+
 			finish();
+			ctx.startActivity(new Intent(ctx, LoginActivity.class));
 		}

 		// check for the links(URI) to be in the db
-		UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+		UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
 		List<UserAccount> userAccounts = userAccountsApi.usersAccounts();

 		for(UserAccount userAccount : userAccounts) {
@ -92,95 +85,34 @@ public class DeepLinksActivity extends BaseActivity {
 			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
+			// 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() > 0) {
+
+				viewBinding.progressBar.setVisibility(View.GONE);
+				String[] restOfUrl = Objects.requireNonNull(data.getPath()).split("/");
+
+				if(data.getPathSegments().contains("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));
+						tinyDB.putString("repoFullName", restOfUrl[restOfUrl.length - 4] + "/" + restOfUrl[restOfUrl.length - 3]);

-						final String repoOwner = data.getPathSegments().get(0);
-						final String repoName = data.getPathSegments().get(1);
+						final String repoOwner = restOfUrl[restOfUrl.length - 4];
+						final String repoName = restOfUrl[restOfUrl.length - 3];

 						int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
-						RepositoriesApi repositoryData = BaseApi.getInstance(ctx, RepositoriesApi.class);
+						RepositoriesApi repositoryData = new RepositoriesApi(ctx);

 						Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);

@ -199,122 +131,125 @@ public class DeepLinksActivity extends BaseActivity {
 						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);
+
+						new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+							goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 3], restOfUrl[restOfUrl.length - 2], "issue");
+						}, 500);
 					}
 					else {
+
 						ctx.startActivity(mainIntent);
 						finish();
 					}
 				}
-				else if(data.getPathSegments().get(2).equals("pulls")) { // pr
+				else if(data.getPathSegments().contains("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()));
+							getPullRequest(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 4], restOfUrl[restOfUrl.length - 3], 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)));
+
+							goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 3], restOfUrl[restOfUrl.length - 2], "pull");
 						}, 500);
 					}
 					else {
+
 						ctx.startActivity(mainIntent);
 						finish();
 					}
 				}
+				else if(data.getPathSegments().contains("commit")) { // commits (no API yet to properly implement)

-				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);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+						goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 4], restOfUrl[restOfUrl.length - 3], "pull");
+					}, 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 if(!restOfUrl[restOfUrl.length - 2].equals("") & !restOfUrl[restOfUrl.length - 1].equals("")) { // go to repo
+
+					new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+						goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 2], restOfUrl[restOfUrl.length - 1], "repo");
+					}, 500);
 				}
 				else { // no action, show options
-					showNoActionButtons();
+
+					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();
+						});
+					}
 				}
 			}
 			else {
@ -333,7 +268,6 @@ public class DeepLinksActivity extends BaseActivity {
 			viewBinding.addNewAccount.setOnClickListener(addNewAccount -> {

 				Intent accountIntent = new Intent(ctx, AddNewAccountActivity.class);
-				accountIntent.putExtra("instanceUrl", data.getHost());
 				startActivity(accountIntent);
 				finish();
 			});
@ -384,7 +318,6 @@ public class DeepLinksActivity extends BaseActivity {

 					issueIntent.putExtra("issueNumber", index);
 					issueIntent.putExtra("prMergeable", prInfo.isMergeable());
-					issueIntent.putExtra("openedFromLink", "true");

 					if(prInfo.getHead() != null) {

@ -400,7 +333,7 @@ public class DeepLinksActivity extends BaseActivity {

 							// pull was done from a deleted fork
 							tinyDB.putString("prIsFork", "true");
-							tinyDB.putString("prForkFullName", ctx.getString(R.string.prDeletedFork));
+							tinyDB.putString("prForkFullName", ctx.getString(R.string.prDeletedFrok));
 						}
 					}

@ -411,7 +344,7 @@ public class DeepLinksActivity extends BaseActivity {
 					tinyDB.putString("repoFullName", repoOwner + "/" + repoName);

 					int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
-					RepositoriesApi repositoryData = BaseApi.getInstance(ctx, RepositoriesApi.class);
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);

 					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);

@ -482,7 +415,7 @@ public class DeepLinksActivity extends BaseActivity {
 					tinyDB.putString("repoBranch", repoInfo.getDefault_branch());

 					int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
-					RepositoriesApi repositoryData = BaseApi.getInstance(ctx, RepositoriesApi.class);
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);

 					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);

@ -519,181 +452,4 @@ public class DeepLinksActivity extends BaseActivity {
 			}
 		});
 	}
-
-	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
@ -18,18 +18,17 @@ import android.widget.ImageView;
 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 org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityEditIssueBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.CreateIssue;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.models.Milestones;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@ -45,7 +44,7 @@ import retrofit2.Callback;
 public class EditIssueActivity extends BaseActivity implements View.OnClickListener {

    private View.OnClickListener onClickListener;
-    private int resultLimit = Constants.resultLimitOldGiteaInstances;
+    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;

    private EditText editIssueTitle;
    private EditText editIssueDescription;
@ -64,15 +63,17 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 	private String repoName;
 	private int issueIndex;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_edit_issue;
+    }
+
    @SuppressLint("ClickableViewAccessibility")
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityEditIssueBinding activityEditIssueBinding = ActivityEditIssueBinding.inflate(getLayoutInflater());
-	    setContentView(activityEditIssueBinding.getRoot());
-
        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);

        loginUid = tinyDB.getString("loginUid");
@ -83,17 +84,17 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
        repoName = parts[1];
        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;
+            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
        }

        editIssueTitle.requestFocus();
--- a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
@ -1,28 +1,28 @@
 package org.mian.gitnex.activities;

 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
-import org.gitnex.tea4j.models.FileDiffView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.FilesDiffAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityFileDiffBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.ParseDiff;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.FileDiffView;
 import java.io.IOException;
 import java.util.List;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
-import retrofit2.Response;
+import retrofit2.Callback;

 /**
 * Author M M Arif
@ -35,15 +35,18 @@ public class FileDiffActivity extends BaseActivity {
 	private ListView mListView;
 	private ProgressBar mProgressBar;

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

 		super.onCreate(savedInstanceState);

-		ActivityFileDiffBinding activityFileDiffBinding = ActivityFileDiffBinding.inflate(getLayoutInflater());
-		setContentView(activityFileDiffBinding.getRoot());
-
-		Toolbar toolbar = activityFileDiffBinding.toolbar;
+		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);

 		final TinyDB tinyDb = TinyDB.getInstance(appCtx);
@ -51,11 +54,13 @@ public class FileDiffActivity extends BaseActivity {
 		String[] parts = repoFullName.split("/");
 		final String repoOwner = parts[0];
 		final String repoName = parts[1];
+		final String loginUid = tinyDb.getString("loginUid");
+		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-		ImageView closeActivity = activityFileDiffBinding.close;
-		toolbarTitle = activityFileDiffBinding.toolbarTitle;
-		mListView = activityFileDiffBinding.listView;
-		mProgressBar = activityFileDiffBinding.progressBar;
+		ImageView closeActivity = findViewById(R.id.close);
+		toolbarTitle = findViewById(R.id.toolbar_title);
+		mListView = findViewById(R.id.listView);
+		mProgressBar = findViewById(R.id.progress_bar);

 		mListView.setDivider(null);

@ -68,69 +73,80 @@ public class FileDiffActivity extends BaseActivity {
 		String pullIndex = tinyDb.getString("issueNumber");

 		boolean apiCall = !new Version(tinyDb.getString("giteaVersion")).less("1.13.0");
-		getPullDiffContent(repoOwner, repoName, pullIndex, apiCall);
+		getPullDiffContent(repoOwner, repoName, pullIndex, instanceToken, apiCall);

 	}

-	private void getPullDiffContent(String owner, String repo, String pullIndex, boolean apiCall) {
+	private void getPullDiffContent(String owner, String repo, String pullIndex, String token, boolean apiCall) {

-		Thread thread = new Thread(() -> {
+		Call<ResponseBody> call;
+		if(apiCall) {

-			Call<ResponseBody> call = apiCall ?
-				RetrofitClient.getApiInterface(ctx).getPullDiffContent(Authorization.get(ctx), owner, repo, pullIndex) :
-				RetrofitClient.getWebInterface(ctx).getPullDiffContent(Authorization.getWeb(ctx), owner, repo, pullIndex);
+			call = RetrofitClient.getApiInterface(ctx).getPullDiffContent(token, owner, repo, pullIndex);
+		}
+		else {

-			try {
+			call = RetrofitClient.getWebInterface(ctx).getPullDiffContent(owner, repo, pullIndex);
+		}

-				Response<ResponseBody> response = call.execute();
-				assert response.body() != null;
+		call.enqueue(new Callback<ResponseBody>() {

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

-					case 200:
-						List<FileDiffView> fileDiffViews = ParseDiff.getFileDiffViewArray(response.body().string());
+				if(response.code() == 200) {

-						int filesCount = fileDiffViews.size();
+					try {

-						String toolbarTitleText = (filesCount > 1) ?
-							getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)) :
-							getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount));
+						assert response.body() != null;

-						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, getSupportFragmentManager(), fileDiffViews);
+						List<FileDiffView> fileContentsArray = ParseDiff.getFileDiffViewArray(response.body().string());

-						runOnUiThread(() -> {
-							toolbarTitle.setText(toolbarTitleText);
-							mListView.setAdapter(adapter);
-							mProgressBar.setVisibility(View.GONE);
-						});
-						break;
+						int filesCount = fileContentsArray.size();
+						if(filesCount > 1) {

-					case 401:
-						runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx,
-							getString(R.string.alertDialogTokenRevokedTitle),
-							getString(R.string.alertDialogTokenRevokedMessage),
-							getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-							getString(R.string.alertDialogTokenRevokedCopyPositiveButton)));
-						break;
+							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)));
+						}
+						else {

-					case 403:
-						runOnUiThread(() -> Toasty.error(ctx, ctx.getString(R.string.authorizeError)));
-						break;
+							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount)));
+						}

-					case 404:
-						runOnUiThread(() -> Toasty.warning(ctx, ctx.getString(R.string.apiNotFound)));
-						break;
+						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, getSupportFragmentManager(), fileContentsArray);
+						mListView.setAdapter(adapter);

-					default:
-						runOnUiThread(() -> Toasty.error(ctx, getString(R.string.labelGeneralError)));
+						mProgressBar.setVisibility(View.GONE);
+					}
+					catch(IOException e) {

+						e.printStackTrace();
+					}
 				}
-			} catch(IOException ignored) {}
+				else if(response.code() == 401) {

+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+				}
+				else if(response.code() == 403) {
+
+					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+				}
+				else if(response.code() == 404) {
+
+					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+				}
+				else {
+
+					Toasty.error(ctx, getString(R.string.labelGeneralError));
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+			}
 		});

-		thread.start();
-
 	}

 	private void initCloseListener() {
@ -139,7 +155,6 @@ public class FileDiffActivity extends BaseActivity {

 			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,41 +1,53 @@
 package org.mian.gitnex.activities;

 import android.app.Activity;
-import android.app.NotificationManager;
-import android.content.Context;
 import android.content.Intent;
+import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.method.ScrollingMovementMethod;
+import android.util.Base64;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.core.app.NotificationCompat;
-import com.vdurmont.emoji.EmojiParser;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import com.github.barteksc.pdfviewer.PDFView;
+import com.github.barteksc.pdfviewer.util.FitPolicy;
+import com.github.chrisbanes.photoview.PhotoView;
 import org.apache.commons.io.FileUtils;
-import org.gitnex.tea4j.models.Files;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityFileViewBinding;
 import org.mian.gitnex.fragments.BottomSheetFileViewerFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.Images;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.notifications.Notifications;
+import org.mian.gitnex.helpers.highlightjs.HighlightJsView;
+import org.mian.gitnex.helpers.highlightjs.models.Theme;
+import org.mian.gitnex.models.Files;
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Arrays;
-import okhttp3.ResponseBody;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Objects;
 import retrofit2.Call;
-import retrofit2.Response;
+import retrofit2.Callback;

 /**
 * Author M M Arif
@ -43,36 +55,79 @@ import retrofit2.Response;

 public class FileViewActivity extends BaseActivity implements BottomSheetFileViewerFragment.BottomSheetListener {

-	private ActivityFileViewBinding binding;
-	private Files file;
+	private View.OnClickListener onClickListener;
+	private TextView singleFileContents;
+	private LinearLayout singleFileContentsFrame;
+	private HighlightJsView singleCodeContents;
+	private PhotoView imageView;
+	private ProgressBar mProgressBar;
+	private byte[] imageData;
+	private PDFView pdfView;
+	private LinearLayout pdfViewFrame;
+	private byte[] decodedPdf;
+	private Boolean pdfNightMode;
+	private String singleFileName;
+	private String fileSha;
+	private AppUtil appUtil;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_file_view;
+	}

 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);
+		appUtil = new AppUtil();

-		binding = ActivityFileViewBinding.inflate(getLayoutInflater());
-
-		setContentView(binding.getRoot());
-		setSupportActionBar(binding.toolbar);
-
-		tinyDB.putBoolean("enableMarkdownInFileView", false);
-
-		file = (Files) getIntent().getSerializableExtra("file");
-
-		binding.close.setOnClickListener(view -> finish());
-
-		binding.toolbarTitle.setMovementMethod(new ScrollingMovementMethod());
-		binding.toolbarTitle.setText(file.getPath());
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);

 		String repoFullName = tinyDB.getString("repoFullName");
 		String repoBranch = tinyDB.getString("repoBranch");
 		String[] parts = repoFullName.split("/");
-		String repoOwner = parts[0];
-		String repoName = parts[1];
+		final String repoOwner = parts[0];
+		final String repoName = parts[1];
+		final String loginUid = tinyDB.getString("loginUid");
+		final String instanceToken = "token " + tinyDB.getString(loginUid + "-token");

-		getSingleFileContents(repoOwner, repoName, file.getPath(), repoBranch);
+		tinyDB.putBoolean("enableMarkdownInFileView", false);

+		ImageView closeActivity = findViewById(R.id.close);
+		singleFileContents = findViewById(R.id.singleFileContents);
+		singleCodeContents = findViewById(R.id.singleCodeContents);
+		imageView = findViewById(R.id.imageView);
+		mProgressBar = findViewById(R.id.progress_bar);
+		pdfView = findViewById(R.id.pdfView);
+		pdfViewFrame = findViewById(R.id.pdfViewFrame);
+		singleFileContentsFrame = findViewById(R.id.singleFileContentsFrame);
+
+		singleFileName = getIntent().getStringExtra("singleFileName");
+
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
+		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
+
+		tinyDB.putString("downloadFileContents", "");
+
+		try {
+
+			singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
+			singleFileName = singleFileName.replaceAll("//", "/");
+			singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
+		}
+		catch(UnsupportedEncodingException e) {
+
+			Log.i("singleFileName", singleFileName);
+		}
+
+		toolbar_title.setText(singleFileName);
+
+		getSingleFileContents(instanceToken, repoOwner, repoName, singleFileName, repoBranch);
 	}

 	@Override
@ -80,143 +135,158 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie

 		super.onResume();

-		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];
+		String repoFullName = tinyDB.getString("repoFullName");
+		String repoBranch = tinyDB.getString("repoBranch");
+		String[] parts = repoFullName.split("/");
+		String repoOwner = parts[0];
+		String repoName = parts[1];
+		String loginUid = tinyDB.getString("loginUid");
+		String instanceToken = "token " + tinyDB.getString(loginUid + "-token");

-			getSingleFileContents(repoOwner, repoName, file.getPath(), repoBranch);
+		if(tinyDB.getBoolean("fileModified")) {
+
+			getSingleFileContents(instanceToken, repoOwner, repoName, singleFileName, repoBranch);
 			tinyDB.putBoolean("fileModified", false);
 		}
 	}

-	private void getSingleFileContents(final String owner, String repo, final String filename, String ref) {

-		Thread thread = new Thread(() -> {
+	private void getSingleFileContents(String token, final String owner, String repo, final String filename, String ref) {

-			Call<ResponseBody> call = RetrofitClient
-				.getWebInterface(ctx)
-				.getFileContents(Authorization.getWeb(ctx), owner, repo, ref, filename);
+		Call<Files> call = RetrofitClient.getApiInterface(ctx).getSingleFileContents(token, owner, repo, filename, ref);

-			try {
+		call.enqueue(new Callback<Files>() {

-				Response<ResponseBody> response = call.execute();
+			@Override
+			public void onResponse(@NonNull Call<Files> call, @NonNull retrofit2.Response<Files> response) {

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

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

-					if(responseBody != null) {
+					if(!response.body().getContent().equals("")) {

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

-						boolean processable = false;
+						fileSha = response.body().getSha();

-						switch(AppUtil.getFileType(fileExtension)) {
+						// download file meta
+						tinyDB.putString("downloadFileName", filename);
+						tinyDB.putString("downloadFileContents", response.body().getContent());

-							case IMAGE:
+						if(appUtil.imageExtension(fileExtension)) { // file is 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())) {
+							singleFileContentsFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							imageView.setVisibility(View.VISIBLE);

-									processable = true;
+							imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+							Drawable imageDrawable = new BitmapDrawable(getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
+							imageView.setImageDrawable(imageDrawable);
+						}
+						else if(appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode

-									byte[] pictureBytes = responseBody.bytes();
+							imageView.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.VISIBLE);

-									runOnUiThread(() -> {
-										binding.contents.setVisibility(View.GONE);
-										binding.markdownFrame.setVisibility(View.GONE);
+							switch(tinyDB.getInt("fileviewerSourceCodeThemeId")) {

-										binding.photoView.setVisibility(View.VISIBLE);
-										binding.photoView.setImageBitmap(Images.scaleImage(pictureBytes, 1920));
-									});
-								}
-								break;
+								case 1:

-							case UNKNOWN:
-							case TEXT:
-
-								if(file.getSize() > Constants.maximumFileViewerSize) {
+									singleCodeContents.setTheme(Theme.ARDUINO_LIGHT);
 									break;
-								}
+								case 2:

-								processable = true;
-								String text = responseBody.string();
+									singleCodeContents.setTheme(Theme.GITHUB);
+									break;
+								case 3:

-								runOnUiThread(() -> {
-									binding.photoView.setVisibility(View.GONE);
+									singleCodeContents.setTheme(Theme.FAR);
+									break;
+								case 4:

-									binding.contents.setContent(text, fileExtension);
+									singleCodeContents.setTheme(Theme.IR_BLACK);
+									break;
+								case 5:

-									if(tinyDB.getBoolean("enableMarkdownInFileView")) {
-										Markdown.render(ctx, EmojiParser.parseToUnicode(text), binding.markdown);
+									singleCodeContents.setTheme(Theme.ANDROID_STUDIO);
+									break;
+								default:

-										binding.contents.setVisibility(View.GONE);
-										binding.markdownFrame.setVisibility(View.VISIBLE);
-									} else {
-										binding.markdownFrame.setVisibility(View.GONE);
-										binding.contents.setVisibility(View.VISIBLE);
-									}
-								});
-								break;
+									singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
+							}
+
+							singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
+						}
+						else if(appUtil.pdfExtension(fileExtension)) { // file is pdf
+
+							imageView.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.VISIBLE);
+
+							pdfNightMode = tinyDB.getBoolean("enablePdfMode");
+
+							decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+							pdfView.fromBytes(decodedPdf).enableSwipe(true).swipeHorizontal(false).enableDoubletap(true).defaultPage(0).enableAnnotationRendering(false).password(null).scrollHandle(null).enableAntialiasing(true).spacing(0).autoSpacing(true).pageFitPolicy(FitPolicy.WIDTH).fitEachPage(true).pageSnap(false).pageFling(true).nightMode(pdfNightMode).load();

 						}
+						else if(appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded

-						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();
+							imageView.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.VISIBLE);

-							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);
-							});
+							singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
+							singleFileContents.setGravity(Gravity.CENTER);
+							singleFileContents.setTypeface(null, Typeface.BOLD);
 						}
-					} else {
+						else { // file type not known - plain text view

-						runOnUiThread(() -> {
-							binding.markdown.setText("");
-							binding.progressBar.setVisibility(View.GONE);
-						});
+							imageView.setVisibility(View.GONE);
+							singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.VISIBLE);
+
+							singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
+						}
 					}
-				} 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)));
+					else {

+						singleFileContents.setText("");
+						mProgressBar.setVisibility(View.GONE);
 					}
 				}
-			} catch(IOException ignored) {}
+				else if(response.code() == 401) {

+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+				}
+				else if(response.code() == 403) {
+
+					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+				}
+				else if(response.code() == 404) {
+
+					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+				}
+				else {
+
+					Toasty.error(ctx, getString(R.string.labelGeneralError));
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<Files> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+			}
 		});

-		thread.start();
-
 	}

 	@Override
@ -226,11 +296,11 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 		inflater.inflate(R.menu.files_view_menu, menu);

-		if(!FileUtils.getExtension(file.getName())
-			.equalsIgnoreCase("md")) {
+		String fileExtension = FileUtils.getExtension(singleFileName);

-			menu.getItem(0)
-				.setVisible(false);
+		if(!fileExtension.equalsIgnoreCase("md")) {
+
+			menu.getItem(0).setVisible(false);
 		}

 		return true;
@ -245,32 +315,36 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie

 			finish();
 			return true;
-
-		} else if(id == R.id.genericMenu) {
+		}
+		else if(id == R.id.genericMenu) {

 			BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
 			bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
 			return true;
+		}
+		else if(id == R.id.markdown) {

-		} else if(id == R.id.markdown) {
+			new Markdown(ctx, appUtil.decodeBase64(tinyDB.getString("downloadFileContents")), singleFileContents);

 			if(!tinyDB.getBoolean("enableMarkdownInFileView")) {
-				Markdown.render(ctx, EmojiParser.parseToUnicode(binding.contents.getContent()), binding.markdown);
-
-				binding.contents.setVisibility(View.GONE);
-				binding.markdownFrame.setVisibility(View.VISIBLE);

+				singleCodeContents.setVisibility(View.GONE);
+				singleFileContentsFrame.setVisibility(View.VISIBLE);
+				singleFileContents.setVisibility(View.VISIBLE);
 				tinyDB.putBoolean("enableMarkdownInFileView", true);
-			} else {
-				binding.markdownFrame.setVisibility(View.GONE);
-				binding.contents.setVisibility(View.VISIBLE);
+			}
+			else {

+				singleCodeContents.setVisibility(View.VISIBLE);
+				singleFileContentsFrame.setVisibility(View.GONE);
+				singleFileContents.setVisibility(View.GONE);
+				singleCodeContents.setSource(appUtil.decodeBase64(tinyDB.getString("downloadFileContents")));
 				tinyDB.putBoolean("enableMarkdownInFileView", false);
 			}
-
 			return true;
+		}
+		else {

-		} else {
 			return super.onOptionsItemSelected(item);
 		}
 	}
@ -279,120 +353,116 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	public void onButtonClicked(String text) {

 		if("downloadFile".equals(text)) {
+
 			requestFileDownload();
 		}

 		if("deleteFile".equals(text)) {
+
+			String fileExtension = FileUtils.getExtension(singleFileName);
+			String data = appUtil.decodeBase64(tinyDB.getString("downloadFileContents"));
 			Intent intent = new Intent(ctx, CreateFileActivity.class);
-			intent.putExtra("fileAction", CreateFileActivity.FILE_ACTION_DELETE);
-			intent.putExtra("filePath", file.getPath());
-			intent.putExtra("fileSha", file.getSha());
+			intent.putExtra("fileAction", 1);
+			intent.putExtra("filePath", singleFileName);
+			intent.putExtra("fileSha", fileSha);
+
+			if(!appUtil.imageExtension(fileExtension)) {
+
+				intent.putExtra("fileContents", data);
+			}
+			else {
+
+				intent.putExtra("fileContents", "");
+			}

 			ctx.startActivity(intent);
 		}

 		if("editFile".equals(text)) {

-			if(binding.contents.getContent() != null &&
-				!binding.contents.getContent().isEmpty()) {
+			String fileExtension = FileUtils.getExtension(singleFileName);
+			String data = appUtil.decodeBase64(tinyDB.getString("downloadFileContents"));
+			Intent intent = new Intent(ctx, CreateFileActivity.class);
+			intent.putExtra("fileAction", 2);
+			intent.putExtra("filePath", singleFileName);
+			intent.putExtra("fileSha", fileSha);

-				Intent intent = new Intent(ctx, CreateFileActivity.class);
+			if(!appUtil.imageExtension(fileExtension)) {

-				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));
+				intent.putExtra("fileContents", data);
 			}
+			else {
+
+				intent.putExtra("fileContents", "");
+			}
+
+			ctx.startActivity(intent);
 		}
+
 	}

 	private void requestFileDownload() {

-		Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+		if(!tinyDB.getString("downloadFileContents").isEmpty()) {

-		intent.addCategory(Intent.CATEGORY_OPENABLE);
-		intent.putExtra(Intent.EXTRA_TITLE, file.getName());
-		intent.setType("*/*");
+			File outputFileName = new File(tinyDB.getString("downloadFileName"));

-		activityResultLauncher.launch(intent);
+			Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);

+			intent.addCategory(Intent.CATEGORY_OPENABLE);
+			intent.setType("*/*");
+			intent.putExtra(Intent.EXTRA_TITLE, outputFileName.getName());
+
+			fileDownloadActivityResultLauncher.launch(intent);
+		}
+		else {
+
+			Toasty.warning(ctx, getString(R.string.waitLoadingDownloadFile));
+		}
 	}

-	ActivityResultLauncher<Intent> activityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+	ActivityResultLauncher<Intent> fileDownloadActivityResultLauncher = registerForActivityResult(
+		new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {

-		if (result.getResultCode() == Activity.RESULT_OK) {
+		@Override
+		public void onActivityResult(ActivityResult result) {

-			assert result.getData() != null;
+			if (result.getResultCode() == Activity.RESULT_OK) {

-			try {
+				Intent data = result.getData();

-				OutputStream outputStream = getContentResolver().openOutputStream(result.getData().getData());
+				try {

-				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);
+					assert data != null;
+					Uri uri = data.getData();

-				int notificationId = Notifications.uniqueNotificationId(ctx);
+					assert uri != null;
+					OutputStream outputStream = getContentResolver().openOutputStream(uri);

-				NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);;
-				notificationManager.notify(notificationId, builder.build());
+					byte[] dataAsBytes = Base64.decode(tinyDB.getString("downloadFileContents"), 0);

-				String repoFullName = tinyDB.getString("repoFullName");
-				String repoBranch = tinyDB.getString("repoBranch");
-				String[] parts = repoFullName.split("/");
-				String repoOwner = parts[0];
-				String repoName = parts[1];
+					assert outputStream != null;
+					outputStream.write(dataAsBytes);
+					outputStream.close();

-				Thread thread = new Thread(() -> {
+					Toasty.success(ctx, getString(R.string.downloadFileSaved));

-					try {
+				}
+				catch(IOException e) {

-						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) {}
+					Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
+				}
+			}
 		}
-
 	});

+	private void initCloseListener() {
+
+		onClickListener = 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
@ -9,6 +9,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.text.Html;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@ -21,19 +22,12 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Collaborators;
-import org.gitnex.tea4j.models.Issues;
-import org.gitnex.tea4j.models.Labels;
-import org.gitnex.tea4j.models.UpdateIssueAssignees;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.AssigneesActions;
 import org.mian.gitnex.actions.LabelsActions;
@ -59,6 +53,11 @@ import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Collaborators;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.models.Labels;
+import org.mian.gitnex.models.UpdateIssueAssignees;
+import org.mian.gitnex.models.WatchInfo;
 import org.mian.gitnex.viewmodels.IssueCommentsViewModel;
 import org.mian.gitnex.views.ReactionList;
 import java.text.DateFormat;
@ -90,8 +89,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt

 	private List<Integer> currentLabelsIds = new ArrayList<>();
 	private List<Integer> labelsIds = new ArrayList<>();
-	private final List<Labels> labelsList = new ArrayList<>();
-	private final List<Collaborators> assigneesList = new ArrayList<>();
+	private List<Labels> labelsList = new ArrayList<>();
+	private List<Collaborators> assigneesList = new ArrayList<>();
 	private List<String> assigneesListData = new ArrayList<>();
 	private List<String> currentAssignees = new ArrayList<>();

@ -102,13 +101,20 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 	private CustomAssigneesSelectionDialogBinding assigneesBinding;
 	private ActivityIssueDetailBinding viewBinding;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_issue_detail;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

 		viewBinding = ActivityIssueDetailBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);

 		String repoFullName = tinyDB.getString("repoFullName");
 		String[] parts = repoFullName.split("/");
@ -196,10 +202,6 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		getSingleIssue(repoOwner, repoName, issueIndex);
 		fetchDataAsync(repoOwner, repoName, issueIndex);

-		if(getIntent().getStringExtra("openPrDiff") != null && getIntent().getStringExtra("openPrDiff").equals("true")) {
-			startActivity(new Intent(ctx, FileDiffActivity.class));
-		}
-
 	}

 	@Override
@ -438,11 +440,6 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt

 		if(id == android.R.id.home) {

-			if(getIntent().getStringExtra("openedFromLink") != null && getIntent().getStringExtra("openedFromLink").equals("true")) {
-				Intent intent = new Intent(ctx, RepoDetailActivity.class);
-				intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-				startActivity(intent);
-			}
 			finish();
 			return true;
 		}
@ -578,7 +575,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 					}

 					TinyDB tinyDb = TinyDB.getInstance(appCtx);
-					final Locale locale = getResources().getConfiguration().locale;
+					final String locale = tinyDb.getString("locale");
 					final String timeFormat = tinyDb.getString("dateFormat");
 					tinyDb.putString("issueState", singleIssue.getState());
 					tinyDb.putString("issueTitle", singleIssue.getTitle());
@ -586,23 +583,12 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt

 					PicassoService.getInstance(ctx).get().load(singleIssue.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated)
 						.transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewBinding.assigneeAvatar);
-					String issueNumber_ = "<font color='" + ResourcesCompat.getColor(getResources(), R.color.lightGray, null) + "'>" + appCtx.getResources()
+					String issueNumber_ = "<font color='" + appCtx.getResources().getColor(R.color.lightGray) + "'>" + appCtx.getResources()
 						.getString(R.string.hash) + singleIssue.getNumber() + "</font>";
-					viewBinding.issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(singleIssue.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
-					String cleanIssueDescription = singleIssue.getBody().trim().replace("\n", "<br/>");
+					viewBinding.issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle()));
+					String cleanIssueDescription = singleIssue.getBody().trim();

-					viewBinding.assigneeAvatar.setOnClickListener(loginId -> {
-						Intent intent = new Intent(ctx, ProfileActivity.class);
-						intent.putExtra("username", singleIssue.getUser().getLogin());
-						ctx.startActivity(intent);
-					});
-
-					viewBinding.assigneeAvatar.setOnLongClickListener(loginId -> {
-						AppUtil.copyToClipboard(ctx, singleIssue.getUser().getLogin(), ctx.getString(R.string.copyLoginIdToClipBoard, singleIssue.getUser().getLogin()));
-						return true;
-					});
-
-					Markdown.render(ctx, EmojiParser.parseToUnicode(cleanIssueDescription), viewBinding.issueDescription);
+					new Markdown(ctx, EmojiParser.parseToUnicode(cleanIssueDescription), viewBinding.issueDescription);

 					RelativeLayout.LayoutParams paramsDesc = (RelativeLayout.LayoutParams) viewBinding.issueDescription.getLayoutParams();

@ -623,20 +609,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt

 							viewBinding.frameAssignees.addView(assigneesView);
 							assigneesView.setLayoutParams(params1);
-
-							int finalI = i;
-							assigneesView.setOnClickListener(loginId -> {
-								Intent intent = new Intent(ctx, ProfileActivity.class);
-								intent.putExtra("username", singleIssue.getAssignees().get(finalI).getLogin());
-								ctx.startActivity(intent);
-							});
-
-							assigneesView.setOnLongClickListener(loginId -> {
-								AppUtil.copyToClipboard(ctx, singleIssue.getAssignees().get(finalI).getLogin(), ctx.getString(R.string.copyLoginIdToClipBoard, singleIssue.getAssignees().get(finalI).getLogin()));
-								return true;
-							});
-
-							/*if(!singleIssue.getAssignees().get(i).getFull_name().equals("")) {
+							if(!singleIssue.getAssignees().get(i).getFull_name().equals("")) {

 								assigneesView.setOnClickListener(
 									new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getFull_name()), ctx));
@ -645,7 +618,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt

 								assigneesView.setOnClickListener(
 									new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getLogin()), ctx));
-							}*/
+							}
 						}
 					}
 					else {
@ -693,7 +666,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt

 						if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {

-							DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", locale);
+							DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
 							String dueDate = formatter.format(singleIssue.getDue_date());
 							viewBinding.issueDueDate.setText(dueDate);
 							viewBinding.issueDueDate
@ -701,7 +674,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 						}
 						else if(timeFormat.equals("normal1")) {

-							DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", locale);
+							DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
 							String dueDate = formatter.format(singleIssue.getDue_date());
 							viewBinding.issueDueDate.setText(dueDate);
 						}
@ -747,7 +720,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}

-					viewBinding.issueCreatedTime.setText(TimeHelper.formatTime(singleIssue.getCreated_at(), locale, timeFormat, ctx));
+					viewBinding.issueCreatedTime.setText(TimeHelper.formatTime(singleIssue.getCreated_at(), new Locale(locale), timeFormat, ctx));
 					viewBinding.issueCreatedTime.setVisibility(View.VISIBLE);

 					if(timeFormat.equals("pretty")) {
@ -762,17 +735,9 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 					bundle.putInt("issueId", singleIssue.getNumber());

 					ReactionList reactionList = new ReactionList(ctx, bundle);
-
 					viewBinding.commentReactionBadges.removeAllViews();
 					viewBinding.commentReactionBadges.addView(reactionList);

-					reactionList.setOnReactionAddedListener(() -> {
-
-						if(viewBinding.commentReactionBadges.getVisibility() != View.VISIBLE) {
-							viewBinding.commentReactionBadges.post(() -> viewBinding.commentReactionBadges.setVisibility(View.VISIBLE));
-						}
-					});
-
 					if(singleIssue.getMilestone() != null) {

 						viewBinding.issueMilestone.setVisibility(View.VISIBLE);
@ -783,7 +748,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 						viewBinding.issueMilestone.setVisibility(View.GONE);
 					}

-					/*if(!singleIssue.getUser().getFull_name().equals("")) {
+					if(!singleIssue.getUser().getFull_name().equals("")) {

 						viewBinding.assigneeAvatar.setOnClickListener(
 							new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getFull_name(), ctx));
@ -792,7 +757,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt

 						viewBinding.assigneeAvatar.setOnClickListener(
 							new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getLogin(), ctx));
-					}*/
+					}

 					viewBinding.progressBar.setVisibility(View.GONE);
 				}
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
@ -2,7 +2,6 @@ package org.mian.gitnex.activities;

 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
@ -10,24 +9,23 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RadioGroup;
+import android.widget.TextView;
 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 org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.databinding.ActivityLoginBinding;
 import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.NetworkStatusObserver;
+import org.mian.gitnex.helpers.NetworkObserver;
 import org.mian.gitnex.helpers.PathsHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.UrlHelper;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.UserInfo;
+import org.mian.gitnex.models.UserTokens;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@ -54,33 +52,34 @@ public class LoginActivity extends BaseActivity {
 	private String device_id = "token";
 	private String selectedProtocol;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_login;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		ActivityLoginBinding activityLoginBinding = ActivityLoginBinding.inflate(getLayoutInflater());
-		setContentView(activityLoginBinding.getRoot());
+		NetworkObserver networkMonitor = new NetworkObserver(ctx);

-		NetworkStatusObserver networkStatusObserver = NetworkStatusObserver.getInstance(ctx);
+		loginButton = findViewById(R.id.login_button);
+		instanceUrlET = findViewById(R.id.instance_url);
+		loginUidET = findViewById(R.id.login_uid);
+		loginPassword = findViewById(R.id.login_passwd);
+		otpCode = findViewById(R.id.otpCode);
+		protocolSpinner = findViewById(R.id.httpsSpinner);
+		loginMethod = findViewById(R.id.loginMethod);
+		loginTokenCode = findViewById(R.id.loginTokenCode);

-		loginButton = activityLoginBinding.loginButton;
-		instanceUrlET = activityLoginBinding.instanceUrl;
-		loginUidET = activityLoginBinding.loginUid;
-		loginPassword = activityLoginBinding.loginPasswd;
-		otpCode = activityLoginBinding.otpCode;
-		protocolSpinner = activityLoginBinding.httpsSpinner;
-		loginMethod = activityLoginBinding.loginMethod;
-		loginTokenCode = activityLoginBinding.loginTokenCode;
-
-		activityLoginBinding.appVersion.setText(AppUtil.getAppVersion(appCtx));
+		((TextView) findViewById(R.id.appVersion)).setText(AppUtil.getAppVersion(appCtx));

 		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.list_spinner_items, Protocol.values());

-		instanceUrlET.setText(getIntent().getStringExtra("instanceUrl"));
-
 		protocolSpinner.setAdapter(adapterProtocols);
-		protocolSpinner.setSelection(0);
+
 		protocolSpinner.setOnItemClickListener((parent, view, position, id) -> {

 			selectedProtocol = String.valueOf(parent.getItemAtPosition(position));
@ -116,24 +115,18 @@ public class LoginActivity extends BaseActivity {
 			}
 		});

-		Handler handler = new Handler(getMainLooper());
+		networkMonitor.onInternetStateListener(isAvailable -> {

-		networkStatusObserver.registerNetworkStatusListener(hasNetworkConnection -> {
+			if(isAvailable) {

-			handler.post(() -> {
+				enableProcessButton();
+			}
+			else {

-				if(hasNetworkConnection) {
-
-					enableProcessButton();
-				}
-				else {
-
-					disableProcessButton();
-					loginButton.setText(getResources().getString(R.string.btnLogin));
-					Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-				}
-
-			});
+				disableProcessButton();
+				loginButton.setText(getResources().getString(R.string.btnLogin));
+				Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
+			}
 		});

 		loadDefaults();
@ -274,13 +267,11 @@ public class LoginActivity extends BaseActivity {

 					if(gitea_version.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)
+						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) -> {
+						alertDialogBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {

 							dialog.dismiss();
 							enableProcessButton();
@ -361,19 +352,19 @@ public class LoginActivity extends BaseActivity {

 						// 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);
+						UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
+						int checkAccount = userAccountsApi.getCount(accountName);
 						long accountId;

-						if(!userAccountExists) {
+						if(checkAccount == 0) {

-							accountId = userAccountsApi.createNewAccount(accountName, TinyDB.getInstance(ctx).getString("instanceUrl"), userDetails.getUsername(), loginToken, "");
+							accountId = userAccountsApi.insertNewAccount(accountName, TinyDB.getInstance(ctx).getString("instanceUrl"), userDetails.getUsername(), loginToken, "");
 							tinyDB.putInt("currentActiveAccountId", (int) accountId);
 						}
 						else {

 							userAccountsApi.updateTokenByAccountName(accountName, loginToken);
-							UserAccount data = userAccountsApi.getAccountByName(accountName);
+							UserAccount data = userAccountsApi.getAccountData(accountName);
 							tinyDB.putInt("currentActiveAccountId", data.getAccountId());
 						}

@ -549,20 +540,20 @@ public class LoginActivity extends BaseActivity {

 										// 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);
+										UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
+										int checkAccount = userAccountsApi.getCount(accountName);
 										long accountId;

-										if(!userAccountExists) {
+										if(checkAccount == 0) {

 											accountId = userAccountsApi
-												.createNewAccount(accountName, TinyDB.getInstance(ctx).getString("instanceUrl"), userDetails.getUsername(), newToken.getSha1(), "");
+												.insertNewAccount(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);
+											UserAccount data = userAccountsApi.getAccountData(accountName);
 											tinyDB.putInt("currentActiveAccountId", data.getAccountId());
 										}

--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@ -3,13 +3,15 @@ package org.mian.gitnex.activities;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.text.Html;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
@ -17,24 +19,18 @@ import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.cardview.widget.CardView;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.navigation.NavigationView;
-import org.gitnex.tea4j.models.GiteaVersion;
-import org.gitnex.tea4j.models.NotificationCount;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.UserAccountsNavAdapter;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.databinding.ActivityMainBinding;
 import org.mian.gitnex.fragments.AdministrationFragment;
 import org.mian.gitnex.fragments.BottomSheetDraftsFragment;
 import org.mian.gitnex.fragments.DraftsFragment;
@ -42,7 +38,7 @@ import org.mian.gitnex.fragments.ExploreFragment;
 import org.mian.gitnex.fragments.MyRepositoriesFragment;
 import org.mian.gitnex.fragments.NotificationsFragment;
 import org.mian.gitnex.fragments.OrganizationsFragment;
-import org.mian.gitnex.fragments.MyProfileFragment;
+import org.mian.gitnex.fragments.ProfileFragment;
 import org.mian.gitnex.fragments.RepositoriesFragment;
 import org.mian.gitnex.fragments.SettingsFragment;
 import org.mian.gitnex.fragments.StarredRepositoriesFragment;
@ -56,9 +52,14 @@ import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.NotificationCount;
+import org.mian.gitnex.models.UserInfo;
 import java.util.ArrayList;
 import java.util.List;
-import jp.wasabeef.picasso.transformations.BlurTransformation;
+import java.util.Objects;
+import eightbitlab.com.blurview.BlurView;
+import eightbitlab.com.blurview.RenderScriptBlur;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -69,6 +70,12 @@ import retrofit2.Callback;
 public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, BottomSheetDraftsFragment.BottomSheetListener {

 	private DrawerLayout drawer;
+	private BlurView blurView;
+	private TextView userFullName;
+	private TextView userEmail;
+	private ImageView userAvatar;
+	private ImageView userAvatarBackground;
+	private ViewGroup navHeaderFrame;
 	private TextView toolbarTitle;
 	private Typeface myTypeface;

@ -79,33 +86,49 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 	private MenuItem navNotifications;
 	private TextView notificationCounter;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_main;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		ActivityMainBinding activityMainBinding = ActivityMainBinding.inflate(getLayoutInflater());
-		setContentView(activityMainBinding.getRoot());
+		tinyDB.putBoolean("noConnection", false);
+
+		String currentVersion = tinyDB.getString("giteaVersion");

 		Intent mainIntent = getIntent();
-
-		// DO NOT MOVE
-		if(mainIntent.hasExtra("switchAccountId") &&
-			AppUtil.switchToAccount(ctx, BaseApi.getInstance(ctx, UserAccountsApi.class)
-				.getAccountById(mainIntent.getIntExtra("switchAccountId", 0)))) {
-
-			mainIntent.removeExtra("switchAccountId");
-			recreate();
-			return;
-
-		}
-		// DO NOT MOVE
-
-		tinyDB.putBoolean("noConnection", false);
+		String launchFragment = mainIntent.getStringExtra("launchFragment");

 		loginUid = tinyDB.getString("loginUid");
 		instanceToken = "token " + tinyDB.getString(loginUid + "-token");

+		if(tinyDB.getString("dateFormat").isEmpty()) {
+
+			tinyDB.putString("dateFormat", "pretty");
+		}
+
+		if(tinyDB.getString("codeBlockStr").isEmpty()) {
+
+			tinyDB.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
+			tinyDB.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+		}
+
+		if(tinyDB.getString("enableCounterIssueBadgeInit").isEmpty()) {
+
+			tinyDB.putBoolean("enableCounterIssueBadge", true);
+		}
+
+		if(tinyDB.getString("homeScreenStr").isEmpty()) {
+
+			tinyDB.putString("homeScreenStr", "yes");
+			tinyDB.putInt("homeScreenId", 0);
+		}
+
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

 		if(!tinyDB.getBoolean("loggedInMode")) {
@ -114,29 +137,28 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			return;
 		}

-		if(tinyDB.getInt("currentActiveAccountId", -1) <= 0) {
-			AlertDialogs.forceLogoutDialog(ctx,
-				getResources().getString(R.string.forceLogoutDialogHeader),
-				getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+		if(tinyDB.getInt("currentActiveAccountId") <= 0) {
+
+			AlertDialogs.forceLogoutDialog(ctx, getResources().getString(R.string.forceLogoutDialogHeader), getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 		}

-		Toolbar toolbar = activityMainBinding.toolbar;
-		toolbarTitle = activityMainBinding.toolbarTitle;
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		toolbarTitle = toolbar.findViewById(R.id.toolbar_title);

 		switch(tinyDB.getInt("customFontId", -1)) {

 			case 0:
+
 				myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
 				break;
-
 			case 2:
+
 				myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf");
 				break;
-
 			default:
+
 				myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf");
 				break;
-
 		}

 		toolbarTitle.setTypeface(myTypeface);
@ -146,47 +168,57 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		Fragment fragmentById = fm.findFragmentById(R.id.fragment_container);

 		if(fragmentById instanceof SettingsFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
 		}
 		else if(fragmentById instanceof MyRepositoriesFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
 		}
 		else if(fragmentById instanceof StarredRepositoriesFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
 		}
 		else if(fragmentById instanceof OrganizationsFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
 		}
 		else if(fragmentById instanceof ExploreFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
 		}
 		else if(fragmentById instanceof NotificationsFragment) {
+
 			toolbarTitle.setText(R.string.pageTitleNotifications);
 		}
-		else if(fragmentById instanceof MyProfileFragment) {
+		else if(fragmentById instanceof ProfileFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
 		}
 		else if(fragmentById instanceof DraftsFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
 		}
 		else if(fragmentById instanceof AdministrationFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
 		}
 		else if(fragmentById instanceof UserAccountsFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleUserAccounts));
 		}

 		getNotificationsCount(instanceToken);

-		drawer = activityMainBinding.drawerLayout;
-		NavigationView navigationView = activityMainBinding.navView;
+		drawer = findViewById(R.id.drawer_layout);
+		NavigationView navigationView = findViewById(R.id.nav_view);
 		navigationView.setNavigationItemSelectedListener(this);
 		hView = navigationView.getHeaderView(0);

 		Menu menu = navigationView.getMenu();
 		navNotifications = menu.findItem(R.id.nav_notifications);

-		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigationDrawerOpen, R.string.navigationDrawerClose);
+		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);

 		drawer.addDrawerListener(toggle);
 		drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
@ -204,26 +236,29 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				String userFullNameNav = tinyDB.getString("userFullname");
 				String userAvatarNav = tinyDB.getString("userAvatar");

-				TextView userEmail = hView.findViewById(R.id.userEmail);
-				TextView userFullName = hView.findViewById(R.id.userFullname);
-				ImageView userAvatar = hView.findViewById(R.id.userAvatar);
-				ImageView userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
-				CardView navRecyclerViewFrame = hView.findViewById(R.id.userAccountsFrame);
+				blurView = hView.findViewById(R.id.blurView);
+				userEmail = hView.findViewById(R.id.userEmail);
+				userFullName = hView.findViewById(R.id.userFullname);
+				userAvatar = hView.findViewById(R.id.userAvatar);
+				userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
+				navHeaderFrame = hView.findViewById(R.id.navHeaderFrame);

-				List<UserAccount> userAccountsList = new ArrayList<>();
+				List<UserAccount> userAccountsList;
+				userAccountsList = new ArrayList<>();
 				UserAccountsApi userAccountsApi;
-				userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+				userAccountsApi = new UserAccountsApi(ctx);

-				RecyclerView navRecyclerViewUserAccounts = hView.findViewById(R.id.userAccounts);
+				RecyclerView navRecyclerViewUserAccounts = hView.findViewById(R.id.navRecyclerViewUserAccounts);
 				UserAccountsNavAdapter adapterUserAccounts;

 				adapterUserAccounts = new UserAccountsNavAdapter(ctx, userAccountsList, drawer, toolbarTitle);

 				userAccountsApi.getAllAccounts().observe((AppCompatActivity) ctx, userAccounts -> {
+
 					if(userAccounts.size() > 0) {
+
 						userAccountsList.addAll(userAccounts);
 						navRecyclerViewUserAccounts.setAdapter(adapterUserAccounts);
-						navRecyclerViewFrame.setVisibility(View.VISIBLE);
 					}
 				});

@ -231,48 +266,53 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				userFullName.setTypeface(myTypeface);

 				if(!userEmailNav.equals("")) {
+
 					userEmail.setText(userEmailNav);
 				}

 				if(!userFullNameNav.equals("")) {
-					userFullName.setText(Html.fromHtml(userFullNameNav));
+
+					userFullName.setText(userFullNameNav);
 				}

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

-					int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 3);
-
 					PicassoService.getInstance(ctx).get()
 						.load(userAvatarNav)
 						.placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(avatarRadius, 0))
+						.transform(new RoundedTransformation(8, 0))
 						.resize(160, 160)
 						.centerCrop().into(userAvatar);

 					PicassoService.getInstance(ctx).get()
 						.load(userAvatarNav)
-						.transform(new BlurTransformation(ctx))
 						.into(userAvatarBackground, new com.squareup.picasso.Callback() {

 							@Override
 							public void onSuccess() {
+
 								int textColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);

 								userFullName.setTextColor(textColor);
 								userEmail.setTextColor(textColor);
+
+								blurView.setupWith(navHeaderFrame)
+									.setBlurAlgorithm(new RenderScriptBlur(ctx))
+									.setBlurRadius(5)
+									.setHasFixedTransformationMatrix(false);
 							}

-							@Override public void onError(Exception e) {}
+							@Override
+							public void onError(Exception e) {}
 						});
 				}

 				userAvatar.setOnClickListener(v -> {

 					toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_profile);
 					drawer.closeDrawers();
-
 				});

 				getNotificationsCount(instanceToken);
@ -282,8 +322,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {

 				navigationView.getMenu().findItem(R.id.nav_administration).setVisible(tinyDB.getBoolean("userIsAdmin"));
-				navigationView.getMenu().findItem(R.id.nav_notifications).setVisible(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.3"));
-
+				navigationView.getMenu().findItem(R.id.nav_notifications).setVisible(new Version(currentVersion).higherOrEqual("1.12.3"));
 			}

 			@Override
@ -297,8 +336,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		toggle.syncState();
 		toolbar.setNavigationIcon(R.drawable.ic_menu);

-		String launchFragment = mainIntent.getStringExtra("launchFragment");
-
 		if(launchFragment != null) {

 			mainIntent.removeExtra("launchFragment");
@ -306,12 +343,13 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			switch(launchFragment) {

 				case "drafts":
+
 					toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_comments_draft);
 					return;
-
 				case "notifications":
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
@ -328,43 +366,34 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			switch(launchFragmentByHandler) {

 				case "repos":
+
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_repositories);
 					return;
-
 				case "org":
+
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_organizations);
 					return;
-
 				case "notification":
+
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
-					setActionBarTitle(getResources().getString(R.string.pageTitleNotifications));
 					return;
-
 				case "explore":
+
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_explore);
 					return;
-
-				case "profile":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_profile);
-					return;
-
-				case "admin":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_administration);
-					return;
-
 			}
 		}

 		if(savedInstanceState == null) {

 			if(!new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.3")) {
+
 				if(tinyDB.getInt("homeScreenId") == 7) {
+
 					tinyDB.putInt("homeScreenId", 0);
 				}
 			}
@ -372,48 +401,49 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			switch(tinyDB.getInt("homeScreenId")) {

 				case 1:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_starred_repos);
 					break;
-
 				case 2:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_organizations);
 					break;
-
 				case 3:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_repositories);
 					break;
-
 				case 4:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_profile);
 					break;
-
 				case 5:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_explore);
 					break;
-
 				case 6:
+
 					toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_comments_draft);
 					break;
-
 				case 7:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
 					break;
-
 				default:
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_home);
@ -438,7 +468,17 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		}

 		// Changelog popup
-		int versionCode = AppUtil.getAppBuildNo(appCtx);
+		int versionCode = 0;
+
+		try {
+
+			PackageInfo packageInfo = appCtx.getPackageManager().getPackageInfo(appCtx.getPackageName(), 0);
+			versionCode = packageInfo.versionCode;
+		}
+		catch(PackageManager.NameNotFoundException e) {
+
+			Log.e("changelogDialog", Objects.requireNonNull(e.getMessage()));
+		}

 		if(versionCode > tinyDB.getInt("versionCode")) {

@ -529,7 +569,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		else if(id == R.id.nav_profile) {

 			toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
 		}
 		else if(id == R.id.nav_repositories) {

@ -605,22 +645,29 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig

 	private void giteaVersion() {

-		Call<GiteaVersion> callVersion = RetrofitClient.getApiInterface(ctx).getGiteaVersionWithToken(Authorization.get(ctx));
+		final TinyDB tinyDb = TinyDB.getInstance(appCtx);
+
+		final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
+
+		Call<GiteaVersion> callVersion = RetrofitClient.getApiInterface(ctx).getGiteaVersionWithToken(token);
+
 		callVersion.enqueue(new Callback<GiteaVersion>() {

 			@Override
 			public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {

-				if(responseVersion.code() == 200 && responseVersion.body() != null) {
-					String version = responseVersion.body().getVersion();
+				if(responseVersion.code() == 200) {

-					tinyDB.putString("giteaVersion", version);
-					BaseApi.getInstance(ctx, UserAccountsApi.class).updateServerVersion(version, tinyDB.getInt("currentActiveAccountId"));
+					GiteaVersion version = responseVersion.body();
+					assert version != null;
+
+					tinyDb.putString("giteaVersion", version.getVersion());
 				}
 			}

 			@Override
 			public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
+
 				Log.e("onFailure-version", t.toString());
 			}
 		});
--- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
@ -9,10 +9,7 @@ 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;
@ -20,8 +17,11 @@ 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 org.mian.gitnex.models.MergePullRequest;
+import org.mian.gitnex.models.MergePullRequestSpinner;
 import java.util.ArrayList;
 import java.util.Objects;
+import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -41,6 +41,12 @@ public class MergePullRequestActivity extends BaseActivity {

 	private String Do;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_merge_pull_request;
+	}
+
 	@SuppressLint("SetTextI18n")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@ -48,7 +54,8 @@ public class MergePullRequestActivity extends BaseActivity {
 		super.onCreate(savedInstanceState);

 		viewBinding = ActivityMergePullRequestBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);

 		String repoFullName = tinyDB.getString("repoFullName");
 		String[] parts = repoFullName.split("/");
@ -170,12 +177,12 @@ public class MergePullRequestActivity extends BaseActivity {

 		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);

-		Call<Void> call = RetrofitClient.getApiInterface(ctx).mergePullRequest(Authorization.get(ctx), repoOwner, repoName, prIndex, mergePR);
+		Call<ResponseBody> call = RetrofitClient.getApiInterface(ctx).mergePullRequest(Authorization.get(ctx), repoOwner, repoName, prIndex, mergePR);

-		call.enqueue(new Callback<Void>() {
+		call.enqueue(new Callback<ResponseBody>() {

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

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

@ -188,7 +195,7 @@ public class MergePullRequestActivity extends BaseActivity {
 							final String repoOwner = parts[0];
 							final String repoName = parts[1];

-							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, tinyDB.getString("prHeadBranch"), false);
+							deleteBranchFunction(repoOwner, repoName);

 							Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
 							tinyDB.putBoolean("prMerged", true);
@ -202,7 +209,7 @@ public class MergePullRequestActivity extends BaseActivity {
 							final String repoOwner = parts[0];
 							final String repoName = parts[1];

-							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, tinyDB.getString("prHeadBranch"), false);
+							deleteBranchFunction(repoOwner, repoName);

 							Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
 							tinyDB.putBoolean("prMerged", true);
@ -244,7 +251,37 @@ public class MergePullRequestActivity extends BaseActivity {
 			}

 			@Override
-			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+				enableProcessButton();
+			}
+
+		});
+
+	}
+
+	private void deleteBranchFunction(String repoOwner, String repoName) {
+
+		String branchName = tinyDB.getString("prHeadBranch");
+
+		Call<JsonElement> call = RetrofitClient
+				.getApiInterface(ctx)
+				.deleteBranch(Authorization.get(ctx), repoOwner, repoName, branchName);
+
+		call.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				if(response.code() == 204) {
+
+					Log.i("deleteBranch", "Branch deleted successfully");
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {

 				Log.e("onFailure", t.toString());
 				enableProcessButton();
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
@ -23,7 +23,6 @@ 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;
@ -36,17 +35,20 @@ import io.mikael.urlbuilder.UrlBuilder;

 public class OrganizationDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener {

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_org_detail;
+    }
+
    @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);
+        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);

        setSupportActionBar(toolbar);
        Objects.requireNonNull(getSupportActionBar()).setTitle(orgName);
@ -143,13 +145,6 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
                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));
@ -196,14 +191,11 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
                    return OrganizationInfoFragment.newInstance(orgName);
                case 1: // repos

-	                return RepositoriesByOrgFragment.newInstance(orgName);
-	            case 2: // labels
-
-                    return OrganizationLabelsFragment.newInstance(orgName);
-                case 3: // teams
+                    return RepositoriesByOrgFragment.newInstance(orgName);
+                case 2: // teams

                    return TeamsByOrgFragment.newInstance(orgName);
-                case 4: // members
+                case 3: // members

                    return MembersByOrgFragment.newInstance(orgName);
            }
@ -212,7 +204,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh

        @Override
        public int getCount() {
-            return 5;
+            return 4;
        }
    }
 }
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java
@ -14,7 +14,6 @@ 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;
@ -35,22 +34,24 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot

    private String teamId;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_org_team_members;
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityOrgTeamMembersBinding activityOrgTeamMembersBinding = ActivityOrgTeamMembersBinding.inflate(getLayoutInflater());
-	    setContentView(activityOrgTeamMembersBinding.getRoot());
-
-        Toolbar toolbar = activityOrgTeamMembersBinding.toolbar;
+        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);

-        ImageView closeActivity = activityOrgTeamMembersBinding.close;
-        TextView toolbarTitle = activityOrgTeamMembersBinding.toolbarTitle;
-        noDataMembers = activityOrgTeamMembersBinding.noDataMembers;
-        mGridView = activityOrgTeamMembersBinding.gridView;
-	    progressBar = activityOrgTeamMembersBinding.progressBar;
+        ImageView closeActivity = findViewById(R.id.close);
+        TextView toolbarTitle = findViewById(R.id.toolbar_title);
+        noDataMembers = findViewById(R.id.noDataMembers);
+        mGridView = findViewById(R.id.gridView);
+	    progressBar = findViewById(R.id.progressBar);

        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);
--- 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
@ -11,15 +11,14 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.AddEmail;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.ActivityProfileEmailBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.AddEmail;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@ -30,27 +29,29 @@ import retrofit2.Callback;
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;
    private EditText userEmail;
    private Button addEmailButton;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_profile_email;
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityProfileEmailBinding activityProfileEmailBinding = ActivityProfileEmailBinding.inflate(getLayoutInflater());
-	    setContentView(activityProfileEmailBinding.getRoot());
-
        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);

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

-        ImageView closeActivity = activityProfileEmailBinding.close;
-        userEmail = activityProfileEmailBinding.userEmail;
-        addEmailButton = activityProfileEmailBinding.addEmailButton;
+        ImageView closeActivity = findViewById(R.id.close);
+        userEmail = findViewById(R.id.userEmail);
+        addEmailButton = findViewById(R.id.addEmailButton);

        userEmail.requestFocus();
        assert imm != null;
--- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
@ -1,10 +1,10 @@
 package org.mian.gitnex.activities;

 import android.annotation.SuppressLint;
-import android.app.Dialog;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.Typeface;
@ -17,7 +17,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
@ -28,10 +27,6 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.tabs.TabLayout;
 import com.google.gson.JsonElement;
-import org.gitnex.tea4j.models.Branches;
-import org.gitnex.tea4j.models.Milestones;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetIssuesFilterFragment;
@ -49,6 +44,9 @@ import org.mian.gitnex.fragments.RepoInfoFragment;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.Branches;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@ -71,7 +69,9 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 	private FragmentRefreshListenerPr fragmentRefreshListenerPr;
 	private FragmentRefreshListenerMilestone fragmentRefreshListenerMilestone;
 	private FragmentRefreshListenerFiles fragmentRefreshListenerFiles;
-	private FragmentRefreshListenerFilterIssuesByMilestone fragmentRefreshListenerFilterIssuesByMilestone;
+
+	private String loginUid;
+	private String instanceToken;

 	private String repositoryOwner;
 	private String repositoryName;
@ -79,34 +79,33 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 	public static ViewPager mViewPager;
 	private int tabsCount;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_repo_detail;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		setContentView(R.layout.activity_repo_detail);
-
 		String[] repoNameParts = tinyDB.getString("repoFullName").split("/");
 		repositoryOwner = repoNameParts[0];
 		repositoryName = repoNameParts[1];

 		Toolbar toolbar = findViewById(R.id.toolbar);

-		TextView toolbarTitle = findViewById(R.id.toolbar_title);
-		ImageView repoTypeToolbar = findViewById(R.id.repoTypeToolbar);
-
-		if(tinyDB.getString("repoType").equalsIgnoreCase("private")) {
-			repoTypeToolbar.setVisibility(View.VISIBLE);
-		}
-		else {
-			repoTypeToolbar.setVisibility(View.GONE);
-		}
+		TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
 		toolbarTitle.setText(repositoryName);

 		setSupportActionBar(toolbar);
 		Objects.requireNonNull(getSupportActionBar()).setTitle(repositoryName);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);

+		loginUid = tinyDB.getString("loginUid");
+		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
+
 		tinyDB.putString("repoIssuesState", "open");
 		tinyDB.putString("repoPrState", "open");
 		tinyDB.putString("milestoneState", "open");
@ -234,84 +233,13 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 			mainIntent.removeExtra("goToSection");
 			mainIntent.removeExtra("goToSectionType");

-			switch(goToSectionType) {
-				case "branchesList":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					chooseBranch();
-					break;
-				case "branch":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String selectedBranch = mainIntent.getStringExtra("selectedBranch");
-					tinyDB.putString("repoBranch", selectedBranch);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(selectedBranch);
-					}
-					break;
-				case "file":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String branch1 = mainIntent.getStringExtra("branch");
-					tinyDB.putString("repoBranch", branch1);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(branch1);
-					}
-					Intent intent = new Intent(ctx, FileViewActivity.class);
-					intent.putExtra("file", mainIntent.getSerializableExtra("file"));
-					startActivity(intent);
-					break;
-				case "dir":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String branch2 = mainIntent.getStringExtra("branch");
-					tinyDB.putString("repoBranch", branch2);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(branch2);
-					}
-					//((SectionsPagerAdapter) Objects.requireNonNull(RepoDetailActivity.mViewPager.getAdapter())).getItem(1);
-					break;
-				case "commitsList":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String branch = mainIntent.getStringExtra("branchName");
-					tinyDB.putString("repoBranch", branch);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(branch);
-					}
-					Intent intent1 = new Intent(ctx, CommitsActivity.class);
-					intent1.putExtra("branchName", branch);
-					ctx.startActivity(intent1);
-					break;
-				case "issue":
-					RepoDetailActivity.mViewPager.setCurrentItem(2);
-					break;
-				case "issueNew":
-					RepoDetailActivity.mViewPager.setCurrentItem(2);
-					startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
-					break;
-				case "pull":
-					RepoDetailActivity.mViewPager.setCurrentItem(3);
-					break;
-				case "pullNew":
-					RepoDetailActivity.mViewPager.setCurrentItem(3);
-					startActivity(new Intent(RepoDetailActivity.this, CreatePullRequestActivity.class));
-					break;
-				case "releases":
-					RepoDetailActivity.mViewPager.setCurrentItem(4);
-					break;
-				case "newRelease":
-					RepoDetailActivity.mViewPager.setCurrentItem(4);
-					startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
-					break;
-				case "milestones":
-					RepoDetailActivity.mViewPager.setCurrentItem(5);
-					break;
-				case "milestonesNew":
-					RepoDetailActivity.mViewPager.setCurrentItem(5);
-					startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
-					break;
-				case "labels":
-					RepoDetailActivity.mViewPager.setCurrentItem(6);
-					break;
-				case "settings":
-					startActivity(new Intent(RepoDetailActivity.this, RepositorySettingsActivity.class));
-					break;
+			if(goToSectionType.equals("issue")) {
+
+				RepoDetailActivity.mViewPager.setCurrentItem(2);
+			}
+			else if(goToSectionType.equals("pull")) {
+
+				RepoDetailActivity.mViewPager.setCurrentItem(3);
 			}
 		}

@ -343,49 +271,46 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF

 		int id = item.getItemId();

-		if(id == android.R.id.home) {
+		switch(id) {
+
+			case android.R.id.home:
+				finish();
+				return true;
+
+			case R.id.repoMenu:
+				BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
+				bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
+				return true;
+
+			case R.id.filter:
+				BottomSheetIssuesFilterFragment filterBottomSheet = new BottomSheetIssuesFilterFragment();
+				filterBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuBottomSheet");
+				return true;
+
+			case R.id.filterPr:
+				BottomSheetPullRequestFilterFragment filterPrBottomSheet = new BottomSheetPullRequestFilterFragment();
+				filterPrBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuPrBottomSheet");
+				return true;
+
+			case R.id.filterMilestone:
+				BottomSheetMilestonesFilterFragment filterMilestoneBottomSheet = new BottomSheetMilestonesFilterFragment();
+				filterMilestoneBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet");
+				return true;
+
+			case R.id.switchBranches:
+				chooseBranch();
+				return true;
+
+			case R.id.branchCommits:
+				Intent intent = new Intent(ctx, CommitsActivity.class);
+				intent.putExtra("branchName", tinyDB.getString("repoBranch"));
+				ctx.startActivity(intent);
+				return true;
+
+			default:
+				return super.onOptionsItemSelected(item);

-			finish();
-			return true;
 		}
-		else if(id == R.id.repoMenu) {
-
-			BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
-			bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
-			return true;
-		}
-		else if(id == R.id.filter) {
-
-			BottomSheetIssuesFilterFragment filterBottomSheet = new BottomSheetIssuesFilterFragment();
-			filterBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuBottomSheet");
-			return true;
-		}
-		else if(id == R.id.filterPr) {
-
-			BottomSheetPullRequestFilterFragment filterPrBottomSheet = new BottomSheetPullRequestFilterFragment();
-			filterPrBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuPrBottomSheet");
-			return true;
-		}
-		else if(id == R.id.filterMilestone) {
-
-			BottomSheetMilestonesFilterFragment filterMilestoneBottomSheet = new BottomSheetMilestonesFilterFragment();
-			filterMilestoneBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet");
-			return true;
-		}
-		else if(id == R.id.switchBranches) {
-
-			chooseBranch();
-			return true;
-		}
-		else if(id == R.id.branchCommits) {
-
-			Intent intent = new Intent(ctx, CommitsActivity.class);
-			intent.putExtra("branchName", tinyDB.getString("repoBranch"));
-			ctx.startActivity(intent);
-			return true;
-		}
-
-		return super.onOptionsItemSelected(item);

 	}

@ -443,9 +368,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF

 				startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
 				break;
-			case "filterByMilestone":
-				filterIssuesByMilestone();
-				break;
 			case "openIssues":

 				if(getFragmentRefreshListener() != null) {
@ -499,83 +421,17 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		}
 	}

-	private void filterIssuesByMilestone() {
-
-		Dialog progressDialog = new Dialog(this);
-		progressDialog.setContentView(R.layout.custom_progress_loader);
-		progressDialog.show();
-
-		Call<List<Milestones>> call = RetrofitClient
-			.getApiInterface(ctx)
-			.getMilestones(Authorization.get(ctx), repositoryOwner, repositoryName, 1, 50, "open");
-
-		call.enqueue(new Callback<List<Milestones>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull Response<List<Milestones>> response) {
-
-				progressDialog.hide();
-				if(response.code() == 200) {
-
-					Milestones milestones;
-					List<String> milestonesList = new ArrayList<>();
-					int selectedMilestone = 0;
-					assert response.body() != null;
-
-					milestonesList.add("All");
-					for(int i = 0; i < response.body().size(); i++) {
-						milestones = response.body().get(i);
-						milestonesList.add(milestones.getTitle());
-					}
-
-					for(int j = 0; j < milestonesList.size(); j++) {
-						if(tinyDB.getString("issueMilestoneFilterId").equals(milestonesList.get(j))) {
-							selectedMilestone = j;
-						}
-					}
-
-					AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
-					pBuilder.setTitle(R.string.selectMilestone);
-
-					pBuilder.setSingleChoiceItems(milestonesList.toArray(new String[0]), selectedMilestone, (dialogInterface, i) -> {
-
-						tinyDB.putString("issueMilestoneFilterId", milestonesList.get(i));
-
-						if(getFragmentRefreshListenerFilterIssuesByMilestone() != null) {
-							getFragmentRefreshListenerFilterIssuesByMilestone().onRefresh(milestonesList.get(i));
-						}
-						dialogInterface.dismiss();
-					});
-
-					pBuilder.setNeutralButton(R.string.cancelButton, null);
-					pBuilder.create().show();
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
-				progressDialog.hide();
-				Log.e("onFailure", t.toString());
-			}
-		});
-	}
-
 	private void chooseBranch() {

-		Dialog progressDialog = new Dialog(this);
-		progressDialog.setContentView(R.layout.custom_progress_loader);
-		progressDialog.show();
-
 		Call<List<Branches>> call = RetrofitClient
 			.getApiInterface(ctx)
-			.getBranches(Authorization.get(ctx), repositoryOwner, repositoryName);
+			.getBranches(instanceToken, repositoryOwner, repositoryName);

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

 			@Override
 			public void onResponse(@NonNull Call<List<Branches>> call, @NonNull Response<List<Branches>> response) {

-				progressDialog.hide();
 				if(response.code() == 200) {

 					List<String> branchesList = new ArrayList<>();
@ -588,6 +444,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 						branchesList.add(branches.getName());

 						if(tinyDB.getString("repoBranch").equals(branches.getName())) {
+
 							selectedBranch = i;
 						}
 					}
@ -595,27 +452,33 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 					AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
 					pBuilder.setTitle(R.string.pageTitleChooseBranch);

-					pBuilder.setSingleChoiceItems(branchesList.toArray(new String[0]), selectedBranch, (dialogInterface, i) -> {
+					pBuilder.setSingleChoiceItems(branchesList.toArray(new String[0]), selectedBranch, new  DialogInterface.OnClickListener() {

-						tinyDB.putString("repoBranch", branchesList.get(i));
+						@Override
+						public void onClick(DialogInterface dialogInterface, int i) {

-						if(getFragmentRefreshListenerFiles() != null) {
-							getFragmentRefreshListenerFiles().onRefresh(branchesList.get(i));
+							tinyDB.putString("repoBranch", branchesList.get(i));
+
+							if(getFragmentRefreshListenerFiles() != null) {
+
+								getFragmentRefreshListenerFiles().onRefresh(branchesList.get(i));
+							}
+							dialogInterface.dismiss();
 						}
-						dialogInterface.dismiss();
 					});
-
 					pBuilder.setNeutralButton(R.string.cancelButton, null);
+
 					pBuilder.create().show();
 				}
 			}

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

 	public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
@ -779,13 +642,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF

 	}

-	// Issues milestone filter interface
-	public FragmentRefreshListenerFilterIssuesByMilestone getFragmentRefreshListenerFilterIssuesByMilestone() { return fragmentRefreshListenerFilterIssuesByMilestone; }
-
-	public void setFragmentRefreshListenerFilterIssuesByMilestone(FragmentRefreshListenerFilterIssuesByMilestone fragmentRefreshListener) { this.fragmentRefreshListenerFilterIssuesByMilestone = fragmentRefreshListener; }
-
-	public interface FragmentRefreshListenerFilterIssuesByMilestone { void onRefresh(String text); }
-
 	// Issues interface
 	public FragmentRefreshListener getFragmentRefreshListener() { return fragmentRefreshListener; }

--- a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java
@ -21,15 +21,14 @@ 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.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Version;
+import org.mian.gitnex.models.UserRepositories;
 import java.util.ArrayList;
 import java.util.List;
 import retrofit2.Call;
@ -45,8 +44,8 @@ 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 String TAG = "RepositoryForks";
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 	private int pageSize = 1;

 	private RecyclerView recyclerView;
@ -54,16 +53,19 @@ public class RepoForksActivity extends BaseActivity {
 	private RepoForksAdapter adapter;
 	private ProgressBar progressLoadMore;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_forks;
+	}
+
 	@SuppressLint("DefaultLocale")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		ActivityRepoForksBinding activityRepoForksBinding = ActivityRepoForksBinding.inflate(getLayoutInflater());
-		setContentView(activityRepoForksBinding.getRoot());
-
-		Toolbar toolbar = activityRepoForksBinding.toolbar;
+		Toolbar toolbar = findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);

 		TinyDB tinyDb = TinyDB.getInstance(appCtx);
@ -74,15 +76,15 @@ public class RepoForksActivity extends BaseActivity {
 		final String repoOwner = parts[0];
 		final String repoName = parts[1];

-		TextView toolbar_title = activityRepoForksBinding.toolbarTitle;
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
 		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
 		toolbar_title.setText(String.format("%s : %s", ctx.getResources().getString(R.string.infoTabRepoForksCount), repoName));

-		ImageView closeActivity = activityRepoForksBinding.close;
-		noData = activityRepoForksBinding.noData;
-		progressLoadMore = activityRepoForksBinding.progressLoadMore;
-		progressBar = activityRepoForksBinding.progressBar;
-		SwipeRefreshLayout swipeRefresh = activityRepoForksBinding.pullToRefresh;
+		ImageView closeActivity = findViewById(R.id.close);
+		noData = findViewById(R.id.noData);
+		progressLoadMore = findViewById(R.id.progressLoadMore);
+		progressBar = findViewById(R.id.progress_bar);
+		SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);

 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
@ -90,10 +92,10 @@ public class RepoForksActivity extends BaseActivity {
 		// if gitea is 1.12 or higher use the new limit (resultLimitNewGiteaInstances)
 		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12")) {

-			resultLimit = Constants.resultLimitNewGiteaInstances;
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
 		}

-		recyclerView = activityRepoForksBinding.recyclerView;
+		recyclerView = findViewById(R.id.recyclerView);
 		forksList = new ArrayList<>();

 		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(),
--- a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
@ -9,7 +9,6 @@ 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.viewmodels.RepoStargazersViewModel;

@ -25,19 +24,21 @@ public class RepoStargazersActivity extends BaseActivity {
    private GridView mGridView;
    private ProgressBar mProgressBar;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_repo_stargazers;
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {

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

-	    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("/");
--- a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
@ -9,7 +9,6 @@ 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.viewmodels.RepoWatchersViewModel;

@ -25,19 +24,21 @@ public class RepoWatchersActivity extends BaseActivity {
    private GridView mGridView;
    private ProgressBar mProgressBar;

+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_repo_watchers;
+    }
+
    @Override
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

-	    ActivityRepoWatchersBinding activityRepoWatchersBinding = ActivityRepoWatchersBinding.inflate(getLayoutInflater());
-	    setContentView(activityRepoWatchersBinding.getRoot());
-
-        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("/");
--- a/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java
@ -10,11 +10,8 @@ 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;
@ -22,6 +19,8 @@ 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 org.mian.gitnex.models.RepositoryTransfer;
+import org.mian.gitnex.models.UserRepositories;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -46,13 +45,19 @@ public class RepositorySettingsActivity extends BaseActivity {
 	private String repositoryOwner;
 	private String repositoryName;

+	@Override
+	protected int getLayoutResourceId(){
+		return R.layout.activity_repository_settings;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

 		viewBinding = ActivityRepositorySettingsBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);

 		loginUid = tinyDB.getString("loginUid");
 		String repoFullName = tinyDB.getString("repoFullName");
@ -114,7 +119,6 @@ public class RepositorySettingsActivity extends BaseActivity {
 			}
 		});

-		dialogTransferRepository.setCancelable(false);
 		dialogTransferRepository.show();
 	}

@ -140,7 +144,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 					Toasty.success(ctx, getString(R.string.repoTransferSuccess));

 					finish();
-					BaseApi.getInstance(ctx, RepositoriesApi.class).deleteRepository((int) tinyDB.getLong("repositoryId", 0));
+					RepositoriesApi.deleteRepository((int) tinyDB.getLong("repositoryId", 0));
 					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
 					RepositorySettingsActivity.this.startActivity(intent);
 				}
@ -197,7 +201,6 @@ public class RepositorySettingsActivity extends BaseActivity {
 			}
 		});

-		dialogDeleteRepository.setCancelable(false);
 		dialogDeleteRepository.show();
 	}

@ -221,7 +224,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 					Toasty.success(ctx, getString(R.string.repoDeletionSuccess));

 					finish();
-					BaseApi.getInstance(ctx, RepositoriesApi.class).deleteRepository((int) tinyDB.getLong("repositoryId", 0));
+					RepositoriesApi.deleteRepository((int) tinyDB.getLong("repositoryId", 0));
 					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
 					RepositorySettingsActivity.this.startActivity(intent);
 				}
@ -337,7 +340,6 @@ public class RepositorySettingsActivity extends BaseActivity {
 			propBinding.repoEnableMerge.isChecked(), propBinding.repoEnableRebase.isChecked(),
 			propBinding.repoEnableSquash.isChecked(), propBinding.repoEnableForceMerge.isChecked()));

-		dialogProp.setCancelable(false);
 		dialogProp.show();
 	}

@ -384,7 +386,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 					if(!repositoryName.equals(repoName)) {

 						finish();
-						BaseApi.getInstance(ctx, RepositoriesApi.class).updateRepositoryOwnerAndName(repositoryOwner, repoName, (int) tinyDB.getLong("repositoryId", 0));
+						RepositoriesApi.updateRepositoryOwnerAndName(repositoryOwner, repoName, (int) tinyDB.getLong("repositoryId", 0));
 						Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
 						RepositorySettingsActivity.this.startActivity(intent);
 					}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
@ -1,20 +1,13 @@
 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 android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
 import com.google.android.material.switchmaterial.SwitchMaterial;
-import org.jetbrains.annotations.NotNull;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsAppearanceBinding;
-import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;

 /**
@ -25,70 +18,70 @@ public class SettingsAppearanceActivity extends BaseActivity {

 	private View.OnClickListener onClickListener;

-	private static String[] timeList;
+	private static final String[] timeList = {"Pretty", "Normal"};
 	private static int timeSelectedChoice = 0;

-	private static String[] customFontList;
+	private static final String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
 	private static int customFontSelectedChoice = 0;

-	private static String[] themeList;
+	private static final String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)"};
 	private static int themeSelectedChoice = 0;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_appearance;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		ActivitySettingsAppearanceBinding activitySettingsAppearanceBinding = ActivitySettingsAppearanceBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsAppearanceBinding.getRoot());
+		ImageView closeActivity = findViewById(R.id.close);

-		ImageView closeActivity = activitySettingsAppearanceBinding.close;
+		final TextView tvDateTimeSelected = findViewById(R.id.tvDateTimeSelected); // setter for time
+		final TextView customFontSelected = findViewById(R.id.customFontSelected); // setter for custom font
+		final TextView themeSelected = findViewById(R.id.themeSelected); // setter for theme

-		LinearLayout timeFrame = activitySettingsAppearanceBinding.timeFrame;
-		LinearLayout customFontFrame = activitySettingsAppearanceBinding.customFontFrame;
-		LinearLayout themeFrame = activitySettingsAppearanceBinding.themeSelectionFrame;
-		LinearLayout lightTimeFrame = activitySettingsAppearanceBinding.lightThemeTimeSelectionFrame;
-		LinearLayout darkTimeFrame = activitySettingsAppearanceBinding.darkThemeTimeSelectionFrame;
+		LinearLayout timeFrame = findViewById(R.id.timeFrame);
+		LinearLayout customFontFrame = findViewById(R.id.customFontFrame);
+		LinearLayout themeFrame = findViewById(R.id.themeSelectionFrame);

-		SwitchMaterial counterBadgesSwitch = activitySettingsAppearanceBinding.switchCounterBadge;
-
-		timeList = getResources().getStringArray(R.array.timeFormats);
-		customFontList = getResources().getStringArray(R.array.fonts);
-		themeList = getResources().getStringArray(R.array.themes);
+		SwitchMaterial counterBadgesSwitch = findViewById(R.id.switchCounterBadge);

 		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;
+		if(!tinyDB.getString("timeStr").isEmpty()) {

-		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);
+			tvDateTimeSelected.setText(tinyDB.getString("timeStr"));
 		}

-		timeSelectedChoice = tinyDB.getInt("timeId");
-		customFontSelectedChoice = tinyDB.getInt("customFontId", 1);
-		themeSelectedChoice = tinyDB.getInt("themeId");
+		if(!tinyDB.getString("customFontStr").isEmpty()) {
+
+			customFontSelected.setText(tinyDB.getString("customFontStr"));
+		}
+
+		if(!tinyDB.getString("themeStr").isEmpty()) {
+
+			themeSelected.setText(tinyDB.getString("themeStr"));
+		}
+
+		if(timeSelectedChoice == 0) {
+
+			timeSelectedChoice = tinyDB.getInt("timeId");
+		}
+
+		if(customFontSelectedChoice == 0) {
+
+			customFontSelectedChoice = tinyDB.getInt("customFontId", 1);
+		}
+
+		if(themeSelectedChoice == 0) {
+
+			themeSelectedChoice = tinyDB.getInt("themeId");
+		}

 		counterBadgesSwitch.setChecked(tinyDB.getBoolean("enableCounterBadges"));

@ -110,7 +103,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {

 				themeSelectedChoice = i;
-				activitySettingsAppearanceBinding.themeSelected.setText(themeList[i]);
+				themeSelected.setText(themeList[i]);
 				tinyDB.putString("themeStr", themeList[i]);
 				tinyDB.putInt("themeId", i);

@ -125,16 +118,6 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			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 -> {

@ -146,7 +129,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {

 				customFontSelectedChoice = i;
-				activitySettingsAppearanceBinding.customFontSelected.setText(customFontList[i]);
+				customFontSelected.setText(customFontList[i]);
 				tinyDB.putString("customFontStr", customFontList[i]);
 				tinyDB.putInt("customFontId", i);

@ -172,17 +155,17 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			tBuilder.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {

 				timeSelectedChoice = i;
-				activitySettingsAppearanceBinding.tvDateTimeSelected.setText(timeList[i]);
+				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;
+				if("Normal".equals(timeList[i])) {
+
+					tinyDB.putString("dateFormat", "normal");
+				}
+				else {
+
+					tinyDB.putString("dateFormat", "pretty");
 				}

 				dialogInterfaceTime.dismiss();
@ -199,54 +182,4 @@ public class SettingsAppearanceActivity extends BaseActivity {
 		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
@ -3,8 +3,8 @@ package org.mian.gitnex.activities;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsDraftsBinding;
 import org.mian.gitnex.helpers.Toasty;

 /**
@ -15,23 +15,28 @@ public class SettingsDraftsActivity extends BaseActivity {

 	private View.OnClickListener onClickListener;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_drafts;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		ActivitySettingsDraftsBinding activitySettingsDraftsBinding = ActivitySettingsDraftsBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsDraftsBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsDraftsBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);

 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);

-		activitySettingsDraftsBinding.commentsDeletionSwitch.setChecked(tinyDB.getBoolean("draftsCommentsDeletionEnabled"));
+		SwitchMaterial commentsDeletionSwitch = findViewById(R.id.commentsDeletionSwitch);
+
+		commentsDeletionSwitch.setChecked(tinyDB.getBoolean("draftsCommentsDeletionEnabled"));

 		// delete comments on submit switcher
-		activitySettingsDraftsBinding.commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {

 			tinyDB.putBoolean("draftsCommentsDeletionEnabled", isChecked);
 			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsFileViewerActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsFileViewerActivity.java
@ -0,0 +1,93 @@
+package org.mian.gitnex.activities;
+
+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 com.google.android.material.switchmaterial.SwitchMaterial;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.Toasty;
+
+/**
+ * Author M M Arif
+ */
+
+public class SettingsFileViewerActivity extends BaseActivity {
+
+	private View.OnClickListener onClickListener;
+
+	private static final String[] fileViewerSourceCodeThemesList = {"Sublime", "Arduino Light", "Github", "Far ", "Ir Black", "Android Studio"};
+	private static int fileViewerSourceCodeThemesSelectedChoice = 0;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_fileview;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+
+		super.onCreate(savedInstanceState);
+
+		ImageView closeActivity = findViewById(R.id.close);
+
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
+
+		final TextView fileViewerSourceCodeThemesSelected = findViewById(R.id.sourceCodeThemeSelected); // setter for fileviewer theme
+
+		LinearLayout sourceCodeThemeFrame = findViewById(R.id.sourceCodeThemeFrame);
+
+		SwitchMaterial pdfModeSwitch = findViewById(R.id.switchPdfMode);
+
+		if(!tinyDB.getString("fileviewerSourceCodeThemeStr").isEmpty()) {
+			fileViewerSourceCodeThemesSelected.setText(tinyDB.getString("fileviewerSourceCodeThemeStr"));
+		}
+
+		if(fileViewerSourceCodeThemesSelectedChoice == 0) {
+			fileViewerSourceCodeThemesSelectedChoice = tinyDB.getInt("fileviewerThemeId");
+		}
+
+		pdfModeSwitch.setChecked(tinyDB.getBoolean("enablePdfMode"));
+
+		// fileviewer srouce code theme selection dialog
+		sourceCodeThemeFrame.setOnClickListener(view -> {
+
+			AlertDialog.Builder fvtsBuilder = new AlertDialog.Builder(SettingsFileViewerActivity.this);
+
+			fvtsBuilder.setTitle(R.string.fileviewerSourceCodeThemeSelectorDialogTitle);
+			fvtsBuilder.setCancelable(fileViewerSourceCodeThemesSelectedChoice != -1);
+
+			fvtsBuilder.setSingleChoiceItems(fileViewerSourceCodeThemesList, fileViewerSourceCodeThemesSelectedChoice, (dialogInterfaceTheme, i) -> {
+
+				fileViewerSourceCodeThemesSelectedChoice = i;
+				fileViewerSourceCodeThemesSelected.setText(fileViewerSourceCodeThemesList[i]);
+				tinyDB.putString("fileviewerSourceCodeThemeStr", fileViewerSourceCodeThemesList[i]);
+				tinyDB.putInt("fileviewerSourceCodeThemeId", i);
+
+				dialogInterfaceTheme.dismiss();
+				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+
+			});
+
+			AlertDialog cfDialog = fvtsBuilder.create();
+			cfDialog.show();
+		});
+
+		// pdf night mode switcher
+		pdfModeSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
+			tinyDB.putBoolean("enablePdfMode", isChecked);
+			tinyDB.putString("enablePdfModeInit", "yes");
+			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+		});
+	}
+
+	private void initCloseListener() {
+		onClickListener = view -> finish();
+	}
+
+}
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
@ -23,31 +23,42 @@ public class SettingsGeneralActivity extends BaseActivity {
 	private List<String> homeScreenList;
 	private static int homeScreenSelectedChoice = 0;

-	private List<String> linkHandlerDefaultScreen;
+	private List<String> defaultScreen;
 	private static int defaultLinkHandlerScreenSelectedChoice = 0;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_general;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

 		viewBinding = ActivitySettingsGeneralBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);

 		initCloseListener();
 		viewBinding.close.setOnClickListener(onClickListener);

 		// home screen
-		String[] appHomeDefaultScreen = getResources().getStringArray(R.array.appDefaultHomeScreen);
+		String[] homeDefaultScreen_ = {getResources().getString(R.string.pageTitleMyRepos), getResources().getString(R.string.pageTitleStarredRepos), getResources().getString(R.string.pageTitleOrganizations),
+			getResources().getString(R.string.pageTitleRepositories), getResources().getString(R.string.pageTitleProfile), getResources().getString(R.string.pageTitleExplore),
+			getResources().getString(R.string.titleDrafts)};

-		String[] appHomeDefaultScreenNew = getResources().getStringArray(R.array.appDefaultHomeScreenNew);
+		String[] homeDefaultScreenNew = {getResources().getString(R.string.pageTitleMyRepos), getResources().getString(R.string.pageTitleStarredRepos), getResources().getString(R.string.pageTitleOrganizations),
+			getResources().getString(R.string.pageTitleRepositories), getResources().getString(R.string.pageTitleProfile), getResources().getString(R.string.pageTitleExplore),
+			getResources().getString(R.string.titleDrafts), getResources().getString(R.string.pageTitleNotifications)};

 		if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.3")) {

-			appHomeDefaultScreen = appHomeDefaultScreenNew;
+			homeDefaultScreen_ = homeDefaultScreenNew;
 		}

-		homeScreenList = new ArrayList<>(Arrays.asList(appHomeDefaultScreen));
+		homeScreenList = new ArrayList<>(Arrays.asList(homeDefaultScreen_));
 		String[] homeScreenArray = new String[homeScreenList.size()];
 		homeScreenList.toArray(homeScreenArray);

@ -109,14 +120,34 @@ public class SettingsGeneralActivity extends BaseActivity {
 		// home screen

 		// link handler
-		String[] linkHandlerDefaultScreenList = getResources().getStringArray(R.array.linkHandlerDefaultScreen);
-		linkHandlerDefaultScreen = new ArrayList<>(Arrays.asList(linkHandlerDefaultScreenList));
+		String[] defaultScreen_ = {getResources().getString(R.string.generalDeepLinkSelectedText), getResources().getString(R.string.navRepos), getResources().getString(R.string.navOrgs), getResources().getString(R.string.pageTitleNotifications), getResources().getString(R.string.navExplore)};
+		defaultScreen = new ArrayList<>(Arrays.asList(defaultScreen_));

-		String[] linksArray = new String[linkHandlerDefaultScreen.size()];
-		linkHandlerDefaultScreen.toArray(linksArray);
+		String[] linksArray = new String[defaultScreen.size()];
+		defaultScreen.toArray(linksArray);

-		defaultLinkHandlerScreenSelectedChoice = tinyDB.getInt("defaultScreenId");
-		viewBinding.generalDeepLinkSelected.setText(linksArray[defaultLinkHandlerScreenSelectedChoice]);
+		if(defaultLinkHandlerScreenSelectedChoice == 0) {
+
+			defaultLinkHandlerScreenSelectedChoice = tinyDB.getInt("defaultScreenId");
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.generalDeepLinkSelectedText));
+		}
+
+		if(defaultLinkHandlerScreenSelectedChoice == 1) {
+
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navRepos));
+		}
+		else if(defaultLinkHandlerScreenSelectedChoice == 2) {
+
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navOrgs));
+		}
+		else if(defaultLinkHandlerScreenSelectedChoice == 3) {
+
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.pageTitleNotifications));
+		}
+		else if(defaultLinkHandlerScreenSelectedChoice == 4) {
+
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navExplore));
+		}

 		viewBinding.setDefaultLinkHandler.setOnClickListener(setDefaultLinkHandler -> {

--- a/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java
@ -8,9 +8,9 @@ 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.StaticGlobalVariables;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.notifications.Notifications;
+import org.mian.gitnex.notifications.NotificationsMaster;

 /**
 * Template Author M M Arif
@ -21,19 +21,26 @@ public class SettingsNotificationsActivity extends BaseActivity {

 	private ActivitySettingsNotificationsBinding viewBinding;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_notifications;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

 		viewBinding = ActivitySettingsNotificationsBinding.inflate(getLayoutInflater());
-		setContentView(viewBinding.getRoot());
+		View view = viewBinding.getRoot();
+		setContentView(view);

 		View.OnClickListener onClickListener = viewClose -> finish();

 		viewBinding.close.setOnClickListener(onClickListener);

-		viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay)));
+		viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), tinyDB.getInt("pollingDelayMinutes", StaticGlobalVariables.defaultPollingDelay)));
 		viewBinding.chooseColorState.setCardBackgroundColor(tinyDB.getInt("notificationsLightColor", Color.GREEN));

 		viewBinding.enableNotificationsMode.setChecked(tinyDB.getBoolean("notificationsEnabled", true));
@ -43,13 +50,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
 		viewBinding.enableNotificationsMode.setOnCheckedChangeListener((buttonView, isChecked) -> {

 			tinyDB.putBoolean("notificationsEnabled", isChecked);
-
-			if(isChecked) {
-				Notifications.startWorker(ctx);
-			} else {
-				Notifications.stopWorker(ctx);
-			}
-
+			if(!isChecked) NotificationsMaster.fireWorker(ctx);
 			Toasty.info(appCtx, getResources().getString(R.string.settingsSave));

 		});
@ -58,9 +59,9 @@ public class SettingsNotificationsActivity extends BaseActivity {
 		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.setMinValue(StaticGlobalVariables.minimumPollingDelay);
+			numberPicker.setMaxValue(StaticGlobalVariables.maximumPollingDelay);
+			numberPicker.setValue(tinyDB.getInt("pollingDelayMinutes", StaticGlobalVariables.defaultPollingDelay));
 			numberPicker.setWrapSelectorWheel(true);

 			AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
@ -72,8 +73,8 @@ public class SettingsNotificationsActivity extends BaseActivity {

 				tinyDB.putInt("pollingDelayMinutes", numberPicker.getValue());

-				Notifications.stopWorker(ctx);
-				Notifications.startWorker(ctx);
+				NotificationsMaster.fireWorker(ctx);
+				NotificationsMaster.hireWorker(ctx);

 				viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
 				Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
@ -82,7 +83,6 @@ public class SettingsNotificationsActivity extends BaseActivity {
 			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
 			builder.setView(numberPicker);
 			builder.create().show();
-
 		});

 		// lights switcher
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsReportsActivity.java
@ -3,8 +3,8 @@ package org.mian.gitnex.activities;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mian.gitnex.R;
-import org.mian.gitnex.databinding.ActivitySettingsReportsBinding;
 import org.mian.gitnex.helpers.Toasty;

 /**
@ -15,23 +15,28 @@ public class SettingsReportsActivity extends BaseActivity {

 	private View.OnClickListener onClickListener;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_reporting;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		ActivitySettingsReportsBinding activitySettingsReportsBinding = ActivitySettingsReportsBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsReportsBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsReportsBinding.close;
+		ImageView closeActivity = findViewById(R.id.close);

 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);

-		activitySettingsReportsBinding.crashReportsSwitch.setChecked(tinyDB.getBoolean("crashReportingEnabled"));
+		SwitchMaterial crashReportsSwitch = findViewById(R.id.crashReportsSwitch);
+
+		crashReportsSwitch.setChecked(tinyDB.getBoolean("crashReportingEnabled"));

 		// crash reports switcher
-		activitySettingsReportsBinding.crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+		crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {

 			tinyDB.putBoolean("crashReportingEnabled", isChecked);
 			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
@ -1,9 +1,7 @@
 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;
@ -11,17 +9,12 @@ 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
@ -31,38 +24,36 @@ public class SettingsSecurityActivity extends BaseActivity {

 	private View.OnClickListener onClickListener;

-	private static String[] cacheSizeDataList;
+	private static final String[] cacheSizeDataList = {"50 MB", "100 MB", "250 MB", "500 MB", "1 GB"};
 	private static int cacheSizeDataSelectedChoice = 0;

-	private static String[] cacheSizeImagesList;
+	private static final String[] cacheSizeImagesList = {"50 MB", "100 MB", "250 MB", "500 MB", "1 GB"};
 	private static int cacheSizeImagesSelectedChoice = 0;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_security;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		ActivitySettingsSecurityBinding activitySettingsSecurityBinding = ActivitySettingsSecurityBinding.inflate(getLayoutInflater());
-		setContentView(activitySettingsSecurityBinding.getRoot());
-
-		ImageView closeActivity = activitySettingsSecurityBinding.close;
+		ImageView closeActivity = findViewById(R.id.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
+		TextView cacheSizeDataSelected = findViewById(R.id.cacheSizeDataSelected); // setter for data cache size
+		TextView cacheSizeImagesSelected = findViewById(R.id.cacheSizeImagesSelected); // setter for images cache size
+		TextView clearCacheSelected = findViewById(R.id.clearCacheSelected); // setter for clear cache

-		LinearLayout certsFrame = 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);
+		LinearLayout certsFrame = findViewById(R.id.certsFrame);
+		LinearLayout cacheSizeDataFrame = findViewById(R.id.cacheSizeDataSelectionFrame);
+		LinearLayout cacheSizeImagesFrame = findViewById(R.id.cacheSizeImagesSelectionFrame);
+		LinearLayout clearCacheFrame = findViewById(R.id.clearCacheSelectionFrame);

 		if(!tinyDB.getString("cacheSizeStr").isEmpty()) {

@ -84,70 +75,6 @@ public class SettingsSecurityActivity extends BaseActivity {
 			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)));
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
@ -9,11 +9,7 @@ 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
@ -23,31 +19,30 @@ public class SettingsTranslationActivity extends BaseActivity {

 	private View.OnClickListener onClickListener;

+	private static String[] langList = {"English", "Arabic", "Chinese", "Czech", "Finnish", "French", "German", "Italian", "Latvian", "Persian",
+		"Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish", "Ukrainian"};
 	private static int langSelectedChoice = 0;

+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_settings_translation;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

 		super.onCreate(savedInstanceState);

-		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;
+		ImageView closeActivity = findViewById(R.id.close);

 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);

-		final TextView tvLanguageSelected = activitySettingsTranslationBinding.tvLanguageSelected; // setter for en, fr
-		TextView helpTranslate = activitySettingsTranslationBinding.helpTranslate;
+		final TextView tvLanguageSelected = findViewById(R.id.tvLanguageSelected); // setter for en, fr
+		TextView helpTranslate = findViewById(R.id.helpTranslate);

-		LinearLayout langFrame = activitySettingsTranslationBinding.langFrame;
+		LinearLayout langFrame = findViewById(R.id.langFrame);

 		helpTranslate.setOnClickListener(v12 -> {

@ -59,9 +54,15 @@ public class SettingsTranslationActivity extends BaseActivity {

 		});

-		tvLanguageSelected.setText(tinyDB.getString("localeStr"));
+		if(!tinyDB.getString("localeStr").isEmpty()) {

-		langSelectedChoice = tinyDB.getInt("langId");
+			tvLanguageSelected.setText(tinyDB.getString("localeStr"));
+		}
+
+		if(langSelectedChoice == 0) {
+
+			langSelectedChoice = tinyDB.getInt("langId");
+		}

 		// language dialog
 		langFrame.setOnClickListener(view -> {
@ -71,18 +72,89 @@ public class SettingsTranslationActivity extends BaseActivity {
 			lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
 			lBuilder.setCancelable(langSelectedChoice != -1);

-			lBuilder.setSingleChoiceItems(langs.values().toArray(new String[0]), langSelectedChoice, (dialogInterface, i) -> {
+			lBuilder.setSingleChoiceItems(langList, langSelectedChoice, (dialogInterface, i) -> {

-				String selectedLanguage = langs.keySet().toArray(new String[0])[i];
-				tinyDB.putString("localeStr", langs.get(selectedLanguage));
+				langSelectedChoice = i;
+				tvLanguageSelected.setText(langList[i]);
+				tinyDB.putString("localeStr", langList[i]);
 				tinyDB.putInt("langId", i);
-				tinyDB.putString("locale", selectedLanguage);
+
+				switch(langList[i]) {
+					case "Arabic":
+
+						tinyDB.putString("locale", "ar");
+						break;
+					case "Chinese":
+
+						tinyDB.putString("locale", "zh");
+						break;
+					case "Czech":
+
+						tinyDB.putString("locale", "cs");
+						break;
+					case "Finnish":
+
+						tinyDB.putString("locale", "fi");
+						break;
+					case "French":
+
+						tinyDB.putString("locale", "fr");
+						break;
+					case "German":
+
+						tinyDB.putString("locale", "de");
+						break;
+					case "Italian":
+
+						tinyDB.putString("locale", "it");
+						break;
+					case "Latvian":
+
+						tinyDB.putString("locale", "lv");
+						break;
+					case "Persian":
+
+						tinyDB.putString("locale", "fa");
+						break;
+					case "Polish":
+
+						tinyDB.putString("locale", "pl");
+						break;
+					case "Portuguese/Brazilian":
+
+						tinyDB.putString("locale", "pt");
+						break;
+					case "Russian":
+
+						tinyDB.putString("locale", "ru");
+						break;
+					case "Serbian":
+
+						tinyDB.putString("locale", "sr");
+						break;
+					case "Spanish":
+
+						tinyDB.putString("locale", "es");
+						break;
+					case "Turkish":
+
+						tinyDB.putString("locale", "tr");
+						break;
+					case "Ukrainian":
+
+						tinyDB.putString("locale", "uk");
+						break;
+					default:
+
+						tinyDB.putString("locale", "en");
+						break;
+				}

 				tinyDB.putBoolean("refreshParent", true);
+				this.recreate();
 				this.overridePendingTransition(0, 0);
 				dialogInterface.dismiss();
 				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-				this.recreate();
 			});

 			lBuilder.setNeutralButton(getString(R.string.cancelButton), null);
@ -97,10 +169,4 @@ public class SettingsTranslationActivity extends BaseActivity {
 		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/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 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,7 +57,6 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
    @NonNull
    @Override
    public AdminGetUsersAdapter.UsersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_users, parent, false);
        return new AdminGetUsersAdapter.UsersViewHolder(v);
    }
@ -85,49 +65,40 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
    public void onBindViewHolder(@NonNull AdminGetUsersAdapter.UsersViewHolder holder, int position) {

        UserInfo currentItem = usersList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-	    holder.userLoginId = currentItem.getLogin();

        if(!currentItem.getFullname().equals("")) {
-
-            holder.userFullName.setText(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.colorWhite))
                    .fontSize(44)
                    .width(180)
                    .height(60)
                    .endConfig()
-                    .buildRoundRect(context.getResources().getString(R.string.userRoleAdmin).toLowerCase(), ResourcesCompat.getColor(context.getResources(), R.color.releasePre, null), 8);
+                    .buildRoundRect(mCtx.getResources().getString(R.string.userRoleAdmin).toLowerCase(), mCtx.getResources().getColor(R.color.releasePre), 8);
            holder.userRole.setImageDrawable(drawable);
        }
        else {
-
            holder.userRole.setVisibility(View.GONE);
        }

-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
    }

    @Override
@ -140,15 +111,14 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
        return usersFilter;
    }

-    private final Filter usersFilter = new Filter() {
+    private Filter usersFilter = new Filter() {
        @Override
        protected FilterResults performFiltering(CharSequence constraint) {
            List<UserInfo> filteredList = new ArrayList<>();

            if (constraint == null || constraint.length() == 0) {
                filteredList.addAll(usersListFull);
-            }
-            else {
+            } else {
                String filterPattern = constraint.toString().toLowerCase().trim();

                for (UserInfo item : usersListFull) {
@ -166,7 +136,6 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap

        @Override
        protected void publishResults(CharSequence constraint, FilterResults results) {
-
            usersList.clear();
            usersList.addAll((List) results.values);
            notifyDataSetChanged();
--- a/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java
@ -1,7 +1,6 @@
 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;
@ -10,11 +9,10 @@ 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 org.mian.gitnex.models.Collaborators;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@ -25,21 +23,21 @@ import java.util.List;

 public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdapter.AssigneesViewHolder> {

-	private final Context context;
-	private final List<Collaborators> assigneesList;
+	private Context mCtx;
+	private List<Collaborators> assigneesList;
 	private List<String> assigneesStrings = new ArrayList<>();
 	private List<String> currentAssignees;

-	private final AssigneesListAdapterListener assigneesListener;
+	private AssigneesListAdapterListener assigneesListener;

 	public interface AssigneesListAdapterListener {

 		void assigneesInterface(List<String> data);
 	}

-	public AssigneesListAdapter(Context ctx, List<Collaborators> dataMain, AssigneesListAdapterListener assigneesListener, List<String> currentAssignees) {
+	public AssigneesListAdapter(Context mCtx, List<Collaborators> dataMain, AssigneesListAdapterListener assigneesListener, List<String> currentAssignees) {

-		this.context = ctx;
+		this.mCtx = mCtx;
 		this.assigneesList = dataMain;
 		this.assigneesListener = assigneesListener;
 		this.currentAssignees = currentAssignees;
@ -47,9 +45,9 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap

 	static class AssigneesViewHolder extends RecyclerView.ViewHolder {

-		private final CheckBox assigneesSelection;
-		private final TextView assigneesName;
-		private final ImageView assigneesAvatar;
+		private CheckBox assigneesSelection;
+		private TextView assigneesName;
+		private ImageView assigneesAvatar;

 		private AssigneesViewHolder(View itemView) {

@ -74,7 +72,6 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 	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("")) {

@ -82,10 +79,10 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 		}
 		else {

-			holder.assigneesName.setText(Html.fromHtml(currentItem.getFull_name()));
+			holder.assigneesName.setText(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);
+			.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(holder.assigneesAvatar);

 		for(int i = 0; i < assigneesList.size(); i++) {

--- 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 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.list_collaborators, null);
            viewHolder = new ViewHolder(finalView);
            finalView.setTag(viewHolder);
        }
        else {
-
            viewHolder = (ViewHolder) finalView.getTag();
        }

        initData(viewHolder, position);
        return finalView;
+
    }

    private void initData(ViewHolder viewHolder, int position) {

-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
        Collaborators currentItem = collaboratorsList.get(position);
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);
-
-	    viewHolder.userLoginId = currentItem.getLogin();
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);

        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
@ -11,12 +11,11 @@ import android.widget.Button;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Commits;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Commits;
 import java.util.List;
 import java.util.Locale;

@ -26,7 +25,7 @@ import java.util.Locale;

 public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

-    private final Context context;
+    private Context ctx;
    private final int TYPE_LOAD = 0;
    private List<Commits> commitsList;
    private CommitsAdapter.OnLoadMoreListener loadMoreListener;
@ -35,15 +34,16 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder

    public CommitsAdapter(Context ctx, List<Commits> commitsListMain) {

-        this.context = ctx;
+        this.ctx = ctx;
        this.commitsList = commitsListMain;
+
    }

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

-        LayoutInflater inflater = LayoutInflater.from(context);
+        LayoutInflater inflater = LayoutInflater.from(ctx);

        if(viewType == TYPE_LOAD) {
            return new CommitsHolder(inflater.inflate(R.layout.list_commits, parent, false));
@ -51,19 +51,25 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
        else {
            return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
        }
+
    }

    @Override
    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {

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

        if(getItemViewType(position) == TYPE_LOAD) {
+
            ((CommitsHolder) holder).bindData(commitsList.get(position));
+
        }
+
    }

    @Override
@ -75,12 +81,14 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
        else {
            return 1;
        }
+
    }

    @Override
    public int getItemCount() {

        return commitsList.size();
+
    }

    class CommitsHolder extends RecyclerView.ViewHolder {
@ -98,23 +106,27 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
            commitCommitter = itemView.findViewById(R.id.commitCommitterVw);
            commitDate = itemView.findViewById(R.id.commitDateVw);
            commitHtmlUrl = itemView.findViewById(R.id.commitHtmlUrlVw);
+
        }

        @SuppressLint("SetTextI18n")
        void bindData(Commits commitsModel) {

-            final TinyDB tinyDb = TinyDB.getInstance(context);
-	        Locale locale = context.getResources().getConfiguration().locale;
+            final TinyDB tinyDb = TinyDB.getInstance(ctx);
+            final String locale = tinyDb.getString("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));
+            commitTitle.setText(commitsModel.getCommit().getMessage());
+            commitCommitter.setText(ctx.getString(R.string.commitCommittedBy, commitsModel.getCommit().getCommitter().getName()));
+
+            commitDate.setText(TimeHelper.formatTime(commitsModel.getCommit().getCommitter().getDate(), new Locale(locale), timeFormat, ctx));

            if(timeFormat.equals("pretty")) {
-                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), context));
+                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), ctx));
            }
-            commitHtmlUrl.setOnClickListener(v -> context.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
+
+            commitHtmlUrl.setOnClickListener(v -> ctx.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
+
        }

    }
@ -122,29 +134,41 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
    static class LoadHolder extends RecyclerView.ViewHolder {

        LoadHolder(View itemView) {
+
            super(itemView);
        }
+
    }

    public void setMoreDataAvailable(boolean moreDataAvailable) {
+
        isMoreDataAvailable = moreDataAvailable;
+
    }

    public void notifyDataChanged() {
+
        notifyDataSetChanged();
        isLoading = false;
+
    }

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

    public void setLoadMoreListener(CommitsAdapter.OnLoadMoreListener loadMoreListener) {
+
        this.loadMoreListener = loadMoreListener;
+
    }

    public void updateList(List<Commits> list) {
+
        commitsList = list;
        notifyDataSetChanged();
    }
+
 }
--- a/app/src/main/java/org/mian/gitnex/adapters/CreditsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CreditsAdapter.java
@ -0,0 +1,59 @@
+package org.mian.gitnex.adapters;
+
+import android.text.SpannableStringBuilder;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class CreditsAdapter extends RecyclerView.Adapter<CreditsAdapter.CreditsViewHolder> {
+
+    private List<CharSequence> creditsList;
+
+    static class CreditsViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView creditText;
+
+        private CreditsViewHolder(View itemView) {
+            super(itemView);
+
+            creditText = itemView.findViewById(R.id.creditText);
+
+        }
+    }
+
+    public CreditsAdapter(List<CharSequence> creditsListMain) {
+        this.creditsList = creditsListMain;
+    }
+
+    @NonNull
+    @Override
+    public CreditsAdapter.CreditsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.credits, parent, false);
+        return new CreditsAdapter.CreditsViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull CreditsAdapter.CreditsViewHolder holder, int position) {
+
+        SpannableStringBuilder strBuilder = new SpannableStringBuilder(creditsList.get(position));
+        holder.creditText.setText((strBuilder));
+        holder.creditText.setMovementMethod(LinkMovementMethod.getInstance());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return creditsList.size();
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/DraftsAdapter.java
@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
@ -11,13 +12,10 @@ 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;
@ -34,7 +32,7 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView

    private List<DraftWithRepository> draftsList;
    private final FragmentManager fragmentManager;
-    private final Context context;
+    private final Context mCtx;

    class DraftsViewHolder extends RecyclerView.ViewHolder {

@ -57,9 +55,7 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView

                int getDraftId = draftWithRepository.getDraftId();
                deleteDraft(getAdapterPosition());
-
-	            DraftsApi draftsApi = BaseApi.getInstance(context, DraftsApi.class);
-	            assert draftsApi != null;
+	            DraftsApi draftsApi = new DraftsApi(mCtx);
 	            draftsApi.deleteSingleDraft(getDraftId);

            });
@ -79,23 +75,24 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 	                bundle.putString("commentAction", "edit");
                }

-                TinyDB tinyDb = TinyDB.getInstance(context);
+                TinyDB tinyDb = TinyDB.getInstance(mCtx);
                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.setOnInteractedListener(() -> mCtx.startActivity(new Intent(mCtx, IssueDetailActivity.class)));
 		        bottomSheetReplyFragment.show(fragmentManager, "replyBottomSheet");
+
            });

        }

    }

-    public DraftsAdapter(Context ctx, FragmentManager fragmentManager, List<DraftWithRepository> draftsListMain) {
-        this.context = ctx;
+    public DraftsAdapter(Context mCtx, FragmentManager fragmentManager, List<DraftWithRepository> draftsListMain) {
+        this.mCtx = mCtx;
        this.fragmentManager = fragmentManager;
        this.draftsList = draftsListMain;
    }
@ -105,7 +102,8 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
        draftsList.remove(position);
        notifyItemRemoved(position);
        notifyItemRangeChanged(position, draftsList.size());
-        Toasty.success(context, context.getResources().getString(R.string.draftsSingleDeleteSuccess));
+        Toasty.success(mCtx, mCtx.getResources().getString(R.string.draftsSingleDeleteSuccess));
+
    }

    @NonNull
@ -121,14 +119,13 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView

        DraftWithRepository currentItem = draftsList.get(position);

-	    String issueNumber = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
-	    Spanned headTitle = HtmlCompat
-		    .fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName(), HtmlCompat.FROM_HTML_MODE_LEGACY);
+	    String issueNumber = "<font color='" + mCtx.getResources().getColor(R.color.lightGray) + "'>" + mCtx.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
+	    Spanned headTitle = Html.fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName());

 	    holder.repoInfo.setText(headTitle);
 	    holder.draftWithRepository = currentItem;

-	    Markdown.render(context, currentItem.getDraftText(), holder.draftText);
+	    new Markdown(mCtx, currentItem.getDraftText(), holder.draftText);

 	    if(!currentItem.getCommentId().equalsIgnoreCase("new")) {
 		    holder.editCommentStatus.setVisibility(View.VISIBLE);
--- 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,6 +1,8 @@
 package org.mian.gitnex.adapters;

 import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
@ -9,31 +11,30 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoForksActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.List;
-import java.util.Locale;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -41,121 +42,87 @@ 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;
+	private List<UserRepositories> searchedReposList;
+	private Context mCtx;

-	public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context ctx) {
-		this.context = ctx;
-		this.reposList = dataList;
-		this.tinyDb = TinyDB.getInstance(context);
+	public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context mCtx) {
+
+		this.mCtx = mCtx;
+		this.searchedReposList = dataList;
 	}

-	@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));
-		}
-	}
+	static class ReposSearchViewHolder extends RecyclerView.ViewHolder {

-	@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) {
-			((ExploreRepositoriesAdapter.RepositoriesHolder) holder).bindData(reposList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(reposList.get(position).getFullName() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return reposList.size();
-	}
-
-	class RepositoriesHolder extends RecyclerView.ViewHolder {
-		private UserRepositories userRepositories;
-
-		private final ImageView image;
-		private final TextView repoName;
-		private final TextView orgName;
-		private final TextView repoDescription;
+		private ImageView image;
+		private TextView repoName;
+		private TextView repoDescription;
+		private TextView fullName;
 		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
-		private final TextView repoLastUpdated;
-		private final View spacerView;
+		private ImageView repoPrivatePublic;
+		private TextView repoStars;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
+		private TextView repoType;
+		private LinearLayout archiveRepo;
+		private TextView repoBranch;
+		private TextView htmlUrl;
+
+		private ReposSearchViewHolder(View itemView) {

-		RepositoriesHolder(View itemView) {
 			super(itemView);
+
 			repoName = itemView.findViewById(R.id.repoName);
-			orgName = itemView.findViewById(R.id.orgName);
 			repoDescription = itemView.findViewById(R.id.repoDescription);
-			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
 			image = itemView.findViewById(R.id.imageAvatar);
+			fullName = itemView.findViewById(R.id.repoFullName);
+			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
 			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
-			spacerView = itemView.findViewById(R.id.spacerView);
+			repoForks = itemView.findViewById(R.id.repoForks);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+			repoType = itemView.findViewById(R.id.repoType);
+			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
+			htmlUrl = itemView.findViewById(R.id.htmlUrl);

 			itemView.setOnClickListener(v -> {

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

-				tinyDb.putString("repoFullName", userRepositories.getFullName());
+				Intent intent = new Intent(context, RepoDetailActivity.class);
+				intent.putExtra("repoFullName", repoFullName.getText().toString());
+
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
 				tinyDb.putBoolean("resumeIssues", true);
 				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-				tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());

-				if(userRepositories.getPrivateFlag()) {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-				}
-				else {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-				}
-
-				String[] parts = userRepositories.getFullName().split("/");
+				String[] parts = fullName.getText().toString().split("/");
 				final String repoOwner = parts[0];
 				final String repoName = parts[1];

 				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+				RepositoriesApi repositoryData = new RepositoriesApi(context);

 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);

 				if(count == 0) {

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

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

 				//store if user is watching this repo
@ -164,138 +131,195 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
 					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");

 					WatchInfo watch = new WatchInfo();
+
 					Call<WatchInfo> call;
+
 					call = RetrofitClient.getApiInterface(context).checkRepoWatchStatus(token, repoOwner, repoName);

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

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

 						@Override
 						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+
 							tinyDb.putBoolean("repoWatch", false);
 							Toasty.error(context, context.getString(R.string.genericApiStatusError));
+
 						}
 					});
+
 				}
+
 				context.startActivity(intent);

 			});
+
+			reposDropdownMenu.setOnClickListener(v -> {
+
+				final Context context = v.getContext();
+
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+				TextView repoForksList = view.findViewById(R.id.repoForksList);
+				TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
+				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+				bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
+
+				repoCopyUrl.setOnClickListener(openInBrowser -> {
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+					ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
+					assert clipboard != null;
+					clipboard.setPrimaryClip(clip);
+
+					Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
+					dialog.dismiss();
+				});
+
+				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+					intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+					context.startActivity(intentOpenInBrowser);
+					dialog.dismiss();
+
+				});
+
+				repoStargazers.setOnClickListener(stargazers -> {
+
+					Intent intent = new Intent(context, RepoStargazersActivity.class);
+					intent.putExtra("repoFullNameForStars", fullName.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
+
+				});
+
+				repoWatchers.setOnClickListener(watchers -> {
+
+					Intent intentW = new Intent(context, RepoWatchersActivity.class);
+					intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+				repoForksList.setOnClickListener(forks -> {
+
+					Intent intentW = new Intent(context, RepoForksActivity.class);
+					intentW.putExtra("repoFullNameForForks", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+			});
+
 		}

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

-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-			Locale locale = context.getResources().getConfiguration().locale;
-			String timeFormat = tinyDb.getString("dateFormat");
+	@NonNull
+	@Override
+	public ExploreRepositoriesAdapter.ReposSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

-			orgName.setText(userRepositories.getFullName().split("/")[0]);
-			repoName.setText(userRepositories.getFullName().split("/")[1]);
-			repoStars.setText(userRepositories.getStars_count());
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories, parent, false);
+		return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
+	}

-			ColorGenerator generator = ColorGenerator.MATERIAL;
-			int color = generator.getColor(userRepositories.getName());
-			String firstCharacter = String.valueOf(userRepositories.getFullName().charAt(0));
+	@Override
+	public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int position) {

-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
+		UserRepositories currentItem = searchedReposList.get(position);
+		holder.repoDescription.setVisibility(View.GONE);
+		holder.repoBranch.setText(currentItem.getDefault_branch());
+		holder.htmlUrl.setText(currentItem.getHtml_url());

-			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);
-				}
+		ColorGenerator generator = ColorGenerator.MATERIAL;
+		int color = generator.getColor(currentItem.getName());
+		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+
+		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
+
+		if(currentItem.getAvatar_url() != null) {
+			if(!currentItem.getAvatar_url().equals("")) {
+				PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
 			}
 			else {
-				image.setImageDrawable(drawable);
+				holder.image.setImageDrawable(drawable);
 			}
-
-			if(userRepositories.getUpdated_at() != null) {
-
-				switch(timeFormat) {
-					case "pretty": {
-						PrettyTime prettyTime = new PrettyTime(locale);
-						String createdTime = prettyTime.format(userRepositories.getUpdated_at());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdated_at()), context));
-						break;
-					}
-					case "normal": {
-						DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-						String createdTime = formatter.format(userRepositories.getUpdated_at());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						break;
-					}
-					case "normal1": {
-						DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-						String createdTime = formatter.format(userRepositories.getUpdated_at());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						break;
-					}
-				}
-			}
-			else {
-				repoLastUpdated.setVisibility(View.GONE);
-			}
-
-			if(!userRepositories.getDescription().equals("")) {
-				repoDescription.setVisibility(View.VISIBLE);
-				repoDescription.setText(userRepositories.getDescription());
-				spacerView.setVisibility(View.GONE);
-			}
-			else {
-				repoDescription.setVisibility(View.GONE);
-				spacerView.setVisibility(View.VISIBLE);
-			}
-
-			if(isRepoAdmin == null) {
-				isRepoAdmin = new CheckBox(context);
-			}
-			isRepoAdmin.setChecked(userRepositories.getPermissions().isAdmin());
 		}
-	}
-
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
+		else {
+			holder.image.setImageDrawable(drawable);
 		}
+
+		holder.repoName.setText(currentItem.getName());
+		if(!currentItem.getDescription().equals("")) {
+			holder.repoDescription.setVisibility(View.VISIBLE);
+			holder.repoDescription.setText(currentItem.getDescription());
+		}
+		holder.fullName.setText(currentItem.getFullName());
+		if(currentItem.getPrivateFlag()) {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+			holder.repoType.setText(R.string.strPrivate);
+		}
+		else {
+			holder.repoPrivatePublic.setVisibility(View.GONE);
+			holder.repoType.setText(R.string.strPublic);
+		}
+		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoForks.setText(currentItem.getForks_count());
+		holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+		if(holder.isRepoAdmin == null) {
+			holder.isRepoAdmin = new CheckBox(mCtx);
+		}
+		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
+
+		if(currentItem.isArchived()) {
+			holder.archiveRepo.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.archiveRepo.setVisibility(View.GONE);
+		}
+
 	}

-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
+	@Override
+	public int getItemCount() {
+
+		return searchedReposList.size();
 	}

-	@SuppressLint("NotifyDataSetChanged")
 	public void notifyDataChanged() {
+
 		notifyDataSetChanged();
-		isLoading = false;
 	}

-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<UserRepositories> list) {
-		reposList = list;
-		notifyDataChanged();
-	}
 }
--- 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,13 @@ import android.view.ViewGroup;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;
 import org.apache.commons.io.FileUtils;
-import org.gitnex.tea4j.models.Files;
 import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Files;
 import java.util.ArrayList;
 import java.util.List;

@ -24,39 +23,55 @@ 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 ImageView dirTypeImage;
+	    private ImageView unknownTypeImage;
+        private TextView fileName;
+        private TextView fileType;
+        private TextView fileInfo;

        private FilesViewHolder(View itemView) {

            super(itemView);
-
-	        LinearLayout fileFrame = itemView.findViewById(R.id.fileFrame);
            fileName = itemView.findViewById(R.id.fileName);
-	        fileTypeIs = itemView.findViewById(R.id.fileTypeIs);
+            fileTypeImage = itemView.findViewById(R.id.fileImage);
+	        dirTypeImage = itemView.findViewById(R.id.dirImage);
+	        unknownTypeImage = itemView.findViewById(R.id.unknownImage);
+            fileType = itemView.findViewById(R.id.fileType);
            fileInfo = itemView.findViewById(R.id.fileInfo);

-	        fileFrame.setOnClickListener(v -> filesListener.onClickFile(file));
-
            //ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);

+            fileName.setOnClickListener(v -> {
+
+                Context context = v.getContext();
+
+                if(fileType.getText().toString().equals("file")) {
+                    filesListener.onClickFile(fileName.getText().toString());
+                }
+                else if(fileType.getText().toString().equals("dir")) {
+                    filesListener.onClickDir(fileName.getText().toString());
+                }
+                else {
+                    Toasty.warning(context, context.getString(R.string.filesGenericError));
+                }
+
+            });
+
+
            /*filesDropdownMenu.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View v) {
@ -123,24 +138,13 @@ 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) {
@ -151,43 +155,35 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
    @Override
    public void onBindViewHolder(@NonNull FilesAdapter.FilesViewHolder holder, int position) {

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

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

-        switch(currentItem.getType()) {
-
-	        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.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.unknownTypeImage.setVisibility(View.GONE);
+            holder.fileInfo.setVisibility(View.VISIBLE);
+            holder.fileInfo.setText(FileUtils.byteCountToDisplaySize(currentItem.getSize()));
        }
+        else if(currentItem.getType().equals("dir")) {
+	        holder.dirTypeImage.setVisibility(View.VISIBLE);
+	        holder.unknownTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeImage.setVisibility(View.GONE);
+	        holder.fileInfo.setVisibility(View.GONE);
+        }
+        else {
+	        holder.unknownTypeImage.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeImage.setVisibility(View.GONE);
+        }
+
    }

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

    @Override
@ -195,19 +191,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 +212,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
@ -13,10 +13,10 @@ 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.models.FileDiffView;
 import org.mian.gitnex.views.DiffTextView;
 import java.util.List;
 import java.util.Map;
@ -54,6 +54,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 		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
@ -93,6 +94,7 @@ public class FilesDiffAdapter extends BaseAdapter {

 			diffStats.setVisibility(View.GONE);
 			diffLines.addView(getMessageView(context.getResources().getString(R.string.binaryFileError)));
+
 		}
 		else {

@ -166,6 +168,7 @@ public class FilesDiffAdapter extends BaseAdapter {

 						}

+
 						diffTextView.setOnClickListener(v -> {

 							if(((DiffTextView) v).getCurrentBackgroundColor() != COLOR_SELECTED) {
@ -194,6 +197,7 @@ public class FilesDiffAdapter extends BaseAdapter {

 									stringBuilder.append(((DiffTextView) view).getText());
 									stringBuilder.append("\n");
+
 								}

 								stringBuilder.append("```\n\n");
@ -205,6 +209,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 								bundle.putBoolean("cursorToEnd", true);

 								BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
+
 							}

 							return true;
@ -221,6 +226,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 			else {

 				diffLines.addView(getMessageView(context.getResources().getString(R.string.fileTooLarge)));
+
 			}

 		}
@ -242,11 +248,13 @@ public class FilesDiffAdapter extends BaseAdapter {
 		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
@ -6,8 +6,6 @@ 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.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@ -20,19 +18,19 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.IssueComments;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.IssueComments;
 import org.mian.gitnex.views.ReactionList;
 import org.mian.gitnex.views.ReactionSpinner;
 import java.util.List;
@ -47,28 +45,27 @@ import retrofit2.Callback;

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

-	private final Context context;
+	private final Context ctx;
 	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.ctx = 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;
@ -90,9 +87,10 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap

 			menu.setOnClickListener(v -> {

+				final Context ctx = v.getContext();
 				final String loginUid = tinyDB.getString("loginUid");

-				@SuppressLint("InflateParams") View vw = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_issue_comments, null);
+				@SuppressLint("InflateParams") View vw = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_issue_comments, null);

 				TextView commentMenuEdit = vw.findViewById(R.id.commentMenuEdit);
 				TextView commentShare = vw.findViewById(R.id.issueCommentShare);
@ -110,37 +108,30 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 					commentMenuCopy.setVisibility(View.GONE);
 				}

-				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
 				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 reactionSpinner = new ReactionSpinner(ctx, 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);
+				linearLayout.addView(reactionSpinner);

 				commentMenuEdit.setOnClickListener(v1 -> {
+
 					Bundle bundle = new Bundle();
 					bundle.putInt("commentId", issueComment.getId());
 					bundle.putString("commentAction", "edit");
@ -151,48 +142,56 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 					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");
+					String intentHeader = tinyDB.getString("issueNumber") + ctx.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));
+					ctx.startActivity(Intent.createChooser(sharingIntent, intentHeader));

 					dialog.dismiss();
+
 				});

 				issueCommentCopyUrl.setOnClickListener(v1 -> {
+
 					// comment Url
 					CharSequence commentUrl = issueComment.getHtml_url();

-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
 					assert clipboard != null;

 					ClipData clip = ClipData.newPlainText(commentUrl, commentUrl);
 					clipboard.setPrimaryClip(clip);

 					dialog.dismiss();
-					Toasty.success(context, context.getString(R.string.copyIssueUrlToastMsg));
+					Toasty.success(ctx, ctx.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");
 					}

@ -204,37 +203,33 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap

 					dialog.dismiss();
 					BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
+
 				});

 				commentMenuCopy.setOnClickListener(v1 -> {
-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
 					assert clipboard != null;

 					ClipData clip = ClipData.newPlainText("Comment on issue #" + tinyDB.getString("issueNumber"), issueComment.getBody());
 					clipboard.setPrimaryClip(clip);

 					dialog.dismiss();
-					Toasty.success(context, context.getString(R.string.copyIssueCommentToastMsg));
+					Toasty.success(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
+
 				});

 				commentMenuDelete.setOnClickListener(v1 -> {
-					deleteIssueComment(context, issueComment.getId(), getAdapterPosition());
+
+					deleteIssueComment(ctx, 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) {
@ -242,6 +237,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 		issuesComments.remove(position);
 		notifyItemRemoved(position);
 		notifyItemRangeChanged(position, issuesComments.size());
+
 	}

 	private void deleteIssueComment(final Context ctx, final int commentId, int position) {
@ -308,43 +304,46 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap

 		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issue_comments, parent, false);
 		return new IssueCommentsAdapter.IssueCommentViewHolder(v);
+
 	}
 	@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()
+		PicassoService.getInstance(ctx).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))
+			.transform(new RoundedTransformation(4, 0))
+			.resize(AppUtil.getPixelsFromDensity(ctx, 35), AppUtil.getPixelsFromDensity(ctx, 35))
 			.centerCrop()
 			.into(holder.avatar);

-		Markdown.render(context, EmojiParser.parseToUnicode(issueComment.getBody()), holder.comment);
+		new Markdown(ctx, 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()));
+
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "pretty", ctx));
+				holder.information
+					.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreated_at()), ctx));
 			}
 			else if(timeFormat.equals("normal")) {
-				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), locale, "normal", context));
+
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "normal", ctx));
 			}

 			if(!issueComment.getCreated_at().equals(issueComment.getUpdated_at())) {
+
 				if(informationBuilder != null) {
-					informationBuilder.append(context.getString(R.string.colorfulBulletSpan)).append(context.getString(R.string.modifiedText));
+
+					informationBuilder.append(ctx.getString(R.string.colorfulBulletSpan)).append(ctx.getString(R.string.modifiedText));
 				}
 			}
 		}
@ -355,20 +354,14 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 		bundle1.putAll(bundle);
 		bundle1.putInt("commentId", issueComment.getId());

-		ReactionList reactionList = new ReactionList(context, bundle1);
-
+		ReactionList reactionList = new ReactionList(ctx, 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();
 	}

--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@ -3,26 +3,23 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Issues;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Issues;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@ -35,16 +32,17 @@ import java.util.Locale;

 public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

-	private final Context context;
+	private Context context;
 	private final int TYPE_LOAD = 0;
 	private List<Issues> issuesList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;

-	public IssuesAdapter(Context ctx, List<Issues> issuesListMain) {
+	public IssuesAdapter(Context context, List<Issues> issuesListMain) {

-		this.context = ctx;
+		this.context = context;
 		this.issuesList = issuesListMain;
+
 	}

 	@NonNull
@ -59,6 +57,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		else {
 			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
 		}
+
 	}

 	@Override
@ -68,12 +67,15 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>

 			isLoading = true;
 			loadMoreListener.onLoadMore();
+
 		}

 		if(getItemViewType(position) == TYPE_LOAD) {

 			((IssuesHolder) holder).bindData(issuesList.get(position));
+
 		}
+
 	}

 	@Override
@ -85,94 +87,104 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		else {
 			return 1;
 		}
+
 	}

 	@Override
 	public int getItemCount() {

 		return issuesList.size();
+
 	}

 	class IssuesHolder extends RecyclerView.ViewHolder {

-		private Issues issue;
-
-		private final ImageView issueAssigneeAvatar;
-		private final TextView issueTitle;
-		private final TextView issueCreatedTime;
-		private final TextView issueCommentsCount;
+		private TextView issueNumber;
+		private ImageView issueAssigneeAvatar;
+		private TextView issueTitle;
+		private TextView issueCreatedTime;
+		private TextView issueCommentsCount;

 		IssuesHolder(View itemView) {

 			super(itemView);
+
+			issueNumber = itemView.findViewById(R.id.issueNumber);
 			issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
 			issueTitle = itemView.findViewById(R.id.issueTitle);
 			issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
+			LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
 			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);

-			itemView.setOnClickListener(layoutView -> {
+			issueTitle.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+
 				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", issue.getNumber());
+				intent.putExtra("issueNumber", issueNumber.getText());

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

-			issueAssigneeAvatar.setOnClickListener(v -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", issue.getUser().getLogin());
+			});
+			frameCommentsCount.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+
+				Intent intent = new Intent(context, IssueDetailActivity.class);
+				intent.putExtra("issueNumber", issueNumber.getText());
+
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("issueNumber", issueNumber.getText().toString());
+				tinyDb.putString("issueType", "Issue");
 				context.startActivity(intent);
+
 			});

-			issueAssigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, issue.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issue.getUser().getLogin()));
-				return true;
-			});
 		}

 		@SuppressLint("SetTextI18n")
-		void bindData(Issues issue) {
+		void bindData(Issues issuesModel) {

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

-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+			if(!issuesModel.getUser().getFull_name().equals("")) {
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
+			}
+			else {
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
+			}

-			PicassoService.getInstance(context).get()
-				.load(issue.getUser().getAvatar_url())
-				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0))
-				.resize(120, 120)
-				.centerCrop()
-				.into(issueAssigneeAvatar);
+			PicassoService.getInstance(context).get().load(issuesModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);

-			String issueNumber_ = "<font color='" + 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));
+			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.issue = issue;
-			this.issueCommentsCount.setText(String.valueOf(issue.getComments()));
+			issueNumber.setText(String.valueOf(issuesModel.getNumber()));
+			issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));

 			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));
+					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", locale);
-					String createdTime = formatter.format(issue.getCreated_at());
-					this.issueCreatedTime.setText(createdTime);
+					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", locale);
-					String createdTime = formatter.format(issue.getCreated_at());
-					this.issueCreatedTime.setText(createdTime);
+					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;
 				}
 			}
@ -187,27 +199,32 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>

 			super(itemView);
 		}
+
 	}

 	public void setMoreDataAvailable(boolean moreDataAvailable) {

 		isMoreDataAvailable = moreDataAvailable;
+
 	}

 	public void notifyDataChanged() {

 		notifyDataSetChanged();
 		isLoading = false;
+
 	}

 	public interface OnLoadMoreListener {

 		void onLoadMore();
+
 	}

 	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {

 		this.loadMoreListener = loadMoreListener;
+
 	}

 	public void updateList(List<Issues> list) {
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@ -15,11 +15,12 @@ import androidx.cardview.widget.CardView;
 import androidx.core.widget.ImageViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.gitnex.tea4j.models.Labels;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateLabelActivity;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ColorInverter;
+import org.mian.gitnex.models.Labels;
+import java.util.ArrayList;
 import java.util.List;

 /**
@ -28,17 +29,19 @@ import java.util.List;

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

-    private final List<Labels> labelsList;
-    private 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 TextView labelTitle;
+        private TextView labelId;
+        private TextView labelColor;

-        private final CardView labelView;
-        private final ImageView labelIcon;
-        private final TextView labelName;
+        private CardView labelView;
+        private ImageView labelIcon;
+        private TextView labelName;

        private LabelsViewHolder(View itemView) {
            super(itemView);
@ -47,6 +50,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
            labelIcon = itemView.findViewById(R.id.labelIcon);
            labelName = itemView.findViewById(R.id.labelName);
            ImageView labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
+            labelTitle = itemView.findViewById(R.id.labelTitle);
+            labelId = itemView.findViewById(R.id.labelId);
+            labelColor = itemView.findViewById(R.id.labelColor);

            labelsOptionsMenu.setOnClickListener(v -> {

@ -59,7 +65,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                TextView labelMenuDelete = view.findViewById(R.id.labelMenuDelete);
                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);

-                bottomSheetHeader.setText(labels.getName());
+                bottomSheetHeader.setText(labelTitle.getText());
                BottomSheetDialog dialog = new BottomSheetDialog(context);
                dialog.setContentView(view);
                dialog.show();
@ -67,25 +73,24 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                labelMenuEdit.setOnClickListener(editLabel -> {

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

                labelMenuDelete.setOnClickListener(deleteLabel -> {

-                    AlertDialogs.labelDeleteDialog(context, labels.getName(), String.valueOf(labels.getId()),
+                    AlertDialogs.labelDeleteDialog(context, labelTitle.getText().toString(), labelId.getText().toString(),
                            context.getResources().getString(R.string.labelDeleteTitle),
                            context.getResources().getString(R.string.labelDeleteMessage),
-                            context.getResources().getString(R.string.labelDeleteTitle),
-                            context.getResources().getString(R.string.labelDeleteNegativeButton),
-	                        type, orgName);
+                            context.getResources().getString(R.string.labelDeletePositiveButton),
+                            context.getResources().getString(R.string.labelDeleteNegativeButton));
                    dialog.dismiss();
+
                });

            });
@ -93,11 +98,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
        }
    }

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

    @NonNull
@ -111,7 +114,10 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
    public void onBindViewHolder(@NonNull LabelsAdapter.LabelsViewHolder holder, int position) {

        Labels currentItem = labelsList.get(position);
-	    holder.labels = currentItem;
+
+        holder.labelTitle.setText(currentItem.getName());
+        holder.labelId.setText(String.valueOf(currentItem.getId()));
+        holder.labelColor.setText(currentItem.getColor());

        String labelColor = currentItem.getColor();
        String labelName = currentItem.getName();
@ -124,6 +130,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
        holder.labelName.setTextColor(contrastColor);
        holder.labelName.setText(labelName);
        holder.labelView.setCardBackgroundColor(color);
+
    }

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsListAdapter.java
@ -9,8 +9,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Labels;
 import org.mian.gitnex.R;
+import org.mian.gitnex.models.Labels;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@ -22,11 +22,11 @@ import java.util.List;
 public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.LabelsViewHolder> {

 	private List<Integer> currentLabelsIds;
-	private final List<Labels> labels;
-	private final List<String> labelsStrings = new ArrayList<>();
+	private List<Labels> labels;
+	private List<String> labelsStrings = new ArrayList<>();
 	private List<Integer> labelsIds = new ArrayList<>();

-	private final LabelsListAdapterListener labelsListener;
+	private LabelsListAdapterListener labelsListener;

 	public interface LabelsListAdapterListener {

@ -43,9 +43,9 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La

 	static class LabelsViewHolder extends RecyclerView.ViewHolder {

-		private final CheckBox labelSelection;
-		private final TextView labelText;
-		private final ImageView labelColor;
+		private CheckBox labelSelection;
+		private TextView labelText;
+		private ImageView labelColor;

 		private LabelsViewHolder(View itemView) {

--- a/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
@ -2,8 +2,6 @@ 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;
@ -12,12 +10,10 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
 import java.util.ArrayList;
 import java.util.List;

@ -27,40 +23,26 @@ import java.util.List;

 public class MembersByOrgAdapter extends BaseAdapter implements Filterable {

-    private final List<UserInfo> membersList;
-    private final Context context;
-    private final List<UserInfo> membersListFull;
+    private List<UserInfo> membersList;
+    private Context mCtx;
+    private List<UserInfo> membersListFull;

    private class ViewHolder {

-	    private String userLoginId;
-
-        private final ImageView memberAvatar;
-        private final TextView memberName;
+        private ImageView memberAvatar;
+        private TextView memberName;

        ViewHolder(View v) {
-
            memberAvatar  = v.findViewById(R.id.memberAvatar);
            memberName  = v.findViewById(R.id.memberName);
-
-	        memberAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", userLoginId);
-		        context.startActivity(intent);
-	        });
-
-	        memberAvatar.setOnLongClickListener(loginId -> {
-		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-		        return true;
-	        });
        }
    }

-    public MembersByOrgAdapter(Context ctx, List<UserInfo> membersListMain) {
-
-        this.context = ctx;
+    public MembersByOrgAdapter(Context mCtx, List<UserInfo> membersListMain) {
+        this.mCtx = mCtx;
        this.membersList = membersListMain;
        membersListFull = new ArrayList<>(membersList);
+
    }

    @Override
@ -85,37 +67,31 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
        MembersByOrgAdapter.ViewHolder viewHolder = null;

        if (finalView == null) {
-
-            finalView = LayoutInflater.from(context).inflate(R.layout.list_members_by_org, null);
-            viewHolder = new ViewHolder(finalView);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_org, null);
+            viewHolder = new MembersByOrgAdapter.ViewHolder(finalView);
            finalView.setTag(viewHolder);
        }
        else {
-
            viewHolder = (MembersByOrgAdapter.ViewHolder) finalView.getTag();
        }

        initData(viewHolder, position);
        return finalView;
+
    }

    private void initData(MembersByOrgAdapter.ViewHolder viewHolder, int position) {

        UserInfo currentItem = membersList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);
-
-	    viewHolder.userLoginId = currentItem.getLogin();
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);

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

    @Override
@ -123,17 +99,14 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
        return membersFilter;
    }

-    private final Filter membersFilter = new Filter() {
+    private Filter membersFilter = new Filter() {
        @Override
        protected FilterResults performFiltering(CharSequence constraint) {
            List<UserInfo> filteredList = new ArrayList<>();

            if (constraint == null || constraint.length() == 0) {
-
                filteredList.addAll(membersListFull);
-            }
-            else {
-
+            } else {
                String filterPattern = constraint.toString().toLowerCase().trim();

                for (UserInfo item : membersListFull) {
@ -151,7 +124,6 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {

        @Override
        protected void publishResults(CharSequence constraint, FilterResults results) {
-
            membersList.clear();
            membersList.addAll((List) results.values);
            notifyDataSetChanged();
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@ -10,18 +10,17 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.Milestones;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.MilestoneActions;
 import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Markdown;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Milestones;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@ -35,17 +34,19 @@ import java.util.Locale;

 public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

-	private final Context context;
+	private Context context;
 	private final int TYPE_LOAD = 0;
 	private List<Milestones> dataList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false;
 	private boolean isMoreDataAvailable = true;
+	private String TAG = StaticGlobalVariables.tagMilestonesAdapter;

-	public MilestonesAdapter(Context ctx, List<Milestones> dataListMain) {
+	public MilestonesAdapter(Context context, List<Milestones> dataListMain) {

-		this.context = ctx;
+		this.context = context;
 		this.dataList = dataListMain;
+
 	}

 	@NonNull
@ -60,6 +61,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		else {
 			return new MilestonesAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
 		}
+
 	}

 	@Override
@ -69,29 +71,33 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol

 			isLoading = true;
 			loadMoreListener.onLoadMore();
+
 		}

 		if(getItemViewType(position) == TYPE_LOAD) {

 			((MilestonesAdapter.DataHolder) holder).bindData(dataList.get(position));
+
 		}
+
 	}

 	class DataHolder extends RecyclerView.ViewHolder {

-		private Milestones milestones;
-
-		private final TextView msTitle;
-		private final TextView msDescription;
-		private final TextView msOpenIssues;
-		private final TextView msClosedIssues;
-		private final TextView msDueDate;
-		private final ProgressBar msProgress;
+		private TextView milestoneId;
+		private TextView msTitle;
+		private TextView msDescription;
+		private TextView msOpenIssues;
+		private TextView msClosedIssues;
+		private TextView msDueDate;
+		private ProgressBar msProgress;
+		private TextView milestoneStatus;

 		DataHolder(View itemView) {

 			super(itemView);

+			milestoneId = itemView.findViewById(R.id.milestoneId);
 			msTitle = itemView.findViewById(R.id.milestoneTitle);
 			msDescription = itemView.findViewById(R.id.milestoneDescription);
 			msOpenIssues = itemView.findViewById(R.id.milestoneIssuesOpen);
@ -99,11 +105,12 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 			msDueDate = itemView.findViewById(R.id.milestoneDueDate);
 			msProgress = itemView.findViewById(R.id.milestoneProgress);
 			ImageView milestonesMenu = itemView.findViewById(R.id.milestonesMenu);
+			milestoneStatus = itemView.findViewById(R.id.milestoneStatus);

 			milestonesMenu.setOnClickListener(v -> {

 				Context ctx = v.getContext();
-				int milestoneId_ = Integer.parseInt(String.valueOf(milestones.getId()));
+				int milestoneId_ = Integer.parseInt(milestoneId.getText().toString());

 				@SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_milestones_in_list, null);

@ -114,15 +121,17 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 				dialog.setContentView(view);
 				dialog.show();

-				if(milestones.getState().equals("open")) {
+				if(milestoneStatus.getText().toString().equals("open")) {

 					closeMilestone.setVisibility(View.VISIBLE);
 					openMilestone.setVisibility(View.GONE);
+
 				}
 				else {

 					closeMilestone.setVisibility(View.GONE);
 					openMilestone.setVisibility(View.VISIBLE);
+
 				}

 				closeMilestone.setOnClickListener(v12 -> {
@ -130,6 +139,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					MilestoneActions.closeMilestone(ctx, milestoneId_);
 					dialog.dismiss();
 					updateAdapter(getAdapterPosition());
+
 				});

 				openMilestone.setOnClickListener(v12 -> {
@ -137,6 +147,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					MilestoneActions.openMilestone(ctx, milestoneId_);
 					dialog.dismiss();
 					updateAdapter(getAdapterPosition());
+
 				});

 			});
@ -146,16 +157,18 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		@SuppressLint("SetTextI18n")
 		void bindData(Milestones dataModel) {

-			this.milestones = dataModel;
 			final TinyDB tinyDb = TinyDB.getInstance(context);
-			final String locale = context.getResources().getConfiguration().locale.getLanguage();
+			final String locale = tinyDb.getString("locale");
 			final String timeFormat = tinyDb.getString("dateFormat");

-			Markdown.render(context, dataModel.getTitle(), msTitle);
+			milestoneId.setText(String.valueOf(dataModel.getId()));
+			milestoneStatus.setText(dataModel.getState());
+
+			new Markdown(context, dataModel.getTitle(), msTitle);

 			if(!dataModel.getDescription().equals("")) {

-				Markdown.render(context, EmojiParser.parseToUnicode(dataModel.getDescription()), msDescription);
+				new Markdown(context, EmojiParser.parseToUnicode(dataModel.getDescription()), msDescription);
 			}
 			else {

@ -171,12 +184,14 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol

 					msProgress.setProgress(100);
 					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 100), context));
+
 				}
 				else {

 					int msCompletion = 100 * dataModel.getClosed_issues() / (dataModel.getOpen_issues() + dataModel.getClosed_issues());
 					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, msCompletion), context));
 					msProgress.setProgress(msCompletion);
+
 				}

 			}
@ -184,11 +199,11 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol

 				msProgress.setProgress(0);
 				msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 0), context));
+
 			}

 			if(dataModel.getDue_on() != null) {

-				String TAG = Constants.tagMilestonesAdapter;
 				if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {

 					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
@ -205,11 +220,12 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					String dueDate = formatter.format(date);

 					if(date.before(new Date())) {
-						msDueDate.setTextColor(ResourcesCompat.getColor(context.getResources(), R.color.darkRed, null));
+						msDueDate.setTextColor(context.getResources().getColor(R.color.darkRed));
 					}

 					msDueDate.setText(dueDate);
 					msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToast(dataModel.getDue_on()), context));
+
 				}
 				else if(timeFormat.equals("normal1")) {

@ -227,6 +243,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					assert date1 != null;
 					String dueDate = formatter.format(date1);
 					msDueDate.setText(dueDate);
+
 				}

 			}
@ -244,6 +261,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		dataList.remove(position);
 		notifyItemRemoved(position);
 		notifyItemRangeChanged(position, dataList.size());
+
 	}

 	@Override
@ -255,12 +273,14 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		else {
 			return 1;
 		}
+
 	}

 	@Override
 	public int getItemCount() {

 		return dataList.size();
+
 	}

 	static class LoadHolder extends RecyclerView.ViewHolder {
@ -269,27 +289,32 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol

 			super(itemView);
 		}
+
 	}

 	public void setMoreDataAvailable(boolean moreDataAvailable) {

 		isMoreDataAvailable = moreDataAvailable;
+
 	}

 	public void notifyDataChanged() {

 		notifyDataSetChanged();
 		isLoading = false;
+
 	}

 	public interface OnLoadMoreListener {

 		void onLoadMore();
+
 	}

 	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {

 		this.loadMoreListener = loadMoreListener;
+
 	}

 	public void updateList(List<Milestones> list) {
--- a/app/src/main/java/org/mian/gitnex/adapters/MyProfileFollowersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyProfileFollowersAdapter.java
@ -1,151 +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 MyProfileFollowersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<UserInfo> followersList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public MyProfileFollowersAdapter(List<UserInfo> dataList, Context ctx) {
-		this.context = ctx;
-		this.followersList = dataList;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(context);
-		if(viewType == TYPE_LOAD) {
-			return new MyProfileFollowersAdapter.FollowersHolder(inflater.inflate(R.layout.list_profile_followers_following, parent, false));
-		}
-		else {
-			return new MyProfileFollowersAdapter.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) {
-			((MyProfileFollowersAdapter.FollowersHolder) holder).bindData(followersList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(followersList.get(position).getUsername() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return followersList.size();
-	}
-
-	class FollowersHolder extends RecyclerView.ViewHolder {
-		private UserInfo userInfo;
-		private final ImageView userAvatar;
-		private final TextView userFullName;
-		private final TextView userName;
-
-		FollowersHolder(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);
-
-			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);
-			}
-
-			PicassoService.getInstance(context).get().load(userInfo.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(userAvatar);
-		}
-	}
-
-	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) {
-		followersList = list;
-		notifyDataChanged();
-	}
-}
-
-
--- a/app/src/main/java/org/mian/gitnex/adapters/MyProfileFollowingAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyProfileFollowingAdapter.java
@ -1,149 +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 MyProfileFollowingAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<UserInfo> followingList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public MyProfileFollowingAdapter(List<UserInfo> dataList, Context ctx) {
-		this.context = ctx;
-		this.followingList = dataList;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(context);
-		if(viewType == TYPE_LOAD) {
-			return new MyProfileFollowingAdapter.FollowingHolder(inflater.inflate(R.layout.list_profile_followers_following, parent, false));
-		}
-		else {
-			return new MyProfileFollowingAdapter.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) {
-			((MyProfileFollowingAdapter.FollowingHolder) holder).bindData(followingList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(followingList.get(position).getUsername() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return followingList.size();
-	}
-
-	class FollowingHolder extends RecyclerView.ViewHolder {
-		private UserInfo userInfo;
-		private final ImageView userAvatar;
-		private final TextView userFullName;
-		private final TextView userName;
-
-		FollowingHolder(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);
-
-			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);
-			}
-
-			PicassoService.getInstance(context).get().load(userInfo.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(userAvatar);
-		}
-	}
-
-	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) {
-		followingList = list;
-		notifyDataChanged();
-	}
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@ -1,5 +1,8 @@
 package org.mian.gitnex.adapters;

+import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
@ -10,32 +13,31 @@ import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import org.gitnex.tea4j.models.UserRepositories;
-import org.gitnex.tea4j.models.WatchInfo;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoForksActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchInfo;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -45,75 +47,79 @@ import retrofit2.Callback;

 public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.MyReposViewHolder> implements Filterable {

-	private final List<UserRepositories> reposList;
-	private final Context context;
-	private final List<UserRepositories> reposListFull;
+	private List<UserRepositories> reposList;
+	private Context mCtx;
+	private List<UserRepositories> reposListFull;

 	static class MyReposViewHolder extends RecyclerView.ViewHolder {

-		private UserRepositories userRepositories;
-
-		private final ImageView image;
-		private final TextView repoName;
-		private final TextView orgName;
-		private final TextView repoDescription;
+		private ImageView imageAvatar;
+		private TextView repoName;
+		private TextView repoDescription;
+		private TextView repoFullName;
+		private ImageView repoPrivatePublic;
+		private TextView repoStars;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
+		private TextView repoType;
 		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
-		private final TextView repoLastUpdated;
-		private final View spacerView;
+		private LinearLayout archiveRepo;
+		private TextView repoBranch;
+		private TextView htmlUrl;

 		private MyReposViewHolder(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);
+			imageAvatar = itemView.findViewById(R.id.imageAvatar);
+			repoFullName = itemView.findViewById(R.id.repoFullName);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
 			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
-			spacerView = itemView.findViewById(R.id.spacerView);
+			repoForks = itemView.findViewById(R.id.repoForks);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+			repoType = itemView.findViewById(R.id.repoType);
+			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
+			htmlUrl = itemView.findViewById(R.id.htmlUrl);

 			itemView.setOnClickListener(v -> {

 				Context context = v.getContext();
-				TinyDB tinyDb = TinyDB.getInstance(context);

 				Intent intent = new Intent(context, RepoDetailActivity.class);
-				intent.putExtra("repoFullName", userRepositories.getFullName());
+				intent.putExtra("repoFullName", repoFullName.getText().toString());

-				tinyDb.putString("repoFullName", userRepositories.getFullName());
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
+				tinyDb.putString("repoType", repoType.getText().toString());
 				//tinyDb.putBoolean("resumeIssues", true);
 				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-				tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());

-				if(userRepositories.getPrivateFlag()) {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-				}
-				else {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-				}
-
-				String[] parts = userRepositories.getFullName().split("/");
+				String[] parts = repoFullName.getText().toString().split("/");
 				final String repoOwner = parts[0];
 				final String repoName = parts[1];

 				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+				RepositoriesApi repositoryData = new RepositoriesApi(context);

 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);

 				if(count == 0) {

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

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

 				//store if user is watching this repo
@ -166,13 +172,81 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 				context.startActivity(intent);

 			});
+
+			reposDropdownMenu.setOnClickListener(v -> {
+
+				final Context context = v.getContext();
+
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+				TextView repoForksList = view.findViewById(R.id.repoForksList);
+				TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
+				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+				bottomSheetHeader.setText(String.format("%s / %s", repoFullName.getText().toString().split("/")[0], repoFullName.getText().toString().split("/")[1]));
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
+
+				repoCopyUrl.setOnClickListener(openInBrowser -> {
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+					ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
+					assert clipboard != null;
+					clipboard.setPrimaryClip(clip);
+
+					Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
+					dialog.dismiss();
+				});
+
+				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+					intentOpenInBrowser.putExtra("repoFullNameBrowser", repoFullName.getText());
+					context.startActivity(intentOpenInBrowser);
+					dialog.dismiss();
+
+				});
+
+				repoStargazers.setOnClickListener(stargazers -> {
+
+					Intent intent = new Intent(context, RepoStargazersActivity.class);
+					intent.putExtra("repoFullNameForStars", repoFullName.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
+
+				});
+
+				repoWatchers.setOnClickListener(watchers -> {
+
+					Intent intentW = new Intent(context, RepoWatchersActivity.class);
+					intentW.putExtra("repoFullNameForWatchers", repoFullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+				repoForksList.setOnClickListener(forks -> {
+
+					Intent intentW = new Intent(context, RepoForksActivity.class);
+					intentW.putExtra("repoFullNameForForks", repoFullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+			});
+
 		}

 	}

-	public MyReposListAdapter(Context ctx, List<UserRepositories> reposListMain) {
+	public MyReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {

-		this.context = ctx;
+		this.mCtx = mCtx;
 		this.reposList = reposListMain;
 		reposListFull = new ArrayList<>(reposList);
 	}
@ -188,77 +262,59 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 	@Override
 	public void onBindViewHolder(@NonNull MyReposListAdapter.MyReposViewHolder holder, int position) {

-		TinyDB tinyDb = TinyDB.getInstance(context);
 		UserRepositories currentItem = reposList.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-		Locale locale = context.getResources().getConfiguration().locale;
-		String timeFormat = tinyDb.getString("dateFormat");
-		holder.userRepositories = currentItem;
-		holder.orgName.setText(currentItem.getFullName().split("/")[0]);
-		holder.repoName.setText(currentItem.getFullName().split("/")[1]);
-		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoDescription.setVisibility(View.GONE);
+		holder.repoBranch.setText(currentItem.getDefault_branch());
+		holder.htmlUrl.setText(currentItem.getHtml_url());

 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
-		String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
+		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));

 		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);

 		if(currentItem.getAvatar_url() != null) {
 			if(!currentItem.getAvatar_url().equals("")) {
-				PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
+				PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.imageAvatar);
 			}
 			else {
-				holder.image.setImageDrawable(drawable);
+				holder.imageAvatar.setImageDrawable(drawable);
 			}
 		}
 		else {
-			holder.image.setImageDrawable(drawable);
-		}
-
-		if(currentItem.getUpdated_at() != null) {
-
-			switch(timeFormat) {
-				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
-					String createdTime = prettyTime.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					holder.repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.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(currentItem.getUpdated_at());
-					holder.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(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					break;
-				}
-			}
-		}
-		else {
-			holder.repoLastUpdated.setVisibility(View.GONE);
+			holder.imageAvatar.setImageDrawable(drawable);
 		}

+		holder.repoName.setText(currentItem.getName());
 		if(!currentItem.getDescription().equals("")) {
 			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
-			holder.spacerView.setVisibility(View.GONE);
+		}
+		holder.repoFullName.setText(currentItem.getFullName());
+		if(currentItem.getPrivateFlag()) {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
-			holder.repoDescription.setVisibility(View.GONE);
-			holder.spacerView.setVisibility(View.VISIBLE);
+			holder.repoPrivatePublic.setVisibility(View.GONE);
+			holder.repoType.setText(R.string.strPublic);
 		}
+		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoForks.setText(currentItem.getForks_count());
+		holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());

 		if(holder.isRepoAdmin == null) {
-			holder.isRepoAdmin = new CheckBox(context);
+			holder.isRepoAdmin = new CheckBox(mCtx);
 		}
 		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
+
+		if(currentItem.isArchived()) {
+			holder.archiveRepo.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.archiveRepo.setVisibility(View.GONE);
+		}
+
 	}

 	@Override
@ -273,7 +329,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 		return myReposFilter;
 	}

-	private final Filter myReposFilter = new Filter() {
+	private Filter myReposFilter = new Filter() {

 		@Override
 		protected FilterResults performFiltering(CharSequence constraint) {
--- a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
@ -1,7 +1,7 @@
 package org.mian.gitnex.adapters;

-import android.annotation.SuppressLint;
 import android.content.Context;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@ -9,94 +9,51 @@ 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 org.gitnex.tea4j.models.NotificationThread;
 import org.mian.gitnex.R;
-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.TinyDB;
+import org.mian.gitnex.models.NotificationThread;
 import java.util.List;

 /**
 * Author opyale
- * Modified M M Arif
 */

-public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdapter.NotificationsViewHolder> {

-	private final Context context;
-	private final int TYPE_LOAD = 0;
+	private Context context;
 	private List<NotificationThread> notificationThreads;
-	private final OnMoreClickedListener onMoreClickedListener;
-	private final OnNotificationClickedListener onNotificationClickedListener;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-	private final TinyDB tinyDb;
+	private OnMoreClickedListener onMoreClickedListener;
+	private OnNotificationClickedListener onNotificationClickedListener;
+	private TinyDB tinyDb;

 	public NotificationsAdapter(Context context, List<NotificationThread> notificationThreads, OnMoreClickedListener onMoreClickedListener, OnNotificationClickedListener onNotificationClickedListener) {
+
 		this.tinyDb = TinyDB.getInstance(context);
 		this.context = context;
 		this.notificationThreads = notificationThreads;
 		this.onMoreClickedListener = onMoreClickedListener;
 		this.onNotificationClickedListener = onNotificationClickedListener;
+
 	}

-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(context);
-		if(viewType == TYPE_LOAD) {
-			return new NotificationsAdapter.NotificationsHolder(inflater.inflate(R.layout.list_notifications, parent, false));
-		}
-		else {
-			return new NotificationsAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
-	}
+	static class NotificationsViewHolder extends RecyclerView.ViewHolder {

-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
-			isLoading = true;
-			loadMoreListener.onLoadMore();
-		}
+		private LinearLayout frame;
+		private TextView subject;
+		private TextView repository;
+		private ImageView typePr;
+		private ImageView typeIssue;
+		private ImageView typeUnknown;
+		private ImageView pinned;
+		private ImageView more;

-		if(getItemViewType(position) == TYPE_LOAD) {
-			((NotificationsAdapter.NotificationsHolder) holder).bindData(notificationThreads.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(notificationThreads.get(position).getSubject() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return notificationThreads.size();
-	}
-
-	class NotificationsHolder extends RecyclerView.ViewHolder {
-
-		private final LinearLayout frame;
-		private final TextView subject;
-		private final TextView repository;
-		private final ImageView typePr;
-		private final ImageView typeIssue;
-		private final ImageView typeUnknown;
-		private final ImageView pinned;
-		private final ImageView more;
-
-		NotificationsHolder(View itemView) {
+		public NotificationsViewHolder(@NonNull View itemView) {

 			super(itemView);
+
 			frame = itemView.findViewById(R.id.frame);
 			subject = itemView.findViewById(R.id.subject);
 			repository = itemView.findViewById(R.id.repository);
@ -105,103 +62,105 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
 			typeUnknown = itemView.findViewById(R.id.typeUnknown);
 			pinned = itemView.findViewById(R.id.pinned);
 			more = itemView.findViewById(R.id.more);
+
+		}
+	}
+
+	@NonNull
+	@Override
+	public NotificationsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(context).inflate(R.layout.list_notifications, parent, false);
+		return new NotificationsAdapter.NotificationsViewHolder(v);
+
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull NotificationsViewHolder holder, int position) {
+
+		NotificationThread notificationThread = notificationThreads.get(position);
+
+		String url = notificationThread.getSubject().getUrl();
+		String subjectId = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources()
+			.getString(R.string.hash) + url.substring(url.lastIndexOf("/") + 1) + "</font>";
+
+		holder.subject.setText(Html.fromHtml(subjectId + " " + notificationThread.getSubject().getTitle()));
+		holder.repository.setText(notificationThread.getRepository().getFullName());
+
+		if(notificationThread.isPinned()) {
+			holder.pinned.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.pinned.setVisibility(View.GONE);
 		}

-		@SuppressLint("SetTextI18n")
-		void bindData(NotificationThread notificationThread) {
+		switch(notificationThread.getSubject().getType()) {

-			String url = notificationThread.getSubject().getUrl();
-			String subjectId = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + url.substring(url.lastIndexOf("/") + 1) + "</font>";
+			case "Pull":
+				holder.typePr.setVisibility(View.VISIBLE);
+				holder.typeIssue.setVisibility(View.GONE);
+				holder.typeUnknown.setVisibility(View.GONE);
+				break;

-			subject.setText(HtmlCompat.fromHtml(subjectId + " " + notificationThread.getSubject().getTitle(), HtmlCompat.FROM_HTML_MODE_LEGACY));
-			repository.setText(notificationThread.getRepository().getFullName());
+			case "Issue":
+				holder.typePr.setVisibility(View.GONE);
+				holder.typeIssue.setVisibility(View.VISIBLE);
+				holder.typeUnknown.setVisibility(View.GONE);
+				break;
+
+			default:
+				holder.typePr.setVisibility(View.GONE);
+				holder.typeIssue.setVisibility(View.GONE);
+				holder.typeUnknown.setVisibility(View.VISIBLE);
+				break;
+
+		}
+
+		holder.frame.setOnClickListener(v -> {
+
+			onNotificationClickedListener.onNotificationClicked(notificationThread);
+
+			String[] parts = notificationThread.getRepository().getFullName().split("/");
+			final String repoOwner = parts[0];
+			final String repoName = parts[1];
+
+			int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+			RepositoriesApi repositoryData = new RepositoriesApi(context);
+
+			Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+			if(count == 0) {
+
+				long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+				tinyDb.putLong("repositoryId", id);

-			if(notificationThread.isPinned()) {
-				pinned.setVisibility(View.VISIBLE);
 			}
 			else {
-				pinned.setVisibility(View.GONE);
+
+				Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+				tinyDb.putLong("repositoryId", data.getRepositoryId());
+
 			}
+		});

-			switch(notificationThread.getSubject().getType()) {
-				case "Pull":
-					typePr.setVisibility(View.VISIBLE);
-					typeIssue.setVisibility(View.GONE);
-					typeUnknown.setVisibility(View.GONE);
-					break;
-				case "Issue":
-					typePr.setVisibility(View.GONE);
-					typeIssue.setVisibility(View.VISIBLE);
-					typeUnknown.setVisibility(View.GONE);
-					break;
-				default:
-					typePr.setVisibility(View.GONE);
-					typeIssue.setVisibility(View.GONE);
-					typeUnknown.setVisibility(View.VISIBLE);
-					break;
-			}
+		holder.more.setOnClickListener(v -> onMoreClickedListener.onMoreClicked(notificationThread));

-			frame.setOnClickListener(v -> {
-
-				onNotificationClickedListener.onNotificationClicked(notificationThread);
-
-				String[] parts = notificationThread.getRepository().getFullName().split("/");
-				final String repoOwner = parts[0];
-				final String repoName = parts[1];
-
-				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, 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());
-				}
-			});
-
-			more.setOnClickListener(v -> onMoreClickedListener.onMoreClicked(notificationThread));
-		}
 	}

-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
+	@Override
+	public int getItemCount() {

-	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<NotificationThread> list) {
-		notificationThreads = list;
-		notifyDataChanged();
+		return notificationThreads.size();
 	}

 	public interface OnNotificationClickedListener {
+
 		void onNotificationClicked(NotificationThread notificationThread);
 	}

 	public interface OnMoreClickedListener {
+
 		void onMoreClicked(NotificationThread notificationThread);
 	}
+
 }
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
@ -12,13 +12,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserOrganizations;
 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 org.mian.gitnex.models.UserOrganizations;
 import java.util.ArrayList;
 import java.util.List;

@ -28,42 +27,46 @@ import java.util.List;

 public class OrganizationsListAdapter extends RecyclerView.Adapter<OrganizationsListAdapter.OrganizationsViewHolder> implements Filterable {

-    private final List<UserOrganizations> orgList;
-    private final Context context;
-    private final List<UserOrganizations> orgListFull;
+    private List<UserOrganizations> orgList;
+    private Context mCtx;
+    private List<UserOrganizations> orgListFull;

    static class OrganizationsViewHolder extends RecyclerView.ViewHolder {

-    	private UserOrganizations userOrganizations;
-
-        private final ImageView image;
-        private final TextView orgName;
-        private final TextView orgDescription;
+        private ImageView image;
+        private TextView mTextView1;
+        private TextView mTextView2;
+        private TextView organizationId;

        private OrganizationsViewHolder(View itemView) {
            super(itemView);
-	        orgName = itemView.findViewById(R.id.orgName);
-	        orgDescription = itemView.findViewById(R.id.orgDescription);
+            mTextView1 = itemView.findViewById(R.id.orgUsername);
+            mTextView2 = itemView.findViewById(R.id.orgDescription);
            image = itemView.findViewById(R.id.imageAvatar);
+            organizationId = itemView.findViewById(R.id.organizationId);

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

-                Context context = v.getContext();
-                Intent intent = new Intent(context, OrganizationDetailActivity.class);
-                intent.putExtra("orgName", userOrganizations.getUsername());
+                    Context context = v.getContext();
+                    Intent intent = new Intent(context, OrganizationDetailActivity.class);
+                    intent.putExtra("orgName", mTextView1.getText().toString());

-                TinyDB tinyDb = TinyDB.getInstance(context);
-                tinyDb.putString("orgName", userOrganizations.getUsername());
-                tinyDb.putString("organizationId", String.valueOf(userOrganizations.getId()));
-                tinyDb.putBoolean("organizationAction", true);
-                context.startActivity(intent);
+                    TinyDB tinyDb = TinyDB.getInstance(context);
+                    tinyDb.putString("orgName", mTextView1.getText().toString());
+                    tinyDb.putString("organizationId", organizationId.getText().toString());
+                    tinyDb.putBoolean("organizationAction", true);
+                    context.startActivity(intent);
+
+                }
            });
+
        }
    }

-    public OrganizationsListAdapter(Context ctx, List<UserOrganizations> orgsListMain) {
-
-        this.context = ctx;
+    public OrganizationsListAdapter(Context mCtx, List<UserOrganizations> orgsListMain) {
+        this.mCtx = mCtx;
        this.orgList = orgsListMain;
        orgListFull = new ArrayList<>(orgList);
    }
@ -71,7 +74,6 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
    @NonNull
    @Override
    public OrganizationsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_organizations, parent, false);
        return new OrganizationsViewHolder(v);
    }
@ -81,20 +83,16 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
    public void onBindViewHolder(@NonNull OrganizationsViewHolder holder, int position) {

        UserOrganizations currentItem = orgList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+        holder.mTextView2.setVisibility(View.GONE);
+        holder.organizationId.setText(Integer.toString(currentItem.getId()));

-	    holder.userOrganizations = currentItem;
-	    holder.orgName.setText(currentItem.getUsername());
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
+        holder.mTextView1.setText(currentItem.getUsername());
+        if (!currentItem.getDescription().equals("")) {
+            holder.mTextView2.setVisibility(View.VISIBLE);
+            holder.mTextView2.setText(currentItem.getDescription());
+        }

-        PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
-
-	    if(!currentItem.getDescription().equals("")) {
-		    holder.orgDescription.setVisibility(View.VISIBLE);
-		    holder.orgDescription.setText(currentItem.getDescription());
-	    }
-	    else {
-		    holder.orgDescription.setVisibility(View.GONE);
-	    }
    }

    @Override
@ -107,19 +105,14 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
        return orgFilter;
    }

-    private final Filter orgFilter = new Filter() {
-
+    private Filter orgFilter = new Filter() {
        @Override
        protected FilterResults performFiltering(CharSequence constraint) {
-
            List<UserOrganizations> filteredList = new ArrayList<>();

            if (constraint == null || constraint.length() == 0) {
-
                filteredList.addAll(orgListFull);
-            }
-            else {
-
+            } else {
                String filterPattern = constraint.toString().toLowerCase().trim();

                for (UserOrganizations item : orgListFull) {
@ -137,7 +130,6 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations

        @Override
        protected void publishResults(CharSequence constraint, FilterResults results) {
-
            orgList.clear();
            orgList.addAll((List) results.values);
            notifyDataSetChanged();
--- a/app/src/main/java/org/mian/gitnex/adapters/MyProfileEmailsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyProfileEmailsAdapter.java
@ -6,27 +6,26 @@ 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.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
-import org.gitnex.tea4j.models.Emails;
 import org.mian.gitnex.R;
+import org.mian.gitnex.models.Emails;
 import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;

 /**
 * Author M M Arif
 */

-public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmailsAdapter.EmailsViewHolder> {
+public class ProfileEmailsAdapter extends RecyclerView.Adapter<ProfileEmailsAdapter.EmailsViewHolder> {

-    private final List<Emails> emailsList;
-    private final Context context;
+    private List<Emails> emailsList;
+    private Context mCtx;

    static class EmailsViewHolder extends RecyclerView.ViewHolder {

-        private final ImageView emailPrimary;
-        private final TextView userEmail;
+        private ImageView emailPrimary;
+        private TextView userEmail;

        private EmailsViewHolder(View itemView) {
            super(itemView);
@ -37,20 +36,20 @@ public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmails
        }
    }

-    public MyProfileEmailsAdapter(Context ctx, List<Emails> emailsListMain) {
-        this.context = ctx;
+    public ProfileEmailsAdapter(Context mCtx, List<Emails> emailsListMain) {
+        this.mCtx = mCtx;
        this.emailsList = emailsListMain;
    }

    @NonNull
    @Override
-    public MyProfileEmailsAdapter.EmailsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public ProfileEmailsAdapter.EmailsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_emails, parent, false);
-        return new MyProfileEmailsAdapter.EmailsViewHolder(v);
+        return new ProfileEmailsAdapter.EmailsViewHolder(v);
    }

    @Override
-    public void onBindViewHolder(@NonNull MyProfileEmailsAdapter.EmailsViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull ProfileEmailsAdapter.EmailsViewHolder holder, int position) {

        Emails currentItem = emailsList.get(position);

@ -59,12 +58,12 @@ public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmails
        if(currentItem.getPrimary()) {
            TextDrawable drawable = TextDrawable.builder()
                    .beginConfig()
-                    .textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null))
+                    .textColor(mCtx.getResources().getColor(R.color.colorWhite))
                    .fontSize(36)
                    .width(220)
                    .height(60)
                    .endConfig()
-                    .buildRoundRect(context.getResources().getString(R.string.emailTypeText), ResourcesCompat.getColor(context.getResources(), R.color.tooltipBackground, null), 8);
+                    .buildRoundRect(mCtx.getResources().getString(R.string.emailTypeText), mCtx.getResources().getColor(R.color.tooltipBackground), 8);
            holder.emailPrimary.setImageDrawable(drawable);
        }
        else {
--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
@ -0,0 +1,78 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
+import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * Author M M Arif
+ */
+
+public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowersAdapter.FollowersViewHolder> {
+
+    private List<UserInfo> followersList;
+    private Context mCtx;
+
+    static class FollowersViewHolder extends RecyclerView.ViewHolder {
+
+        private ImageView userAvatar;
+        private TextView userFullName;
+        private TextView userName;
+
+        private FollowersViewHolder(View itemView) {
+            super(itemView);
+
+            userAvatar = itemView.findViewById(R.id.userAvatar);
+            userFullName = itemView.findViewById(R.id.userFullName);
+            userName = itemView.findViewById(R.id.userName);
+
+        }
+    }
+
+    public ProfileFollowersAdapter(Context mCtx, List<UserInfo> followersListMain) {
+        this.mCtx = mCtx;
+        this.followersList = followersListMain;
+    }
+
+    @NonNull
+    @Override
+    public ProfileFollowersAdapter.FollowersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_followers, parent, false);
+        return new ProfileFollowersAdapter.FollowersViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ProfileFollowersAdapter.FollowersViewHolder holder, int position) {
+
+        UserInfo currentItem = followersList.get(position);
+
+        if(!currentItem.getFullname().equals("")) {
+            holder.userFullName.setText(currentItem.getFullname());
+            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+        }
+        else {
+            holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userName.setVisibility(View.GONE);
+        }
+
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+    }
+
+    @Override
+    public int getItemCount() {
+        return followersList.size();
+    }
+
+}
+
+
--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
@ -0,0 +1,77 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.models.UserInfo;
+import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * Author M M Arif
+ */
+
+public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowingAdapter.FollowingViewHolder> {
+
+    private List<UserInfo> followingList;
+    private Context mCtx;
+
+    static class FollowingViewHolder extends RecyclerView.ViewHolder {
+
+        private ImageView userAvatar;
+        private TextView userFullName;
+        private TextView userName;
+
+        private FollowingViewHolder(View itemView) {
+            super(itemView);
+
+            userAvatar = itemView.findViewById(R.id.userAvatar);
+            userFullName = itemView.findViewById(R.id.userFullName);
+            userName = itemView.findViewById(R.id.userName);
+
+        }
+    }
+
+    public ProfileFollowingAdapter(Context mCtx, List<UserInfo> followingListMain) {
+        this.mCtx = mCtx;
+        this.followingList = followingListMain;
+    }
+
+    @NonNull
+    @Override
+    public ProfileFollowingAdapter.FollowingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_following, parent, false);
+        return new ProfileFollowingAdapter.FollowingViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ProfileFollowingAdapter.FollowingViewHolder holder, int position) {
+
+        UserInfo currentItem = followingList.get(position);
+
+        if(!currentItem.getFullname().equals("")) {
+            holder.userFullName.setText(currentItem.getFullname());
+            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+        }
+        else {
+            holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userName.setVisibility(View.GONE);
+        }
+
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+    }
+
+    @Override
+    public int getItemCount() {
+        return followingList.size();
+    }
+
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
@ -3,26 +3,23 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import com.vdurmont.emoji.EmojiParser;
-import org.gitnex.tea4j.models.PullRequests;
 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.PullRequests;
 import java.util.List;
 import java.util.Locale;

@ -32,15 +29,17 @@ import java.util.Locale;

 public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

-	private final Context context;
+	private Context context;
 	private final int TYPE_LOAD = 0;
 	private List<PullRequests> prList;
 	private PullRequestsAdapter.OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;

 	public PullRequestsAdapter(Context context, List<PullRequests> prListMain) {
+
 		this.context = context;
 		this.prList = prListMain;
+
 	}

 	@NonNull
@ -55,6 +54,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		else {
 			return new PullRequestsAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
 		}
+
 	}

 	@Override
@ -64,11 +64,15 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH

 			isLoading = true;
 			loadMoreListener.onLoadMore();
+
 		}

 		if(getItemViewType(position) == TYPE_LOAD) {
+
 			((PullRequestsAdapter.PullRequestsHolder) holder).bindData(prList.get(position));
+
 		}
+
 	}

 	@Override
@ -80,125 +84,172 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		else {
 			return 1;
 		}
+
 	}

 	@Override
 	public int getItemCount() {
+
 		return prList.size();
+
 	}

 	class PullRequestsHolder extends RecyclerView.ViewHolder {

-		private PullRequests pullRequest;
-
-		private final ImageView assigneeAvatar;
-		private final TextView prTitle;
-		private final TextView prCreatedTime;
-		private final TextView prCommentsCount;
+		private TextView prNumber;
+		private TextView prMergeable;
+		private TextView prHeadBranch;
+		private TextView prIsFork;
+		private TextView prForkFullName;
+		private ImageView assigneeAvatar;
+		private TextView prTitle;
+		private TextView prCreatedTime;
+		private TextView prCommentsCount;

 		PullRequestsHolder(View itemView) {

 			super(itemView);
+
+			prNumber = itemView.findViewById(R.id.prNumber);
+			prMergeable = itemView.findViewById(R.id.prMergeable);
+			prHeadBranch = itemView.findViewById(R.id.prHeadBranch);
+			prIsFork = itemView.findViewById(R.id.prIsFork);
+			prForkFullName = itemView.findViewById(R.id.prForkFullName);
 			assigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
 			prTitle = itemView.findViewById(R.id.prTitle);
 			prCommentsCount = itemView.findViewById(R.id.prCommentsCount);
+			LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
 			prCreatedTime = itemView.findViewById(R.id.prCreatedTime);

-			itemView.setOnClickListener(v -> {
+			prTitle.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+
 				Intent intent = new Intent(context, IssueDetailActivity.class);
-				intent.putExtra("issueNumber", pullRequest.getNumber());
-				intent.putExtra("prMergeable", pullRequest.isMergeable());
-				intent.putExtra("prHeadBranch", pullRequest.getHead().getRef());
+				intent.putExtra("issueNumber", prNumber.getText());
+				intent.putExtra("prMergeable", prMergeable.getText());
+				intent.putExtra("prHeadBranch", prHeadBranch.getText());

 				TinyDB tinyDb = TinyDB.getInstance(context);
-				tinyDb.putString("issueNumber", String.valueOf(pullRequest.getNumber()));
-				tinyDb.putString("prMergeable", String.valueOf(pullRequest.isMergeable()));
-				tinyDb.putString("prHeadBranch", pullRequest.getHead().getRef());
+				tinyDb.putString("issueNumber", prNumber.getText().toString());
+				tinyDb.putString("prMergeable", prMergeable.getText().toString());
+				tinyDb.putString("prHeadBranch", prHeadBranch.getText().toString());
+				tinyDb.putString("prIsFork", prIsFork.getText().toString());
+				tinyDb.putString("prForkFullName", prForkFullName.getText().toString());
+				tinyDb.putString("issueType", "Pull");
+				context.startActivity(intent);

-				if(pullRequest.getHead() != null && pullRequest.getHead().getRepo() != null) {
-					tinyDb.putString("prIsFork", String.valueOf(pullRequest.getHead().getRepo().isFork()));
-					tinyDb.putString("prForkFullName", pullRequest.getHead().getRepo().getFull_name());
-				}
-				else {
-					// pull was done from a deleted fork
-					tinyDb.putString("prIsFork", "true");
-					tinyDb.putString("prForkFullName", context.getString(R.string.prDeletedFork));
-				}
+			});
+			frameCommentsCount.setOnClickListener(v -> {

+				Context context = v.getContext();
+
+				Intent intent = new Intent(context, IssueDetailActivity.class);
+				intent.putExtra("issueNumber", prNumber.getText());
+				intent.putExtra("prMergeable", prMergeable.getText());
+				intent.putExtra("prHeadBranch", prHeadBranch.getText());
+
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("issueNumber", prNumber.getText().toString());
+				tinyDb.putString("prMergeable", prMergeable.getText().toString());
+				tinyDb.putString("prHeadBranch", prHeadBranch.getText().toString());
+				tinyDb.putString("prIsFork", prIsFork.getText().toString());
+				tinyDb.putString("prForkFullName", prForkFullName.getText().toString());
 				tinyDb.putString("issueType", "Pull");
 				context.startActivity(intent);

 			});

-			assigneeAvatar.setOnClickListener(v -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", pullRequest.getUser().getLogin());
-				context.startActivity(intent);
-			});
-
-			assigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, pullRequest.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, pullRequest.getUser().getLogin()));
-				return true;
-			});
 		}

 		@SuppressLint("SetTextI18n")
-		void bindData(PullRequests pullRequest) {
+		void bindData(PullRequests prModel) {

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

-			PicassoService.getInstance(context).get()
-				.load(pullRequest.getUser().getAvatar_url())
-				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0))
-				.resize(120, 120)
-				.centerCrop()
-				.into(this.assigneeAvatar);
+			if(!prModel.getUser().getFull_name().equals("")) {
+				assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getFull_name(), context));
+			}
+			else {
+				assigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.prCreator) + prModel.getUser().getLogin(), context));
+			}

-			this.pullRequest = pullRequest;
+			if(prModel.getUser().getAvatar_url() != null) {
+				PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+			}
+			else {
+				PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+			}

-			String prNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + pullRequest.getNumber() + "</font>";
+			String prNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + prModel.getNumber() + "</font>";
+			prTitle.setText(Html.fromHtml(prNumber_ + " " + prModel.getTitle()));

-			this.prTitle.setText(HtmlCompat.fromHtml(prNumber_ + " " + EmojiParser.parseToUnicode(pullRequest.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
-			this.prCommentsCount.setText(String.valueOf(pullRequest.getComments()));
-			this.prCreatedTime.setText(TimeHelper.formatTime(pullRequest.getCreated_at(), locale, timeFormat, context));
+			prNumber.setText(String.valueOf(prModel.getNumber()));
+			prMergeable.setText(String.valueOf(prModel.isMergeable()));
+			if(prModel.getHead() != null) {
+				prHeadBranch.setText(prModel.getHead().getRef());
+				if(prModel.getHead().getRepo() != null) {
+					prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
+					prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
+				}
+				else {
+					// pull was done from a deleted fork
+					prIsFork.setText("true");
+					prForkFullName.setText(context.getString(R.string.prDeletedFrok));
+				}
+			}
+			prCommentsCount.setText(String.valueOf(prModel.getComments()));
+
+			prCreatedTime.setText(TimeHelper.formatTime(prModel.getCreated_at(), new Locale(locale), timeFormat, context));

 			if(timeFormat.equals("pretty")) {
-				this.prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(pullRequest.getCreated_at()), context));
+				prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(prModel.getCreated_at()), context));
 			}
+
 		}
+
 	}

 	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(PullRequestsAdapter.OnLoadMoreListener loadMoreListener) {
+
 		this.loadMoreListener = loadMoreListener;
+
 	}

 	public void updateList(List<PullRequests> list) {
+
 		prList = list;
 		notifyDataSetChanged();
 	}
+
 }
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
@ -1,28 +1,26 @@
 package org.mian.gitnex.adapters;

 import android.content.Context;
-import android.content.Intent;
+import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Releases;
 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.ClickListener;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.models.Releases;
 import java.util.List;
 import java.util.Locale;

@ -32,26 +30,25 @@ import java.util.Locale;

 public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.ReleasesViewHolder> {

-    private final List<Releases> releasesList;
-    private final Context context;
+    private List<Releases> releasesList;
+    private Context mCtx;

 	static class ReleasesViewHolder extends RecyclerView.ViewHolder {

-		private Releases releases;
-
-        private final TextView releaseType;
-        private final TextView releaseName;
-        private final ImageView authorAvatar;
-        private final TextView authorName;
-        private final TextView releaseTag;
-		private final TextView releaseDate;
-        private final TextView releaseBodyContent;
-        private final LinearLayout downloadFrame;
-        private final LinearLayout downloads;
-        private final TextView releaseZipDownload;
-	    private final TextView releaseTarDownload;
-	    private final ImageView downloadDropdownIcon;
-	    private final RecyclerView downloadList;
+        private TextView releaseType;
+        private TextView releaseName;
+        private ImageView authorAvatar;
+        private TextView authorName;
+        private TextView releaseTag;
+        private TextView releaseCommitSha;
+        private TextView releaseDate;
+        private TextView releaseBodyContent;
+        private LinearLayout downloadFrame;
+        private RelativeLayout downloads;
+        private TextView releaseZipDownload;
+	    private TextView releaseTarDownload;
+	    private ImageView downloadDropdownIcon;
+	    private RecyclerView downloadList;

        private ReleasesViewHolder(View itemView) {

@ -62,7 +59,7 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 	        authorAvatar = itemView.findViewById(R.id.authorAvatar);
 	        authorName = itemView.findViewById(R.id.authorName);
 	        releaseTag = itemView.findViewById(R.id.releaseTag);
-	        TextView releaseCommitSha = itemView.findViewById(R.id.releaseCommitSha);
+	        releaseCommitSha = itemView.findViewById(R.id.releaseCommitSha);
 	        releaseDate = itemView.findViewById(R.id.releaseDate);
 	        releaseBodyContent = itemView.findViewById(R.id.releaseBodyContent);
 	        downloadFrame = itemView.findViewById(R.id.downloadFrame);
@ -75,18 +72,11 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 	        downloadList.setHasFixedSize(true);
 	        downloadList.setLayoutManager(new LinearLayoutManager(itemView.getContext()));

-	        authorAvatar.setOnClickListener(loginId -> {
-		        Context context = loginId.getContext();
-
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", releases.getAuthor().getLogin());
-		        context.startActivity(intent);
-	        });
        }
    }

-    public ReleasesAdapter(Context ctx, List<Releases> releasesMain) {
-        this.context = ctx;
+    public ReleasesAdapter(Context mCtx, List<Releases> releasesMain) {
+        this.mCtx = mCtx;
        this.releasesList = releasesMain;
    }

@ -100,13 +90,11 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
    @Override
    public void onBindViewHolder(@NonNull ReleasesAdapter.ReleasesViewHolder holder, int position) {

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

        Releases currentItem = releasesList.get(position);
-        holder.releases = currentItem;

 	    holder.releaseName.setText(currentItem.getName());

@ -123,25 +111,25 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 	    }

 	    if(currentItem.getAuthor().getAvatar_url() != null) {
-		    PicassoService.getInstance(context).get().load(currentItem.getAuthor().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.authorAvatar);
+		    PicassoService.getInstance(mCtx).get().load(currentItem.getAuthor().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.authorAvatar);
 	    }

-	    holder.authorName.setText(context.getResources().getString(R.string.releasePublishedBy, currentItem.getAuthor().getUsername()));
+	    holder.authorName.setText(mCtx.getResources().getString(R.string.releasePublishedBy, currentItem.getAuthor().getUsername()));

 	    if(currentItem.getTag_name() != null) {
 	    	holder.releaseTag.setText(currentItem.getTag_name());
 	    }

 	    if(currentItem.getPublished_at() != null) {
-		    holder.releaseDate.setText(TimeHelper.formatTime(currentItem.getPublished_at(), locale, timeFormat, context));
+		    holder.releaseDate.setText(TimeHelper.formatTime(currentItem.getPublished_at(), new Locale(locale), timeFormat, mCtx));
 	    }

 	    if(timeFormat.equals("pretty")) {
-		    holder.releaseDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getPublished_at()), context));
+		    holder.releaseDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getPublished_at()), mCtx));
 	    }

        if(!currentItem.getBody().equals("")) {
-	        Markdown.render(context, currentItem.getBody(), holder.releaseBodyContent);
+	        new Markdown(mCtx, currentItem.getBody(), holder.releaseBodyContent);
        }
        else {
 	        holder.releaseBodyContent.setText(R.string.noReleaseBodyContent);
@ -153,25 +141,28 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas

 			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_down);
 			    holder.downloads.setVisibility(View.VISIBLE);
+
 		    }
 		    else {

 			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_right);
 			    holder.downloads.setVisibility(View.GONE);
+
 		    }

 	    });

        holder.releaseZipDownload.setText(
-                HtmlCompat.fromHtml("<a href='" + currentItem.getZipball_url() + "'>" + context.getResources().getString(R.string.zipArchiveDownloadReleasesTab) + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
+                Html.fromHtml("<a href='" + currentItem.getZipball_url() + "'>" + mCtx.getResources().getString(R.string.zipArchiveDownloadReleasesTab) + "</a> "));
        holder.releaseZipDownload.setMovementMethod(LinkMovementMethod.getInstance());

        holder.releaseTarDownload.setText(
-                HtmlCompat.fromHtml("<a href='" + currentItem.getTarball_url() + "'>" + context.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
+                Html.fromHtml("<a href='" + currentItem.getTarball_url() + "'>" + mCtx.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + "</a> "));
        holder.releaseTarDownload.setMovementMethod(LinkMovementMethod.getInstance());

 	    ReleasesDownloadsAdapter adapter = new ReleasesDownloadsAdapter(currentItem.getAssets());
 	    holder.downloadList.setAdapter(adapter);
+
    }

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesDownloadsAdapter.java
@ -1,15 +1,15 @@
 package org.mian.gitnex.adapters;

+import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Releases;
 import org.mian.gitnex.R;
+import org.mian.gitnex.models.Releases;
 import java.util.List;

 /**
@ -18,16 +18,18 @@ import java.util.List;

 public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder> {

-	private final List<Releases.assetsObject> releasesDownloadsList;
+	private List<Releases.assetsObject> releasesDownloadsList;

 	static class ReleasesDownloadsViewHolder extends RecyclerView.ViewHolder {

-		private final TextView downloadName;
+		private TextView downloadName;

 		private ReleasesDownloadsViewHolder(View itemView) {

 			super(itemView);
+
 			downloadName = itemView.findViewById(R.id.downloadName);
+
 		}
 	}

@ -51,10 +53,11 @@ public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownl
 		if(currentItem.getName() != null) {

 			holder.downloadName.setText(
-				HtmlCompat.fromHtml("<a href='" + currentItem.getBrowser_download_url() + "'>" + currentItem.getName() + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
+				Html.fromHtml("<a href='" + currentItem.getBrowser_download_url() + "'>" + currentItem.getName() + "</a> "));
 			holder.downloadName.setMovementMethod(LinkMovementMethod.getInstance());

 		}
+
 	}

 	@Override
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
M M Arif	030498f360	Release 3.3.0 (#780 ) Release 3.3.0 Co-authored-by: M M Arif <mmarif@swatian.com> Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/780	2020-11-18 08:19:52 +01:00
M M Arif	0fd072611b	Fix add new account (#778 ) Fix add new account Co-authored-by: M M Arif <mmarif@swatian.com> Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/778 Reviewed-by: 6543 <6543@noreply.codeberg.org>	2020-11-17 19:55:49 +01:00
6543	7aec99641e	Update Translations 2020-11-16 (#775 ) (#776 ) Merge branch 'release-3.3' into backport_775 Update Translations 2020-11-16 (#775) Update Translations 2020-11-16 Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/775 Reviewed-by: M M Arif <mmarif@noreply.codeberg.org> Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/776 Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>	2020-11-17 14:53:50 +01:00
M M Arif	40f909e46b	Fix date and minor ui improvements (#773 ) Fix date and minor ui improvements Co-authored-by: M M Arif <mmarif@swatian.com> Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/773 Reviewed-by: 6543 <6543@noreply.codeberg.org>	2020-11-17 05:40:14 +01:00
				`@ -0,0 +1 @@`
				!function(e){"use strict";function t(){"complete"===document.readyState?n():e.addEventListener("DOMContentLoaded",n)}function n(){try{var e=document.querySelectorAll("code.hljs");for(var t in e)e.hasOwnProperty(t)&&r(e[t])}catch(n){console.error("LineNumbers error: ",n)}}function r(e){if("object"==typeof e){var t=e.parentNode,n=o(t.textContent);if(n>1){for(var r="",c=0;n>c;c++)r+=c+1+"\n";var l=document.createElement("code");l.className="hljs hljs-line-numbers",l.style["float"]="left",l.textContent=r,t.insertBefore(l,e)}}}function o(e){if(0===e.length)return 0;var t=/\r\n\|\r\|\n/g,n=e.match(t);return n=n?n.length:0,e[e.length-1].match(t)\|\|(n+=1),n}"undefined"==typeof e.hljs?console.error("highlight.js not detected!"):(e.hljs.initLineNumbersOnLoad=t,e.hljs.lineNumbersBlock=r)}(window);