Release 3.3.0 rc2 (#753)

Release 3.3.0 rc2

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

.drone.yml

@@ -66,7 +66,7 @@ steps:
   - name: build
     image: nextcloudci/android:android-49
     commands:
-      - ./gradlew build
+      - ./gradlew assembleFreeRelease
 
   - name: sign
     image: nextcloudci/android:android-49
@@ -78,7 +78,7 @@ steps:
       KEY_PASS:
         from_secret: KEY_PASS
       OUTPUT: signed.apk
-      GITEA: https://gitea.com
+      INSTANCE: https://codeberg.org
       KS_FILE: ci_keystore.jks
       KS_REPO:
         from_secret: KS_REPO

.gitea/issue_template.md

@@ -1,32 +1,37 @@
 ## # What do you want to address?
-(This step is required; examples are shown below)
+<!-- This step is required; examples are shown below -->
 
 - [ ] Bug
 - [ ] Feature
 - [ ] Suggestion
 
 ## # Describe your matter briefly
-(This step is required)
+<!-- This step is required. -->
+<br><br>
 
-
-##### What did you expect? (Useful when addressing bugs)
+##### What did you expect? <!-- Useful when addressing bugs -->
 ---
-_(This step is optional)_
+<!-- This step is optional. -->
+<br><br>
 
-
-##### Some additional details (Useful, when we are trying to reproduce a bug)
+##### Some additional details <!-- Useful, when we are trying to reproduce a bug -->
 ---
-_(This step is optional; an example is shown below)_
+<!-- This step is optional; an example is shown below -->
 
 * The version of **Gitea** you are using: 
 * The version of **GitNex** you are using: 
-* Phone **OS** version and model: 
-* The type of certificate you are using (self-signed, signed): 
+* 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)_
+<!-- Screenshots and stacktrace's can go here. -->
+<br><br>
+
+- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/master/CONTRIBUTING.md).
+<br>
 
 #### Thank you for your time.

.gitea/pull_request_template.md

@@ -1,8 +1,9 @@
-Please check the following:
+### Describe what your pull request does and which issue you’re targeting
+<!-- Create a new issue, if it doesn't exist yet -->
+<br><br>
 
-1. Make sure you are targeting the `master` branch, pull requests on release branches are only allowed for bug fixes.
-2. Read contributing guidelines: [CONTRIBUTING.md](https://gitea.com/GitNex/GitNex/src/branch/master/CONTRIBUTING.md)
-3. Please follow the [Code-Standards](https://gitea.com/gitnex/GitNex/wiki/Code-Standards)
-4. Describe what your pull request does and which issue you’re targeting (create one if does not exist)
+<!-- Make sure you are targeting the master branch, pull requests on release branches are only allowed for bug fixes. -->
 
-**You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.**
+- [ ] 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/master/LICENSE).

.gitignore

@@ -11,6 +11,9 @@
 # Release dir
 app/release/*
 
+# Pro dir
+app/pro/*
+
 # Files for the ART/Dalvik VM
 *.dex
 

.gitlab-ci.yml

@@ -7,6 +7,9 @@ stages:
 test:
   image: nextcloudci/android:android-49
   stage: test
+  only:
+    - master
+    - tags
   script:
     - ./gradlew test
 
@@ -15,8 +18,9 @@ build:
   stage: build
   only:
     - master
+    - tags
   script:
-    - ./gradlew build
+    - ./gradlew assembleFreeRelease
   artifacts:
     paths:
       - app/build/outputs/
@@ -27,9 +31,10 @@ sign:
   stage: sign
   only:
     - master
+    - tags
   variables:
     OUTPUT: "signed.apk"
-    GITEA: "https://gitea.com"
+    INSTANCE: "https://codeberg.org"
     KS_FILE: "ci_keystore.jks"
   script:
     - ./scripts/sign-build.sh
@@ -43,6 +48,7 @@ latest:
   stage: publish
   only:
     - master
+    - tags
   variables:
     WEBDAV_USERNAME: "GitNexBot"
     PLUGIN_FILE: "signed.apk"

.idea/codeStyles/Project.xml

@@ -16,6 +16,15 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="RIGHT_MARGIN" value="220" />
       <option name="KEEP_LINE_BREAKS" value="false" />

CONTRIBUTING.md

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

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) [![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) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
 
 [<img alt="Become a Patroen" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif) [<img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="40"/>](https://liberapay.com/mmarif/donate)
 
 # GitNex - Android client for Gitea
 
-GitNex is a free, open-source Android client for Git repository management tool Gitea. Gitea is a community managed fork of Gogs, lightweight code hosting solution written in Go.
+GitNex is 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.
 
 ## Downloads
 [<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
-[<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex)
-[<img alt='Download builds and releases' src='assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
+[<img alt='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/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.
@@ -21,10 +21,10 @@ Check the versions [compatibility page](https://codeberg.org/gitnex/GitNex/wiki/
 ## Build from source
 Option 1 - Download the source code, open it in Android Studio and build it there.
 
-Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew build`.
+Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew assembleFree`.
 
 ## Features
-- Repositories / issues/ org list
+- Multiple accounts support
 - File and directory browser
 - File viewer
 - Create files
@@ -33,6 +33,7 @@ Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew build`
 - Files diff for PRs
 - Notifications
 - Drafts
+- Repositories / issues / org list
 - [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features)
 
 ## Contributing
@@ -71,24 +72,21 @@ Thanks to all the open source libraries, contributors and donators.
 - Retrofit
 - Gson
 - Okhttp
-- ViHtarb/tooltip
 - Picasso
 - Markwon
 - Prettytime
 - Amulyakhare/textdrawable
 - Vdurmont/emoji-java
-- Abumoallim/android-multi-select-dialog
 - Pes/materialcolorpicker
-- Hendraanggrian/socialview
 - 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
+- Barteksc/androidPdfViewer
+- Ge0rg/memorizingTrustManager
+- Dimezis/blurView
+- Mikaelhg/urlbuilder
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)

app/build.gradle

@@ -1,15 +1,28 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 308
-        versionName "3.1.0-rc2"
+        targetSdkVersion 30
+        versionCode 328
+        versionName "3.3.0-rc2"
+        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
+    flavorDimensions "default"
+    productFlavors {
+        free {
+            applicationId "org.mian.gitnex"
+        }
+        pro {
+            applicationId "org.mian.gitnex.pro"
+        }
+    }
     buildFeatures {
         viewBinding = true
     }
@@ -28,6 +41,9 @@ android {
         targetCompatibility = "8"
         sourceCompatibility = "8"
     }
+    defaultConfig{
+        vectorDrawables.useSupportLibrary = true
+    }
 }
 
 configurations {
@@ -36,30 +52,29 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = "2.3.0-alpha06"
-    def markwon_version = "4.4.0"
+    def lifecycle_version = '2.3.0-beta01'
+    def markwon_version = '4.6.0'
     def work_version = "2.4.0"
     def acra = "5.5.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.appcompat:appcompat:1.3.0-alpha01"
-    implementation "com.google.android.material:material:1.3.0-alpha02"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-    testImplementation "junit:junit:4.13"
-    androidTestImplementation "androidx.test:runner:1.2.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
-    implementation "com.github.vihtarb:tooltip:0.2.0"
-    implementation 'com.squareup.okhttp3:okhttp:4.8.0'
+    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 "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.8.0'
-    implementation 'org.ocpsoft.prettytime:prettytime:4.0.5.Final'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.6.Final'
     implementation "com.vdurmont:emoji-java:5.1.1"
     implementation "com.pes.materialcolorpicker:library:1.2.5"
     implementation "io.noties.markwon:core:$markwon_version"
@@ -77,8 +92,6 @@ dependencies {
     implementation "io.noties.markwon:syntax-highlight:$markwon_version"
     implementation "com.caverock:androidsvg:1.4"
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.19"
-    implementation "com.hendraanggrian.appcompat:socialview:0.2"
-    implementation "com.hendraanggrian.appcompat:socialview-commons:0.2"
     implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
     implementation "commons-io:commons-io:20030203.000550"
     implementation 'org.apache.commons:commons-lang3:3.11'

app/src/main/AndroidManifest.xml

@@ -17,49 +17,79 @@
         android:supportsRtl="true"
         tools:targetApi="n">
 
-        <activity android:name=".activities.MergePullRequestActivity" />
+        <activity
+            android:name=".activities.MergePullRequestActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.FileViewActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.CreateFileActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.RepoWatchersActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.RepoStargazersActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.AdminGetUsersActivity" />
         <activity
-            android:name=".activities.AddRemoveAssigneesActivity"
-            android:theme="@style/Theme.AppCompat.Light.Dialog" />
-        <activity android:name=".activities.CreateReleaseActivity" />
-        <activity android:name=".activities.EditIssueActivity" />
-        <activity android:name=".activities.CreateNewUserActivity" />
+            android:name=".activities.AdminGetUsersActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
-            android:name=".activities.AddRemoveLabelsActivity"
-            android:theme="@style/Theme.AppCompat.Light.Dialog" />
-        <activity android:name=".activities.ProfileEmailActivity" />
-        <activity android:name=".activities.AddCollaboratorToRepositoryActivity" />
-        <activity android:name=".activities.CreateTeamByOrgActivity" />
-        <activity android:name=".activities.OrganizationTeamMembersActivity" />
+            android:name=".activities.CreateReleaseActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.EditIssueActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateNewUserActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.ProfileEmailActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.AddCollaboratorToRepositoryActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateTeamByOrgActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.OrganizationTeamMembersActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.OrganizationDetailActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:label="@string/title_activity_org_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.CreateLabelActivity" />
-        <activity android:name=".activities.CreateIssueActivity" />
-        <activity android:name=".activities.CreateMilestoneActivity" />
-        <activity android:name=".activities.ReplyToIssueActivity" />
+        <activity
+            android:name=".activities.CreateLabelActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateIssueActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateMilestoneActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.ReplyToIssueActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.IssueDetailActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".activities.RepoDetailActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
             android:label="@string/title_activity_repo_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar" android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation">
+        <activity
+            android:name=".activities.MainActivity"
+            android:theme="@android:style/Theme.NoTitleBar"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -68,28 +98,86 @@
         </activity>
         <activity
             android:name=".activities.LoginActivity"
-            android:launchMode="singleTask" android:theme="@android:style/Theme.NoTitleBar"/>
-        <activity android:name=".activities.CreateRepoActivity" />
-        <activity android:name=".activities.CreateOrganizationActivity" />
-        <activity android:name=".activities.OpenRepoInBrowserActivity" />
-        <activity android:name=".activities.FileDiffActivity" />
-        <activity android:name=".activities.CommitsActivity" />
-        <activity android:name=".helpers.ssl.MemorizingActivity" android:theme="@android:style/Theme.Material.Dialog" />
-        <activity android:name=".activities.SettingsAppearanceActivity" />
-        <activity android:name=".activities.SettingsFileViewerActivity" />
-        <activity android:name=".activities.SettingsSecurityActivity" />
-        <activity android:name=".activities.SettingsTranslationActivity" />
-        <activity android:name=".activities.SettingsReportsActivity" />
-        <activity android:name=".activities.AddNewTeamMemberActivity" />
-        <activity android:name=".activities.SettingsDraftsActivity" />
-        <activity android:name=".activities.RepoForksActivity" />
-        <activity android:name=".activities.AddNewAccountActivity" />
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:launchMode="singleTask"
+            android:theme="@android:style/Theme.NoTitleBar"/>
+        <activity
+            android:name=".activities.CreateRepoActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreateOrganizationActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.OpenRepoInBrowserActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.FileDiffActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CommitsActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".helpers.ssl.MemorizingActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
+            android:theme="@android:style/Theme.Material.Dialog" />
+        <activity
+            android:name=".activities.SettingsAppearanceActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsFileViewerActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsSecurityActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsTranslationActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsReportsActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.AddNewTeamMemberActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsDraftsActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.RepoForksActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.AddNewAccountActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.RepositorySettingsActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.CreatePullRequestActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
+        <activity
+            android:name=".activities.SettingsGeneralActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
 
         <!-- Version < 3.0. DeX Mode and Screen Mirroring support -->
         <meta-data android:name="com.samsung.android.keepalive.density" android:value="true"/>
         <!-- Version >= 3.0. DeX Dual Mode support -->
         <meta-data android:name="com.samsung.android.multidisplay.keep_process_alive" android:value="true"/>
 
+        <!-- deep links -->
+        <activity
+            android:name=".activities.DeepLinksActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" android:host="*" />
+            </intent-filter>
+
+        </activity>
+        <!-- deep links -->
+
     </application>
 
 </manifest>

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

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

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

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

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

@@ -12,8 +12,10 @@ 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;
+import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -154,8 +156,55 @@ public class CollaboratorActions {
             public void onFailure(@NonNull Call<Permission> call, @NonNull Throwable t) {
                 Log.e("onFailure", t.toString());
             }
+
         });
 
     }
 
+	public static ActionResult<List<Collaborators>> getCollaborators(Context context) {
+
+		ActionResult<List<Collaborators>> actionResult = new ActionResult<>();
+		TinyDB tinyDb = new TinyDB(context);
+
+		String instanceUrl = tinyDb.getString("instanceUrl");
+		String loginUid = tinyDb.getString("loginUid");
+		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		String repoOwner = parts[0];
+		String repoName = parts[1];
+
+		Call<List<Collaborators>> call = RetrofitClient
+			.getInstance(instanceUrl, context)
+			.getApiInterface()
+			.getCollaborators(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName);
+
+		call.enqueue(new Callback<List<Collaborators>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+
+				if (response.isSuccessful()) {
+
+					assert response.body() != null;
+					actionResult.finish(ActionResult.Status.SUCCESS, response.body());
+				}
+				else {
+
+					actionResult.finish(ActionResult.Status.FAILED);
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
+
+				actionResult.finish(ActionResult.Status.FAILED);
+			}
+		});
+
+		return actionResult;
+
+	}
+
 }

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

@@ -1,11 +1,9 @@
 package org.mian.gitnex.actions;
 
 import android.content.Context;
-import android.util.Log;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.helpers.AlertDialogs;
@@ -13,6 +11,7 @@ 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;
@@ -53,8 +52,6 @@ public class IssueActions {
 						DraftsApi draftsApi = new DraftsApi(ctx);
 						draftsApi.deleteSingleDraft((int) draftIdOnCreate);
 
-						((ReplyToIssueActivity) ctx).finish();
-
 					}
 				}
 				else if(response.code() == 401) {
@@ -83,7 +80,7 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<IssueComments> call, @NonNull Throwable t) {
 
-				Log.e("onFailure", t.toString());
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
 			}
 		});
 
@@ -157,7 +154,7 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
 
-				Log.e("onFailure", t.toString());
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
 			}
 		});
 
@@ -217,7 +214,7 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				Toasty.success(ctx, ctx.getString(R.string.unsubscribedSuccessfully));
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
 			}
 		});
 
@@ -277,9 +274,69 @@ public class IssueActions {
 			@Override
 			public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
 
-				Toasty.error(ctx, ctx.getString(R.string.unsubscriptionError));
+				Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
 			}
 		});
 	}
 
+	public static ActionResult<ActionResult.None> reply(Context context, String comment, int issueIndex) {
+
+		ActionResult<ActionResult.None> actionResult = new ActionResult<>();
+		TinyDB tinyDb = new TinyDB(context);
+
+		String instanceUrl = tinyDb.getString("instanceUrl");
+		String loginUid = tinyDb.getString("loginUid");
+		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		String repoOwner = parts[0];
+		String repoName = parts[1];
+
+		Issues issueComment = new Issues(comment);
+
+		Call<Issues> call = RetrofitClient
+			.getInstance(instanceUrl, context)
+			.getApiInterface()
+			.replyCommentToIssue(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueComment);
+
+		call.enqueue(new Callback<Issues>() {
+
+			@Override
+			public void onResponse(@NonNull Call<Issues> call, @NonNull retrofit2.Response<Issues> response) {
+
+				if(response.code() == 201) {
+
+					actionResult.finish(ActionResult.Status.SUCCESS);
+
+					tinyDb.putBoolean("commentPosted", true);
+					tinyDb.putBoolean("resumeIssues", true);
+					tinyDb.putBoolean("resumePullRequests", true);
+
+				}
+				else if(response.code() == 401) {
+
+					AlertDialogs.authorizationTokenRevokedDialog(context, context.getString(R.string.alertDialogTokenRevokedTitle),
+						context.getString(R.string.alertDialogTokenRevokedMessage),
+						context.getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+						context.getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+				}
+				else {
+
+					actionResult.finish(ActionResult.Status.FAILED);
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
+
+				Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
+			}
+		});
+
+		return actionResult;
+
+	}
+
 }

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

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

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

@@ -63,7 +63,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         ImageView closeActivity = findViewById(R.id.close);
         addCollaboratorSearch = findViewById(R.id.addCollaboratorSearch);
         mRecyclerView = findViewById(R.id.recyclerViewUserSearch);
-        mProgressBar = findViewById(R.id.progress_bar);
+        mProgressBar = findViewById(R.id.progressBar);
         noData = findViewById(R.id.noData);
 
         addCollaboratorSearch.requestFocus();
@@ -76,7 +76,10 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
 
             if (actionId == EditorInfo.IME_ACTION_SEND) {
+
                 if(!addCollaboratorSearch.getText().toString().equals("")) {
+
+	                mProgressBar.setVisibility(View.VISIBLE);
                     loadUserSearchList(instanceUrl, instanceToken, addCollaboratorSearch.getText().toString(), loginUid);
                 }
             }
@@ -99,10 +102,15 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
             @Override
             public void onResponse(@NonNull Call<UserSearch> call, @NonNull Response<UserSearch> response) {
 
-                if (response.isSuccessful()) {
+	            mProgressBar.setVisibility(View.GONE);
+
+                if (response.code() == 200) {
+
                     assert response.body() != null;
                     getUsersList(response.body().getData(), ctx);
-                } else {
+                }
+                else {
+
                     Log.i("onResponse", String.valueOf(response.code()));
                 }
 
@@ -129,20 +137,20 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         mProgressBar.setVisibility(View.VISIBLE);
 
         if(adapter.getItemCount() > 0) {
+
             mRecyclerView.setAdapter(adapter);
             noData.setVisibility(View.GONE);
-            mProgressBar.setVisibility(View.GONE);
         }
         else {
+
             noData.setVisibility(View.VISIBLE);
-            mProgressBar.setVisibility(View.GONE);
         }
 
+	    mProgressBar.setVisibility(View.GONE);
     }
 
     private void initCloseListener() {
         onClickListener = view -> finish();
     }
 
-
 }

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

@@ -40,9 +40,11 @@ public class AddNewAccountActivity extends BaseActivity {
 	private ActivityAddNewAccountBinding viewBinding;
 
 	private enum Protocol {HTTPS, HTTP}
+	private String spinnerSelectedValue;
 
 	@Override
-	protected int getLayoutResourceId(){
+	protected int getLayoutResourceId() {
+
 		return R.layout.activity_add_new_account;
 	}
 
@@ -62,25 +64,24 @@ public class AddNewAccountActivity extends BaseActivity {
 		initCloseListener();
 		viewBinding.close.setOnClickListener(onClickListener);
 
-		ArrayAdapter<AddNewAccountActivity.Protocol> adapterProtocols = new ArrayAdapter<>(AddNewAccountActivity.this, R.layout.spinner_item, AddNewAccountActivity.Protocol.values());
-		adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item);
-
+		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(ctx, R.layout.list_spinner_items, Protocol.values());
 		viewBinding.protocolSpinner.setAdapter(adapterProtocols);
 
-		viewBinding.addNewAccount.setOnClickListener(login  -> {
+		viewBinding.protocolSpinner.setOnItemClickListener((parent, view1, position, id) -> spinnerSelectedValue = String.valueOf(parent.getItemAtPosition(position)));
+
+		viewBinding.addNewAccount.setOnClickListener(login -> {
 
 			boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
 			if(!connToInternet) {
 
 				Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
-
 			}
 			else {
 
 				processLogin();
 			}
-		 });
+		});
 
 	}
 
@@ -88,9 +89,15 @@ public class AddNewAccountActivity extends BaseActivity {
 
 		try {
 
-			String instanceUrlET = viewBinding.instanceUrl.getText().toString();
-			String loginToken = viewBinding.loginToken.getText().toString();
-			Protocol protocol = (Protocol) viewBinding.protocolSpinner.getSelectedItem();
+			String instanceUrlET = String.valueOf(viewBinding.instanceUrl.getText());
+			String loginToken = String.valueOf(viewBinding.loginToken.getText());
+			String protocol = spinnerSelectedValue;
+
+			if(protocol == null) {
+
+				Toasty.error(ctx, getResources().getString(R.string.protocolEmptyError));
+				return;
+			}
 
 			if(instanceUrlET.equals("")) {
 
@@ -106,10 +113,7 @@ public class AddNewAccountActivity extends BaseActivity {
 
 			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET, "http")).toUri();
 
-			URI instanceUrlWithProtocol = UrlBuilder.fromUri(rawInstanceUrl).withPath(PathsHelper.join(rawInstanceUrl.getPath()))
-				.withScheme(protocol.name().toLowerCase()).toUri();
-
-			URI instanceUrl = UrlBuilder.fromUri(instanceUrlWithProtocol).withPath(PathsHelper.join(instanceUrlWithProtocol.getPath(), "/api/v1/"))
+			URI instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(protocol.toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/"))
 				.toUri();
 
 			versionCheck(instanceUrl.toString(), loginToken);
@@ -127,7 +131,7 @@ public class AddNewAccountActivity extends BaseActivity {
 
 		Call<GiteaVersion> callVersion;
 
-		callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(loginToken);
+		callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken("token " + loginToken);
 
 		callVersion.enqueue(new Callback<GiteaVersion>() {
 
@@ -137,19 +141,18 @@ public class AddNewAccountActivity extends BaseActivity {
 				if(responseVersion.code() == 200) {
 
 					GiteaVersion version = responseVersion.body();
-					Version giteaVersion;
 
 					assert version != null;
 
-					try {
-						giteaVersion = new Version(version.getVersion());
-					}
-					catch(Exception e) {
+					if(!Version.valid(version.getVersion())) {
 
 						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
 						return;
 					}
 
+					tinyDB.putString("giteaVersion", version.getVersion());
+					Version giteaVersion = new Version(version.getVersion());
+
 					if(giteaVersion.less(getString(R.string.versionLow))) {
 
 						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
@@ -159,7 +162,6 @@ public class AddNewAccountActivity extends BaseActivity {
 						alertDialogBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {
 
 							dialog.dismiss();
-							//enableProcessButton();
 						});
 
 						alertDialogBuilder.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
@@ -169,7 +171,6 @@ public class AddNewAccountActivity extends BaseActivity {
 						});
 
 						alertDialogBuilder.create().show();
-
 					}
 					else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {
 
@@ -179,7 +180,6 @@ public class AddNewAccountActivity extends BaseActivity {
 
 						Toasty.warning(ctx, getResources().getString(R.string.versionUnsupportedNew));
 						login(instanceUrl, loginToken);
-
 					}
 
 				}
@@ -192,7 +192,6 @@ public class AddNewAccountActivity extends BaseActivity {
 			private void login(String instanceUrl, String loginToken) {
 
 				setupNewAccountWithToken(instanceUrl, loginToken);
-
 			}
 
 			@Override
@@ -239,12 +238,12 @@ public class AddNewAccountActivity extends BaseActivity {
 
 					case 401:
 
-						Toasty.error(ctx,getResources().getString(R.string.unauthorizedApiError));
+						Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
 						break;
 
 					default:
 
-						Toasty.error(ctx,getResources().getString(R.string.genericApiStatusError) + response.code());
+						Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
 				}
 
 			}
@@ -253,7 +252,7 @@ public class AddNewAccountActivity extends BaseActivity {
 			public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
 
 				Log.e("onFailure", t.toString());
-				Toasty.error(ctx,getResources().getString(R.string.genericError));
+				Toasty.error(ctx, getResources().getString(R.string.genericError));
 			}
 		});
 

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

@@ -81,9 +81,11 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 		closeActivity.setOnClickListener(onClickListener);
 
 		if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")) {
+
 			teamId = getIntent().getStringExtra("teamId");
 		}
 		else {
+
 			teamId = "0";
 		}
 
@@ -104,9 +106,7 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 
 					adapter = new UserSearchForTeamMemberAdapter(dataList, ctx, Integer.parseInt(teamId));
 					loadUserSearchList(instanceUrl, instanceToken, addNewTeamMember.getText().toString(), loginUid, teamId);
-
 				}
-
 			}
 
 			@Override
@@ -141,16 +141,13 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 						dataList.addAll(response.body().getData());
 						mRecyclerView.setAdapter(adapter);
 						noData.setVisibility(View.GONE);
-						mProgressBar.setVisibility(View.GONE);
-
 					}
 					else {
 
 						noData.setVisibility(View.VISIBLE);
-						mProgressBar.setVisibility(View.GONE);
-
 					}
 
+					mProgressBar.setVisibility(View.GONE);
 				}
 
 			}

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

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

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

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

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -75,7 +76,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
                 DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
             swipeRefresh.setRefreshing(false);
             AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
@@ -94,14 +95,14 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
 
             adapter = new AdminGetUsersAdapter(ctx, usersListMain);
             if(adapter.getItemCount() > 0) {
+
                 mRecyclerView.setVisibility(View.VISIBLE);
                 mRecyclerView.setAdapter(adapter);
                 noDataUsers.setVisibility(View.GONE);
                 searchFilter = true;
             }
             else {
-                //adapter.notifyDataSetChanged();
-                //mRecyclerView.setAdapter(adapter);
+
                 mRecyclerView.setVisibility(View.GONE);
                 noDataUsers.setVisibility(View.VISIBLE);
             }
@@ -116,7 +117,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
         final MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 
-        new Handler().postDelayed(() -> {
+        new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
             if(searchFilter) {
 
@@ -139,6 +140,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
 
                     @Override
                     public boolean onQueryTextChange(String newText) {
+
                         adapter.getFilter().filter(newText);
                         return false;
                     }
@@ -156,18 +158,21 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
 
         int id = item.getItemId();
 
-        switch (id) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.genericMenu:
-                BottomSheetAdminUsersFragment bottomSheet = new BottomSheetAdminUsersFragment();
-                bottomSheet.show(getSupportFragmentManager(), "usersBottomSheet");
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
+        if(id == android.R.id.home) {
 
+	        finish();
+	        return true;
+        }
+        else if(id == R.id.genericMenu) {
+
+	        BottomSheetAdminUsersFragment bottomSheet = new BottomSheetAdminUsersFragment();
+	        bottomSheet.show(getSupportFragmentManager(), "usersBottomSheet");
+	        return true;
+        }
+        else {
+
+	        return super.onOptionsItemSelected(item);
+        }
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import org.acra.ACRA;
 import org.acra.BuildConfig;
+import org.acra.annotation.AcraCore;
 import org.acra.annotation.AcraNotification;
 import org.acra.config.CoreConfigurationBuilder;
 import org.acra.config.LimiterConfigurationBuilder;
@@ -16,6 +17,9 @@ import org.mian.gitnex.helpers.FontsOverride;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.notifications.NotificationsMaster;
+import static org.acra.ReportField.ANDROID_VERSION;
+import static org.acra.ReportField.PHONE_MODEL;
+import static org.acra.ReportField.STACK_TRACE;
 
 /**
  * Author M M Arif
@@ -25,36 +29,52 @@ import org.mian.gitnex.notifications.NotificationsMaster;
 		resTitle = R.string.crashTitle,
 		resChannelName = R.string.setCrashReports,
 		resText = R.string.crashMessage)
+@AcraCore(reportContent = { ANDROID_VERSION, PHONE_MODEL, STACK_TRACE })
 
 public abstract class BaseActivity extends AppCompatActivity {
 
-	private Context appCtx;
-
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 
-		appCtx = getApplicationContext();
+		Context appCtx = getApplicationContext();
 		final TinyDB tinyDb = new TinyDB(appCtx);
 
 		switch(tinyDb.getInt("themeId")) {
 
 			case 1:
+
 				setTheme(R.style.AppThemeLight);
 				break;
-
 			case 2:
+
 				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
+
 					setTheme(R.style.AppTheme);
 				}
 				else {
+
 					setTheme(R.style.AppThemeLight);
 				}
 				break;
+			case 3:
 
+				setTheme(R.style.AppThemeRetro);
+				break;
+			case 4:
+
+				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
+
+					setTheme(R.style.AppTheme);
+				}
+				else {
+
+					setTheme(R.style.AppThemeRetro);
+				}
+				break;
 			default:
+
 				setTheme(R.style.AppTheme);
 				break;
-
 		}
 
 		String appLocale = tinyDb.getString("locale");
@@ -66,29 +86,30 @@ public abstract class BaseActivity extends AppCompatActivity {
 		switch(tinyDb.getInt("customFontId", -1)) {
 
 			case 0:
+
 				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
 				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
 				FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
 				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
 				break;
-
 			case 2:
+
 				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf");
 				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf");
 				FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf");
 				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf");
 				break;
-
 			default:
+
 				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf");
 				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf");
 				FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf");
 				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf");
 				break;
-
 		}
 
         if(tinyDb.getInt("pollingDelayMinutes") == 0) {
+
             tinyDb.putInt("pollingDelayMinutes", 15);
         }
 
@@ -96,35 +117,35 @@ public abstract class BaseActivity extends AppCompatActivity {
 
         // enabling counter badges by default
         if(tinyDb.getString("enableCounterBadgesInit").isEmpty()) {
+
             tinyDb.putBoolean("enableCounterBadges", true);
             tinyDb.putString("enableCounterBadgesInit", "yes");
         }
 
 		// enable crash reports by default
 		if(tinyDb.getString("crashReportingEnabledInit").isEmpty()) {
+
 			tinyDb.putBoolean("crashReportingEnabled", true);
 			tinyDb.putString("crashReportingEnabledInit", "yes");
 		}
 
 		// default cache setter
 		if(tinyDb.getString("cacheSizeStr").isEmpty()) {
+
 			tinyDb.putString("cacheSizeStr", getResources().getString(R.string.cacheSizeDataSelectionSelectedText));
 		}
 		if(tinyDb.getString("cacheSizeImagesStr").isEmpty()) {
+
 			tinyDb.putString("cacheSizeImagesStr", getResources().getString(R.string.cacheSizeImagesSelectionSelectedText));
 		}
 
 		// enable comment drafts by default
 		if(tinyDb.getString("draftsCommentsDeletionEnabledInit").isEmpty()) {
+
 			tinyDb.putBoolean("draftsCommentsDeletionEnabled", true);
 			tinyDb.putString("draftsCommentsDeletionEnabledInit", "yes");
 		}
 
-		if(!tinyDb.getString("instanceUrlWithProtocol").endsWith("/")) {
-
-			tinyDb.putString("instanceUrlWithProtocol", tinyDb.getString("instanceUrlWithProtocol") + "/");
-		}
-
 		if (tinyDb.getBoolean("crashReportingEnabled")) {
 
 			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);
@@ -132,9 +153,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 			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();

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.activities;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.Menu;
@@ -24,6 +25,7 @@ import org.mian.gitnex.clients.AppApiService;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.interfaces.ApiInterface;
 import org.mian.gitnex.models.Commits;
@@ -94,18 +96,18 @@ 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 = StaticGlobalVariables.resultLimitNewGiteaInstances;
 		}
 
 		recyclerView = findViewById(R.id.recyclerView);
 		commitsList = new ArrayList<>();
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 			swipeRefresh.setRefreshing(false);
 			loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
 			adapter.notifyDataChanged();
-
 		}, 200));
 
 		adapter = new CommitsAdapter(ctx, commitsList);
@@ -115,9 +117,7 @@ public class CommitsActivity extends BaseActivity {
 
 				int page = (commitsList.size() + resultLimit) / resultLimit;
 				loadMore(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, branchName, resultLimit);
-
 			}
-
 		}));
 
 		recyclerView.setHasFixedSize(true);
@@ -126,7 +126,6 @@ public class CommitsActivity extends BaseActivity {
 
 		api = AppApiService.createService(ApiInterface.class, instanceUrl, ctx);
 		loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
-
 	}
 
 	private void loadInitial(String token, String repoOwner, String repoName, String branchName, int resultLimit) {
@@ -138,7 +137,7 @@ public class CommitsActivity extends BaseActivity {
 			@Override
 			public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
 
-				if(response.isSuccessful()) {
+				if(response.code() == 200) {
 
 					assert response.body() != null;
 					if(response.body().size() > 0) {
@@ -147,29 +146,30 @@ public class CommitsActivity extends BaseActivity {
 						commitsList.addAll(response.body());
 						adapter.notifyDataChanged();
 						noData.setVisibility(View.GONE);
-
 					}
 					else {
+
 						commitsList.clear();
 						adapter.notifyDataChanged();
 						noData.setVisibility(View.VISIBLE);
 					}
+				}
+				if(response.code() == 409) {
 
-					progressBar.setVisibility(View.GONE);
-
+					noData.setVisibility(View.VISIBLE);
 				}
 				else {
 
 					Log.e(TAG, String.valueOf(response.code()));
-
 				}
 
+				progressBar.setVisibility(View.GONE);
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
 
-				Log.e(TAG, t.toString());
+				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
 			}
 
 		});
@@ -190,37 +190,32 @@ public class CommitsActivity extends BaseActivity {
 				if(response.isSuccessful()) {
 
 					List<Commits> result = response.body();
-
 					assert result != null;
+
 					if(result.size() > 0) {
 
 						pageSize = result.size();
 						commitsList.addAll(result);
-
 					}
 					else {
 
 						adapter.setMoreDataAvailable(false);
-
 					}
 
 					adapter.notifyDataChanged();
-					progressLoadMore.setVisibility(View.GONE);
-
 				}
 				else {
 
 					Log.e(TAG, String.valueOf(response.code()));
-
 				}
 
+				progressLoadMore.setVisibility(View.GONE);
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
 
-				Log.e(TAG, t.toString());
-
+				Toasty.error(ctx, getResources().getString(R.string.errorOnLogin));
 			}
 
 		});
@@ -255,7 +250,6 @@ public class CommitsActivity extends BaseActivity {
 		});
 
 		return super.onCreateOptionsMenu(menu);
-
 	}
 
 	private void filter(String text) {
@@ -263,7 +257,9 @@ public class CommitsActivity extends BaseActivity {
 		List<Commits> arr = new ArrayList<>();
 
 		for(Commits d : commitsList) {
+
 			if(d.getCommit().getMessage().toLowerCase().contains(text) || d.getSha().toLowerCase().contains(text)) {
+
 				arr.add(d);
 			}
 		}
@@ -274,6 +270,7 @@ public class CommitsActivity extends BaseActivity {
 	private void initCloseListener() {
 
 		onClickListener = view -> {
+
 			getIntent().removeExtra("branchName");
 			finish();
 		};

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

@@ -1,17 +1,17 @@
 package org.mian.gitnex.activities;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
@@ -45,7 +45,7 @@ public class CreateFileActivity extends BaseActivity {
     private EditText newFileContent;
     private EditText newFileBranchName;
     private EditText newFileCommitMessage;
-    private Spinner newFileBranchesSpinner;
+    private AutoCompleteTextView newFileBranchesSpinner;
 	private String filePath;
 	private String fileSha;
 	private int fileAction = 0; // 0 = create, 1 = delete, 2 = edit
@@ -55,11 +55,20 @@ public class CreateFileActivity extends BaseActivity {
 
     List<Branches> branchesList = new ArrayList<>();
 
+    private String instanceUrl;
+	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
     public void onCreate(Bundle savedInstanceState) {
 
@@ -71,23 +80,20 @@ public class CreateFileActivity extends BaseActivity {
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
+        instanceUrl = tinyDb.getString("instanceUrl");
+        loginUid = tinyDb.getString("loginUid");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        repoOwner = parts[0];
+        repoName = parts[1];
+        instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         closeActivity = findViewById(R.id.close);
         newFileName = findViewById(R.id.newFileName);
         newFileContent = findViewById(R.id.newFileContent);
         newFileBranchName = findViewById(R.id.newFileBranchName);
         newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
-        TextView branchNameId = findViewById(R.id.branchNameId);
-        TextView branchNameHintText = findViewById(R.id.branchNameHintText);
 	    TextView toolbarTitle = findViewById(R.id.toolbarTitle);
-	    TextView fileNameHint = findViewById(R.id.fileNameHint);
 
         newFileName.requestFocus();
         assert imm != null;
@@ -98,9 +104,19 @@ public class CreateFileActivity extends BaseActivity {
 
         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) {
+
+			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
+		    }
+		    return false;
+	    });
+
 	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 1) == 1) {
 
-		    fileNameHint.setVisibility(View.GONE);
 		    fileAction = getIntent().getIntExtra("fileAction", 1);
 
 		    filePath = getIntent().getStringExtra("filePath");
@@ -121,7 +137,6 @@ public class CreateFileActivity extends BaseActivity {
 
 	    if(getIntent().getStringExtra("filePath") != null && getIntent().getIntExtra("fileAction", 2) == 2) {
 
-		    fileNameHint.setVisibility(View.GONE);
 		    fileAction = getIntent().getIntExtra("fileAction", 2);
 
 		    filePath = getIntent().getStringExtra("filePath");
@@ -142,35 +157,8 @@ public class CreateFileActivity extends BaseActivity {
         closeActivity.setOnClickListener(onClickListener);
 
         newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
-        newFileBranchesSpinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getBranches(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
 
-        newFileBranchesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
-        {
-            public void onItemSelected(AdapterView<?> arg0,
-                                       View arg1, int arg2, long arg3)
-            {
-                Branches bModelValue = (Branches) newFileBranchesSpinner.getSelectedItem();
-
-                if(bModelValue.toString().equals("No branch")) {
-                    newFileBranchName.setEnabled(true);
-                    newFileBranchName.setVisibility(View.VISIBLE);
-                    branchNameId.setVisibility(View.VISIBLE);
-                    branchNameHintText.setVisibility(View.VISIBLE);
-                }
-                else {
-                    newFileBranchName.setEnabled(false);
-                    newFileBranchName.setVisibility(View.GONE);
-                    branchNameId.setVisibility(View.GONE);
-                    branchNameHintText.setVisibility(View.GONE);
-                    newFileBranchName.setText("");
-                }
-
-            }
-
-            public void onNothingSelected(AdapterView<?> arg0) {}
-        });
-
         disableProcessButton();
 
         if(!connToInternet) {
@@ -184,54 +172,43 @@ public class CreateFileActivity extends BaseActivity {
 
     }
 
-    private View.OnClickListener createFileListener = v -> processNewFile();
+    private final View.OnClickListener createFileListener = v -> processNewFile();
 
     private void processNewFile() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
 
         String newFileName_ = newFileName.getText().toString();
         String newFileContent_ = newFileContent.getText().toString();
         String newFileBranchName_ = newFileBranchName.getText().toString();
         String newFileCommitMessage_ = newFileCommitMessage.getText().toString();
 
-        Branches currentBranch = (Branches) newFileBranchesSpinner.getSelectedItem();
-
         if(!connToInternet) {
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if(newFileName_.equals("") || newFileContent_.equals("") || newFileCommitMessage_.equals("")) {
 
             Toasty.error(ctx, getString(R.string.newFileRequiredFields));
             return;
-
         }
 
-        if(currentBranch.toString().equals("No branch")) {
+        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;
-
                 }
             }
 
@@ -240,7 +217,6 @@ public class CreateFileActivity extends BaseActivity {
         if(appUtil.charactersLength(newFileCommitMessage_) > 255) {
 
             Toasty.warning(ctx, getString(R.string.newFileCommitMessageError));
-
         }
         else {
 
@@ -249,17 +225,17 @@ public class CreateFileActivity extends BaseActivity {
             if(fileAction == 1) {
 
 	            deleteFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, filePath,
-		            newFileBranchName_, newFileCommitMessage_, currentBranch.toString(), fileSha);
+		            newFileBranchName_, newFileCommitMessage_, selectedBranch, fileSha);
             }
             else if(fileAction == 2) {
 
 	            editFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, filePath,
-		           appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString(), fileSha);
+		           appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, selectedBranch, fileSha);
             }
             else {
 
 	            createNewFile(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newFileName_,
-		            appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, currentBranch.toString());
+		            appUtil.encodeBase64(newFileContent_), newFileBranchName_, newFileCommitMessage_, selectedBranch);
             }
 
         }
@@ -270,9 +246,11 @@ public class CreateFileActivity extends BaseActivity {
 
         NewFile createNewFileJsonStr;
         if(currentBranch.equals("No branch")) {
+
             createNewFileJsonStr = new NewFile("", fileContent, fileCommitMessage, fileBranchName);
         }
         else {
+
             createNewFileJsonStr = new NewFile(currentBranch, fileContent, fileCommitMessage, "");
         }
 
@@ -291,7 +269,6 @@ public class CreateFileActivity extends BaseActivity {
                     enableProcessButton();
                     Toasty.success(ctx, getString(R.string.newFileSuccessMessage));
                     finish();
-
                 }
                 else if(response.code() == 401) {
 
@@ -300,21 +277,20 @@ public class CreateFileActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else {
 
                     if(response.code() == 404) {
+
                         enableProcessButton();
                         Toasty.warning(ctx, getString(R.string.apiNotFound));
                     }
                     else {
+
                         enableProcessButton();
                         Toasty.error(ctx, getString(R.string.orgCreatedError));
                     }
-
                 }
-
             }
 
             @Override
@@ -331,6 +307,7 @@ public class CreateFileActivity extends BaseActivity {
 
     	String branchName;
 		DeleteFile deleteFileJsonStr;
+
 		if(currentBranch.equals("No branch")) {
 
 			branchName = fileBranchName;
@@ -360,7 +337,6 @@ public class CreateFileActivity extends BaseActivity {
 					getIntent().removeExtra("fileSha");
 					getIntent().removeExtra("fileContents");
 					finish();
-
 				}
 				else if(response.code() == 401) {
 
@@ -369,7 +345,6 @@ public class CreateFileActivity extends BaseActivity {
 						getResources().getString(R.string.alertDialogTokenRevokedMessage),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
 				}
 				else {
 
@@ -383,9 +358,7 @@ public class CreateFileActivity extends BaseActivity {
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.genericError));
 					}
-
 				}
-
 			}
 
 			@Override
@@ -402,6 +375,7 @@ public class CreateFileActivity extends BaseActivity {
 
 		String branchName;
 		EditFile editFileJsonStr;
+
 		if(currentBranch.equals("No branch")) {
 
 			branchName = fileBranchName;
@@ -432,7 +406,6 @@ public class CreateFileActivity extends BaseActivity {
 					getIntent().removeExtra("fileContents");
 					tinyDb.putBoolean("fileModified", true);
 					finish();
-
 				}
 				else if(response.code() == 401) {
 
@@ -441,7 +414,6 @@ public class CreateFileActivity extends BaseActivity {
 						getResources().getString(R.string.alertDialogTokenRevokedMessage),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
 				}
 				else {
 
@@ -455,9 +427,7 @@ public class CreateFileActivity extends BaseActivity {
 						enableProcessButton();
 						Toasty.info(ctx, getString(R.string.genericError));
 					}
-
 				}
-
 			}
 
 			@Override
@@ -483,37 +453,53 @@ public class CreateFileActivity extends BaseActivity {
             public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {
 
                 if(response.isSuccessful()) {
+
                     if(response.code() == 200) {
 
                         List<Branches> branchesList_ = response.body();
 
                         branchesList.add(new Branches("No branch"));
                         assert branchesList_ != null;
+
                         if(branchesList_.size() > 0) {
+
                             for (int i = 0; i < branchesList_.size(); i++) {
 
-                                Branches data = new Branches(
-                                        branchesList_.get(i).getName()
-                                );
+                                Branches data = new Branches(branchesList_.get(i).getName());
                                 branchesList.add(data);
-
                             }
                         }
 
                         ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateFileActivity.this,
-                                R.layout.spinner_item, branchesList);
+                                R.layout.list_spinner_items, branchesList);
 
-                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
                         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("");
+		                    }
+
+	                    });
                     }
                 }
-
             }
 
             @Override
             public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
             }
         });
@@ -521,6 +507,7 @@ public class CreateFileActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
+
         onClickListener = view -> finish();
     }
 

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

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

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

@@ -87,22 +87,14 @@ public class CreateLabelActivity extends BaseActivity {
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
-        colorPicker.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                cp.show();
-            }
-        });
+        colorPicker.setOnClickListener(v -> cp.show());
 
-        cp.setCallback(new ColorPickerCallback() {
-            @Override
-            public void onColorChosen(@ColorInt int color) {
+        cp.setCallback(color -> {
 
-                //Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
-                colorPicker.setBackgroundColor(color);
-                tinyDb.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
-                cp.dismiss();
-
-            }
+            //Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
+            colorPicker.setBackgroundColor(color);
+            tinyDb.putString("labelColor", String.format("#%06X", (0xFFFFFF & color)));
+            cp.dismiss();
         });
 
         if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("edit")) {
@@ -131,9 +123,9 @@ public class CreateLabelActivity extends BaseActivity {
 
     }
 
-    private View.OnClickListener createLabelListener = v -> processCreateLabel();
+    private final View.OnClickListener createLabelListener = v -> processCreateLabel();
 
-    private View.OnClickListener updateLabelListener = v -> processUpdateLabel();
+    private final View.OnClickListener updateLabelListener = v -> processUpdateLabel();
 
     private void processUpdateLabel() {
 
@@ -152,9 +144,11 @@ public class CreateLabelActivity extends BaseActivity {
 
         String updateLabelColor;
         if(tinyDb.getString("labelColor").isEmpty()) {
+
             updateLabelColor = tinyDb.getString("labelColorDefault");
         }
         else {
+
             updateLabelColor = tinyDb.getString("labelColor");
         }
 
@@ -162,21 +156,18 @@ public class CreateLabelActivity extends BaseActivity {
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if(updateLabelName.equals("")) {
 
             Toasty.error(ctx, getString(R.string.labelEmptyError));
             return;
-
         }
 
         if(!appUtil.checkStrings(updateLabelName)) {
 
             Toasty.error(ctx, getString(R.string.labelNameError));
             return;
-
         }
 
         disableProcessButton();
@@ -200,10 +191,13 @@ public class CreateLabelActivity extends BaseActivity {
 
         String newLabelName = labelName.getText().toString();
         String newLabelColor;
+
         if(tinyDb.getString("labelColor").isEmpty()) {
+
             newLabelColor = String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(ctx, R.color.releasePre)));
         }
         else {
+
             newLabelColor = tinyDb.getString("labelColor");
         }
 
@@ -211,26 +205,22 @@ public class CreateLabelActivity extends BaseActivity {
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if(newLabelName.equals("")) {
 
             Toasty.error(ctx, getString(R.string.labelEmptyError));
             return;
-
         }
 
         if(!appUtil.checkStrings(newLabelName)) {
 
             Toasty.error(ctx, getString(R.string.labelNameError));
             return;
-
         }
 
         disableProcessButton();
         createNewLabel(instanceUrl, instanceToken, repoOwner, repoName, newLabelName, newLabelColor, loginUid);
-
     }
 
     private void createNewLabel(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String newLabelName, String newLabelColor, String loginUid) {
@@ -256,7 +246,6 @@ public class CreateLabelActivity extends BaseActivity {
                     tinyDb.putString("labelColor", "");
                     tinyDb.putBoolean("labelsRefresh", true);
                     finish();
-
                 }
                 else if(response.code() == 401) {
 
@@ -265,16 +254,13 @@ public class CreateLabelActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else {
 
                     enableProcessButton();
                     tinyDb.putString("labelColor", "");
                     Toasty.error(ctx, getString(R.string.labelGeneralError));
-
                 }
-
             }
 
             @Override
@@ -306,6 +292,7 @@ public class CreateLabelActivity extends BaseActivity {
             public void onResponse(@NonNull Call<CreateLabel> call, @NonNull retrofit2.Response<CreateLabel> response) {
 
                 if(response.isSuccessful()) {
+
                     if(response.code() == 200) {
 
                         Toasty.success(ctx, getString(R.string.labelUpdated));
@@ -317,7 +304,6 @@ public class CreateLabelActivity extends BaseActivity {
                         getIntent().removeExtra("labelTitle");
                         getIntent().removeExtra("labelColor");
                         finish();
-
                     }
                 }
                 else if(response.code() == 401) {
@@ -327,7 +313,6 @@ public class CreateLabelActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else {
 
@@ -335,9 +320,7 @@ public class CreateLabelActivity extends BaseActivity {
                     tinyDb.putString("labelColor", "");
                     tinyDb.putString("labelColorDefault", "");
                     Toasty.error(ctx, getString(R.string.labelGeneralError));
-
                 }
-
             }
 
             @Override
@@ -353,15 +336,14 @@ public class CreateLabelActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                getIntent().removeExtra("labelAction");
-                getIntent().removeExtra("labelId");
-                getIntent().removeExtra("labelTitle");
-                getIntent().removeExtra("labelColor");
-                finish();
-            }
+
+        onClickListener = view -> {
+
+            getIntent().removeExtra("labelAction");
+            getIntent().removeExtra("labelId");
+            getIntent().removeExtra("labelTitle");
+            getIntent().removeExtra("labelColor");
+            finish();
         };
     }
 
@@ -380,13 +362,13 @@ public class CreateLabelActivity extends BaseActivity {
             public void onResponse(@NonNull Call<Labels> call, @NonNull retrofit2.Response<Labels> response) {
 
                 if(response.isSuccessful()) {
+
                     if(response.code() == 204) {
 
                         Toasty.success(ctx, getString(R.string.labelDeleteText));
                         LabelsViewModel.loadLabelsList(instanceUrl, instanceToken, repoOwner, repoName, ctx);
                         getIntent().removeExtra("labelAction");
                         getIntent().removeExtra("labelId");
-
                     }
                 }
                 else if(response.code() == 401) {
@@ -395,14 +377,11 @@ public class CreateLabelActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else {
 
                     Toasty.error(ctx, getString(R.string.labelDeleteErrorText));
-
                 }
-
             }
 
             @Override

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

@@ -1,9 +1,11 @@
 package org.mian.gitnex.activities;
 
+import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
@@ -43,6 +45,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         return R.layout.activity_new_milestone;
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
@@ -63,6 +66,17 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         assert imm != null;
         imm.showSoftInput(milestoneTitle, InputMethodManager.SHOW_IMPLICIT);
 
+	    milestoneDescription.setOnTouchListener((touchView, motionEvent) -> {
+
+		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
+
+		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
+
+			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
+		    }
+		    return false;
+	    });
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
         milestoneDueDate.setOnClickListener(this);
@@ -78,7 +92,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
     }
 
-    private View.OnClickListener createMilestoneListener = v -> processNewMilestone();
+    private final View.OnClickListener createMilestoneListener = v -> processNewMilestone();
 
     private void processNewMilestone() {
 
@@ -92,7 +106,6 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        //String appLocale = tinyDb.getString("locale");
 
         String newMilestoneTitle = milestoneTitle.getText().toString();
         String newMilestoneDescription = milestoneDescription.getText().toString();
@@ -102,26 +115,25 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if(newMilestoneTitle.equals("")) {
 
             Toasty.error(ctx, getString(R.string.milestoneNameErrorEmpty));
             return;
-
         }
 
         if(!newMilestoneDescription.equals("")) {
+
             if (appUtil.charactersLength(newMilestoneDescription) > 255) {
 
                 Toasty.warning(ctx, getString(R.string.milestoneDescError));
                 return;
-
             }
         }
 
         String finalMilestoneDueDate = null;
+
         if(!newMilestoneDueDate.isEmpty()) {
 
             finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
@@ -135,7 +147,6 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
         disableProcessButton();
         createNewMilestone(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
-
     }
 
     private void createNewMilestone(final String instanceUrl, final String token, String repoOwner, String repoName, String newMilestoneTitle, String newMilestoneDescription, String newMilestoneDueDate) {
@@ -155,6 +166,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
             public void onResponse(@NonNull Call<Milestones> call, @NonNull retrofit2.Response<Milestones> response) {
 
                 if(response.isSuccessful()) {
+
                     if(response.code() == 201) {
 
                         TinyDB tinyDb = new TinyDB(appCtx);
@@ -162,7 +174,6 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
                         Toasty.success(ctx, getString(R.string.milestoneCreated));
                         enableProcessButton();
                         finish();
-
                     }
                 }
                 else if(response.code() == 401) {
@@ -172,19 +183,17 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else {
 
                     enableProcessButton();
                     Toasty.error(ctx, getString(R.string.milestoneCreatedError));
-
                 }
-
             }
 
             @Override
             public void onFailure(@NonNull Call<Milestones> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -203,16 +212,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
             final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
             DatePickerDialog datePickerDialog = new DatePickerDialog(this,
-                    new DatePickerDialog.OnDateSetListener() {
-
-                        @Override
-                        public void onDateSet(DatePicker view, int year,
-                                              int monthOfYear, int dayOfMonth) {
-
-                            milestoneDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
-
-                        }
-                    }, mYear, mMonth, mDay);
+	            (view, year, monthOfYear, dayOfMonth) -> milestoneDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth)), mYear, mMonth, mDay);
             datePickerDialog.show();
         }
 

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

@@ -73,7 +73,6 @@ public class CreateNewUserActivity extends BaseActivity {
 
             createUserButton.setOnClickListener(createNewUserListener);
         }
-
     }
 
     private void processCreateNewUser() {
@@ -94,40 +93,34 @@ public class CreateNewUserActivity extends BaseActivity {
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if(newFullName.equals("") || newUserName.equals("") | newUserEmail.equals("") || newUserPassword.equals("")) {
 
             Toasty.error(ctx, getString(R.string.emptyFields));
             return;
-
         }
 
         if(!appUtil.checkStrings(newFullName)) {
 
             Toasty.error(ctx, getString(R.string.userInvalidFullName));
             return;
-
         }
 
         if(!appUtil.checkStringsWithAlphaNumeric(newUserName)) {
 
             Toasty.error(ctx, getString(R.string.userInvalidUserName));
             return;
-
         }
 
         if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
             Toasty.error(ctx, getString(R.string.userInvalidEmail));
             return;
-
         }
 
         disableProcessButton();
         createNewUser(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newFullName, newUserName, newUserEmail, newUserPassword);
-
     }
 
     private void createNewUser(final String instanceUrl, final String instanceToken, String newFullName, String newUserName, String newUserEmail, String newUserPassword) {
@@ -151,7 +144,6 @@ public class CreateNewUserActivity extends BaseActivity {
                     Toasty.success(ctx, getString(R.string.userCreatedText));
                     enableProcessButton();
                     finish();
-
                 }
                 else if(response.code() == 401) {
 
@@ -160,33 +152,27 @@ public class CreateNewUserActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else if(response.code() == 403) {
 
                     enableProcessButton();
                     Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-
                 }
                 else if(response.code() == 404) {
 
                     enableProcessButton();
                     Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-
                 }
                 else if(response.code() == 422) {
 
                     enableProcessButton();
                     Toasty.warning(ctx, ctx.getString(R.string.userExistsError));
-
                 }
                 else {
 
                     enableProcessButton();
                     Toasty.error(ctx, getString(R.string.genericError));
-
                 }
-
             }
 
             @Override
@@ -199,7 +185,7 @@ public class CreateNewUserActivity extends BaseActivity {
 
     }
 
-    private View.OnClickListener createNewUserListener = v -> processCreateNewUser();
+    private final View.OnClickListener createNewUserListener = v -> processCreateNewUser();
 
     private void initCloseListener() {
 

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

@@ -1,8 +1,10 @@
 package org.mian.gitnex.activities;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
@@ -40,6 +42,7 @@ public class CreateOrganizationActivity extends BaseActivity {
         return R.layout.activity_new_organization;
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
@@ -58,6 +61,17 @@ public class CreateOrganizationActivity extends BaseActivity {
         assert imm != null;
         imm.showSoftInput(orgName, InputMethodManager.SHOW_IMPLICIT);
 
+	    orgDesc.setOnTouchListener((touchView, motionEvent) -> {
+
+		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
+
+		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
+
+			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
+		    }
+		    return false;
+	    });
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
@@ -75,19 +89,11 @@ public class CreateOrganizationActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
+
+        onClickListener = view -> finish();
     }
 
-    private View.OnClickListener createOrgListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            processNewOrganization();
-        }
-    };
+    private final View.OnClickListener createOrgListener = v -> processNewOrganization();
 
     private void processNewOrganization() {
 
@@ -105,33 +111,29 @@ public class CreateOrganizationActivity extends BaseActivity {
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if(!newOrgDesc.equals("")) {
+
             if (appUtil.charactersLength(newOrgDesc) > 255) {
 
                 Toasty.warning(ctx, getString(R.string.orgDescError));
                 return;
-
             }
         }
 
         if(newOrgName.equals("")) {
 
             Toasty.error(ctx, getString(R.string.orgNameErrorEmpty));
-
         }
         else if(!appUtil.checkStrings(newOrgName)) {
 
             Toasty.warning(ctx, getString(R.string.orgNameErrorInvalid));
-
         }
         else {
 
             disableProcessButton();
             createNewOrganization(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newOrgName, newOrgDesc);
-
         }
 
     }
@@ -157,7 +159,6 @@ public class CreateOrganizationActivity extends BaseActivity {
                     enableProcessButton();
                     Toasty.success(ctx, getString(R.string.orgCreated));
                     finish();
-
                 }
                 else if(response.code() == 401) {
 
@@ -166,37 +167,35 @@ public class CreateOrganizationActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else if(response.code() == 409) {
 
                     enableProcessButton();
                     Toasty.warning(ctx, getString(R.string.orgExistsError));
-
                 }
                 else if(response.code() == 422) {
 
                     enableProcessButton();
                     Toasty.warning(ctx, getString(R.string.orgExistsError));
-
                 }
                 else {
 
                     if(response.code() == 404) {
+
                         enableProcessButton();
                         Toasty.warning(ctx, getString(R.string.apiNotFound));
                     }
                     else {
+
                         enableProcessButton();
                         Toasty.error(ctx, getString(R.string.orgCreatedError));
                     }
-
                 }
-
             }
 
             @Override
             public void onFailure(@NonNull Call<UserOrganizations> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }

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

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

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

@@ -1,18 +1,18 @@
 package org.mian.gitnex.activities;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Spinner;
 import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -37,7 +37,7 @@ public class CreateReleaseActivity extends BaseActivity {
     private View.OnClickListener onClickListener;
     public ImageView closeActivity;
     private EditText releaseTagName;
-    private Spinner releaseBranch;
+    private AutoCompleteTextView releaseBranch;
     private EditText releaseTitle;
     private EditText releaseContent;
     private CheckBox releaseType;
@@ -45,6 +45,14 @@ public class CreateReleaseActivity extends BaseActivity {
     private Button createNewRelease;
     final Context ctx = this;
     private Context appCtx;
+    private TinyDB tinyDb;
+    private String selectedBranch;
+
+    private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	private String repoName;
 
     List<Branches> branchesList = new ArrayList<>();
 
@@ -53,24 +61,25 @@ public class CreateReleaseActivity extends BaseActivity {
         return R.layout.activity_create_release;
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
+	    tinyDb = new TinyDB(appCtx);
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        instanceUrl = tinyDb.getString("instanceUrl");
+        loginUid = tinyDb.getString("loginUid");
+        instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
+        repoOwner = parts[0];
+        repoName = parts[1];
 
         closeActivity = findViewById(R.id.close);
         releaseTagName = findViewById(R.id.releaseTagName);
@@ -79,27 +88,26 @@ public class CreateReleaseActivity extends BaseActivity {
         releaseType = findViewById(R.id.releaseType);
         releaseDraft = findViewById(R.id.releaseDraft);
 
-        releaseTagName.requestFocus();
+	    releaseTitle.requestFocus();
         assert imm != null;
-        imm.showSoftInput(releaseTagName, InputMethodManager.SHOW_IMPLICIT);
+        imm.showSoftInput(releaseTitle, InputMethodManager.SHOW_IMPLICIT);
+
+	    releaseContent.setOnTouchListener((touchView, motionEvent) -> {
+
+		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
+
+		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
+
+			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
+		    }
+		    return false;
+	    });
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
         releaseBranch = findViewById(R.id.releaseBranch);
-        releaseBranch.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getBranches(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-        releaseBranch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                Branches branch = (Branches) parent.getSelectedItem();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
 
         createNewRelease = findViewById(R.id.createNewRelease);
         disableProcessButton();
@@ -115,25 +123,16 @@ public class CreateReleaseActivity extends BaseActivity {
 
     }
 
-    private View.OnClickListener createReleaseListener = v -> processNewRelease();
+    private final View.OnClickListener createReleaseListener = v -> processNewRelease();
 
     private void processNewRelease() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-
         String newReleaseTagName = releaseTagName.getText().toString();
         String newReleaseTitle = releaseTitle.getText().toString();
         String newReleaseContent = releaseContent.getText().toString();
-        String newReleaseBranch = releaseBranch.getSelectedItem().toString();
+	    String checkBranch = selectedBranch;
         boolean newReleaseType = releaseType.isChecked();
         boolean newReleaseDraft = releaseDraft.isChecked();
 
@@ -141,31 +140,33 @@ public class CreateReleaseActivity extends BaseActivity {
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
+	    if(newReleaseTitle.equals("")) {
+
+		    Toasty.error(ctx, getString(R.string.titleErrorEmpty));
+		    return;
+	    }
+
         if(newReleaseTagName.equals("")) {
 
             Toasty.error(ctx, getString(R.string.tagNameErrorEmpty));
             return;
-
         }
 
-        if(newReleaseTitle.equals("")) {
+	    if(checkBranch == null) {
 
-            Toasty.error(ctx, getString(R.string.titleErrorEmpty));
-            return;
-
-        }
+	    	Toasty.error(ctx, getString(R.string.selectBranchError));
+		    return;
+	    }
 
         disableProcessButton();
-        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, newReleaseBranch, newReleaseType, newReleaseDraft);
-
+        createNewReleaseFunc(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, newReleaseTagName, newReleaseTitle, newReleaseContent, selectedBranch, newReleaseType, newReleaseDraft);
     }
 
-    private void createNewReleaseFunc(final String instanceUrl, final String token, String repoOwner, String repoName, String newReleaseTagName, String newReleaseTitle, String newReleaseContent, String newReleaseBranch, boolean newReleaseType, boolean newReleaseDraft) {
+    private void createNewReleaseFunc(final String instanceUrl, final String token, String repoOwner, String repoName, String newReleaseTagName, String newReleaseTitle, String newReleaseContent, String selectedBranch, boolean newReleaseType, boolean newReleaseDraft) {
 
-        Releases createReleaseJson = new Releases(newReleaseContent, newReleaseDraft, newReleaseTitle, newReleaseType, newReleaseTagName, newReleaseBranch);
+        Releases createReleaseJson = new Releases(newReleaseContent, newReleaseDraft, newReleaseTitle, newReleaseType, newReleaseTagName, selectedBranch);
 
         Call<Releases> call;
 
@@ -181,12 +182,10 @@ public class CreateReleaseActivity extends BaseActivity {
 
                 if (response.code() == 201) {
 
-                    TinyDB tinyDb = new TinyDB(appCtx);
                     tinyDb.putBoolean("updateReleases", true);
                     Toasty.success(ctx, getString(R.string.releaseCreatedText));
                     enableProcessButton();
                     finish();
-
                 }
                 else if(response.code() == 401) {
 
@@ -195,31 +194,27 @@ public class CreateReleaseActivity extends BaseActivity {
                              ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
                              ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                              ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else if(response.code() == 403) {
 
                     enableProcessButton();
                     Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-
                 }
                 else if(response.code() == 404) {
 
                     enableProcessButton();
                     Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-
                 }
                 else {
 
                     enableProcessButton();
                     Toasty.error(ctx, ctx.getString(R.string.genericError));
-
                 }
-
             }
 
             @Override
             public void onFailure(@NonNull Call<Releases> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -240,29 +235,27 @@ public class CreateReleaseActivity extends BaseActivity {
             public void onResponse(@NonNull Call<List<Branches>> call, @NonNull retrofit2.Response<List<Branches>> response) {
 
                 if(response.isSuccessful()) {
+
                     if(response.code() == 200) {
 
                         List<Branches> branchesList_ = response.body();
 
                         assert branchesList_ != null;
                         if(branchesList_.size() > 0) {
-                            for (int i = 0; i < branchesList_.size(); i++) {
 
-                                Branches data = new Branches(
-                                        branchesList_.get(i).getName()
-                                );
-                                branchesList.add(data);
-
-                            }
+	                        branchesList.addAll(branchesList_);
                         }
 
-                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateReleaseActivity.this,
-                                R.layout.spinner_item, branchesList);
+	                    ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateReleaseActivity.this,
+		                    R.layout.list_spinner_items, branchesList);
 
-                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
                         releaseBranch.setAdapter(adapter);
                         enableProcessButton();
 
+	                    releaseBranch.setOnItemClickListener ((parent, view, position, id) ->
+
+		                    selectedBranch = branchesList.get(position).getName()
+	                    );
                     }
                 }
                 else if(response.code() == 401) {
@@ -271,13 +264,13 @@ public class CreateReleaseActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
 
             }
 
             @Override
             public void onFailure(@NonNull Call<List<Branches>> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
             }
         });
@@ -285,12 +278,8 @@ public class CreateReleaseActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
+
+        onClickListener = view -> finish();
     }
 
     private void disableProcessButton() {

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

@@ -1,18 +1,18 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Spinner;
 import androidx.annotation.NonNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -38,15 +38,23 @@ public class CreateRepoActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
-    private Spinner spinner;
+    private AutoCompleteTextView spinner;
     private Button createRepo;
     private EditText repoName;
     private EditText repoDesc;
     private CheckBox repoAccess;
     final Context ctx = this;
     private Context appCtx;
+    private TinyDB tinyDb;
 
-    List<OrgOwner> organizationsList = new ArrayList<>();
+    private String instanceUrl;
+	private String loginUid;
+	private String userLogin;
+	private String instanceToken;
+
+	private String selectedOwner;
+
+	List<OrgOwner> organizationsList = new ArrayList<>();
 
     //https://github.com/go-gitea/gitea/blob/52cfd2743c0e85b36081cf80a850e6a5901f1865/models/repo.go#L964-L967
     final List<String> reservedRepoNames = Arrays.asList(".", "..");
@@ -62,14 +70,14 @@ public class CreateRepoActivity extends BaseActivity {
 
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
+	    tinyDb = new TinyDB(appCtx);
 
         boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String userLogin = tinyDb.getString("userLogin");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        instanceUrl = tinyDb.getString("instanceUrl");
+        loginUid = tinyDb.getString("loginUid");
+        userLogin = tinyDb.getString("userLogin");
+        instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -86,20 +94,7 @@ public class CreateRepoActivity extends BaseActivity {
         closeActivity.setOnClickListener(onClickListener);
 
         spinner = findViewById(R.id.ownerSpinner);
-        spinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getOrganizations(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), userLogin);
-        
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                OrgOwner user = (OrgOwner) parent.getSelectedItem();
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
 
         createRepo = findViewById(R.id.createNewRepoButton);
         disableProcessButton();
@@ -114,24 +109,15 @@ public class CreateRepoActivity extends BaseActivity {
         }
     }
 
-    private View.OnClickListener createRepoListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            processNewRepo();
-        }
-    };
+    private final View.OnClickListener createRepoListener = v -> processNewRepo();
 
     private void processNewRepo() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         String newRepoName = repoName.getText().toString();
         String newRepoDesc = repoDesc.getText().toString();
-        String repoOwner = spinner.getSelectedItem().toString();
         boolean newRepoAccess = repoAccess.isChecked();
 
         if(!connToInternet) {
@@ -141,6 +127,7 @@ public class CreateRepoActivity extends BaseActivity {
         }
 
         if(!newRepoDesc.equals("")) {
+
             if (appUtil.charactersLength(newRepoDesc) > 255) {
 
                 Toasty.warning(ctx, getString(R.string.repoDescError));
@@ -163,20 +150,24 @@ public class CreateRepoActivity extends BaseActivity {
         else if (reservedRepoPatterns.matcher(newRepoName).find()) {
 
             Toasty.warning(ctx, getString(R.string.repoNameErrorReservedPatterns));
+        }
+	    else if(selectedOwner == null) {
+
+		    Toasty.error(ctx, getString(R.string.repoOwnerError));
         }
         else {
 
             disableProcessButton();
-            createNewRepository(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
+            createNewRepository(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, selectedOwner, newRepoAccess);
         }
     }
 
-    private void createNewRepository(final String instanceUrl, final String token, String loginUid, String repoName, String repoDesc, String repoOwner, boolean isPrivate) {
+    private void createNewRepository(final String instanceUrl, final String token, String loginUid, String repoName, String repoDesc, String selectedOwner, boolean isPrivate) {
 
         OrganizationRepository createRepository = new OrganizationRepository(true, repoDesc, null, null, repoName, isPrivate, "Default");
 
         Call<OrganizationRepository> call;
-        if(repoOwner.equals(loginUid)) {
+        if(selectedOwner.equals(loginUid)) {
 
             call = RetrofitClient
                     .getInstance(instanceUrl, ctx)
@@ -188,7 +179,7 @@ public class CreateRepoActivity extends BaseActivity {
             call = RetrofitClient
                     .getInstance(instanceUrl, ctx)
                     .getApiInterface()
-                    .createNewUserOrgRepository(token, repoOwner, createRepository);
+                    .createNewUserOrgRepository(token, selectedOwner, createRepository);
         }
 
         call.enqueue(new Callback<OrganizationRepository>() {
@@ -222,7 +213,6 @@ public class CreateRepoActivity extends BaseActivity {
                     enableProcessButton();
                     Toasty.error(ctx, getString(R.string.repoCreatedError));
                 }
-
             }
 
             @Override
@@ -236,8 +226,6 @@ public class CreateRepoActivity extends BaseActivity {
 
     private void getOrganizations(String instanceUrl, String instanceToken, final String userLogin) {
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-
         Call<List<OrgOwner>> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
                 .getApiInterface()
@@ -248,59 +236,58 @@ public class CreateRepoActivity extends BaseActivity {
             @Override
             public void onResponse(@NonNull Call<List<OrgOwner>> call, @NonNull retrofit2.Response<List<OrgOwner>> response) {
 
-                if(response.isSuccessful()) {
-                    if(response.code() == 200) {
+	            if(response.code() == 200) {
 
-                        int organizationId = 0;
+		            int organizationId = 0;
 
-                        List<OrgOwner> organizationsList_ = response.body();
+		            List<OrgOwner> organizationsList_ = response.body();
 
-                        organizationsList.add(new OrgOwner(userLogin));
-                        assert organizationsList_ != null;
-                        if(organizationsList_.size() > 0) {
+		            organizationsList.add(new OrgOwner(userLogin));
+		            assert organizationsList_ != null;
 
-                            for (int i = 0; i < organizationsList_.size(); i++) {
+		            if(organizationsList_.size() > 0) {
 
-                                if(!tinyDb.getString("organizationId").isEmpty()) {
+			            for(int i = 0; i < organizationsList_.size(); i++) {
 
-                                    if (Integer.parseInt(tinyDb.getString("organizationId")) == organizationsList_.get(i).getId()) {
-                                        organizationId = i + 1;
-                                    }
-                                }
+				            if(!tinyDb.getString("organizationId").isEmpty()) {
 
-                                OrgOwner data = new OrgOwner(
-                                        organizationsList_.get(i).getUsername()
-                                );
-                                organizationsList.add(data);
+					            if(Integer.parseInt(tinyDb.getString("organizationId")) == organizationsList_.get(i).getId()) {
+						            organizationId = i + 1;
+					            }
+				            }
 
-                            }
-                        }
+				            OrgOwner data = new OrgOwner(organizationsList_.get(i).getUsername());
+				            organizationsList.add(data);
+			            }
+		            }
 
-                        ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(CreateRepoActivity.this,
-                                R.layout.spinner_item, organizationsList);
+		            ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(CreateRepoActivity.this, R.layout.list_spinner_items, organizationsList);
 
-                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
-                        spinner.setAdapter(adapter);
+		            spinner.setAdapter(adapter);
 
-                        if (tinyDb.getBoolean("organizationAction") & organizationId != 0) {
+		            spinner.setOnItemClickListener ((parent, view, position, id) -> selectedOwner = organizationsList.get(position).getUsername());
 
-                            spinner.setSelection(organizationId);
-                            tinyDb.putBoolean("organizationAction", false);
-                        }
+		            if(tinyDb.getBoolean("organizationAction") & organizationId != 0) {
 
-                        enableProcessButton();
+			            int selectOwnerById = organizationId;
+			            new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-                    }
-                }
-                else if(response.code() == 401) {
+				            spinner.setText(organizationsList.get(selectOwnerById).getUsername(), false);
+				            selectedOwner = organizationsList.get(selectOwnerById).getUsername();
+			            }, 500);
 
-                    enableProcessButton();
-                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-                }
+			            tinyDb.putBoolean("organizationAction", false);
+		            }
 
+		            enableProcessButton();
+	            }
+
+	            else if(response.code() == 401) {
+
+		            enableProcessButton();
+		            AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage),
+			            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+	            }
             }
 
             @Override

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

@@ -41,7 +41,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
     private TextView teamAccessControls;
     private TextView teamAccessControlsArray;
     private Button createTeamButton;
-    private String[] permissionList = {"Read", "Write", "Admin"};
+    private final String[] permissionList = {"Read", "Write", "Admin"};
     public int permissionSelectedChoice = -1;
 
     @Override
@@ -49,7 +49,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         return R.layout.activity_create_team_by_org;
     }
 
-    private String[] accessControlsList = new String[] {
+    private final String[] accessControlsList = new String[] {
             "Code",
             "Issues",
             "Pull Request",
@@ -61,7 +61,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
     private List<String> pushAccessList;
 
-    private boolean[] selectedAccessControlsTrueFalse = new boolean[]{
+    private final boolean[] selectedAccessControlsTrueFalse = new boolean[]{
             false,
             false,
             false,
@@ -102,12 +102,8 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
             AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
 
             pBuilder.setTitle(R.string.newTeamPermission);
-            if(permissionSelectedChoice != -1) {
-                pBuilder.setCancelable(true);
-            }
-            else {
-                pBuilder.setCancelable(false);
-            }
+	        pBuilder.setCancelable(permissionSelectedChoice != -1);
+
             pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, (dialogInterface, i) -> {
 
                 permissionSelectedChoice = i;
@@ -136,15 +132,12 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 	            }
 
                 dialogInterface.dismiss();
-
             });
 
             AlertDialog pDialog = pBuilder.create();
             pDialog.show();
-
         });
 
-
         teamAccessControls.setOnClickListener(v -> {
 
             teamAccessControls.setText("");
@@ -189,6 +182,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                         }
 
                         if(value){
+
                             teamAccessControls.setText(getString(R.string.newTeamPermissionValues, teamAccessControls.getText(), pushAccessList.get(selectedVal)));
                             teamAccessControlsArray.setText(getString(R.string.newTeamPermissionValuesFinal, teamAccessControlsArray.getText(), repoCode));
                         }
@@ -198,15 +192,16 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
                     String data = String.valueOf(teamAccessControls.getText());
                     if(!data.equals("")) {
+
                         teamAccessControls.setText(data.substring(0, data.length() - 2));
                     }
 
                     String dataArray = String.valueOf(teamAccessControlsArray.getText());
+
                     if(!dataArray.equals("")) {
+
                         teamAccessControlsArray.setText(dataArray.substring(0, dataArray.length() - 2));
                     }
-                    //Log.i("orgName", String.valueOf(teamAccessControlsArray.getText()));
-
                 });
 
             AlertDialog aDialog = aDialogBuilder.create();
@@ -222,14 +217,12 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
             shape.setCornerRadius( 8 );
             shape.setColor(getResources().getColor(R.color.hintColor));
             createTeamButton.setBackground(shape);
-
-        } else {
+        }
+        else {
 
             createTeamButton.setEnabled(true);
             createTeamButton.setOnClickListener(this);
-
         }
-
     }
 
     private void processCreateTeam() {
@@ -251,52 +244,49 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if (newTeamName.equals("")) {
 
             Toasty.error(ctx, getString(R.string.teamNameEmpty));
             return;
-
         }
 
         if(!appUtil.checkStringsWithAlphaNumericDashDotUnderscore(newTeamName)) {
 
             Toasty.warning(ctx, getString(R.string.teamNameError));
             return;
-
         }
 
         if(!newTeamDesc.equals("")) {
 
             if(!appUtil.checkStrings(newTeamDesc)) {
+
                 Toasty.warning(ctx, getString(R.string.teamDescError));
                 return;
             }
 
             if(newTeamDesc.length() > 100) {
+
                 Toasty.warning(ctx, getString(R.string.teamDescLimit));
                 return;
             }
-
         }
 
         if (newTeamPermission.equals("")) {
 
             Toasty.error(ctx, getString(R.string.teamPermissionEmpty));
             return;
-
         }
 
         List<String> newTeamAccessControls_ = new ArrayList<>(Arrays.asList(newTeamAccessControls.split(",")));
 
         for (int i = 0; i < newTeamAccessControls_.size(); i++) {
+
             newTeamAccessControls_.set(i, newTeamAccessControls_.get(i).trim());
         }
 
         createNewTeamCall(instanceUrl, instanceToken, orgName, newTeamName, newTeamDesc, newTeamPermission, newTeamAccessControls_, loginUid);
-
     }
 
     private void createNewTeamCall(final String instanceUrl, final String instanceToken, String orgName, String newTeamName, String newTeamDesc, String newTeamPermission, List<String> newTeamAccessControls, String loginUid) {
@@ -316,6 +306,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
             public void onResponse(@NonNull Call<Teams> call, @NonNull retrofit2.Response<Teams> response2) {
 
                 if(response2.isSuccessful()) {
+
                     if(response2.code() == 201) {
 
                         TinyDB tinyDb = new TinyDB(appCtx);
@@ -324,7 +315,6 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                         Toasty.success(ctx, getString(R.string.teamCreated));
                         finish();
                     }
-
                 }
                 else if(response2.code() == 404) {
 
@@ -341,7 +331,6 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
                     Toasty.error(ctx, getString(R.string.teamCreatedError));
                 }
-
             }
 
             @Override
@@ -356,6 +345,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
     public void onClick(View v) {
 
         if(v == createTeamButton) {
+
             processCreateTeam();
         }
     }

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

@@ -0,0 +1,493 @@
+package org.mian.gitnex.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.view.View;
+import androidx.annotation.NonNull;
+import org.apache.commons.lang3.StringUtils;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+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.PathsHelper;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.UrlHelper;
+import org.mian.gitnex.models.GiteaVersion;
+import org.mian.gitnex.models.PullRequests;
+import org.mian.gitnex.models.UserRepositories;
+import java.net.URI;
+import java.util.List;
+import java.util.Objects;
+import io.mikael.urlbuilder.UrlBuilder;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class DeepLinksActivity extends BaseActivity {
+
+	private ActivityDeeplinksBinding viewBinding;
+	private Context ctx = this;
+	private Context appCtx;
+	private TinyDB tinyDb;
+	private String currentInstance;
+	private String instanceToken;
+	private boolean noAccountFound = false;
+
+	private Intent mainIntent;
+	private Intent issueIntent;
+	private Intent repoIntent;
+
+	@Override
+	protected int getLayoutResourceId() {
+
+		return R.layout.activity_deeplinks;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+
+		super.onCreate(savedInstanceState);
+		appCtx = getApplicationContext();
+		tinyDb = new TinyDB(appCtx);
+
+		viewBinding = ActivityDeeplinksBinding.inflate(getLayoutInflater());
+		View view = viewBinding.getRoot();
+		setContentView(view);
+
+		mainIntent = new Intent(ctx, MainActivity.class);
+		issueIntent = new Intent(ctx, IssueDetailActivity.class);
+		repoIntent = new Intent(ctx, RepoDetailActivity.class);
+
+		Intent intent = getIntent();
+		Uri data = intent.getData();
+		assert data != null;
+
+		// check for login
+		if(!tinyDb.getBoolean("loggedInMode")) {
+
+			finish();
+			ctx.startActivity(new Intent(ctx, LoginActivity.class));
+		}
+
+		// check for the links(URI) to be in the db
+		UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
+		List<UserAccount> userAccounts = userAccountsApi.usersAccounts();
+
+		if(userAccounts.size() > 0) {
+
+			String hostUri;
+			for(int i = 0; i < userAccounts.size(); i++) {
+
+				hostUri = userAccounts.get(i).getInstanceUrl();
+
+				currentInstance = userAccounts.get(i).getInstanceUrl();
+				instanceToken = userAccounts.get(i).getToken();
+
+				if(hostUri.toLowerCase().contains(Objects.requireNonNull(data.getHost().toLowerCase()))) {
+
+					noAccountFound = false;
+					break;
+				}
+
+				noAccountFound = true;
+			}
+		}
+
+		if(noAccountFound) {
+
+			checkInstance(data);
+			return;
+		}
+
+		// 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());
+
+					tinyDb.putString("issueNumber", data.getLastPathSegment());
+					tinyDb.putString("issueType", "Issue");
+
+					tinyDb.putString("repoFullName", restOfUrl[restOfUrl.length - 4] + "/" + restOfUrl[restOfUrl.length - 3]);
+
+					final String repoOwner = restOfUrl[restOfUrl.length - 4];
+					final String repoName = restOfUrl[restOfUrl.length - 3];
+
+					int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);
+
+					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+					if(count == 0) {
+
+						long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", id);
+					}
+					else {
+
+						Repository dataRepo = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", dataRepo.getRepositoryId());
+					}
+
+					ctx.startActivity(issueIntent);
+					finish();
+				}
+				else if(Objects.requireNonNull(data.getLastPathSegment()).contains("issues")) {
+
+					new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+						goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 3], restOfUrl[restOfUrl.length - 2], "issue");
+					}, 500);
+				}
+				else {
+
+					ctx.startActivity(mainIntent);
+					finish();
+				}
+			}
+			else if(data.getPathSegments().contains("pulls")) { // pr
+
+				if(!Objects.requireNonNull(data.getLastPathSegment()).contains("pulls") & StringUtils.isNumeric(data.getLastPathSegment())) {
+
+					new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+						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, restOfUrl[restOfUrl.length - 3], restOfUrl[restOfUrl.length - 2], "pull");
+					}, 500);
+				}
+				else {
+
+					ctx.startActivity(mainIntent);
+					finish();
+				}
+
+			}
+			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
+
+				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 {
+
+			ctx.startActivity(mainIntent);
+			finish();
+		}
+	}
+
+	private void checkInstance(Uri data) {
+
+		URI host;
+		if(data.getPort() > 0) {
+
+			host = UrlBuilder.fromString(UrlHelper.fixScheme(data.getHost(), "https")).withPort(data.getPort()).toUri();
+		}
+		else {
+
+			host = UrlBuilder.fromString(UrlHelper.fixScheme(data.getHost(), "https")).toUri();
+		}
+
+		URI instanceUrl = UrlBuilder.fromUri(host).withScheme(data.getScheme().toLowerCase()).withPath(PathsHelper.join(host.getPath(), "/api/v1/"))
+			.toUri();
+
+		Call<GiteaVersion> callVersion;
+		callVersion = RetrofitClient.getInstance(String.valueOf(instanceUrl), ctx).getApiInterface().getGiteaVersion();
+
+		callVersion.enqueue(new Callback<GiteaVersion>() {
+
+			@Override
+			public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
+
+				if(responseVersion.isSuccessful() || responseVersion.code() == 403) {
+
+					viewBinding.progressBar.setVisibility(View.GONE);
+					viewBinding.addNewAccountFrame.setVisibility(View.VISIBLE);
+					viewBinding.noActionFrame.setVisibility(View.GONE);
+					viewBinding.addAccountText.setText(String.format(getResources().getString(R.string.accountDoesNotExist), data.getHost()));
+
+					viewBinding.addNewAccount.setOnClickListener(addNewAccount -> {
+
+						Intent accountIntent = new Intent(ctx, AddNewAccountActivity.class);
+						startActivity(accountIntent);
+						finish();
+					});
+
+					viewBinding.openInBrowser.setOnClickListener(addNewAccount -> {
+
+						Intent intentBrowser = new Intent();
+						intentBrowser.setAction(Intent.ACTION_VIEW);
+						intentBrowser.addCategory(Intent.CATEGORY_BROWSABLE);
+						intentBrowser.setData(Uri.parse(String.valueOf(host)));
+						startActivity(intentBrowser);
+						finish();
+					});
+
+					viewBinding.launchApp.setOnClickListener(launchApp -> {
+
+						startActivity(mainIntent);
+						finish();
+					});
+				}
+				else {
+
+					Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
+					finish();
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
+
+				Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
+				finish();
+			}
+		});
+	}
+
+	private void getPullRequest(String url, String token, String repoOwner, String repoName, int index) {
+
+		Call<PullRequests> call = RetrofitClient
+			.getInstance(url, ctx)
+			.getApiInterface()
+			.getPullRequestByIndex(token, repoOwner, repoName, index);
+
+		call.enqueue(new Callback<PullRequests>() {
+
+			@Override
+			public void onResponse(@NonNull Call<PullRequests> call, @NonNull retrofit2.Response<PullRequests> response) {
+
+				PullRequests prInfo = response.body();
+
+				if (response.code() == 200) {
+
+					assert prInfo != null;
+
+					issueIntent.putExtra("issueNumber", index);
+					issueIntent.putExtra("prMergeable", prInfo.isMergeable());
+
+					if(prInfo.getHead() != null) {
+
+						issueIntent.putExtra("prHeadBranch", prInfo.getHead().getRef());
+						tinyDb.putString("prHeadBranch", prInfo.getHead().getRef());
+
+						if(prInfo.getHead().getRepo() != null) {
+
+							tinyDb.putString("prIsFork", String.valueOf(prInfo.getHead().getRepo().isFork()));
+							tinyDb.putString("prForkFullName", prInfo.getHead().getRepo().getFull_name());
+						}
+						else {
+
+							// pull was done from a deleted fork
+							tinyDb.putString("prIsFork", "true");
+							tinyDb.putString("prForkFullName", ctx.getString(R.string.prDeletedFrok));
+						}
+					}
+
+					tinyDb.putString("issueNumber", String.valueOf(index));
+					tinyDb.putString("prMergeable", String.valueOf(prInfo.isMergeable()));
+					tinyDb.putString("issueType", "Pull");
+
+					tinyDb.putString("repoFullName", repoOwner + "/" + repoName);
+
+					int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);
+
+					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+					if(count == 0) {
+
+						long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", id);
+					}
+					else {
+
+						Repository dataRepo = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", dataRepo.getRepositoryId());
+					}
+
+					ctx.startActivity(issueIntent);
+					finish();
+				}
+
+				else {
+
+					Log.e("onFailure-links-pr", String.valueOf(response.code()));
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<PullRequests> call, @NonNull Throwable t) {
+
+				Log.e("onFailure-links-pr", t.toString());
+			}
+		});
+	}
+
+	private void goToRepoSection(String url, String token, String repoOwner, String repoName, String type) {
+
+		Call<UserRepositories> call = RetrofitClient
+			.getInstance(url, ctx)
+			.getApiInterface()
+			.getUserRepository(token, repoOwner, repoName);
+
+		call.enqueue(new Callback<UserRepositories>() {
+
+			@Override
+			public void onResponse(@NonNull Call<UserRepositories> call, @NonNull retrofit2.Response<UserRepositories> response) {
+
+				UserRepositories repoInfo = response.body();
+
+				if (response.code() == 200) {
+
+					assert repoInfo != null;
+
+					repoIntent.putExtra("repoFullName", repoInfo.getFullName());
+					repoIntent.putExtra("goToSection", "yes");
+					repoIntent.putExtra("goToSectionType", type);
+
+					tinyDb.putString("repoFullName", repoInfo.getFullName());
+					if(repoInfo.getPrivateFlag()) {
+
+						tinyDb.putString("repoType", getResources().getString(R.string.strPrivate));
+					}
+					else {
+
+						tinyDb.putString("repoType", getResources().getString(R.string.strPublic));
+					}
+					tinyDb.putBoolean("isRepoAdmin", repoInfo.getPermissions().isAdmin());
+					tinyDb.putString("repoBranch", repoInfo.getDefault_branch());
+
+					int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);
+
+					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
+
+					if(count == 0) {
+
+						long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", id);
+					}
+					else {
+
+						Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
+						tinyDb.putLong("repositoryId", data.getRepositoryId());
+					}
+
+					ctx.startActivity(repoIntent);
+					finish();
+				}
+
+				else {
+
+					Log.e("onFailure-links", String.valueOf(response.code()));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
+
+				Log.e("onFailure-links", t.toString());
+			}
+		});
+	}
+}

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

@@ -3,23 +3,21 @@ package org.mian.gitnex.activities;
 import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
-import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import com.hendraanggrian.appcompat.socialview.Mention;
-import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
-import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
@@ -29,7 +27,6 @@ import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.CreateIssue;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.models.Milestones;
@@ -40,7 +37,6 @@ import java.util.Calendar;
 import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -50,43 +46,51 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     final Context ctx = this;
     private Context appCtx;
+	private TinyDB tinyDb;
     private View.OnClickListener onClickListener;
     private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
 
     private EditText editIssueTitle;
-    private SocialAutoCompleteTextView editIssueDescription;
+    private EditText editIssueDescription;
     private TextView editIssueDueDate;
     private Button editIssueButton;
-    private Spinner editIssueMilestoneSpinner;
+    private AutoCompleteTextView editIssueMilestoneSpinner;
 
     private String msState = "open";
+    private int milestoneId;
 
     List<Milestones> milestonesList = new ArrayList<>();
-    private ArrayAdapter<Mention> defaultMentionAdapter;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	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);
         appCtx = getApplicationContext();
+	    tinyDb = new TinyDB(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
-
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+	    instanceUrl = tinyDb.getString("instanceUrl");
+        loginUid = tinyDb.getString("loginUid");
+        instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+        repoOwner = parts[0];
+        repoName = parts[1];
+        issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
 
         ImageView closeActivity = findViewById(R.id.close);
         editIssueButton = findViewById(R.id.editIssueButton);
@@ -97,6 +101,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
         // if gitea is 1.12 or higher use the new limit
         if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+
             resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
         }
 
@@ -104,13 +109,18 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         assert imm != null;
         imm.showSoftInput(editIssueTitle, InputMethodManager.SHOW_IMPLICIT);
 
-        defaultMentionAdapter = new MentionArrayAdapter<>(this);
-        loadCollaboratorsList();
+	    editIssueDescription.setOnTouchListener((touchView, motionEvent) -> {
+
+		    touchView.getParent().requestDisallowInterceptTouchEvent(true);
+
+		    if ((motionEvent.getAction() & MotionEvent.ACTION_UP) != 0 && (motionEvent.getActionMasked() & MotionEvent.ACTION_UP) != 0) {
+
+			    touchView.getParent().requestDisallowInterceptTouchEvent(false);
+		    }
+		    return false;
+	    });
 
         editIssueMilestoneSpinner = findViewById(R.id.editIssueMilestoneSpinner);
-        editIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
-
-        editIssueDescription.setMentionAdapter(defaultMentionAdapter);
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
@@ -121,94 +131,27 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         if(!tinyDb.getString("issueNumber").isEmpty()) {
 
             if(tinyDb.getString("issueType").equalsIgnoreCase("Pull")) {
+
                 toolbar_title.setText(getString(R.string.editPrNavHeader, String.valueOf(issueIndex)));
             }
             else {
+
                 toolbar_title.setText(getString(R.string.editIssueNavHeader, String.valueOf(issueIndex)));
             }
         }
 
         disableProcessButton();
         getIssue(instanceUrl, instanceToken, loginUid, repoOwner, repoName, issueIndex, resultLimit);
-
-
-    }
-
-    public void loadCollaboratorsList() {
-
-        final TinyDB tinyDb = new TinyDB(appCtx);
-
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-
-        Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
-                .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-        call.enqueue(new Callback<List<Collaborators>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
-
-                if (response.isSuccessful()) {
-
-                    assert response.body() != null;
-                    String fullName = "";
-                    for (int i = 0; i < response.body().size(); i++) {
-                        if(!response.body().get(i).getFull_name().equals("")) {
-                            fullName = response.body().get(i).getFull_name();
-                        }
-                        defaultMentionAdapter.add(
-                                new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
-                    }
-
-                } else {
-
-                    Log.i("onResponse", String.valueOf(response.code()));
-
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.toString());
-            }
-
-        });
     }
 
     private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
+
+        onClickListener = view -> finish();
     }
 
     private void processEditIssue() {
 
         boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-        TinyDB tinyDb = new TinyDB(appCtx);
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
-
-        Milestones mModel = (Milestones) editIssueMilestoneSpinner.getSelectedItem();
-
-        int editIssueMilestoneId = mModel.getId();
 
         String editIssueTitleForm = editIssueTitle.getText().toString();
         String editIssueDescriptionForm = editIssueDescription.getText().toString();
@@ -218,40 +161,30 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if (editIssueTitleForm.equals("")) {
 
             Toasty.error(ctx, getString(R.string.issueTitleEmpty));
             return;
-
         }
 
-        /*if (editIssueDescriptionForm.equals("")) {
-
-            Toasty.info(ctx, getString(R.string.issueDescriptionEmpty));
-            return;
-
-        }*/
-
         if (editIssueDueDateForm.equals("")) {
+
             editIssueDueDateForm = null;
-        } else {
+        }
+        else {
+
             editIssueDueDateForm = (AppUtil.customDateCombine(AppUtil.customDateFormat(editIssueDueDateForm)));
         }
 
-        //Log.i("editIssueDueDateForm", String.valueOf(editIssueDueDateForm));
         disableProcessButton();
-        editIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid, editIssueTitleForm, editIssueDescriptionForm, editIssueDueDateForm, editIssueMilestoneId);
-
+        editIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid, editIssueTitleForm, editIssueDescriptionForm, editIssueDueDateForm, milestoneId);
     }
 
-    private void editIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid, String title, String description, String dueDate, int editIssueMilestoneId) {
+    private void editIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid, String title, String description, String dueDate, int milestoneId) {
 
-        final TinyDB tinyDb = new TinyDB(appCtx);
-
-        CreateIssue issueData = new CreateIssue(title, description, dueDate, editIssueMilestoneId);
+        CreateIssue issueData = new CreateIssue(title, description, dueDate, milestoneId);
 
         Call<JsonElement> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
@@ -266,16 +199,17 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                 if(response.code() == 201) {
 
                     if(tinyDb.getString("issueType").equalsIgnoreCase("Pull")) {
+
                         Toasty.success(ctx, getString(R.string.editPrSuccessMessage));
                     }
                     else {
+
                         Toasty.success(ctx, getString(R.string.editIssueSuccessMessage));
                     }
 
                     tinyDb.putBoolean("issueEdited", true);
                     tinyDb.putBoolean("resumeIssues", true);
                     finish();
-
                 }
                 else if(response.code() == 401) {
 
@@ -284,19 +218,17 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else {
 
                     enableProcessButton();
                     Toasty.error(ctx, getString(R.string.genericError));
-
                 }
-
             }
 
             @Override
             public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }
@@ -304,7 +236,6 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     }
 
-
     @Override
     public void onClick(View v) {
 
@@ -316,20 +247,11 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
             final int mDay = c.get(Calendar.DAY_OF_MONTH);
 
             DatePickerDialog datePickerDialog = new DatePickerDialog(this,
-                    new DatePickerDialog.OnDateSetListener() {
-
-                        @Override
-                        public void onDateSet(DatePicker view, int year,
-                                              int monthOfYear, int dayOfMonth) {
-
-                            editIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth));
-
-                        }
-                    }, mYear, mMonth, mDay);
+	            (view, year, monthOfYear, dayOfMonth) -> editIssueDueDate.setText(getString(R.string.setDueDate, year, (monthOfYear + 1), dayOfMonth)), mYear, mMonth, mDay);
             datePickerDialog.show();
-
         }
         else if(v == editIssueButton) {
+
             processEditIssue();
         }
 
@@ -353,9 +275,10 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                     editIssueTitle.setText(response.body().getTitle());
                     editIssueDescription.setText(response.body().getBody());
 
-                    int msId = 0;
+                    int currentMilestoneId = 0;
                     if(response.body().getMilestone() != null) {
-                        msId = response.body().getMilestone().getId();
+
+	                    currentMilestoneId = response.body().getMilestone().getId();
                     }
 
                     // get milestones list
@@ -366,14 +289,14 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                                 .getApiInterface()
                                 .getMilestones(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, 1, resultLimit, msState);
 
-                        final int finalMsId = msId;
+	                    int checkMilestoneId = currentMilestoneId;
 
-                        call_.enqueue(new Callback<List<Milestones>>() {
+	                    call_.enqueue(new Callback<List<Milestones>>() {
 
                             @Override
                             public void onResponse(@NonNull Call<List<Milestones>> call, @NonNull retrofit2.Response<List<Milestones>> response_) {
 
-                                int finalMsId1 = 0;
+                                int getSelectedMilestoneId = 0;
 
                                 if (response_.code() == 200) {
 
@@ -381,39 +304,40 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
                                     milestonesList.add(new Milestones(0, "No milestone"));
                                     assert milestonesList_ != null;
+
                                     if (milestonesList_.size() > 0) {
+
+	                                    milestonesList.addAll(milestonesList_);
+
                                         for (int i = 0; i < milestonesList_.size(); i++) {
 
-                                            Milestones data = new Milestones(
-                                                    milestonesList_.get(i).getId(),
-                                                    milestonesList_.get(i).getTitle()
-                                            );
-                                            milestonesList.add(data);
-
-                                            if(finalMsId == milestonesList_.get(i).getId()) {
-                                                finalMsId1 = i + 1;
+                                            if(checkMilestoneId == milestonesList_.get(i).getId()) {
+	                                            getSelectedMilestoneId = i + 1;
                                             }
-
                                         }
                                     }
 
-                                    ArrayAdapter<Milestones> adapter_ = new ArrayAdapter<>(EditIssueActivity.this,
-                                            R.layout.spinner_item, milestonesList);
+                                    ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(EditIssueActivity.this,
+                                            R.layout.list_spinner_items, milestonesList);
 
-                                    adapter_.setDropDownViewResource(R.layout.spinner_dropdown_item);
-                                    editIssueMilestoneSpinner.setAdapter(adapter_);
+                                    editIssueMilestoneSpinner.setAdapter(adapter);
+
+	                                editIssueMilestoneSpinner.setOnItemClickListener ((parent, view, position, id) -> milestoneId = milestonesList.get(position).getId());
+
+	                                int finalMsId = getSelectedMilestoneId;
+	                                new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+		                                editIssueMilestoneSpinner.setText(milestonesList.get(finalMsId).getTitle(),false);
+		                                milestoneId = milestonesList.get(finalMsId).getId();
+	                                }, 500);
 
-                                    if(milestonesList_.size() > 0) {
-                                        editIssueMilestoneSpinner.setSelection(finalMsId1);
-                                    }
                                     enableProcessButton();
-
                                 }
-
                             }
 
                             @Override
                             public void onFailure(@NonNull Call<List<Milestones>> call, @NonNull Throwable t) {
+
                                 Log.e("onFailure", t.toString());
                             }
                         });
@@ -441,11 +365,11 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
                     Toasty.error(ctx, getString(R.string.genericError));
                 }
-
             }
 
             @Override
             public void onFailure(@NonNull Call<Issues> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
             }
         });

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

@@ -88,16 +88,17 @@ public class FileDiffActivity extends BaseActivity {
 		}
 
 		getPullDiffContent(instanceUrl, repoOwner, repoName, pullIndex, instanceToken, apiCall);
-
 	}
 
 	private void getPullDiffContent(String instanceUrl, String owner, String repo, String pullIndex, String token, boolean apiCall) {
 
 		Call<ResponseBody> call;
 		if(apiCall) {
+
 			call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getPullDiffContent(token, owner, repo, pullIndex);
 		}
 		else {
+
 			call = RetrofitClient.getInstance(instanceUrl, ctx).getWebInterface().getPullDiffContent(owner, repo, pullIndex);
 		}
 
@@ -109,51 +110,47 @@ public class FileDiffActivity extends BaseActivity {
 				if(response.code() == 200) {
 
 					try {
+
 						assert response.body() != null;
 
-						AppUtil appUtil = new AppUtil();
 						List<FileDiffView> fileContentsArray = ParseDiff.getFileDiffViewArray(response.body().string());
 
 						int filesCount = fileContentsArray.size();
 						if(filesCount > 1) {
+
 							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeader, Integer.toString(filesCount)));
 						}
 						else {
+
 							toolbarTitle.setText(getResources().getString(R.string.fileDiffViewHeaderSingle, Integer.toString(filesCount)));
 						}
 
-						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, fileContentsArray);
+						FilesDiffAdapter adapter = new FilesDiffAdapter(ctx, getSupportFragmentManager(), fileContentsArray);
 						mListView.setAdapter(adapter);
 
 						mProgressBar.setVisibility(View.GONE);
-
 					}
 					catch(IOException e) {
+
 						e.printStackTrace();
 					}
-
 				}
 				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
@@ -174,5 +171,4 @@ public class FileDiffActivity extends BaseActivity {
 		};
 	}
 
-
 }

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.BitmapFactory;
@@ -21,9 +22,13 @@ 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.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import com.github.barteksc.pdfviewer.PDFView;
 import com.github.barteksc.pdfviewer.util.FitPolicy;
 import com.github.chrisbanes.photoview.PhotoView;
@@ -140,18 +145,15 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 			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(instanceUrl, instanceToken, repoOwner, repoName, singleFileName, repoBranch);
-
 	}
 
 	@Override
@@ -169,6 +171,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
 		if(tinyDb.getBoolean("fileModified")) {
+
 			getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName, repoBranch);
 			tinyDb.putBoolean("fileModified", false);
 		}
@@ -209,7 +212,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 							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
 
@@ -219,27 +221,33 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 							singleCodeContents.setVisibility(View.VISIBLE);
 
 							switch(tinyDb.getInt("fileviewerSourceCodeThemeId")) {
+
 								case 1:
+
 									singleCodeContents.setTheme(Theme.ARDUINO_LIGHT);
 									break;
 								case 2:
+
 									singleCodeContents.setTheme(Theme.GITHUB);
 									break;
 								case 3:
+
 									singleCodeContents.setTheme(Theme.FAR);
 									break;
 								case 4:
+
 									singleCodeContents.setTheme(Theme.IR_BLACK);
 									break;
 								case 5:
+
 									singleCodeContents.setTheme(Theme.ANDROID_STUDIO);
 									break;
 								default:
+
 									singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
 							}
 
 							singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
-
 						}
 						else if(appUtil.pdfExtension(fileExtension)) { // file is pdf
 
@@ -264,7 +272,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 							singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
 							singleFileContents.setGravity(Gravity.CENTER);
 							singleFileContents.setTypeface(null, Typeface.BOLD);
-
 						}
 						else { // file type not known - plain text view
 
@@ -274,37 +281,30 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 							singleFileContentsFrame.setVisibility(View.VISIBLE);
 
 							singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
-
 						}
-
 					}
 					else {
+
 						singleFileContents.setText("");
 						mProgressBar.setVisibility(View.GONE);
 					}
-
 				}
 				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
@@ -324,7 +324,9 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		inflater.inflate(R.menu.files_view_menu, menu);
 
 		String fileExtension = FileUtils.getExtension(singleFileName);
+
 		if(!fileExtension.equalsIgnoreCase("md")) {
+
 			menu.getItem(0).setVisible(false);
 		}
 
@@ -336,89 +338,90 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 		int id = item.getItemId();
 
-		switch(id) {
-			case android.R.id.home:
+		if(id == android.R.id.home) {
 
-				finish();
-				return true;
-			case R.id.genericMenu:
-
-				BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
-				bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
-				return true;
-			case R.id.markdown:
-
-				final Markwon markwon = Markwon.builder(Objects.requireNonNull(ctx)).usePlugin(CorePlugin.create())
-					.usePlugin(ImagesPlugin.create(plugin -> {
-						plugin.addSchemeHandler(new SchemeHandler() {
-
-							@NonNull
-							@Override
-							public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
-
-								final int resourceId = ctx.getResources().getIdentifier(
-									raw.substring("drawable://".length()),
-									"drawable",
-									ctx.getPackageName());
-
-								final Drawable drawable = ctx.getDrawable(resourceId);
-
-								assert drawable != null;
-								return ImageItem.withResult(drawable);
-							}
-
-							@NonNull
-							@Override
-							public Collection<String> supportedSchemes() {
-
-								return Collections.singleton("drawable");
-							}
-						});
-						plugin.placeholderProvider(drawable -> null);
-						plugin.addMediaDecoder(GifMediaDecoder.create(false));
-						plugin.addMediaDecoder(SvgMediaDecoder.create(ctx.getResources()));
-						plugin.addMediaDecoder(SvgMediaDecoder.create());
-						plugin.defaultMediaDecoder(DefaultMediaDecoder.create(ctx.getResources()));
-						plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-					}))
-					.usePlugin(new AbstractMarkwonPlugin() {
-						@Override
-						public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-
-							builder.codeTextColor(tinyDb.getInt("codeBlockColor")).codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-								.linkColor(getResources().getColor(R.color.lightBlue));
-						}
-					})
-					.usePlugin(TablePlugin.create(ctx))
-					.usePlugin(TaskListPlugin.create(ctx))
-					.usePlugin(HtmlPlugin.create())
-					.usePlugin(StrikethroughPlugin.create())
-					.usePlugin(LinkifyPlugin.create())
-					.build();
-
-				if(!tinyDb.getBoolean("enableMarkdownInFileView")) {
-
-					singleCodeContents.setVisibility(View.GONE);
-					singleFileContentsFrame.setVisibility(View.VISIBLE);
-					singleFileContents.setVisibility(View.VISIBLE);
-					Spanned bodyWithMD = markwon.toMarkdown(appUtil.decodeBase64(tinyDb.getString("downloadFileContents")));
-					markwon.setParsedMarkdown(singleFileContents, bodyWithMD);
-					tinyDb.putBoolean("enableMarkdownInFileView", true);
-				}
-				else {
-
-					singleCodeContents.setVisibility(View.VISIBLE);
-					singleFileContentsFrame.setVisibility(View.GONE);
-					singleFileContents.setVisibility(View.GONE);
-					singleCodeContents.setSource(appUtil.decodeBase64(tinyDb.getString("downloadFileContents")));
-					tinyDb.putBoolean("enableMarkdownInFileView", false);
-				}
-
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
+			finish();
+			return true;
 		}
+		else if(id == R.id.genericMenu) {
 
+			BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
+			bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
+			return true;
+		}
+		else if(id == R.id.markdown) {
+
+			final Markwon markwon = Markwon.builder(Objects.requireNonNull(ctx)).usePlugin(CorePlugin.create())
+				.usePlugin(ImagesPlugin.create(plugin -> {
+					plugin.addSchemeHandler(new SchemeHandler() {
+
+						@NonNull
+						@Override
+						public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+
+							final int resourceId = ctx.getResources().getIdentifier(
+								raw.substring("drawable://".length()),
+								"drawable",
+								ctx.getPackageName());
+
+							final Drawable drawable = ContextCompat.getDrawable(ctx, resourceId);
+
+							assert drawable != null;
+							return ImageItem.withResult(drawable);
+						}
+
+						@NonNull
+						@Override
+						public Collection<String> supportedSchemes() {
+
+							return Collections.singleton("drawable");
+						}
+					});
+					plugin.placeholderProvider(drawable -> null);
+					plugin.addMediaDecoder(GifMediaDecoder.create(false));
+					plugin.addMediaDecoder(SvgMediaDecoder.create(ctx.getResources()));
+					plugin.addMediaDecoder(SvgMediaDecoder.create());
+					plugin.defaultMediaDecoder(DefaultMediaDecoder.create(ctx.getResources()));
+					plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+				}))
+				.usePlugin(new AbstractMarkwonPlugin() {
+					@Override
+					public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
+
+						builder.codeTextColor(tinyDb.getInt("codeBlockColor")).codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
+							.linkColor(getResources().getColor(R.color.lightBlue));
+					}
+				})
+				.usePlugin(TablePlugin.create(ctx))
+				.usePlugin(TaskListPlugin.create(ctx))
+				.usePlugin(HtmlPlugin.create())
+				.usePlugin(StrikethroughPlugin.create())
+				.usePlugin(LinkifyPlugin.create())
+				.build();
+
+			if(!tinyDb.getBoolean("enableMarkdownInFileView")) {
+
+				singleCodeContents.setVisibility(View.GONE);
+				singleFileContentsFrame.setVisibility(View.VISIBLE);
+				singleFileContents.setVisibility(View.VISIBLE);
+				Spanned bodyWithMD = markwon.toMarkdown(appUtil.decodeBase64(tinyDb.getString("downloadFileContents")));
+				markwon.setParsedMarkdown(singleFileContents, bodyWithMD);
+				tinyDb.putBoolean("enableMarkdownInFileView", true);
+			}
+			else {
+
+				singleCodeContents.setVisibility(View.VISIBLE);
+				singleFileContentsFrame.setVisibility(View.GONE);
+				singleFileContents.setVisibility(View.GONE);
+				singleCodeContents.setSource(appUtil.decodeBase64(tinyDb.getString("downloadFileContents")));
+				tinyDb.putBoolean("enableMarkdownInFileView", false);
+			}
+			return true;
+		}
+		else {
+
+			return super.onOptionsItemSelected(item);
+		}
 	}
 
 	@Override
@@ -437,10 +440,13 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 			intent.putExtra("fileAction", 1);
 			intent.putExtra("filePath", singleFileName);
 			intent.putExtra("fileSha", fileSha);
+
 			if(!appUtil.imageExtension(fileExtension)) {
+
 				intent.putExtra("fileContents", data);
 			}
 			else {
+
 				intent.putExtra("fileContents", "");
 			}
 
@@ -455,10 +461,13 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 			intent.putExtra("fileAction", 2);
 			intent.putExtra("filePath", singleFileName);
 			intent.putExtra("fileSha", fileSha);
+
 			if(!appUtil.imageExtension(fileExtension)) {
+
 				intent.putExtra("fileContents", data);
 			}
 			else {
+
 				intent.putExtra("fileContents", "");
 			}
 
@@ -471,8 +480,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 		if(!tinyDb.getString("downloadFileContents").isEmpty()) {
 
-			int CREATE_REQUEST_CODE = 40;
-
 			File outputFileName = new File(tinyDb.getString("downloadFileName"));
 
 			Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
@@ -481,48 +488,48 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 			intent.setType("*/*");
 			intent.putExtra(Intent.EXTRA_TITLE, outputFileName.getName());
 
-			startActivityForResult(intent, CREATE_REQUEST_CODE);
-
+			fileDownloadActivityResultLauncher.launch(intent);
 		}
 		else {
 
 			Toasty.warning(ctx, getString(R.string.waitLoadingDownloadFile));
 		}
-
 	}
 
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+	ActivityResultLauncher<Intent> fileDownloadActivityResultLauncher = registerForActivityResult(
+		new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback<ActivityResult>() {
 
-		super.onActivityResult(requestCode, resultCode, data);
+		@Override
+		public void onActivityResult(ActivityResult result) {
 
-		if(requestCode == 40 && resultCode == RESULT_OK) {
+			if (result.getResultCode() == Activity.RESULT_OK) {
 
-			try {
+				Intent data = result.getData();
 
-				assert data != null;
-				Uri uri = data.getData();
+				try {
 
-				assert uri != null;
-				OutputStream outputStream = getContentResolver().openOutputStream(uri);
+					assert data != null;
+					Uri uri = data.getData();
 
-				byte[] dataAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
+					assert uri != null;
+					OutputStream outputStream = getContentResolver().openOutputStream(uri);
 
-				assert outputStream != null;
-				outputStream.write(dataAsBytes);
-				outputStream.close();
+					byte[] dataAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
 
-				Toasty.success(ctx, getString(R.string.downloadFileSaved));
+					assert outputStream != null;
+					outputStream.write(dataAsBytes);
+					outputStream.close();
 
+					Toasty.success(ctx, getString(R.string.downloadFileSaved));
+
+				}
+				catch(IOException e) {
+
+					Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
+				}
 			}
-			catch(IOException e) {
-
-				Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
-			}
-
 		}
-
-	}
+	});
 
 	private void initCloseListener() {
 

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

@@ -1,43 +1,50 @@
 package org.mian.gitnex.activities;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.amulyakhare.textdrawable.TextDrawable;
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
+import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
+import org.mian.gitnex.actions.AssigneesActions;
+import org.mian.gitnex.actions.LabelsActions;
+import org.mian.gitnex.adapters.AssigneesListAdapter;
 import org.mian.gitnex.adapters.IssueCommentsAdapter;
+import org.mian.gitnex.adapters.LabelsListAdapter;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.databinding.ActivityIssueDetailBinding;
+import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding;
+import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
+import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.fragments.BottomSheetSingleIssueFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.AppUtil;
@@ -48,15 +55,22 @@ import org.mian.gitnex.helpers.LabelWidthCalculator;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.UserMentions;
 import org.mian.gitnex.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 java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import io.noties.markwon.AbstractMarkwonPlugin;
@@ -82,28 +96,36 @@ import retrofit2.Response;
  * Author M M Arif
  */
 
-public class IssueDetailActivity extends BaseActivity {
+public class IssueDetailActivity extends BaseActivity implements LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener, BottomSheetSingleIssueFragment.BottomSheetListener {
 
-	public ImageView closeActivity;
 	private IssueCommentsAdapter adapter;
-	private RecyclerView mRecyclerView;
-	private ImageView assigneeAvatar;
-	private TextView issueTitle;
-	private TextView issueDescription;
-	private TextView issueMilestone;
-	private TextView issueDueDate;
-	private TextView issueCreatedTime;
-	private HorizontalScrollView labelsScrollView;
-	private HorizontalScrollView assigneesScrollView;
-	private ScrollView scrollViewComments;
-	private TextView issueModified;
-	private ExtendedFloatingActionButton createNewComment;
 	final Context ctx = this;
 	private Context appCtx;
-	private LinearLayout labelsLayout;
-	private LinearLayout assigneesLayout;
-	private View divider;
-	private ProgressBar progressBar;
+	private TinyDB tinyDb;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	private String repoName;
+	private int issueIndex;
+
+	private LabelsListAdapter labelsAdapter;
+	private AssigneesListAdapter assigneesAdapter;
+
+	private List<Integer> currentLabelsIds = new ArrayList<>();
+	private List<Integer> labelsIds = 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<>();
+
+	private Dialog dialogLabels;
+	private Dialog dialogAssignees;
+
+	private CustomLabelsSelectionDialogBinding labelsBinding;
+	private CustomAssigneesSelectionDialogBinding assigneesBinding;
+	private ActivityIssueDetailBinding viewBinding;
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -116,79 +138,65 @@ public class IssueDetailActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 		appCtx = getApplicationContext();
+		tinyDb = new TinyDB(appCtx);
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		viewBinding = ActivityIssueDetailBinding.inflate(getLayoutInflater());
+		View view = viewBinding.getRoot();
+		setContentView(view);
 
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		instanceUrl = tinyDb.getString("instanceUrl");
+		loginUid = tinyDb.getString("loginUid");
+		instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 		String repoFullName = tinyDb.getString("repoFullName");
 		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-		final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+		repoOwner = parts[0];
+		repoName = parts[1];
+		issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
 
-		final SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh);
-
-		assigneeAvatar = findViewById(R.id.assigneeAvatar);
-		issueTitle = findViewById(R.id.issueTitle);
-		issueDescription = findViewById(R.id.issueDescription);
-		issueMilestone = findViewById(R.id.issueMilestone);
-		issueDueDate = findViewById(R.id.issueDueDate);
-		issueCreatedTime = findViewById(R.id.issueCreatedTime);
-		labelsScrollView = findViewById(R.id.labelsScrollView);
-		assigneesScrollView = findViewById(R.id.assigneesScrollView);
-		scrollViewComments = findViewById(R.id.scrollViewComments);
-		issueModified = findViewById(R.id.issueModified);
-		createNewComment = findViewById(R.id.addNewComment);
-		labelsLayout = findViewById(R.id.frameLabels);
-		assigneesLayout = findViewById(R.id.frameAssignees);
-		divider = findViewById(R.id.divider);
-		progressBar = findViewById(R.id.progressBar);
-
-		Toolbar toolbar = findViewById(R.id.toolbar);
-		TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
-		setSupportActionBar(toolbar);
+		setSupportActionBar(viewBinding.toolbar);
 		Objects.requireNonNull(getSupportActionBar()).setTitle(repoName);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-		mRecyclerView = findViewById(R.id.recyclerView);
-		mRecyclerView.setHasFixedSize(true);
-		mRecyclerView.setNestedScrollingEnabled(false);
-		mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+		viewBinding.recyclerView.setHasFixedSize(true);
+		viewBinding.recyclerView.setNestedScrollingEnabled(false);
+		viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
-		mRecyclerView.addItemDecoration(dividerItemDecoration);
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
+		viewBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 
-		createNewComment.setOnClickListener(v -> startActivity(new Intent(ctx, ReplyToIssueActivity.class)));
+		viewBinding.addNewComment.setOnClickListener(v -> BottomSheetReplyFragment.newInstance(new Bundle()).show(getSupportFragmentManager(), "replyBottomSheet"));
+
+		labelsAdapter = new LabelsListAdapter(labelsList, IssueDetailActivity.this, currentLabelsIds);
+		assigneesAdapter = new AssigneesListAdapter(ctx, assigneesList, IssueDetailActivity.this, currentAssignees);
+		LabelsActions.getCurrentIssueLabels(ctx, instanceUrl, loginUid, instanceToken, repoOwner, repoName, issueIndex, currentLabelsIds);
+		AssigneesActions.getCurrentIssueAssignees(ctx, instanceUrl, loginUid, instanceToken, repoOwner, repoName, issueIndex, currentAssignees);
 
 		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 
-			scrollViewComments.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+			viewBinding.scrollViewComments.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
 
-				if((scrollY - oldScrollY) > 0 && createNewComment.isShown()) {
-					createNewComment.setVisibility(View.GONE);
+				if((scrollY - oldScrollY) > 0 && viewBinding.addNewComment.isShown()) {
+					viewBinding.addNewComment.setVisibility(View.GONE);
 				}
 				else if((scrollY - oldScrollY) < 0) {
-					createNewComment.setVisibility(View.VISIBLE);
+					viewBinding.addNewComment.setVisibility(View.VISIBLE);
 				}
 
-				if(!scrollViewComments.canScrollVertically(1)) { // bottom
-					createNewComment.setVisibility(View.GONE);
+				if(!viewBinding.scrollViewComments.canScrollVertically(1)) { // bottom
+					viewBinding.addNewComment.setVisibility(View.GONE);
 				}
 
-				if(!scrollViewComments.canScrollVertically(-1)) { // top
-					createNewComment.setVisibility(View.VISIBLE);
+				if(!viewBinding.scrollViewComments.canScrollVertically(-1)) { // top
+					viewBinding.addNewComment.setVisibility(View.VISIBLE);
 				}
 
 			});
 
 		}
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-			swipeRefresh.setRefreshing(false);
+			viewBinding.pullToRefresh.setRefreshing(false);
 			IssueCommentsViewModel
 				.loadIssueComments(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex,
 					ctx);
@@ -213,14 +221,233 @@ public class IssueDetailActivity extends BaseActivity {
 
 		}
 
-		toolbarTitle.setTypeface(myTypeface);
-		toolbarTitle.setText(repoName);
+		viewBinding.toolbarTitle.setTypeface(myTypeface);
+		viewBinding.toolbarTitle.setText(repoName);
 
 		getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 		fetchDataAsync(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 
 	}
 
+	@Override
+	public void onButtonClicked(String text) {
+
+		switch(text) {
+
+			case "showLabels":
+				showLabels();
+				break;
+
+			case "showAssignees":
+				showAssignees();
+				break;
+		}
+
+	}
+
+	@Override
+	public void labelsInterface(List<String> data) {
+	}
+
+	@Override
+	public void labelsIdsInterface(List<Integer> data) {
+
+		labelsIds = data;
+	}
+
+	@Override
+	public void assigneesInterface(List<String> data) {
+
+		assigneesListData = data;
+	}
+
+	private void showAssignees() {
+
+		assigneesAdapter.updateList(currentAssignees);
+		dialogAssignees = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+		dialogAssignees.setCancelable(false);
+
+		if (dialogAssignees.getWindow() != null) {
+
+			dialogAssignees.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = assigneesBinding.getRoot();
+		dialogAssignees.setContentView(view);
+
+		assigneesBinding.cancel.setOnClickListener(assigneesBinding_ -> {
+
+			currentAssignees = new ArrayList<>(new LinkedHashSet<>(currentAssignees));
+			assigneesListData = new ArrayList<>(new LinkedHashSet<>(assigneesListData));
+			Collections.sort(assigneesListData);
+			Collections.sort(currentAssignees);
+
+			if(!assigneesListData.equals(currentAssignees)) {
+
+				updateIssueAssignees();
+			}
+			else {
+
+				dialogAssignees.dismiss();
+			}
+		});
+
+		dialogAssignees.show();
+		AssigneesActions.getRepositoryAssignees(ctx, instanceUrl, instanceToken, repoOwner, repoName, assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding);
+	}
+
+	public void showLabels() {
+
+		labelsAdapter.updateList(currentLabelsIds);
+		dialogLabels = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+		dialogLabels.setCancelable(false);
+
+		if (dialogLabels.getWindow() != null) {
+
+			dialogLabels.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+		}
+
+		labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = labelsBinding.getRoot();
+		dialogLabels.setContentView(view);
+
+		labelsBinding.cancel.setOnClickListener(labelsBinding_ -> {
+
+			currentLabelsIds = new ArrayList<>(new LinkedHashSet<>(currentLabelsIds));
+			labelsIds = new ArrayList<>(new LinkedHashSet<>(labelsIds));
+			Collections.sort(labelsIds);
+			Collections.sort(currentLabelsIds);
+
+			if(!labelsIds.equals(currentLabelsIds)) {
+
+				updateIssueLabels();
+			}
+			else {
+
+				dialogLabels.dismiss();
+			}
+		});
+
+		dialogLabels.show();
+		LabelsActions.getRepositoryLabels(ctx, instanceUrl, instanceToken, repoOwner, repoName, labelsList, dialogLabels, labelsAdapter, labelsBinding);
+	}
+
+	private void updateIssueAssignees() {
+
+		UpdateIssueAssignees updateAssigneeJson = new UpdateIssueAssignees(assigneesListData);
+
+		Call<JsonElement> call3;
+
+		call3 = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.patchIssueAssignees(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
+
+		call3.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response2) {
+
+				if(response2.code() == 201) {
+
+					Toasty.success(ctx, ctx.getString(R.string.assigneesUpdated));
+
+					dialogAssignees.dismiss();
+
+					viewBinding.frameAssignees.removeAllViews();
+					viewBinding.frameLabels.removeAllViews();
+					getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
+					currentAssignees.clear();
+					new Handler(Looper.getMainLooper()).postDelayed(() -> AssigneesActions.getCurrentIssueAssignees(ctx, instanceUrl, loginUid, instanceToken, repoOwner, repoName, issueIndex, currentAssignees), 1000);
+				}
+				else if(response2.code() == 401) {
+
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+						getResources().getString(R.string.alertDialogTokenRevokedMessage),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+				}
+				else if(response2.code() == 403) {
+
+					Toasty.error(ctx, ctx.getString(R.string.authorizeError));
+				}
+				else if(response2.code() == 404) {
+
+					Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
+				}
+				else {
+
+					Toasty.error(ctx, getString(R.string.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+				Log.e("onFailure", t.toString());
+			}
+		});
+
+	}
+
+	private void updateIssueLabels() {
+
+		Labels patchIssueLabels = new Labels(labelsIds);
+
+		Call<JsonElement> call = RetrofitClient
+			.getInstance(instanceUrl, ctx)
+			.getApiInterface()
+			.updateIssueLabels(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, patchIssueLabels);
+
+		call.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				if(response.code() == 200) {
+
+					Toasty.success(ctx, ctx.getString(R.string.labelsUpdated));
+					dialogLabels.dismiss();
+
+					viewBinding.frameAssignees.removeAllViews();
+					viewBinding.frameLabels.removeAllViews();
+					getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
+					currentLabelsIds.clear();
+					new Handler(Looper.getMainLooper()).postDelayed(() -> LabelsActions.getCurrentIssueLabels(ctx, instanceUrl, loginUid, instanceToken, repoOwner, repoName, issueIndex, currentLabelsIds), 1000);
+				}
+				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.genericError));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+				Log.e("onFailure", t.toString());
+			}
+		});
+
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 
@@ -234,85 +461,76 @@ public class IssueDetailActivity extends BaseActivity {
 
 		int id = item.getItemId();
 
-		switch(id) {
-			case android.R.id.home:
-				finish();
-				return true;
-			case R.id.genericMenu:
-				BottomSheetSingleIssueFragment bottomSheet = new BottomSheetSingleIssueFragment();
-				bottomSheet.show(getSupportFragmentManager(), "singleIssueBottomSheet");
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
-		}
+		if(id == android.R.id.home) {
 
+			finish();
+			return true;
+		}
+		else if(id == R.id.genericMenu) {
+
+			BottomSheetSingleIssueFragment bottomSheet = new BottomSheetSingleIssueFragment();
+			bottomSheet.show(getSupportFragmentManager(), "singleIssueBottomSheet");
+			return true;
+		}
+		else {
+
+			return super.onOptionsItemSelected(item);
+		}
 	}
 
 	@Override
 	public void onResume() {
 
 		super.onResume();
-		final TinyDB tinyDb = new TinyDB(appCtx);
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		final int issueIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
 
 		if(tinyDb.getBoolean("commentPosted")) {
-			scrollViewComments.post(() -> {
+
+			viewBinding.scrollViewComments.post(() -> {
 
 				IssueCommentsViewModel
 					.loadIssueComments(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex,
 						ctx);
 
-				new Handler().postDelayed(() -> scrollViewComments.fullScroll(ScrollView.FOCUS_DOWN), 1000);
+				new Handler(Looper.getMainLooper()).postDelayed(() -> viewBinding.scrollViewComments.fullScroll(ScrollView.FOCUS_DOWN), 1000);
 
 				tinyDb.putBoolean("commentPosted", false);
-
 			});
 		}
 
 		if(tinyDb.getBoolean("commentEdited")) {
-			scrollViewComments.post(() -> {
+
+			viewBinding.scrollViewComments.post(() -> {
 
 				IssueCommentsViewModel
 					.loadIssueComments(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex,
 						ctx);
 				tinyDb.putBoolean("commentEdited", false);
-
 			});
 		}
 
 		if(tinyDb.getBoolean("singleIssueUpdate")) {
 
-			new Handler().postDelayed(() -> {
+			new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-				assigneesLayout.removeAllViews();
-				labelsLayout.removeAllViews();
+				viewBinding.frameAssignees.removeAllViews();
+				viewBinding.frameLabels.removeAllViews();
 				getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 				tinyDb.putBoolean("singleIssueUpdate", false);
 
 			}, 500);
-
 		}
 
 		if(tinyDb.getBoolean("issueEdited")) {
 
-			new Handler().postDelayed(() -> {
+			new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-				assigneesLayout.removeAllViews();
-				labelsLayout.removeAllViews();
+				viewBinding.frameAssignees.removeAllViews();
+				viewBinding.frameLabels.removeAllViews();
 				getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 				tinyDb.putBoolean("issueEdited", false);
 
 			}, 500);
-
 		}
-
 	}
 
 	private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo, int index, String loginUid) {
@@ -325,14 +543,13 @@ public class IssueDetailActivity extends BaseActivity {
 				assert issueCommentsMain != null;
 
 				if(issueCommentsMain.size() > 0) {
-					divider.setVisibility(View.VISIBLE);
+
+					viewBinding.divider.setVisibility(View.VISIBLE);
 				}
 
-				adapter = new IssueCommentsAdapter(ctx, issueCommentsMain);
-				mRecyclerView.setAdapter(adapter);
-
+				adapter = new IssueCommentsAdapter(ctx, getSupportFragmentManager(), issueCommentsMain);
+				viewBinding.recyclerView.setAdapter(adapter);
 			});
-
 	}
 
 	private void getSingleIssue(String instanceUrl, String instanceToken, String repoOwner, String repoName, int issueIndex, String loginUid) {
@@ -351,6 +568,28 @@ public class IssueDetailActivity extends BaseActivity {
 					Issues singleIssue = response.body();
 					assert singleIssue != null;
 
+					viewBinding.issuePrState.setVisibility(View.VISIBLE);
+
+					if(singleIssue.getPull_request() != null) {
+
+						if(singleIssue.getPull_request().isMerged()) { // merged
+
+							viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request_merged);
+						}
+						else if(!singleIssue.getPull_request().isMerged() && singleIssue.getState().equals("closed")) { // closed
+
+							viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request_closed);
+						}
+						else { // open
+
+							viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request);
+						}
+					}
+					else if(singleIssue.getState().equals("closed")) { // issue closed
+
+						viewBinding.issuePrState.setImageResource(R.drawable.ic_issue_closed_red);
+					}
+
 					final Markwon markwon = Markwon.builder(Objects.requireNonNull(ctx)).usePlugin(CorePlugin.create())
 						.usePlugin(ImagesPlugin.create(plugin -> {
 							plugin.addSchemeHandler(new SchemeHandler() {
@@ -362,7 +601,7 @@ public class IssueDetailActivity extends BaseActivity {
 									final int resourceId = ctx.getResources()
 										.getIdentifier(raw.substring("drawable://".length()), "drawable", ctx.getPackageName());
 
-									final Drawable drawable = ctx.getDrawable(resourceId);
+									final Drawable drawable = ContextCompat.getDrawable(ctx, resourceId);
 
 									assert drawable != null;
 									return ImageItem.withResult(drawable);
@@ -401,21 +640,23 @@ public class IssueDetailActivity extends BaseActivity {
 					tinyDb.putString("singleIssueHtmlUrl", singleIssue.getHtml_url());
 
 					PicassoService.getInstance(ctx).get().load(singleIssue.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+						.transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewBinding.assigneeAvatar);
 					String issueNumber_ = "<font color='" + appCtx.getResources().getColor(R.color.lightGray) + "'>" + appCtx.getResources()
 						.getString(R.string.hash) + singleIssue.getNumber() + "</font>";
-					issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle()));
+					viewBinding.issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle()));
 					String cleanIssueDescription = singleIssue.getBody().trim();
 					Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
-					markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(ctx, bodyWithMD, cleanIssueDescription));
+					markwon.setParsedMarkdown(viewBinding.issueDescription, UserMentions.UserMentionsFunc(ctx, bodyWithMD, cleanIssueDescription));
 
-					RelativeLayout.LayoutParams paramsDesc = (RelativeLayout.LayoutParams) issueDescription.getLayoutParams();
+					RelativeLayout.LayoutParams paramsDesc = (RelativeLayout.LayoutParams) viewBinding.issueDescription.getLayoutParams();
 
 					LinearLayout.LayoutParams params1 = new LinearLayout.LayoutParams(80, 80);
 					params1.setMargins(15, 0, 0, 0);
 
 					if(singleIssue.getAssignees() != null) {
-						assigneesScrollView.setVisibility(View.VISIBLE);
+
+						viewBinding.assigneesScrollView.setVisibility(View.VISIBLE);
+
 						for(int i = 0; i < singleIssue.getAssignees().size(); i++) {
 
 							ImageView assigneesView = new ImageView(ctx);
@@ -424,21 +665,23 @@ public class IssueDetailActivity extends BaseActivity {
 								.placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop()
 								.into(assigneesView);
 
-							assigneesLayout.addView(assigneesView);
+							viewBinding.frameAssignees.addView(assigneesView);
 							assigneesView.setLayoutParams(params1);
 							if(!singleIssue.getAssignees().get(i).getFull_name().equals("")) {
+
 								assigneesView.setOnClickListener(
 									new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getFull_name()), ctx));
 							}
 							else {
+
 								assigneesView.setOnClickListener(
 									new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getLogin()), ctx));
 							}
-
 						}
 					}
 					else {
-						assigneesScrollView.setVisibility(View.GONE);
+
+						viewBinding.assigneesScrollView.setVisibility(View.GONE);
 					}
 
 					LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
@@ -446,7 +689,8 @@ public class IssueDetailActivity extends BaseActivity {
 					params.setMargins(0, 0, 15, 0);
 
 					if(singleIssue.getLabels() != null) {
-						labelsScrollView.setVisibility(View.VISIBLE);
+
+						viewBinding.labelsScrollView.setVisibility(View.VISIBLE);
 
 						for(int i = 0; i < singleIssue.getLabels().size(); i++) {
 
@@ -455,8 +699,8 @@ public class IssueDetailActivity extends BaseActivity {
 							int color = Color.parseColor("#" + labelColor);
 
 							ImageView labelsView = new ImageView(ctx);
-							labelsLayout.setOrientation(LinearLayout.HORIZONTAL);
-							labelsLayout.setGravity(Gravity.START | Gravity.TOP);
+							viewBinding.frameLabels.setOrientation(LinearLayout.HORIZONTAL);
+							viewBinding.frameLabels.setGravity(Gravity.START | Gravity.TOP);
 							labelsView.setLayoutParams(params);
 
 							int height = AppUtil.getPixelsFromDensity(ctx, 25);
@@ -468,93 +712,104 @@ public class IssueDetailActivity extends BaseActivity {
 								.height(height).endConfig().buildRoundRect(labelName, color, AppUtil.getPixelsFromDensity(ctx, 5));
 
 							labelsView.setImageDrawable(drawable);
-							labelsLayout.addView(labelsView);
-
+							viewBinding.frameLabels.addView(labelsView);
 						}
 					}
 					else {
-						labelsScrollView.setVisibility(View.GONE);
+
+						viewBinding.labelsScrollView.setVisibility(View.GONE);
 					}
 
 					if(singleIssue.getDue_date() != null) {
 
 						if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {
+
 							DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
 							String dueDate = formatter.format(singleIssue.getDue_date());
-							issueDueDate.setText(dueDate);
-							issueDueDate
+							viewBinding.issueDueDate.setText(dueDate);
+							viewBinding.issueDueDate
 								.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getDue_date()), ctx));
 						}
 						else if(timeFormat.equals("normal1")) {
+
 							DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
 							String dueDate = formatter.format(singleIssue.getDue_date());
-							issueDueDate.setText(dueDate);
+							viewBinding.issueDueDate.setText(dueDate);
 						}
-
 					}
 					else {
 
-						issueDueDate.setVisibility(View.GONE);
+						viewBinding.issueDueDate.setVisibility(View.GONE);
 					}
 
 					String edited;
 
 					if(!singleIssue.getUpdated_at().equals(singleIssue.getCreated_at())) {
+
 						edited = getString(R.string.colorfulBulletSpan) + getString(R.string.modifiedText);
-						issueModified.setVisibility(View.VISIBLE);
-						issueModified.setText(edited);
-						issueModified
+						viewBinding.issueModified.setVisibility(View.VISIBLE);
+						viewBinding.issueModified.setText(edited);
+						viewBinding.issueModified
 							.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getUpdated_at()), ctx));
 					}
 					else {
-						issueModified.setVisibility(View.INVISIBLE);
+
+						viewBinding.issueModified.setVisibility(View.INVISIBLE);
 					}
 
 					if((singleIssue.getDue_date() == null && singleIssue.getMilestone() == null) && singleIssue.getAssignees() != null) {
+
 						paramsDesc.setMargins(0, 35, 0, 0);
-						issueDescription.setLayoutParams(paramsDesc);
+						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}
 					else if(singleIssue.getDue_date() == null && singleIssue.getMilestone() == null) {
+
 						paramsDesc.setMargins(0, 55, 0, 0);
-						issueDescription.setLayoutParams(paramsDesc);
+						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}
 					else if(singleIssue.getAssignees() == null) {
+
 						paramsDesc.setMargins(0, 35, 0, 0);
-						issueDescription.setLayoutParams(paramsDesc);
+						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}
 					else {
+
 						paramsDesc.setMargins(0, 15, 0, 0);
-						issueDescription.setLayoutParams(paramsDesc);
+						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}
 
-					issueCreatedTime.setText(TimeHelper.formatTime(singleIssue.getCreated_at(), new Locale(locale), timeFormat, ctx));
-					issueCreatedTime.setVisibility(View.VISIBLE);
+					viewBinding.issueCreatedTime.setText(TimeHelper.formatTime(singleIssue.getCreated_at(), new Locale(locale), timeFormat, ctx));
+					viewBinding.issueCreatedTime.setVisibility(View.VISIBLE);
 
 					if(timeFormat.equals("pretty")) {
-						issueCreatedTime
+
+						viewBinding.issueCreatedTime
 							.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getCreated_at()), ctx));
 					}
 
 					if(singleIssue.getMilestone() != null) {
-						issueMilestone.setText(getString(R.string.issueMilestone, singleIssue.getMilestone().getTitle()));
+
+						viewBinding.issueMilestone.setVisibility(View.VISIBLE);
+						viewBinding.issueMilestone.setText(getString(R.string.issueMilestone, singleIssue.getMilestone().getTitle()));
 					}
 					else {
-						issueMilestone.setVisibility(View.GONE);
+
+						viewBinding.issueMilestone.setVisibility(View.GONE);
 					}
 
 					if(!singleIssue.getUser().getFull_name().equals("")) {
-						assigneeAvatar.setOnClickListener(
+
+						viewBinding.assigneeAvatar.setOnClickListener(
 							new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getFull_name(), ctx));
 					}
 					else {
-						assigneeAvatar.setOnClickListener(
+
+						viewBinding.assigneeAvatar.setOnClickListener(
 							new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getLogin(), ctx));
 					}
 
-					progressBar.setVisibility(View.GONE);
-
+					viewBinding.progressBar.setVisibility(View.GONE);
 				}
-
 				else if(response.code() == 401) {
 
 					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
@@ -563,7 +818,21 @@ public class IssueDetailActivity extends BaseActivity {
 						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
 				}
+				else if(response.code() == 404) {
 
+					if(tinyDb.getString("issueType").equals("Issue")) {
+
+						Toasty.warning(ctx, getResources().getString(R.string.noDataIssueTab));
+					}
+					else if(tinyDb.getString("issueType").equals("Pull")) {
+
+						Toasty.warning(ctx, getResources().getString(R.string.noDataPullRequests));
+					}
+
+					Intent mainIntent = new Intent(ctx, MainActivity.class);
+					ctx.startActivity(mainIntent);
+					finish();
+				}
 			}
 
 			@Override
@@ -588,21 +857,17 @@ public class IssueDetailActivity extends BaseActivity {
 
 						assert response.body() != null;
 						tinyDb.putBoolean("issueSubscribed", response.body().getSubscribed());
-
 					}
 					else {
 
 						tinyDb.putBoolean("issueSubscribed", false);
-
 					}
-
 				}
 
 				@Override
 				public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
 
 					tinyDb.putBoolean("issueSubscribed", false);
-
 				}
 
 			});

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

@@ -4,19 +4,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.View;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.RadioGroup;
-import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import com.tooltip.Tooltip;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.UserAccountsApi;
@@ -56,10 +52,10 @@ public class LoginActivity extends BaseActivity {
 
 	private Button loginButton;
 	private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode;
-	private Spinner protocolSpinner;
-	private TextView otpInfo;
+	private AutoCompleteTextView protocolSpinner;
 	private RadioGroup loginMethod;
 	private String device_id = "token";
+	private String selectedProtocol;
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -81,51 +77,48 @@ public class LoginActivity extends BaseActivity {
 		loginUidET = findViewById(R.id.login_uid);
 		loginPassword = findViewById(R.id.login_passwd);
 		otpCode = findViewById(R.id.otpCode);
-		otpInfo = findViewById(R.id.otpInfo);
-		ImageView info_button = findViewById(R.id.info);
 		protocolSpinner = findViewById(R.id.httpsSpinner);
 		loginMethod = findViewById(R.id.loginMethod);
 		loginTokenCode = findViewById(R.id.loginTokenCode);
 
 		((TextView) findViewById(R.id.appVersion)).setText(AppUtil.getAppVersion(appCtx));
 
-		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.spinner_item, Protocol.values());
-		adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item);
+		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.list_spinner_items, Protocol.values());
 
 		protocolSpinner.setAdapter(adapterProtocols);
-		protocolSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 
-			public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+		protocolSpinner.setOnItemClickListener((parent, view, position, id) -> {
 
-				if(protocolSpinner.getSelectedItem() == Protocol.HTTP) {
-					Toasty.warning(ctx, getResources().getString(R.string.protocolError));
-				}
+			selectedProtocol = String.valueOf(parent.getItemAtPosition(position));
+
+			if(selectedProtocol.equals(String.valueOf(Protocol.HTTP))) {
+
+				Toasty.warning(ctx, getResources().getString(R.string.protocolError));
 			}
-
-			public void onNothingSelected(AdapterView<?> parent) {
-
-			}
-
 		});
 
-		info_button.setOnClickListener(
-			view -> new Tooltip.Builder(view).setText(R.string.urlInfoTooltip).setTextColor(getResources().getColor(R.color.colorWhite))
-				.setBackgroundColor(getResources().getColor(R.color.tooltipBackground)).setCancelable(true).setDismissOnClick(true).setPadding(30)
-				.setCornerRadius(R.dimen.tooltipCornor).setGravity(Gravity.BOTTOM).show());
+		if(R.id.loginToken == loginMethod.getCheckedRadioButtonId()) {
+
+			AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
+			findViewById(R.id.loginTokenCodeLayout).setVisibility(View.VISIBLE);
+		}
+		else {
+
+			AppUtil.setMultiVisibility(View.VISIBLE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
+			findViewById(R.id.loginTokenCodeLayout).setVisibility(View.GONE);
+		}
 
 		loginMethod.setOnCheckedChangeListener((group, checkedId) -> {
 
 			if(checkedId == R.id.loginToken) {
 
-				AppUtil.setMultiVisibility(View.GONE, loginUidET, loginPassword, otpCode, otpInfo);
-				loginTokenCode.setVisibility(View.VISIBLE);
-
+				AppUtil.setMultiVisibility(View.GONE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
+				findViewById(R.id.loginTokenCodeLayout).setVisibility(View.VISIBLE);
 			}
 			else {
 
-				AppUtil.setMultiVisibility(View.VISIBLE, loginUidET, loginPassword, otpCode, otpInfo);
-				loginTokenCode.setVisibility(View.GONE);
-
+				AppUtil.setMultiVisibility(View.VISIBLE, findViewById(R.id.login_uidLayout), findViewById(R.id.login_passwdLayout), findViewById(R.id.otpCodeLayout));
+				findViewById(R.id.loginTokenCodeLayout).setVisibility(View.GONE);
 			}
 		});
 
@@ -149,41 +142,40 @@ public class LoginActivity extends BaseActivity {
 
 			disableProcessButton();
 			login();
-
 		});
-
 	}
 
 	private void login() {
 
 		try {
 
+			if(selectedProtocol == null) {
+
+				Toasty.error(ctx, getResources().getString(R.string.protocolEmptyError));
+				enableProcessButton();
+				return;
+			}
+
 			String loginUid = loginUidET.getText().toString();
 			String loginPass = loginPassword.getText().toString();
 			String loginToken = loginTokenCode.getText().toString().trim();
 
-			Protocol protocol = (Protocol) protocolSpinner.getSelectedItem();
 			LoginType loginType = (loginMethod.getCheckedRadioButtonId() == R.id.loginUsernamePassword) ? LoginType.BASIC : LoginType.TOKEN;
 
 			URI rawInstanceUrl = UrlBuilder.fromString(UrlHelper.fixScheme(instanceUrlET.getText().toString(), "http")).toUri();
 
-			URI instanceUrlWithProtocol = UrlBuilder.fromUri(rawInstanceUrl).withPath(PathsHelper.join(rawInstanceUrl.getPath()))
-				.withScheme(protocol.name().toLowerCase()).toUri();
-
-			URI instanceUrl = UrlBuilder.fromUri(instanceUrlWithProtocol).withPath(PathsHelper.join(instanceUrlWithProtocol.getPath(), "/api/v1/"))
+			URI instanceUrl = UrlBuilder.fromUri(rawInstanceUrl).withScheme(selectedProtocol.toLowerCase()).withPath(PathsHelper.join(rawInstanceUrl.getPath(), "/api/v1/"))
 				.toUri();
 
 			tinyDB.putString("loginType", loginType.name().toLowerCase());
 			tinyDB.putString("instanceUrlRaw", instanceUrlET.getText().toString());
 			tinyDB.putString("instanceUrl", instanceUrl.toString());
-			tinyDB.putString("instanceUrlWithProtocol", instanceUrlWithProtocol.toString());
 
 			if(instanceUrlET.getText().toString().equals("")) {
 
 				Toasty.error(ctx, getResources().getString(R.string.emptyFieldURL));
 				enableProcessButton();
 				return;
-
 			}
 
 			if(loginType == LoginType.BASIC) {
@@ -193,14 +185,12 @@ public class LoginActivity extends BaseActivity {
 					Toasty.warning(ctx, getResources().getString(R.string.loginOTPTypeError));
 					enableProcessButton();
 					return;
-
 				}
 
 				if(rawInstanceUrl.getUserInfo() != null) {
 
 					tinyDB.putString("basicAuthPassword", loginPass);
 					tinyDB.putBoolean("basicAuthFlag", true);
-
 				}
 
 				if(loginUid.equals("")) {
@@ -208,7 +198,6 @@ public class LoginActivity extends BaseActivity {
 					Toasty.error(ctx, getResources().getString(R.string.emptyFieldUsername));
 					enableProcessButton();
 					return;
-
 				}
 
 				if(loginPass.equals("")) {
@@ -216,7 +205,6 @@ public class LoginActivity extends BaseActivity {
 					Toasty.error(ctx, getResources().getString(R.string.emptyFieldPassword));
 					enableProcessButton();
 					return;
-
 				}
 
 				int loginOTP = (otpCode.length() > 0) ? Integer.parseInt(otpCode.getText().toString().trim()) : 0;
@@ -232,11 +220,9 @@ public class LoginActivity extends BaseActivity {
 					Toasty.error(ctx, getResources().getString(R.string.loginTokenError));
 					enableProcessButton();
 					return;
-
 				}
 
 				versionCheck(instanceUrl.toString(), loginUid, loginPass, 123, loginToken, loginType);
-
 			}
 
 		}
@@ -245,7 +231,6 @@ public class LoginActivity extends BaseActivity {
 			Log.e("onFailure-login", e.toString());
 			Toasty.error(ctx, getResources().getString(R.string.malformedUrl));
 			enableProcessButton();
-
 		}
 	}
 
@@ -256,7 +241,7 @@ public class LoginActivity extends BaseActivity {
 
 		if(!loginToken.equals("")) {
 
-			callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(loginToken);
+			callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken("token " + loginToken);
 		}
 		else {
 
@@ -265,7 +250,6 @@ public class LoginActivity extends BaseActivity {
 			callVersion =
 				(loginOTP != 0) ? RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithOTP(credential, loginOTP) :
 					RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithBasic(credential);
-
 		}
 
 		callVersion.enqueue(new Callback<GiteaVersion>() {
@@ -276,20 +260,18 @@ public class LoginActivity extends BaseActivity {
 				if(responseVersion.code() == 200) {
 
 					GiteaVersion version = responseVersion.body();
-					Version gitea_version;
-
 					assert version != null;
 
-					try {
-						gitea_version = new Version(version.getVersion());
-					}
-					catch(Exception e) {
+					if(!Version.valid(version.getVersion())) {
 
 						Toasty.error(ctx, getResources().getString(R.string.versionUnknown));
 						enableProcessButton();
 						return;
 					}
 
+					tinyDB.putString("giteaVersion", version.getVersion());
+					Version gitea_version = new Version(version.getVersion());
+
 					if(gitea_version.less(getString(R.string.versionLow))) {
 
 						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
@@ -335,9 +317,11 @@ public class LoginActivity extends BaseActivity {
 				// the setup methods then can better handle all different cases
 
 				if(loginType == LoginType.BASIC) {
+
 					setup(instanceUrl, loginUid, loginPass, loginOTP);
 				}
 				else if(loginType == LoginType.TOKEN) { // Token
+
 					setupUsingExistingToken(instanceUrl, loginToken);
 				}
 			}
@@ -366,6 +350,7 @@ public class LoginActivity extends BaseActivity {
 				switch(response.code()) {
 
 					case 200:
+
 						assert userDetails != null;
 						tinyDB.putBoolean("loggedInMode", true);
 						tinyDB.putString(userDetails.getLogin() + "-token", loginToken);
@@ -394,18 +379,16 @@ public class LoginActivity extends BaseActivity {
 						startActivity(new Intent(LoginActivity.this, MainActivity.class));
 						finish();
 						break;
-
 					case 401:
+
 						Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
 						enableProcessButton();
 						break;
-
 					default:
+
 						Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
 						enableProcessButton();
-
 				}
-
 			}
 
 			@Override
@@ -414,7 +397,6 @@ public class LoginActivity extends BaseActivity {
 				Log.e("onFailure", t.toString());
 				Toasty.error(ctx, getResources().getString(R.string.genericError));
 				enableProcessButton();
-
 			}
 		});
 
@@ -445,7 +427,9 @@ public class LoginActivity extends BaseActivity {
 				if(response.code() == 200) {
 
 					assert userTokens != null;
+
 					for(UserTokens t : userTokens) {
+
 						if(t.getName().equals(tokenName)) {
 
 							// this app had created an token on this instance before
@@ -461,6 +445,7 @@ public class LoginActivity extends BaseActivity {
 
 								delcall = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().deleteToken(credential, loginUid, t.getId());
 							}
+
 							delcall.enqueue(new Callback<Void>() {
 
 								@Override
@@ -474,7 +459,6 @@ public class LoginActivity extends BaseActivity {
 
 										Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
 										enableProcessButton();
-
 									}
 								}
 
@@ -484,7 +468,6 @@ public class LoginActivity extends BaseActivity {
 									Log.e("onFailure-login", t.toString());
 									Toasty.error(ctx, getResources().getString(R.string.malformedJson));
 									enableProcessButton();
-
 								}
 							});
 							return;
@@ -497,7 +480,6 @@ public class LoginActivity extends BaseActivity {
 
 					Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
 					enableProcessButton();
-
 				}
 			}
 
@@ -507,7 +489,6 @@ public class LoginActivity extends BaseActivity {
 				Log.e("onFailure-login", t.toString());
 				Toasty.error(ctx, getResources().getString(R.string.malformedJson));
 				enableProcessButton();
-
 			}
 		});
 
@@ -555,6 +536,7 @@ public class LoginActivity extends BaseActivity {
 								switch(response.code()) {
 
 									case 200:
+
 										assert userDetails != null;
 										tinyDB.remove("loginPass");
 										tinyDB.putBoolean("loggedInMode", true);
@@ -570,7 +552,8 @@ public class LoginActivity extends BaseActivity {
 
 										if(checkAccount == 0) {
 
-											accountId = userAccountsApi.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), newToken.getSha1(), "");
+											accountId = userAccountsApi
+												.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), newToken.getSha1(), "");
 											tinyDB.putInt("currentActiveAccountId", (int) accountId);
 										}
 										else {
@@ -583,18 +566,16 @@ public class LoginActivity extends BaseActivity {
 										startActivity(new Intent(LoginActivity.this, MainActivity.class));
 										finish();
 										break;
-
 									case 401:
+
 										Toasty.error(ctx, getResources().getString(R.string.unauthorizedApiError));
 										enableProcessButton();
 										break;
-
 									default:
+
 										Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + response.code());
 										enableProcessButton();
-
 								}
-
 							}
 
 							@Override
@@ -603,7 +584,6 @@ public class LoginActivity extends BaseActivity {
 								Log.e("onFailure", t.toString());
 								Toasty.error(ctx, getResources().getString(R.string.genericError));
 								enableProcessButton();
-
 							}
 						});
 					}
@@ -612,7 +592,6 @@ public class LoginActivity extends BaseActivity {
 
 					Toasty.error(ctx, getResources().getString(R.string.genericApiStatusError) + responseCreate.code());
 					enableProcessButton();
-
 				}
 			}
 
@@ -628,17 +607,21 @@ public class LoginActivity extends BaseActivity {
 	private void loadDefaults() {
 
 		if(tinyDB.getString("loginType").equals(LoginType.BASIC.name().toLowerCase())) {
+
 			loginMethod.check(R.id.loginUsernamePassword);
 		}
 		else {
+
 			loginMethod.check(R.id.loginToken);
 		}
 
 		if(!tinyDB.getString("instanceUrlRaw").equals("")) {
+
 			instanceUrlET.setText(tinyDB.getString("instanceUrlRaw"));
 		}
 
 		if(!tinyDB.getString("loginUid").equals("")) {
+
 			loginUidET.setText(tinyDB.getString("loginUid"));
 		}
 
@@ -649,9 +632,11 @@ public class LoginActivity extends BaseActivity {
 		}
 
 		if(!tinyDB.getString("uniqueAppId").isEmpty()) {
+
 			device_id = tinyDB.getString("uniqueAppId");
 		}
 		else {
+
 			device_id = UUID.randomUUID().toString();
 			tinyDB.putString("uniqueAppId", device_id);
 		}

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

@@ -1,15 +1,14 @@
 package org.mian.gitnex.activities;
 
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Typeface;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,11 +31,10 @@ import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.fragments.AboutFragment;
 import org.mian.gitnex.fragments.AdministrationFragment;
 import org.mian.gitnex.fragments.BottomSheetDraftsFragment;
 import org.mian.gitnex.fragments.DraftsFragment;
-import org.mian.gitnex.fragments.ExploreRepositoriesFragment;
+import org.mian.gitnex.fragments.ExploreFragment;
 import org.mian.gitnex.fragments.MyRepositoriesFragment;
 import org.mian.gitnex.fragments.NotificationsFragment;
 import org.mian.gitnex.fragments.OrganizationsFragment;
@@ -55,6 +53,7 @@ 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;
@@ -80,8 +79,17 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 	private TextView toolbarTitle;
 	final Context ctx = this;
 	private Context appCtx;
+	private static TinyDB tinyDb;
 	private Typeface myTypeface;
 
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+
+	private View hView;
+	private MenuItem navNotifications;
+	private TextView notificationCounter;
+
 	@Override
 	protected int getLayoutResourceId() {
 
@@ -94,41 +102,48 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		super.onCreate(savedInstanceState);
 		appCtx = getApplicationContext();
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
+		tinyDb = new TinyDB(appCtx);
 		tinyDb.putBoolean("noConnection", false);
 
 		Intent mainIntent = getIntent();
 		String launchFragment = mainIntent.getStringExtra("launchFragment");
 
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		instanceUrl = tinyDb.getString("instanceUrl");
+		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")) {
+
 			logout(this, ctx);
 			return;
 		}
 
 		if(tinyDb.getInt("currentActiveAccountId") <= 0) {
+
 			AlertDialogs.forceLogoutDialog(ctx, getResources().getString(R.string.forceLogoutDialogHeader), getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 		}
 
@@ -138,17 +153,17 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		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);
@@ -158,43 +173,55 @@ 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 ExploreRepositoriesFragment) {
+		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 ProfileFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
 		}
-		else if(fragmentById instanceof AboutFragment) {
-			toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
-		}
 		else if(fragmentById instanceof DraftsFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
 		}
 		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(instanceUrl, instanceToken);
+
 		drawer = findViewById(R.id.drawer_layout);
 		NavigationView navigationView = findViewById(R.id.nav_view);
 		navigationView.setNavigationItemSelectedListener(this);
-		final View hView = navigationView.getHeaderView(0);
+		hView = navigationView.getHeaderView(0);
+
+		Menu menu = navigationView.getMenu();
+		navNotifications = menu.findItem(R.id.nav_notifications);
 
 		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
 
@@ -204,12 +231,14 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			@Override
 			public void onDrawerOpened(@NonNull View drawerView) {
 
+				getNotificationsCount(instanceUrl, instanceToken);
 			}
 
 			@Override
 			public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
 
 				if(tinyDb.getBoolean("noConnection")) {
+
 					Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 					tinyDb.putBoolean("noConnection", false);
 				}
@@ -242,17 +271,18 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 						userAccountsList.addAll(userAccounts);
 						navRecyclerViewUserAccounts.setAdapter(adapterUserAccounts);
 					}
-
 				});
 
 				userEmail.setTypeface(myTypeface);
 				userFullName.setTypeface(myTypeface);
 
 				if(!userEmailNav.equals("")) {
+
 					userEmail.setText(userEmailNav);
 				}
 
 				if(!userFullNameNav.equals("")) {
+
 					userFullName.setText(userFullNameNav);
 				}
 
@@ -281,20 +311,18 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 									.setBlurAlgorithm(new RenderScriptBlur(ctx))
 									.setBlurRadius(5)
 									.setHasFixedTransformationMatrix(false);
-
 							}
 
 							@Override
 							public void onError(Exception e) {}
-
 						});
-
 				}
 
 				userAvatar.setOnClickListener(v -> {
 
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_profile);
 					drawer.closeDrawers();
 				});
 
@@ -322,17 +350,48 @@ 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);
 					return;
+			}
+		}
 
+		String launchFragmentByHandler = mainIntent.getStringExtra("launchFragmentByLinkHandler");
+
+		if(launchFragmentByHandler != null) {
+
+			mainIntent.removeExtra("launchFragmentByLinkHandler");
+
+			switch(launchFragmentByHandler) {
+
+				case "repos":
+
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_repositories);
+					return;
+				case "org":
+
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_organizations);
+					return;
+				case "notification":
+
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_notifications);
+					return;
+				case "explore":
+
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_explore);
+					return;
 			}
 		}
 
@@ -349,71 +408,70 @@ 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 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 ExploreRepositoriesFragment()).commit();
+					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);
 					break;
-
 			}
 		}
 
 		if(!connToInternet) {
 
 			if(!tinyDb.getBoolean("noConnection")) {
+
 				Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			}
 
 			tinyDb.putBoolean("noConnection", true);
-
 		}
 		else {
 
 			loadUserInfo(instanceUrl, instanceToken, loginUid);
 			giteaVersion(instanceUrl);
 			tinyDb.putBoolean("noConnection", false);
-
 		}
 
 		// Changelog popup
@@ -439,6 +497,11 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		}
 	}
 
+	public void setActionBarTitle(String title) {
+
+		toolbarTitle.setText(title);
+	}
+
 	@Override
 	public void onButtonClicked(String text) {
 
@@ -466,14 +529,15 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 						})
 						.setNeutralButton(R.string.cancelButton, null).show();
-
 				}
 				else {
+
 					Toasty.error(ctx, getResources().getString(R.string.genericError));
 				}
 
 			}
 			else {
+
 				Toasty.error(ctx, getResources().getString(R.string.genericError));
 			}
 
@@ -485,109 +549,88 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 	public void onBackPressed() {
 
 		if(drawer.isDrawerOpen(GravityCompat.START)) {
+
 			drawer.closeDrawer(GravityCompat.START);
 		}
 		else {
+
 			super.onBackPressed();
 		}
-
 	}
 
 	@Override
 	public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
 
-		switch(menuItem.getItemId()) {
+		int id = menuItem.getItemId();
 
-			case R.id.nav_home:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
-				break;
+		if(id == R.id.nav_home) {
 
-			case R.id.nav_organizations:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
-				break;
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
+		}
+		else if(id == R.id.nav_organizations) {
 
-			case R.id.nav_profile:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
-				break;
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
+		}
+		else if(id == R.id.nav_profile) {
 
-			case R.id.nav_repositories:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
-				break;
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
+		}
+		else if(id == R.id.nav_repositories) {
 
-			case R.id.nav_settings:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SettingsFragment()).commit();
-				break;
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
+		}
+		else if(id == R.id.nav_settings) {
 
-			case R.id.nav_logout:
-				logout(this, ctx);
-				overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-				break;
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SettingsFragment()).commit();
+		}
+		else if(id == R.id.nav_logout) {
 
-			case R.id.nav_about:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AboutFragment()).commit();
-				break;
+			logout(this, ctx);
+			overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+		}
+		else if(id == R.id.nav_starred_repos) {
 
-			case R.id.nav_rate_app:
-				rateThisApp();
-				break;
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
+		}
+		else if(id == R.id.nav_explore) {
 
-			case R.id.nav_starred_repos:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new StarredRepositoriesFragment()).commit();
-				break;
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
+		}
+		else if(id == R.id.nav_notifications) {
 
-			case R.id.nav_explore:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreRepositoriesFragment()).commit();
-				break;
+			toolbarTitle.setText(R.string.pageTitleNotifications);
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
+		}
+		else if(id == R.id.nav_comments_draft) {
 
-			case R.id.nav_notifications:
-				toolbarTitle.setText(R.string.pageTitleNotifications);
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
-				break;
-
-			case R.id.nav_comments_draft:
-				toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
-				break;
-
-			case R.id.nav_administration:
-				toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
-				getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
-				break;
+			toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
+		}
+		else if(id == R.id.nav_administration) {
 
+			toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
 		}
 
 		drawer.closeDrawer(GravityCompat.START);
 		return true;
 	}
 
-	public void rateThisApp() {
-
-		try {
-			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + getPackageName())));
-		}
-		catch(ActivityNotFoundException e) {
-			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + getPackageName())));
-		}
-	}
-
 	public static void logout(Activity activity, Context ctx) {
 
-		TinyDB tinyDb = new TinyDB(ctx.getApplicationContext());
 		tinyDb.putBoolean("loggedInMode", false);
 		tinyDb.remove("basicAuthPassword");
 		tinyDb.putBoolean("basicAuthFlag", false);
 		//tinyDb.clear();
 		activity.finish();
 		ctx.startActivity(new Intent(ctx, LoginActivity.class));
-
 	}
 
 	@Override
@@ -596,13 +639,13 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		int id = item.getItemId();
 
 		if(id == R.id.genericMenu) {
+
 			BottomSheetDraftsFragment bottomSheet = new BottomSheetDraftsFragment();
 			bottomSheet.show(getSupportFragmentManager(), "draftsBottomSheet");
 			return true;
 		}
 
 		return super.onOptionsItemSelected(item);
-
 	}
 
 	private void giteaVersion(final String instanceUrl) {
@@ -624,7 +667,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 					assert version != null;
 
 					tinyDb.putString("giteaVersion", version.getVersion());
-
 				}
 			}
 
@@ -633,9 +675,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 				Log.e("onFailure-version", t.toString());
 			}
-
 		});
-
 	}
 
 	private void loadUserInfo(String instanceUrl, String token, String loginUid) {
@@ -658,6 +698,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 						assert userDetails != null;
 
 						if(userDetails.getIs_admin() != null) {
+
 							tinyDb.putBoolean("userIsAdmin", userDetails.getIs_admin());
 						}
 
@@ -665,9 +706,11 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 						tinyDb.putInt("userId", userDetails.getId());
 
 						if(!userDetails.getFullname().equals("")) {
+
 							tinyDb.putString("userFullname", userDetails.getFullname());
 						}
 						else {
+
 							tinyDb.putString("userFullname", userDetails.getLogin());
 						}
 
@@ -675,9 +718,11 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 						tinyDb.putString("userAvatar", userDetails.getAvatar());
 
 						if(userDetails.getLang() != null) {
+
 							tinyDb.putString("userLang", userDetails.getLang());
 						}
 						else {
+
 							tinyDb.putString("userLang", "");
 						}
 					}
@@ -685,15 +730,12 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				else if(response.code() == 401) {
 
 					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
 				}
 				else {
 
 					String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
 					Toasty.error(ctx, toastError);
-
 				}
-
 			}
 
 			@Override
@@ -705,4 +747,31 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 	}
 
+	private void getNotificationsCount(String instanceUrl, String token) {
+
+		Call<NotificationCount> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkUnreadNotifications(token);
+
+		call.enqueue(new Callback<NotificationCount>() {
+
+			@Override
+			public void onResponse(@NonNull Call<NotificationCount> call, @NonNull retrofit2.Response<NotificationCount> response) {
+
+				NotificationCount notificationCount = response.body();
+
+				if(response.code() == 200) {
+
+					assert notificationCount != null;
+					notificationCounter = navNotifications.getActionView().findViewById(R.id.counterBadgeNotification);
+					notificationCounter.setText(String.valueOf(notificationCount.getCounter()));
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<NotificationCount> call, @NonNull Throwable t) {
+
+				Log.e("onFailure-notification", t.toString());
+			}
+		});
+	}
+
 }

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

@@ -6,12 +6,9 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
 import com.google.gson.JsonElement;
-import com.hendraanggrian.appcompat.socialview.Mention;
-import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityMergePullRequestBinding;
@@ -21,15 +18,13 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
-import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.MergePullRequest;
 import org.mian.gitnex.models.MergePullRequestSpinner;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Objects;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -40,9 +35,17 @@ public class MergePullRequestActivity extends BaseActivity {
 	private View.OnClickListener onClickListener;
 	final Context ctx = this;
 	private Context appCtx;
+	private TinyDB tinyDb;
+
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
+	private String repoOwner;
+	private String repoName;
+	private int prIndex;
+
 	private ActivityMergePullRequestBinding viewBinding;
 
-	private ArrayAdapter<Mention> defaultMentionAdapter;
 	private String Do;
 
 	@Override
@@ -57,13 +60,22 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 		appCtx = getApplicationContext();
+		tinyDb = new TinyDB(appCtx);
 
 		viewBinding = ActivityMergePullRequestBinding.inflate(getLayoutInflater());
 		View view = viewBinding.getRoot();
 		setContentView(view);
 
+		instanceUrl = tinyDb.getString("instanceUrl");
+		loginUid = tinyDb.getString("loginUid");
+		instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		repoOwner = parts[0];
+		repoName = parts[1];
+		prIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
+
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
-		TinyDB tinyDb = new TinyDB(appCtx);
 
 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -73,29 +85,8 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		setMergeAdapter();
 
-		viewBinding.mergeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
-			@Override
-			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-
-				MergePullRequestSpinner mergeId = (MergePullRequestSpinner) parent.getSelectedItem();
-				Do = mergeId.getId();
-
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> parent) {
-
-			}
-
-		});
-
-		defaultMentionAdapter = new MentionArrayAdapter<>(this);
-		loadCollaboratorsList();
-
-		viewBinding.mergeDescription.setMentionAdapter(defaultMentionAdapter);
-
 		if(!tinyDb.getString("issueTitle").isEmpty()) {
+
 			viewBinding.toolbarTitle.setText(tinyDb.getString("issueTitle"));
 			viewBinding.mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber") + ")");
 		}
@@ -105,21 +96,26 @@ public class MergePullRequestActivity extends BaseActivity {
 
 		// if gitea version is greater/equal(1.12.0) than user installed version (installed.higherOrEqual(compareVer))
 		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+
 			viewBinding.deleteBranch.setVisibility(View.VISIBLE);
 		}
 
 		if(tinyDb.getString("prMergeable").equals("false")) {
+
 			disableProcessButton();
 			viewBinding.mergeInfoDisabledMessage.setVisibility(View.VISIBLE);
 		}
 		else {
+
 			viewBinding.mergeInfoDisabledMessage.setVisibility(View.GONE);
 		}
 
 		if(tinyDb.getString("prIsFork").equals("true")) {
+
 			viewBinding.deleteBranchForkInfo.setVisibility(View.VISIBLE);
 		}
 		else {
+
 			viewBinding.deleteBranchForkInfo.setVisibility(View.GONE);
 		}
 
@@ -136,8 +132,6 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void setMergeAdapter() {
 
-		TinyDB tinyDb = new TinyDB(appCtx);
-
 		ArrayList<MergePullRequestSpinner> mergeList = new ArrayList<>();
 
 		mergeList.add(new MergePullRequestSpinner("merge", getResources().getString(R.string.mergeOptionMerge)));
@@ -145,61 +139,18 @@ public class MergePullRequestActivity extends BaseActivity {
 		mergeList.add(new MergePullRequestSpinner("rebase-merge", getResources().getString(R.string.mergeOptionRebaseCommit)));
 		// squash merge works only on gitea > v1.11.4 due to a bug
 		if(new Version(tinyDb.getString("giteaVersion")).higher("1.11.4")) {
+
 			mergeList.add(new MergePullRequestSpinner("squash", getResources().getString(R.string.mergeOptionSquash)));
 		}
 
-		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.spinner_item, mergeList);
-		adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.list_spinner_items, mergeList);
 		viewBinding.mergeSpinner.setAdapter(adapter);
 
-	}
-
-	public void loadCollaboratorsList() {
-
-		final TinyDB tinyDb = new TinyDB(appCtx);
-
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-
-		Call<List<Collaborators>> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-		call.enqueue(new Callback<List<Collaborators>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
-
-				if(response.isSuccessful()) {
-
-					assert response.body() != null;
-					String fullName = "";
-					for(int i = 0; i < response.body().size(); i++) {
-						if(!response.body().get(i).getFull_name().equals("")) {
-							fullName = response.body().get(i).getFull_name();
-						}
-						defaultMentionAdapter.add(new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
-					}
-
-				}
-				else {
-
-					Log.i("onResponse", String.valueOf(response.code()));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-
-				Log.i("onFailure", t.toString());
-			}
+		viewBinding.mergeSpinner.setOnItemClickListener ((parent, view, position, id) -> {
 
+			Do = mergeList.get(position).getId();
 		});
+
 	}
 
 	private void initCloseListener() {
@@ -207,12 +158,12 @@ public class MergePullRequestActivity extends BaseActivity {
 		onClickListener = view -> finish();
 	}
 
-	private View.OnClickListener mergePullRequest = v -> processMergePullRequest();
+	private final View.OnClickListener mergePullRequest = v -> processMergePullRequest();
 
 	private void processMergePullRequest() {
 
-		String mergePRDesc = viewBinding.mergeDescription.getText().toString();
-		String mergePRTitle = viewBinding.mergeTitle.getText().toString();
+		String mergePRDesc = Objects.requireNonNull(viewBinding.mergeDescription.getText()).toString();
+		String mergePRTitle = Objects.requireNonNull(viewBinding.mergeTitle.getText()).toString();
 		boolean deleteBranch = viewBinding.deleteBranch.isChecked();
 
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
@@ -221,27 +172,21 @@ public class MergePullRequestActivity extends BaseActivity {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
-
 		}
 
-		disableProcessButton();
-		mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
+		if(Do == null) {
 
+			Toasty.error(ctx, getResources().getString(R.string.selectMergeStrategy));
+		}
+		else {
+
+			disableProcessButton();
+			mergeFunction(Do, mergePRDesc, mergePRTitle, deleteBranch);
+		}
 	}
 
 	private void mergeFunction(String Do, String mergePRDT, String mergeTitle, boolean deleteBranch) {
 
-		final TinyDB tinyDb = new TinyDB(appCtx);
-
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-		final int prIndex = Integer.parseInt(tinyDb.getString("issueNumber"));
-
 		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);
 
 		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().mergePullRequest(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
@@ -268,7 +213,6 @@ public class MergePullRequestActivity extends BaseActivity {
 							tinyDb.putBoolean("prMerged", true);
 							tinyDb.putBoolean("resumePullRequests", true);
 							finish();
-
 						}
 						else {
 
@@ -283,7 +227,6 @@ public class MergePullRequestActivity extends BaseActivity {
 							tinyDb.putBoolean("prMerged", true);
 							tinyDb.putBoolean("resumePullRequests", true);
 							finish();
-
 						}
 
 					}
@@ -293,7 +236,6 @@ public class MergePullRequestActivity extends BaseActivity {
 						tinyDb.putBoolean("prMerged", true);
 						tinyDb.putBoolean("resumePullRequests", true);
 						finish();
-
 					}
 
 				}
@@ -301,19 +243,21 @@ public class MergePullRequestActivity extends BaseActivity {
 
 					enableProcessButton();
 					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
 				}
 				else if(response.code() == 404) {
 
 					enableProcessButton();
 					Toasty.warning(ctx, getString(R.string.mergePR404ErrorMsg));
+				}
+				else if(response.code() == 405) {
 
+					enableProcessButton();
+					Toasty.warning(ctx, getString(R.string.mergeNotAllowed));;
 				}
 				else {
 
 					enableProcessButton();
 					Toasty.error(ctx, getString(R.string.genericError));
-
 				}
 
 			}
@@ -331,11 +275,6 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	private void deleteBranchFunction(String repoOwner, String repoName) {
 
-		TinyDB tinyDb = new TinyDB(appCtx);
-
-		String instanceUrl = tinyDb.getString("instanceUrl");
-		String loginUid = tinyDb.getString("loginUid");
-		String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 		String branchName = tinyDb.getString("prHeadBranch");
 
 		Call<JsonElement> call = RetrofitClient
@@ -351,9 +290,7 @@ public class MergePullRequestActivity extends BaseActivity {
 				if(response.code() == 204) {
 
 					Log.i("deleteBranch", "Branch deleted successfully");
-
 				}
-
 			}
 
 			@Override
@@ -361,7 +298,6 @@ public class MergePullRequestActivity extends BaseActivity {
 
 				Log.e("onFailure", t.toString());
 				enableProcessButton();
-
 			}
 
 		});

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

@@ -46,9 +46,9 @@ public class OpenRepoInBrowserActivity extends AppCompatActivity {
 
 	    }
 	    catch(URISyntaxException e) {
+
 		    Toasty.error(appCtx, getString(R.string.genericError));
 	    }
-
     }
 
 }

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

@@ -74,17 +74,17 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
         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);
@@ -92,12 +92,18 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
         ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
         int tabsCount = vg.getChildCount();
+
         for (int j = 0; j < tabsCount; j++) {
+
             ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
             int tabChildCount = vgTab.getChildCount();
+
             for (int i = 0; i < tabChildCount; i++) {
+
                 View tabViewChild = vgTab.getChildAt(i);
+
                 if (tabViewChild instanceof TextView) {
+
                     ((TextView) tabViewChild).setTypeface(myTypeface);
                 }
             }
@@ -105,7 +111,6 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
         mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
-
     }
 
 
@@ -122,18 +127,21 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
         int id = item.getItemId();
 
-        switch (id) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.repoMenu:
-                BottomSheetOrganizationFragment bottomSheet = new BottomSheetOrganizationFragment();
-                bottomSheet.show(getSupportFragmentManager(), "orgBottomSheet");
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
+        if(id == android.R.id.home) {
 
+	        finish();
+	        return true;
+        }
+        else if(id == R.id.repoMenu) {
+
+	        BottomSheetOrganizationFragment bottomSheet = new BottomSheetOrganizationFragment();
+	        bottomSheet.show(getSupportFragmentManager(), "orgBottomSheet");
+	        return true;
+        }
+        else {
+
+	        return super.onOptionsItemSelected(item);
+        }
     }
 
     @Override
@@ -175,25 +183,31 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
 
             String orgName;
             if(getIntent().getStringExtra("orgName") != null || !Objects.equals(getIntent().getStringExtra("orgName"), "")) {
+
                 orgName = getIntent().getStringExtra("orgName");
             }
             else {
+
                 orgName = tinyDb.getString("orgName");
             }
 
             Fragment fragment = null;
             switch (position) {
+
                 case 0: // info
+
                     return OrganizationInfoFragment.newInstance(orgName);
                 case 1: // repos
+
                     return RepositoriesByOrgFragment.newInstance(orgName);
                 case 2: // teams
+
                     return TeamsByOrgFragment.newInstance(orgName);
                 case 3: // members
+
                     return MembersByOrgFragment.newInstance(orgName);
             }
             return fragment;
-
         }
 
         @Override

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

@@ -15,6 +15,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.TeamMembersByOrgAdapter;
+import org.mian.gitnex.fragments.BottomSheetOrganizationFragment;
 import org.mian.gitnex.fragments.BottomSheetOrganizationTeamsFragment;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
@@ -66,22 +67,25 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
         closeActivity.setOnClickListener(onClickListener);
 
         if(getIntent().getStringExtra("teamTitle") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamTitle")).equals("")) {
-            toolbarTitle.setText(getIntent().getStringExtra("teamTitle"));
+
+        	toolbarTitle.setText(getIntent().getStringExtra("teamTitle"));
         }
         else {
-            toolbarTitle.setText(R.string.orgTeamMembers);
+
+        	toolbarTitle.setText(R.string.orgTeamMembers);
         }
 
         if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){
-            teamId = getIntent().getStringExtra("teamId");
+
+        	teamId = getIntent().getStringExtra("teamId");
         }
         else {
-            teamId = "0";
+
+        	teamId = "0";
         }
 
         assert teamId != null;
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), Integer.parseInt(teamId));
-
     }
 
     @Override
@@ -94,10 +98,10 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("teamActionFlag")) {
+
             fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), Integer.parseInt(teamId));
             tinyDb.putBoolean("teamActionFlag", false);
         }
-
     }
 
     private void fetchDataAsync(String instanceUrl, String instanceToken, int teamId) {
@@ -107,11 +111,14 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
         teamMembersModel.getMembersByOrgList(instanceUrl, instanceToken, teamId, ctx).observe(this, teamMembersListMain -> {
 
             adapter = new TeamMembersByOrgAdapter(ctx, teamMembersListMain);
+
             if(adapter.getCount() > 0) {
+
                 mGridView.setAdapter(adapter);
                 noDataMembers.setVisibility(View.GONE);
             }
             else {
+
                 adapter.notifyDataSetChanged();
                 mGridView.setAdapter(adapter);
                 noDataMembers.setVisibility(View.VISIBLE);
@@ -119,7 +126,6 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
 
 	        progressBar.setVisibility(View.GONE);
         });
-
     }
 
     @Override
@@ -128,7 +134,6 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
         return true;
-
     }
 
     @Override
@@ -136,31 +141,32 @@ public class OrganizationTeamMembersActivity extends BaseActivity implements Bot
 
         int id = item.getItemId();
 
-        switch(id) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.genericMenu:
-                BottomSheetOrganizationTeamsFragment bottomSheet = new BottomSheetOrganizationTeamsFragment();
-                bottomSheet.show(getSupportFragmentManager(), "orgTeamsBottomSheet");
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
+	    if(id == android.R.id.home) {
 
+		    finish();
+		    return true;
+	    }
+	    else if(id == R.id.genericMenu) {
+
+		    BottomSheetOrganizationTeamsFragment bottomSheet = new BottomSheetOrganizationTeamsFragment();
+		    bottomSheet.show(getSupportFragmentManager(), "orgTeamsBottomSheet");
+		    return true;
+	    }
+	    else {
+
+		    return super.onOptionsItemSelected(item);
+	    }
     }
 
     @Override
     public void onButtonClicked(String text) {
 
-        TinyDB tinyDb = new TinyDB(appCtx);
-
         if("newMember".equals(text)) {
+
             Intent intent = new Intent(OrganizationTeamMembersActivity.this, AddNewTeamMemberActivity.class);
             intent.putExtra("teamId", teamId);
             startActivity(intent);
         }
-
     }
 
     private void initCloseListener() {

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

@@ -73,11 +73,7 @@ public class ProfileEmailActivity extends BaseActivity {
 
     }
 
-    private View.OnClickListener addEmailListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            processAddNewEmail();
-        }
-    };
+    private final View.OnClickListener addEmailListener = v -> processAddNewEmail();
 
     private void processAddNewEmail() {
 
@@ -93,27 +89,23 @@ public class ProfileEmailActivity extends BaseActivity {
 
             Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
             return;
-
         }
 
         if(newUserEmail.equals("")) {
 
             Toasty.error(ctx, getString(R.string.emailErrorEmpty));
             return;
-
         }
         else if(!Patterns.EMAIL_ADDRESS.matcher(newUserEmail).matches()) {
 
             Toasty.warning(ctx, getString(R.string.emailErrorInvalid));
             return;
-
         }
 
         List<String> newEmailList = new ArrayList<>(Arrays.asList(newUserEmail.split(",")));
 
         disableProcessButton();
         addNewEmail(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), newEmailList);
-
     }
 
     private void addNewEmail(final String instanceUrl, final String token, List<String> newUserEmail) {
@@ -139,7 +131,6 @@ public class ProfileEmailActivity extends BaseActivity {
                     tinyDb.putBoolean("emailsRefresh", true);
                     enableProcessButton();
                     finish();
-
                 }
                 else if(response.code() == 401) {
 
@@ -148,37 +139,32 @@ public class ProfileEmailActivity extends BaseActivity {
                             getResources().getString(R.string.alertDialogTokenRevokedMessage),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
                             getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
                 }
                 else if(response.code() == 403) {
 
                     enableProcessButton();
                     Toasty.error(ctx, ctx.getString(R.string.authorizeError));
-
                 }
                 else if(response.code() == 404) {
 
                     enableProcessButton();
                     Toasty.warning(ctx, ctx.getString(R.string.apiNotFound));
-
                 }
                 else if(response.code() == 422) {
 
                     enableProcessButton();
                     Toasty.warning(ctx, ctx.getString(R.string.emailErrorInUse));
-
                 }
                 else {
 
                     enableProcessButton();
                     Toasty.error(ctx, getString(R.string.labelGeneralError));
-
                 }
-
             }
 
             @Override
             public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
                 enableProcessButton();
             }

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

@@ -11,15 +11,12 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
-import com.hendraanggrian.appcompat.socialview.Mention;
-import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
-import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.IssueActions;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -30,13 +27,10 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Issues;
-import java.util.List;
 import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -51,8 +45,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 	private Context appCtx;
 
 	private TextView draftSaved;
-	private SocialAutoCompleteTextView addComment;
-	private ArrayAdapter<Mention> defaultMentionAdapter;
+	private EditText addComment;
 	private Button replyButton;
 	private String TAG = StaticGlobalVariables.replyToIssueActivity;
 	private long draftIdOnCreate;
@@ -79,11 +72,6 @@ public class ReplyToIssueActivity extends BaseActivity {
 		addComment = findViewById(R.id.addComment);
 		addComment.setShowSoftInputOnFocus(true);
 
-        defaultMentionAdapter = new MentionArrayAdapter<>(ctx);
-		loadCollaboratorsList();
-
-		addComment.setMentionAdapter(defaultMentionAdapter);
-
 		closeActivity = findViewById(R.id.close);
 		TextView toolbar_title = findViewById(R.id.toolbar_title);
 
@@ -92,6 +80,7 @@ public class ReplyToIssueActivity extends BaseActivity {
 		imm.showSoftInput(addComment, InputMethodManager.SHOW_IMPLICIT);
 
 		if(!tinyDb.getString("issueTitle").isEmpty()) {
+
 			toolbar_title.setText(tinyDb.getString("issueTitle"));
 		}
 
@@ -104,7 +93,14 @@ public class ReplyToIssueActivity extends BaseActivity {
 		}
 		else {
 
-			draftIdOnCreate = returnDraftId();
+			if(getIntent().getStringExtra("commentBody") != null) {
+
+				draftIdOnCreate = returnDraftId(getIntent().getStringExtra("commentBody"));
+			}
+			else {
+
+				draftIdOnCreate = returnDraftId("");
+			}
 		}
 
 		replyButton = findViewById(R.id.replyButton);
@@ -114,15 +110,14 @@ public class ReplyToIssueActivity extends BaseActivity {
 			addComment.setText(getIntent().getStringExtra("commentBody"));
 
 			if(getIntent().getBooleanExtra("cursorToEnd", false)) {
+
 				addComment.setSelection(addComment.length());
 			}
-
 		}
 
 		if(getIntent().getStringExtra("draftTitle") != null) {
 
 			toolbar_title.setText(getIntent().getStringExtra("draftTitle"));
-
 		}
 
 		if(getIntent().getStringExtra("commentAction") != null && Objects.equals(getIntent().getStringExtra("commentAction"), "edit") && !Objects.equals(getIntent().getStringExtra("commentId"), "new")) {
@@ -135,18 +130,15 @@ public class ReplyToIssueActivity extends BaseActivity {
 			addComment.addTextChangedListener(new TextWatcher() {
 
 				public void afterTextChanged(Editable s) {
-
 				}
 
 				public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
 				}
 
 				public void onTextChanged(CharSequence s, int start, int before, int count) {
 
 					saveDraft(addComment.getText().toString(), commentId, draftIdOnCreate);
 					draftSaved.setVisibility(View.VISIBLE);
-
 				}
 
 			});
@@ -156,28 +148,23 @@ public class ReplyToIssueActivity extends BaseActivity {
 				disableProcessButton();
 				assert commentId != null;
 				IssueActions.editIssueComment(ctx, Integer.parseInt(commentId), addComment.getText().toString(), draftIdOnCreate);
-
 			});
 
 			return;
-
 		}
 
 		addComment.addTextChangedListener(new TextWatcher() {
 
 			public void afterTextChanged(Editable s) {
-
 			}
 
 			public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
 			}
 
 			public void onTextChanged(CharSequence s, int start, int before, int count) {
 
 				saveDraft(addComment.getText().toString(), "new", draftIdOnCreate);
 				draftSaved.setVisibility(View.VISIBLE);
-
 			}
 
 		});
@@ -185,12 +172,10 @@ public class ReplyToIssueActivity extends BaseActivity {
 		if(!connToInternet) {
 
 			disableProcessButton();
-
 		}
 		else {
 
 			replyButton.setOnClickListener(replyToIssue);
-
 		}
 
 	}
@@ -213,10 +198,9 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 			DraftsApi.updateDraft(draftText, (int) draftIdOnCreate, commentId); //updateDraftByIssueIdAsyncTask(draftText, issueNumber, repositoryId, commentId);
 		}
-
 	}
 
-	private long returnDraftId() {
+	private long returnDraftId(String draftText) {
 
 		TinyDB tinyDb = new TinyDB(getApplicationContext());
 
@@ -226,67 +210,16 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 		DraftsApi draftsApi = new DraftsApi(appCtx);
 
-		return draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, "", StaticGlobalVariables.draftTypeComment, "");
+		return draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, draftText, StaticGlobalVariables.draftTypeComment, "");
 
 	}
 
-	public void loadCollaboratorsList() {
-
-		final TinyDB tinyDb = new TinyDB(appCtx);
-
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-
-		Call<List<Collaborators>> call = RetrofitClient
-			.getInstance(instanceUrl, ctx)
-			.getApiInterface()
-			.getCollaborators(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
-		call.enqueue(new Callback<List<Collaborators>>() {
-
-			@Override
-			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
-
-				if (response.isSuccessful()) {
-
-					assert response.body() != null;
-					String fullName = "";
-					for(int i = 0; i < response.body().size(); i++) {
-						if(!response.body().get(i).getFull_name().equals("")) {
-							fullName = response.body().get(i).getFull_name();
-						}
-						defaultMentionAdapter.add(new Mention(response.body().get(i).getUsername(), fullName, response.body().get(i).getAvatar_url()));
-					}
-
-				}
-				else {
-
-					Log.i(TAG, String.valueOf(response.code()));
-
-				}
-
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-
-				Log.e(TAG, t.toString());
-			}
-
-		});
-	}
-
 	private void initCloseListener() {
 
 		onClickListener = view -> finish();
 	}
 
-	private View.OnClickListener replyToIssue = v -> processNewCommentReply();
+	private final View.OnClickListener replyToIssue = v -> processNewCommentReply();
 
 	private void processNewCommentReply() {
 
@@ -297,21 +230,17 @@ public class ReplyToIssueActivity extends BaseActivity {
 
 			Toasty.error(ctx, getResources().getString(R.string.checkNetConnection));
 			return;
-
 		}
 
 		if(newReplyDT.equals("")) {
 
 			Toasty.error(ctx, getString(R.string.commentEmptyError));
-
 		}
 		else {
 
 			disableProcessButton();
 			replyComment(newReplyDT);
-
 		}
-
 	}
 
 	private void replyComment(String newReplyDT) {
@@ -354,7 +283,6 @@ public class ReplyToIssueActivity extends BaseActivity {
 					}
 
 					finish();
-
 				}
 				else if(response.code() == 401) {
 
@@ -363,15 +291,12 @@ public class ReplyToIssueActivity extends BaseActivity {
 						getResources().getString(R.string.alertDialogTokenRevokedMessage),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
 						getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-
 				}
 				else {
 
 					enableProcessButton();
 					Toasty.error(ctx, getString(R.string.commentError));
-
 				}
-
 			}
 
 			@Override
@@ -391,26 +316,24 @@ public class ReplyToIssueActivity extends BaseActivity {
 		inflater.inflate(R.menu.reply_to_issue, menu);
 
 		return super.onCreateOptionsMenu(menu);
-
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 
-		switch(item.getItemId()) {
+		int id = item.getItemId();
 
-			case R.id.replyToIssueMenu:
-				Intent fragmentIntent = new Intent(ReplyToIssueActivity.this, MainActivity.class);
-				fragmentIntent.putExtra("launchFragment", "drafts");
-				ReplyToIssueActivity.this.startActivity(fragmentIntent);
-				break;
-
-			default:
-				return super.onOptionsItemSelected(item);
+		if(id == R.id.replyToIssueMenu) {
 
+			Intent fragmentIntent = new Intent(ReplyToIssueActivity.this, MainActivity.class);
+			fragmentIntent.putExtra("launchFragment", "drafts");
+			ReplyToIssueActivity.this.startActivity(fragmentIntent);
+			return true;
 		}
+		else {
 
-		return true;
+			return super.onOptionsItemSelected(item);
+		}
 	}
 
 	private void disableProcessButton() {

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

@@ -33,7 +33,6 @@ import org.mian.gitnex.fragments.BottomSheetIssuesFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetMilestonesFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetPullRequestFilterFragment;
 import org.mian.gitnex.fragments.BottomSheetRepoFragment;
-import org.mian.gitnex.fragments.BranchesFragment;
 import org.mian.gitnex.fragments.CollaboratorsFragment;
 import org.mian.gitnex.fragments.FilesFragment;
 import org.mian.gitnex.fragments.IssuesFragment;
@@ -127,17 +126,17 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		switch(tinyDB.getInt("customFontId", -1)) {
 
 			case 0:
+
 				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
 				break;
-
 			case 2:
+
 				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
 				break;
-
 			default:
+
 				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
 				break;
-
 		}
 
 		toolbarTitle.setTypeface(myTypeface);
@@ -157,13 +156,14 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				View tabViewChild = vgTab.getChildAt(i);
 
 				if(tabViewChild instanceof TextView) {
+
 					((TextView) tabViewChild).setTypeface(myTypeface);
 				}
 			}
 		}
 
 		// Only show collaborators tab, if you have permission to
-		View collaboratorTab = viewGroup.getChildAt(8);
+		View collaboratorTab = viewGroup.getChildAt(7);
 
 		if(tinyDB.getBoolean("isRepoAdmin") || new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
 
@@ -173,7 +173,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 			tabsCount--;
 			collaboratorTab.setVisibility(View.GONE);
-
 		}
 
 		mViewPager = findViewById(R.id.container);
@@ -210,7 +209,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				assert tabOpenIssues != null; // FIXME This should be cleaned up
 				TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeIssueText);
 				openIssueTabView.setTextColor(textColor);
-
 			}
 
 			// Pull request count
@@ -221,7 +219,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				assert tabOpenPulls != null; // FIXME This should be cleaned up
 				TextView openPullTabView = Objects.requireNonNull(tabOpenPulls.getCustomView()).findViewById(R.id.counterBadgePullText);
 				openPullTabView.setTextColor(textColor);
-
 			}
 
 			// Release count
@@ -229,19 +226,36 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 				if(textViewBadgeRelease.getText() != "") { // only show if API returned a number
 
-					Objects.requireNonNull(tabLayout.getTabAt(5)).setCustomView(tabHeader6);
-					TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(5);
+					Objects.requireNonNull(tabLayout.getTabAt(4)).setCustomView(tabHeader6);
+					TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(4);
 					assert tabOpenRelease != null; // FIXME This should be cleaned up
 					TextView openReleaseTabView = Objects.requireNonNull(tabOpenRelease.getCustomView()).findViewById(R.id.counterBadgeReleaseText);
 					openReleaseTabView.setTextColor(textColor);
-
 				}
 			}
 		}
 
+		Intent mainIntent = getIntent();
+		String goToSection = mainIntent.getStringExtra("goToSection");
+		String goToSectionType = mainIntent.getStringExtra("goToSectionType");
+
+		if(goToSection != null) {
+
+			mainIntent.removeExtra("goToSection");
+			mainIntent.removeExtra("goToSectionType");
+
+			if(goToSectionType.equals("issue")) {
+
+				RepoDetailActivity.mViewPager.setCurrentItem(2);
+			}
+			else if(goToSectionType.equals("pull")) {
+
+				RepoDetailActivity.mViewPager.setCurrentItem(3);
+			}
+		}
+
 		checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
 		checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
-
 	}
 
 	@Override
@@ -253,7 +267,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 			getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
 		}
-
 	}
 
 	@Override
@@ -262,7 +275,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.repo_dotted_menu, menu);
 		return true;
-
 	}
 
 	@Override
@@ -300,6 +312,12 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				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);
 
@@ -313,92 +331,105 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		switch(text) {
 
 			case "label":
+
 				startActivity(new Intent(RepoDetailActivity.this, CreateLabelActivity.class));
 				break;
-
 			case "newIssue":
+
 				startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
 				break;
-
 			case "newMilestone":
+
 				startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
 				break;
-
 			case "addCollaborator":
+
 				startActivity(new Intent(RepoDetailActivity.this, AddCollaboratorToRepositoryActivity.class));
 				break;
-
 			case "chooseBranch":
+
 				chooseBranch();
 				break;
-
 			case "createRelease":
+
 				startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
 				break;
-
 			case "openWebRepo":
+
 				Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(tinyDB.getString("repoHtmlUrl")));
 				startActivity(i);
 				break;
-
 			case "shareRepo":
+
 				Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 				sharingIntent.setType("text/plain");
 				sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, tinyDB.getString("repoHtmlUrl"));
 				sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, tinyDB.getString("repoHtmlUrl"));
 				startActivity(Intent.createChooser(sharingIntent, tinyDB.getString("repoHtmlUrl")));
 				break;
-
 			case "copyRepoUrl":
+
 				ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
 				ClipData clip = ClipData.newPlainText("repoUrl", tinyDB.getString("repoHtmlUrl"));
 				assert clipboard != null;
 				clipboard.setPrimaryClip(clip);
 				Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
 				break;
-
 			case "newFile":
+
 				startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
 				break;
-
 			case "openIssues":
+
 				if(getFragmentRefreshListener() != null) {
+
 					getFragmentRefreshListener().onRefresh("open");
 				}
 				break;
-
 			case "closedIssues":
+
 				if(getFragmentRefreshListener() != null) {
+
 					getFragmentRefreshListener().onRefresh("closed");
 				}
 				break;
-
 			case "openPr":
+
 				if(getFragmentRefreshListenerPr() != null) {
+
 					getFragmentRefreshListenerPr().onRefresh("open");
 				}
 				break;
-
 			case "closedPr":
+
 				if(getFragmentRefreshListenerPr() != null) {
+
 					getFragmentRefreshListenerPr().onRefresh("closed");
 				}
 				break;
-
 			case "openMilestone":
+
 				if(getFragmentRefreshListenerMilestone() != null) {
+
 					getFragmentRefreshListenerMilestone().onRefresh("open");
 				}
 				break;
-
 			case "closedMilestone":
+
 				if(getFragmentRefreshListenerMilestone() != null) {
+
 					getFragmentRefreshListenerMilestone().onRefresh("closed");
 				}
 				break;
+			case "repoSettings":
 
+				startActivity(new Intent(RepoDetailActivity.this, RepositorySettingsActivity.class));
+				break;
+			case "newPullRequest":
+
+				startActivity(new Intent(RepoDetailActivity.this, CreatePullRequestActivity.class));
+				break;
 		}
-
 	}
 
 	private void chooseBranch() {
@@ -438,7 +469,9 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 						public void onClick(DialogInterface dialogInterface, int i) {
 
 							tinyDB.putString("repoBranch", branchesList.get(i));
+
 							if(getFragmentRefreshListenerFiles() != null) {
+
 								getFragmentRefreshListenerFiles().onRefresh(branchesList.get(i));
 							}
 							dialogInterface.dismiss();
@@ -447,9 +480,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 					pBuilder.setNeutralButton(R.string.cancelButton, null);
 
 					pBuilder.create().show();
-
 				}
-
 			}
 
 			@Override
@@ -477,40 +508,36 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 			switch(position) {
 
 				case 0: // Repository details
+
 					return RepoInfoFragment.newInstance(repositoryOwner, repositoryName);
-
 				case 1: // Files
-					return FilesFragment.newInstance(repositoryOwner, repositoryName, tinyDB.getString("repoBranch"));
 
+					return FilesFragment.newInstance(repositoryOwner, repositoryName, tinyDB.getString("repoBranch"));
 				case 2: // Issues
+
 					fragment = new IssuesFragment();
 					break;
-
 				case 3: // Pull requests
+
 					fragment = new PullRequestsFragment();
 					break;
+				case 4: // Releases
 
-				case 4: // Branches
-					return BranchesFragment.newInstance(repositoryOwner, repositoryName);
-
-				case 5: // Releases
 					return ReleasesFragment.newInstance(repositoryOwner, repositoryName);
+				case 5: // Milestones
 
-				case 6: // Milestones
 					fragment = new MilestonesFragment();
 					break;
+				case 6: // Labels
 
-				case 7: // Labels
 					return LabelsFragment.newInstance(repositoryOwner, repositoryName);
+				case 7: // Collaborators
 
-				case 8: // Collaborators
 					return CollaboratorsFragment.newInstance(repositoryOwner, repositoryName);
-
 			}
 
 			assert fragment != null;
 			return fragment;
-
 		}
 
 		@Override
@@ -518,7 +545,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 			return tabsCount;
 		}
-
 	}
 
 	private void getRepoInfo(String instanceUrl, String token, final String owner, String repo) {
@@ -534,6 +560,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 				if(response.code() == 200) {
 
 					if(tinyDB.getBoolean("enableCounterBadges")) {
+
 						assert repoInfo != null;
 
 						if(repoInfo.getOpen_issues_count() != null) {
@@ -560,7 +587,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 					Log.e("onFailure", String.valueOf(response.code()));
 				}
-
 			}
 
 			@Override
@@ -582,7 +608,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
 				tinyDB.putInt("repositoryStarStatus", response.code());
-
 			}
 
 			@Override
@@ -609,15 +634,14 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 					assert response.body() != null;
 
 					if(response.body().getSubscribed()) {
+
 						tinyDB.putBoolean("repositoryWatchStatus", true);
 					}
-
 				}
 				else {
 
 					tinyDB.putBoolean("repositoryWatchStatus", false);
 				}
-
 			}
 
 			@Override

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

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.Menu;
@@ -96,6 +97,7 @@ 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 = StaticGlobalVariables.resultLimitNewGiteaInstances;
 		}
 
@@ -106,7 +108,7 @@ public class RepoForksActivity extends BaseActivity {
 			DividerItemDecoration.VERTICAL);
 		recyclerView.addItemDecoration(dividerItemDecoration);
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 			swipeRefresh.setRefreshing(false);
 			loadInitial(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, pageSize, resultLimit);
@@ -121,9 +123,7 @@ public class RepoForksActivity extends BaseActivity {
 
 				int page = (forksList.size() + resultLimit) / resultLimit;
 				loadMore(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, resultLimit);
-
 			}
-
 		}));
 
 		recyclerView.setHasFixedSize(true);
@@ -131,7 +131,6 @@ public class RepoForksActivity extends BaseActivity {
 		recyclerView.setAdapter(adapter);
 
 		loadInitial(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, pageSize, resultLimit);
-
 	}
 
 	private void loadInitial(String instanceUrl, String instanceToken, String repoOwner, String repoName, int pageSize, int resultLimit) {
@@ -149,29 +148,27 @@ public class RepoForksActivity extends BaseActivity {
 				if(response.isSuccessful()) {
 
 					assert response.body() != null;
+
 					if(response.body().size() > 0) {
 
 						forksList.clear();
 						forksList.addAll(response.body());
 						adapter.notifyDataChanged();
 						noData.setVisibility(View.GONE);
-
 					}
 					else {
+
 						forksList.clear();
 						adapter.notifyDataChanged();
 						noData.setVisibility(View.VISIBLE);
 					}
 
 					progressBar.setVisibility(View.GONE);
-
 				}
 				else {
 
 					Log.e(TAG, String.valueOf(response.code()));
-
 				}
-
 			}
 
 			@Override
@@ -179,7 +176,6 @@ public class RepoForksActivity extends BaseActivity {
 
 				Log.e(TAG, t.toString());
 			}
-
 		});
 
 	}
@@ -204,37 +200,31 @@ public class RepoForksActivity extends BaseActivity {
 					forksList.remove(forksList.size() - 1);
 
 					List<UserRepositories> result = response.body();
-
 					assert result != null;
+
 					if(result.size() > 0) {
 
 						pageSize = result.size();
 						forksList.addAll(result);
-
 					}
 					else {
 
 						adapter.setMoreDataAvailable(false);
-
 					}
 
 					adapter.notifyDataChanged();
 					progressLoadMore.setVisibility(View.GONE);
-
 				}
 				else {
 
 					Log.e(TAG, String.valueOf(response.code()));
-
 				}
-
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<List<UserRepositories>> call, @NonNull Throwable t) {
 
 				Log.e(TAG, t.toString());
-
 			}
 
 		});
@@ -269,7 +259,6 @@ public class RepoForksActivity extends BaseActivity {
 		});
 
 		return super.onCreateOptionsMenu(menu);
-
 	}
 
 	private void filter(String text) {
@@ -277,7 +266,9 @@ public class RepoForksActivity extends BaseActivity {
 		List<UserRepositories> arr = new ArrayList<>();
 
 		for(UserRepositories d : forksList) {
+
 			if(d.getName().toLowerCase().contains(text) || d.getDescription().toLowerCase().contains(text)) {
+
 				arr.add(d);
 			}
 		}
@@ -288,6 +279,7 @@ public class RepoForksActivity extends BaseActivity {
 	private void initCloseListener() {
 
 		onClickListener = view -> {
+
 			getIntent().removeExtra("repoFullNameForForks");
 			finish();
 		};

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

@@ -7,16 +7,12 @@ import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.RepoStargazersAdapter;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.viewmodels.RepoStargazersViewModel;
-import java.util.List;
 
 /**
  * Author M M Arif
@@ -66,28 +62,29 @@ public class RepoStargazersActivity extends BaseActivity {
         toolbarTitle.setText(R.string.repoStargazersInMenu);
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
     }
 
     private void fetchDataAsync(String instanceUrl, String instanceToken, String repoOwner, String repoName) {
 
         RepoStargazersViewModel repoStargazersModel = new ViewModelProvider(this).get(RepoStargazersViewModel.class);
 
-        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer<List<UserInfo>>() {
-            @Override
-            public void onChanged(@Nullable List<UserInfo> stargazersListMain) {
-                adapter = new RepoStargazersAdapter(ctx, stargazersListMain);
-                if(adapter.getCount() > 0) {
-                    mGridView.setAdapter(adapter);
-                    noDataStargazers.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mGridView.setAdapter(adapter);
-                    noDataStargazers.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
+        repoStargazersModel.getRepoStargazers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, stargazersListMain -> {
+
+            adapter = new RepoStargazersAdapter(ctx, stargazersListMain);
+
+            if(adapter.getCount() > 0) {
+
+                mGridView.setAdapter(adapter);
+                noDataStargazers.setVisibility(View.GONE);
             }
+            else {
+
+                adapter.notifyDataSetChanged();
+                mGridView.setAdapter(adapter);
+                noDataStargazers.setVisibility(View.VISIBLE);
+            }
+
+            mProgressBar.setVisibility(View.GONE);
         });
 
     }

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

@@ -7,16 +7,12 @@ import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.RepoWatchersAdapter;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.viewmodels.RepoWatchersViewModel;
-import java.util.List;
 
 /**
  * Author M M Arif
@@ -66,28 +62,29 @@ public class RepoWatchersActivity extends BaseActivity {
         toolbarTitle.setText(R.string.repoWatchersInMenu);
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
-
     }
 
     private void fetchDataAsync(String instanceUrl, String instanceToken, String repoOwner, String repoName) {
 
         RepoWatchersViewModel repoWatchersModel = new ViewModelProvider(this).get(RepoWatchersViewModel.class);
 
-        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, new Observer<List<UserInfo>>() {
-            @Override
-            public void onChanged(@Nullable List<UserInfo> watchersListMain) {
-                adapter = new RepoWatchersAdapter(ctx, watchersListMain);
-                if(adapter.getCount() > 0) {
-                    mGridView.setAdapter(adapter);
-                    noDataWatchers.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mGridView.setAdapter(adapter);
-                    noDataWatchers.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
+        repoWatchersModel.getRepoWatchers(instanceUrl, instanceToken, repoOwner, repoName, ctx).observe(this, watchersListMain -> {
+
+            adapter = new RepoWatchersAdapter(ctx, watchersListMain);
+
+            if(adapter.getCount() > 0) {
+
+                mGridView.setAdapter(adapter);
+                noDataWatchers.setVisibility(View.GONE);
             }
+            else {
+
+                adapter.notifyDataSetChanged();
+                mGridView.setAdapter(adapter);
+                noDataWatchers.setVisibility(View.VISIBLE);
+            }
+
+            mProgressBar.setVisibility(View.GONE);
         });
 
     }

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

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

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

@@ -5,13 +5,15 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.Switch;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.helpers.Version;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Author M M Arif
@@ -22,20 +24,16 @@ public class SettingsAppearanceActivity extends BaseActivity {
 	private Context appCtx;
 	private View.OnClickListener onClickListener;
 
-	private static String[] timeList = {"Pretty", "Normal"};
+	private static final String[] timeList = {"Pretty", "Normal"};
 	private static int timeSelectedChoice = 0;
 
-	private static String[] codeBlockList = {"Green - Black", "White - Black", "Grey - Black", "White - Grey", "Dark - White"};
+	private List<String> codeBlockList;
 	private static int codeBlockSelectedChoice = 0;
 
-	private static String[] homeScreenList = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile", "Explore", "Drafts"};
-	private static String[] homeScreenListNew = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile", "Explore", "Drafts",  "Notifications"};
-	private static int homeScreenSelectedChoice = 0;
-
-	private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
+	private static final String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
 	private static int customFontSelectedChoice = 0;
 
-	private static String[] themeList = {"Dark", "Light", "Auto (Day/Night)"};
+	private static final String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)"};
 	private static int themeSelectedChoice = 0;
 
 	@Override
@@ -56,85 +54,138 @@ public class SettingsAppearanceActivity extends BaseActivity {
 
 		final TextView tvDateTimeSelected = findViewById(R.id.tvDateTimeSelected); // setter for time
 		final TextView codeBlockSelected = findViewById(R.id.codeBlockSelected); // setter for code block
-		final TextView homeScreenSelected = findViewById(R.id.homeScreenSelected); // setter for home screen
 		final TextView customFontSelected = findViewById(R.id.customFontSelected); // setter for custom font
 		final TextView themeSelected = findViewById(R.id.themeSelected); // setter for theme
 
 		LinearLayout timeFrame = findViewById(R.id.timeFrame);
 		LinearLayout codeBlockFrame = findViewById(R.id.codeBlockFrame);
-		LinearLayout homeScreenFrame = findViewById(R.id.homeScreenFrame);
 		LinearLayout customFontFrame = findViewById(R.id.customFontFrame);
 		LinearLayout themeFrame = findViewById(R.id.themeSelectionFrame);
 
-		Switch counterBadgesSwitch = findViewById(R.id.switchCounterBadge);
+		SwitchMaterial counterBadgesSwitch = findViewById(R.id.switchCounterBadge);
 
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.3")) {
+		// code block
+		String[] codeBlockList_ = {getResources().getString(R.string.codeBlockGreenOnBlack), getResources().getString(R.string.codeBlockWhiteOnBlack),
+			getResources().getString(R.string.codeBlockGreyOnBlack), getResources().getString(R.string.codeBlockWhiteOnGrey),
+			getResources().getString(R.string.codeBlockDarkOnWhite)};
 
-			homeScreenList = homeScreenListNew;
+		codeBlockList = new ArrayList<>(Arrays.asList(codeBlockList_));
+		String[] codeBlockArray = new String[codeBlockList.size()];
+		codeBlockList.toArray(codeBlockArray);
+
+		if(codeBlockSelectedChoice == 0) {
+
+			codeBlockSelectedChoice = tinyDb.getInt("codeBlockId");
+			codeBlockSelected.setText(getResources().getString(R.string.codeBlockGreenOnBlack));
 		}
 
+		if(codeBlockSelectedChoice == 1) {
+
+			codeBlockSelected.setText(getResources().getString(R.string.codeBlockWhiteOnBlack));
+		}
+		else if(codeBlockSelectedChoice == 2) {
+
+			codeBlockSelected.setText(getResources().getString(R.string.codeBlockGreyOnBlack));
+		}
+		else if(codeBlockSelectedChoice == 3) {
+
+			codeBlockSelected.setText(getResources().getString(R.string.codeBlockWhiteOnGrey));
+		}
+		else if(codeBlockSelectedChoice == 4) {
+
+			codeBlockSelected.setText(getResources().getString(R.string.codeBlockDarkOnWhite));
+		}
+
+		codeBlockFrame.setOnClickListener(codeBlock -> {
+
+			AlertDialog.Builder cBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
+
+			cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
+			cBuilder.setCancelable(codeBlockSelectedChoice != -1);
+
+			cBuilder.setSingleChoiceItems(codeBlockList_, codeBlockSelectedChoice, (dialogInterfaceCodeBlock, i) -> {
+
+				codeBlockSelectedChoice = i;
+				codeBlockSelected.setText(codeBlockList_[i]);
+				tinyDb.putInt("codeBlockId", i);
+
+				switch(i) {
+					case 1: // white on black
+
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorWhite));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+						break;
+					case 2: // grey on black
+
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorAccent));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+						break;
+					case 3: // white on grey
+
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorWhite));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.colorAccent));
+						break;
+					case 4: // dark on white
+
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorPrimary));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.colorWhite));
+						break;
+					default: // green on black
+
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+						break;
+				}
+
+				dialogInterfaceCodeBlock.dismiss();
+				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
+			});
+
+			AlertDialog cDialog = cBuilder.create();
+			cDialog.show();
+		});
+		// code block
+
 		if(!tinyDb.getString("timeStr").isEmpty()) {
+
 			tvDateTimeSelected.setText(tinyDb.getString("timeStr"));
 		}
 
-		if(!tinyDb.getString("codeBlockStr").isEmpty()) {
-			codeBlockSelected.setText(tinyDb.getString("codeBlockStr"));
-		}
-
-		if(!tinyDb.getString("homeScreenStr").isEmpty()) {
-			homeScreenSelected.setText(tinyDb.getString("homeScreenStr"));
-		}
-
 		if(!tinyDb.getString("customFontStr").isEmpty()) {
+
 			customFontSelected.setText(tinyDb.getString("customFontStr"));
 		}
 
 		if(!tinyDb.getString("themeStr").isEmpty()) {
+
 			themeSelected.setText(tinyDb.getString("themeStr"));
 		}
 
 		if(timeSelectedChoice == 0) {
+
 			timeSelectedChoice = tinyDb.getInt("timeId");
 		}
 
-		if(codeBlockSelectedChoice == 0) {
-			codeBlockSelectedChoice = tinyDb.getInt("codeBlockId");
-		}
-
-		if(homeScreenSelectedChoice == 0) {
-			homeScreenSelectedChoice = tinyDb.getInt("homeScreenId");
-		}
-
 		if(customFontSelectedChoice == 0) {
+
 			customFontSelectedChoice = tinyDb.getInt("customFontId", 1);
 		}
 
 		if(themeSelectedChoice == 0) {
+
 			themeSelectedChoice = tinyDb.getInt("themeId");
 		}
 
-		if(tinyDb.getBoolean("enableCounterBadges")) {
-			counterBadgesSwitch.setChecked(true);
-		}
-		else {
-			counterBadgesSwitch.setChecked(false);
-		}
+		counterBadgesSwitch.setChecked(tinyDb.getBoolean("enableCounterBadges"));
 
 		// counter badge switcher
 		counterBadgesSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-			if (isChecked) {
-				tinyDb.putBoolean("enableCounterBadges", true);
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("enableCounterBadges", false);
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
+			tinyDb.putBoolean("enableCounterBadges", isChecked);
+			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 		});
 
 		// theme selection dialog
@@ -143,12 +194,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
 
 			tsBuilder.setTitle(getResources().getString(R.string.themeSelectorDialogTitle));
-			if(themeSelectedChoice != -1) {
-				tsBuilder.setCancelable(true);
-			}
-			else {
-				tsBuilder.setCancelable(false);
-			}
+			tsBuilder.setCancelable(themeSelectedChoice != -1);
 
 			tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {
 
@@ -162,12 +208,10 @@ public class SettingsAppearanceActivity extends BaseActivity {
 				this.overridePendingTransition(0, 0);
 				dialogInterfaceTheme.dismiss();
 				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
 			});
 
 			AlertDialog cfDialog = tsBuilder.create();
 			cfDialog.show();
-
 		});
 
 		// custom font dialog
@@ -176,12 +220,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			AlertDialog.Builder cfBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
 
 			cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
-			if(customFontSelectedChoice != -1) {
-				cfBuilder.setCancelable(true);
-			}
-			else {
-				cfBuilder.setCancelable(false);
-			}
+			cfBuilder.setCancelable(customFontSelectedChoice != -1);
 
 			cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {
 
@@ -195,95 +234,10 @@ public class SettingsAppearanceActivity extends BaseActivity {
 				this.overridePendingTransition(0, 0);
 				dialogInterfaceCustomFont.dismiss();
 				Toasty.success(appCtx, appCtx.getResources().getString(R.string.settingsSave));
-
 			});
 
 			AlertDialog cfDialog = cfBuilder.create();
 			cfDialog.show();
-
-		});
-
-		// home screen dialog
-		homeScreenFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder hsBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			hsBuilder.setTitle(R.string.settingsHomeScreenSelectorDialogTitle);
-			if(homeScreenSelectedChoice != -1) {
-				hsBuilder.setCancelable(true);
-			}
-			else {
-				hsBuilder.setCancelable(false);
-			}
-
-			hsBuilder.setSingleChoiceItems(homeScreenList, homeScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
-
-				homeScreenSelectedChoice = i;
-				homeScreenSelected.setText(homeScreenList[i]);
-				tinyDb.putString("homeScreenStr", homeScreenList[i]);
-				tinyDb.putInt("homeScreenId", i);
-
-				dialogInterfaceHomeScreen.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog hsDialog = hsBuilder.create();
-			hsDialog.show();
-
-		});
-
-		// code block dialog
-		codeBlockFrame.setOnClickListener(view -> {
-
-			AlertDialog.Builder cBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
-
-			cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
-			if(codeBlockSelectedChoice != -1) {
-				cBuilder.setCancelable(true);
-			}
-			else {
-				cBuilder.setCancelable(false);
-			}
-
-			cBuilder.setSingleChoiceItems(codeBlockList, codeBlockSelectedChoice, (dialogInterfaceCodeBlock, i) -> {
-
-				codeBlockSelectedChoice = i;
-				codeBlockSelected.setText(codeBlockList[i]);
-				tinyDb.putString("codeBlockStr", codeBlockList[i]);
-				tinyDb.putInt("codeBlockId", i);
-
-				switch(codeBlockList[i]) {
-					case "White - Black":
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorWhite));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-						break;
-					case "Grey - Black":
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorAccent));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-						break;
-					case "White - Grey":
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorWhite));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.colorAccent));
-						break;
-					case "Dark - White":
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorPrimary));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.colorWhite));
-						break;
-					default:
-						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
-						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-						break;
-				}
-
-				dialogInterfaceCodeBlock.dismiss();
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
-			});
-
-			AlertDialog cDialog = cBuilder.create();
-			cDialog.show();
-
 		});
 
 		// time and date dialog
@@ -292,12 +246,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			AlertDialog.Builder tBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
 
 			tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
-			if(timeSelectedChoice != -1) {
-				tBuilder.setCancelable(true);
-			}
-			else {
-				tBuilder.setCancelable(false);
-			}
+			tBuilder.setCancelable(timeSelectedChoice != -1);
 
 			tBuilder.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {
 
@@ -307,21 +256,20 @@ public class SettingsAppearanceActivity extends BaseActivity {
 				tinyDb.putInt("timeId", i);
 
 				if("Normal".equals(timeList[i])) {
+
 					tinyDb.putString("dateFormat", "normal");
 				}
 				else {
+
 					tinyDb.putString("dateFormat", "pretty");
 				}
 
 				dialogInterfaceTime.dismiss();
 				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
 			});
 
 			AlertDialog tDialog = tBuilder.create();
 			tDialog.show();
-
-
 		});
 
 	}

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

@@ -4,10 +4,10 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.Switch;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
 
 /**
  * Author M M Arif
@@ -37,27 +37,15 @@ public class SettingsDraftsActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		Switch commentsDeletionSwitch = findViewById(R.id.commentsDeletionSwitch);
+		SwitchMaterial commentsDeletionSwitch = findViewById(R.id.commentsDeletionSwitch);
 
-		if(tinyDb.getBoolean("draftsCommentsDeletionEnabled")) {
-			commentsDeletionSwitch.setChecked(true);
-		}
-		else {
-			commentsDeletionSwitch.setChecked(false);
-		}
+		commentsDeletionSwitch.setChecked(tinyDb.getBoolean("draftsCommentsDeletionEnabled"));
 
 		// delete comments on submit switcher
 		commentsDeletionSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-			if(isChecked) {
-				tinyDb.putBoolean("draftsCommentsDeletionEnabled", true);
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("draftsCommentsDeletionEnabled", false);
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
+			tinyDb.putBoolean("draftsCommentsDeletionEnabled", isChecked);
+			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 		});
 
 	}

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

@@ -5,9 +5,9 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.Switch;
 import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
@@ -21,7 +21,7 @@ public class SettingsFileViewerActivity extends BaseActivity {
 	private Context appCtx;
 	private View.OnClickListener onClickListener;
 
-	private static String[] fileViewerSourceCodeThemesList = {"Sublime", "Arduino Light", "Github", "Far ", "Ir Black", "Android Studio"};
+	private static final String[] fileViewerSourceCodeThemesList = {"Sublime", "Arduino Light", "Github", "Far ", "Ir Black", "Android Studio"};
 	private static int fileViewerSourceCodeThemesSelectedChoice = 0;
 
 	@Override
@@ -47,7 +47,7 @@ public class SettingsFileViewerActivity extends BaseActivity {
 
 		LinearLayout sourceCodeThemeFrame = findViewById(R.id.sourceCodeThemeFrame);
 
-		Switch pdfModeSwitch = findViewById(R.id.switchPdfMode);
+		SwitchMaterial pdfModeSwitch = findViewById(R.id.switchPdfMode);
 
 		if(!tinyDb.getString("fileviewerSourceCodeThemeStr").isEmpty()) {
 			fileViewerSourceCodeThemesSelected.setText(tinyDb.getString("fileviewerSourceCodeThemeStr"));
@@ -57,12 +57,7 @@ public class SettingsFileViewerActivity extends BaseActivity {
 			fileViewerSourceCodeThemesSelectedChoice = tinyDb.getInt("fileviewerThemeId");
 		}
 
-		if(tinyDb.getBoolean("enablePdfMode")) {
-			pdfModeSwitch.setChecked(true);
-		}
-		else {
-			pdfModeSwitch.setChecked(false);
-		}
+		pdfModeSwitch.setChecked(tinyDb.getBoolean("enablePdfMode"));
 
 		// fileviewer srouce code theme selection dialog
 		sourceCodeThemeFrame.setOnClickListener(view -> {
@@ -70,12 +65,7 @@ public class SettingsFileViewerActivity extends BaseActivity {
 			AlertDialog.Builder fvtsBuilder = new AlertDialog.Builder(SettingsFileViewerActivity.this);
 
 			fvtsBuilder.setTitle(R.string.fileviewerSourceCodeThemeSelectorDialogTitle);
-			if(fileViewerSourceCodeThemesSelectedChoice != -1) {
-				fvtsBuilder.setCancelable(true);
-			}
-			else {
-				fvtsBuilder.setCancelable(false);
-			}
+			fvtsBuilder.setCancelable(fileViewerSourceCodeThemesSelectedChoice != -1);
 
 			fvtsBuilder.setSingleChoiceItems(fileViewerSourceCodeThemesList, fileViewerSourceCodeThemesSelectedChoice, (dialogInterfaceTheme, i) -> {
 
@@ -91,25 +81,15 @@ public class SettingsFileViewerActivity extends BaseActivity {
 
 			AlertDialog cfDialog = fvtsBuilder.create();
 			cfDialog.show();
-
 		});
 
 		// pdf night mode switcher
 		pdfModeSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-			if(isChecked) {
-				tinyDb.putBoolean("enablePdfMode", true);
-				tinyDb.putString("enablePdfModeInit", "yes");
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("enablePdfMode", false);
-				tinyDb.putString("enablePdfModeInit", "yes");
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
+			tinyDb.putBoolean("enablePdfMode", isChecked);
+			tinyDb.putString("enablePdfModeInit", "yes");
+			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 		});
-
 	}
 
 	private void initCloseListener() {

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

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

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

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.Switch;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
@@ -37,29 +37,16 @@ public class SettingsReportsActivity extends BaseActivity {
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		Switch crashReportsSwitch = findViewById(R.id.crashReportsSwitch);
+		SwitchMaterial crashReportsSwitch = findViewById(R.id.crashReportsSwitch);
 
-		if(tinyDb.getBoolean("crashReportingEnabled")) {
-			crashReportsSwitch.setChecked(true);
-		}
-		else {
-			crashReportsSwitch.setChecked(false);
-		}
+		crashReportsSwitch.setChecked(tinyDb.getBoolean("crashReportingEnabled"));
 
 		// crash reports switcher
 		crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-			if(isChecked) {
-				tinyDb.putBoolean("crashReportingEnabled", true);
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-			else {
-				tinyDb.putBoolean("crashReportingEnabled", false);
-				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-			}
-
+			tinyDb.putBoolean("crashReportingEnabled", isChecked);
+			Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
 		});
-
 	}
 
 	private void initCloseListener() {

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

@@ -12,8 +12,6 @@ import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.FilesData;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
@@ -21,7 +19,6 @@ import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.notifications.NotificationsMaster;
 import java.io.File;
 import java.io.IOException;
-import java.util.HashSet;
 
 /**
  * Author M M Arif
@@ -76,22 +73,27 @@ public class SettingsSecurityActivity extends BaseActivity {
 		LinearLayout clearCacheFrame = findViewById(R.id.clearCacheSelectionFrame);
 
 		if(!tinyDb.getString("cacheSizeStr").isEmpty()) {
+
 			cacheSizeDataSelected.setText(tinyDb.getString("cacheSizeStr"));
 		}
 
 		if(!tinyDb.getString("cacheSizeImagesStr").isEmpty()) {
+
 			cacheSizeImagesSelected.setText(tinyDb.getString("cacheSizeImagesStr"));
 		}
 
 		if(cacheSizeDataSelectedChoice == 0) {
+
 			cacheSizeDataSelectedChoice = tinyDb.getInt("cacheSizeId");
 		}
 
 		if(cacheSizeImagesSelectedChoice == 0) {
+
 			cacheSizeImagesSelectedChoice = tinyDb.getInt("cacheSizeImagesId");
 		}
 
 		if(new Version(currentVersion).less("1.12.3")) {
+
 			pollingDelayFrame.setVisibility(View.GONE);
 		}
 
@@ -99,10 +101,7 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 		// clear cache setter
 		File cacheDir = appCtx.getCacheDir();
-		long size__ = FilesData.getFileSizeRecursively(new HashSet<>(), cacheDir);
-		if(size__ > 0) {
-			clearCacheSelected.setText(String.valueOf(AppUtil.formatFileSizeInDetail(size__)));
-		}
+		clearCacheSelected.setText(FileUtils.byteCountToDisplaySize((int) FileUtils.sizeOfDirectory(cacheDir)));
 
 		// clear cache
 		clearCacheFrame.setOnClickListener(v1 -> {
@@ -119,14 +118,11 @@ public class SettingsSecurityActivity extends BaseActivity {
 					FileUtils.mkdir(cacheDir.getAbsolutePath());
 					this.recreate();
 					this.overridePendingTransition(0, 0);
-
 				}
 				catch (IOException e) {
 
 					Log.e("SettingsSecurity", e.toString());
-
 				}
-
 			});
 
 			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
@@ -140,12 +136,7 @@ public class SettingsSecurityActivity extends BaseActivity {
 			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
 
 			tsBuilder.setTitle(getResources().getString(R.string.cacheSizeImagesDialogHeader));
-			if(cacheSizeImagesSelectedChoice != -1) {
-				tsBuilder.setCancelable(true);
-			}
-			else {
-				tsBuilder.setCancelable(false);
-			}
+			tsBuilder.setCancelable(cacheSizeImagesSelectedChoice != -1);
 
 			tsBuilder.setSingleChoiceItems(cacheSizeImagesList, cacheSizeImagesSelectedChoice, (dialogInterfaceTheme, i) -> {
 
@@ -156,12 +147,10 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 				dialogInterfaceTheme.dismiss();
 				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
 			});
 
 			AlertDialog cfDialog = tsBuilder.create();
 			cfDialog.show();
-
 		});
 
 		// cache size data selection dialog
@@ -170,12 +159,7 @@ public class SettingsSecurityActivity extends BaseActivity {
 			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
 
 			tsBuilder.setTitle(getResources().getString(R.string.cacheSizeDataDialogHeader));
-			if(cacheSizeDataSelectedChoice != -1) {
-				tsBuilder.setCancelable(true);
-			}
-			else {
-				tsBuilder.setCancelable(false);
-			}
+			tsBuilder.setCancelable(cacheSizeDataSelectedChoice != -1);
 
 			tsBuilder.setSingleChoiceItems(cacheSizeDataList, cacheSizeDataSelectedChoice, (dialogInterfaceTheme, i) -> {
 
@@ -186,12 +170,10 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 				dialogInterfaceTheme.dismiss();
 				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
 			});
 
 			AlertDialog cfDialog = tsBuilder.create();
 			cfDialog.show();
-
 		});
 
 		// certs deletion
@@ -212,12 +194,10 @@ public class SettingsSecurityActivity extends BaseActivity {
 				Intent loginActivityIntent = new Intent().setClass(appCtx, LoginActivity.class);
 				loginActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 				appCtx.startActivity(loginActivityIntent);
-
 			});
 
 			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
 			builder.create().show();
-
 		});
 
 		// polling delay
@@ -243,15 +223,12 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 				pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
 				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
 			});
 
 			builder.setNeutralButton(R.string.cancelButton, null);
 			builder.setView(numberPicker);
 			builder.create().show();
-
 		});
-
 	}
 
 	private void initCloseListener() {

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

@@ -22,8 +22,8 @@ public class SettingsTranslationActivity extends BaseActivity {
 	private Context appCtx;
 	private View.OnClickListener onClickListener;
 
-	private static String[] langList = {"English", "Arabic", "Chinese", "Finnish", "French", "German", "Italian", "Latvian", "Persian", "Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish",
-			"Ukrainian"};
+	private static 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
@@ -61,10 +61,12 @@ public class SettingsTranslationActivity extends BaseActivity {
 		});
 
 		if(!tinyDb.getString("localeStr").isEmpty()) {
+
 			tvLanguageSelected.setText(tinyDb.getString("localeStr"));
 		}
 
 		if(langSelectedChoice == 0) {
+
 			langSelectedChoice = tinyDb.getInt("langId");
 		}
 
@@ -74,12 +76,7 @@ public class SettingsTranslationActivity extends BaseActivity {
 			AlertDialog.Builder lBuilder = new AlertDialog.Builder(SettingsTranslationActivity.this);
 
 			lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
-			if(langSelectedChoice != -1) {
-				lBuilder.setCancelable(true);
-			}
-			else {
-				lBuilder.setCancelable(false);
-			}
+			lBuilder.setCancelable(langSelectedChoice != -1);
 
 			lBuilder.setSingleChoiceItems(langList, langSelectedChoice, (dialogInterface, i) -> {
 
@@ -90,51 +87,71 @@ public class SettingsTranslationActivity extends BaseActivity {
 
 				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;
 				}
@@ -144,19 +161,17 @@ public class SettingsTranslationActivity extends BaseActivity {
 				this.overridePendingTransition(0, 0);
 				dialogInterface.dismiss();
 				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-
 			});
 
 			lBuilder.setNeutralButton(getString(R.string.cancelButton), null);
 
 			AlertDialog lDialog = lBuilder.create();
 			lDialog.show();
-
 		});
-
 	}
 
 	private void initCloseListener() {
+
 		onClickListener = view -> finish();
 	}
 

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

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

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

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

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

@@ -2,7 +2,7 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
+import android.os.Bundle;
 import android.text.Html;
 import android.text.Spanned;
 import android.view.LayoutInflater;
@@ -11,11 +11,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.database.models.DraftWithRepository;
+import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import java.util.List;
@@ -27,6 +28,7 @@ import java.util.List;
 public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsViewHolder> {
 
     private List<DraftWithRepository> draftsList;
+    private FragmentManager fragmentManager;
     private Context mCtx;
 
     class DraftsViewHolder extends RecyclerView.ViewHolder {
@@ -69,16 +71,17 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
 	        itemView.setOnClickListener(itemEdit -> {
 
-                Intent intent = new Intent(mCtx, ReplyToIssueActivity.class);
-                intent.putExtra("commentBody", draftText.getText().toString());
-                intent.putExtra("issueNumber", issueNumber.getText().toString());
-                intent.putExtra("repositoryId", repoId.getText().toString());
-                intent.putExtra("draftTitle", repoInfo.getText().toString());
-		        intent.putExtra("commentId", commentId.getText().toString());
-		        intent.putExtra("draftId", draftId.getText().toString());
+		        Bundle bundle = new Bundle();
 
-                if(!commentId.getText().toString().equalsIgnoreCase("")) {
-	                intent.putExtra("commentAction", "edit");
+                bundle.putString("commentBody", draftText.getText().toString());
+                bundle.putString("issueNumber", issueNumber.getText().toString());
+                bundle.putString("repositoryId", repoId.getText().toString());
+                bundle.putString("draftTitle", repoInfo.getText().toString());
+		        bundle.putString("commentId", commentId.getText().toString());
+		        bundle.putString("draftId", draftId.getText().toString());
+
+                if(!commentId.getText().toString().isEmpty()) {
+	                bundle.putString("commentAction", "edit");
                 }
 
                 TinyDB tinyDb = new TinyDB(mCtx);
@@ -86,7 +89,7 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
                 tinyDb.putLong("repositoryId", Long.parseLong(repoId.getText().toString()));
                 //tinyDb.putString("issueType", issueType.getText().toString());
 
-                mCtx.startActivity(intent);
+		        BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
 
             });
 
@@ -94,8 +97,9 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
     }
 
-    public DraftsAdapter(Context mCtx, List<DraftWithRepository> draftsListMain) {
+    public DraftsAdapter(Context mCtx, FragmentManager fragmentManager, List<DraftWithRepository> draftsListMain) {
         this.mCtx = mCtx;
+        this.fragmentManager = fragmentManager;
         this.draftsList = draftsListMain;
     }
 

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

@@ -286,7 +286,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
-		holder.fullName.setText(currentItem.getFullname());
+		holder.fullName.setText(currentItem.getFullName());
 		if(currentItem.getPrivateFlag()) {
 			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
@@ -318,4 +318,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		return searchedReposList.size();
 	}
 
+	public void notifyDataChanged() {
+
+		notifyDataSetChanged();
+	}
+
 }

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

@@ -10,8 +10,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Files;
 import java.util.ArrayList;
@@ -37,6 +37,8 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
     class FilesViewHolder extends RecyclerView.ViewHolder {
 
         private ImageView fileTypeImage;
+	    private ImageView dirTypeImage;
+	    private ImageView unknownTypeImage;
         private TextView fileName;
         private TextView fileType;
         private TextView fileInfo;
@@ -46,6 +48,8 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
             super(itemView);
             fileName = itemView.findViewById(R.id.fileName);
             fileTypeImage = itemView.findViewById(R.id.fileImage);
+	        dirTypeImage = itemView.findViewById(R.id.dirImage);
+	        unknownTypeImage = itemView.findViewById(R.id.unknownImage);
             fileType = itemView.findViewById(R.id.fileType);
             fileInfo = itemView.findViewById(R.id.fileInfo);
 
@@ -157,16 +161,22 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         holder.fileName.setText(currentItem.getName());
 
         if(currentItem.getType().equals("file")) {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file));
+            holder.fileTypeImage.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.unknownTypeImage.setVisibility(View.GONE);
             holder.fileInfo.setVisibility(View.VISIBLE);
-            holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
+            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);
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_directory));
         }
         else {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question));
+	        holder.unknownTypeImage.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeImage.setVisibility(View.GONE);
         }
 
     }

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

@@ -2,8 +2,8 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Typeface;
+import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,8 +12,9 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import androidx.fragment.app.FragmentManager;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
+import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.DiffTextView;
 import org.mian.gitnex.models.FileDiffView;
 import java.util.List;
@@ -36,11 +37,13 @@ public class FilesDiffAdapter extends BaseAdapter {
 	private static int COLOR_FONT;
 
 	private Context context;
+	private FragmentManager fragmentManager;
 	private List<FileDiffView> fileDiffViews;
 
-	public FilesDiffAdapter(Context context, List<FileDiffView> fileDiffViews) {
+	public FilesDiffAdapter(Context context, FragmentManager fragmentManager, List<FileDiffView> fileDiffViews) {
 
 		this.context = context;
+		this.fragmentManager = fragmentManager;
 		this.fileDiffViews = fileDiffViews;
 
 		selectedViews = new ConcurrentSkipListMap<>();
@@ -201,12 +204,11 @@ public class FilesDiffAdapter extends BaseAdapter {
 
 								selectedViews.clear();
 
-								Intent intent = new Intent(context, ReplyToIssueActivity.class);
-								intent.putExtra("commentBody", stringBuilder.toString());
-								intent.putExtra("cursorToEnd", true);
-								intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+								Bundle bundle = new Bundle();
+								bundle.putString("commentBody", stringBuilder.toString());
+								bundle.putBoolean("cursorToEnd", true);
 
-								context.startActivity(intent);
+								BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
 
 							}
 

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

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Bundle;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,14 +15,16 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.fragments.BottomSheetReplyFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -60,11 +63,13 @@ import retrofit2.Callback;
 public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdapter.IssueCommentViewHolder> {
 
 	private List<IssueComments> issuesComments;
+	private FragmentManager fragmentManager;
 	private Context mCtx;
 
-	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
+	public IssueCommentsAdapter(Context mCtx, FragmentManager fragmentManager, List<IssueComments> issuesCommentsMain) {
 
 		this.mCtx = mCtx;
+		this.fragmentManager = fragmentManager;
 		this.issuesComments = issuesCommentsMain;
 
 	}
@@ -109,6 +114,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 				TextView commentMenuQuote = view.findViewById(R.id.commentMenuQuote);
 				TextView commentMenuCopy = view.findViewById(R.id.commentMenuCopy);
 				TextView commentMenuDelete = view.findViewById(R.id.commentMenuDelete);
+				TextView issueCommentCopyUrl = view.findViewById(R.id.issueCommentCopyUrl);
 
 				if(!loginUid.contentEquals(commenterUsername.getText())) {
 					commentMenuEdit.setVisibility(View.GONE);
@@ -125,11 +131,12 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 				commentMenuEdit.setOnClickListener(ediComment -> {
 
-					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
-					intent.putExtra("commentId", commendId.getText());
-					intent.putExtra("commentAction", "edit");
-					intent.putExtra("commentBody", commendBodyRaw.getText());
-					ctx.startActivity(intent);
+					Bundle bundle = new Bundle();
+					bundle.putString("commentId", commendId.getText().toString());
+					bundle.putString("commentAction", "edit");
+					bundle.putString("commentBody", commendBodyRaw.getText().toString());
+
+					BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
 					dialog.dismiss();
 
 				});
@@ -151,6 +158,22 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 				});
 
+				issueCommentCopyUrl.setOnClickListener(ediComment -> {
+
+					// comment Url
+					CharSequence commentUrl = htmlUrl.getText();
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
+					assert clipboard != null;
+
+					ClipData clip = ClipData.newPlainText(commentUrl, commentUrl);
+					clipboard.setPrimaryClip(clip);
+
+					dialog.dismiss();
+					Toasty.success(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
+
+				});
+
 				commentMenuQuote.setOnClickListener(v1 -> {
 
 					StringBuilder stringBuilder = new StringBuilder();
@@ -170,13 +193,12 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 					stringBuilder.append("\n");
 
-					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
-					intent.putExtra("commentBody", stringBuilder.toString());
-					intent.putExtra("cursorToEnd", true);
-					intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+					Bundle bundle = new Bundle();
+					bundle.putString("commentBody", stringBuilder.toString());
+					bundle.putBoolean("cursorToEnd", true);
 
 					dialog.dismiss();
-					ctx.startActivity(intent);
+					BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
 
 				});
 
@@ -189,7 +211,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 					clipboard.setPrimaryClip(clip);
 
 					dialog.dismiss();
-					Toasty.info(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
+					Toasty.success(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
 
 				});
 
@@ -330,7 +352,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 						final int resourceId = mCtx.getResources().getIdentifier(raw.substring("drawable://".length()), "drawable", mCtx.getPackageName());
 
-						final Drawable drawable = mCtx.getDrawable(resourceId);
+						final Drawable drawable = ContextCompat.getDrawable(mCtx, resourceId);
 
 						assert drawable != null;
 						return ImageItem.withResult(drawable);

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

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

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

@@ -1,190 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Typeface;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.TextAppearanceSpan;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatCheckBox;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.MultiSelectDialog;
-import org.mian.gitnex.models.MultiSelectModel;
-import java.util.List;
-
-/**
- * Author com.github.abumoallim, modified by M M Arif
- */
-
-public class MutliSelectAdapter extends RecyclerView.Adapter<MutliSelectAdapter.MultiSelectDialogViewHolder> {
-
-    private List<MultiSelectModel> mDataSet;
-    private String mSearchQuery = "";
-    private Context mContext;
-
-    public MutliSelectAdapter(List<MultiSelectModel> dataSet, Context context) {
-        this.mDataSet = dataSet;
-        this.mContext = context;
-    }
-
-    @NonNull
-    @Override
-    public MultiSelectDialogViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.multi_select_item, parent, false);
-        return new MultiSelectDialogViewHolder(view);
-
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final MultiSelectDialogViewHolder holder, int position) {
-
-        if (!mSearchQuery.equals("") && mSearchQuery.length() > 1) {
-            setHighlightedText(position, holder.dialog_name_item);
-        } else {
-            holder.dialog_name_item.setText(mDataSet.get(position).getName());
-        }
-
-        if (mDataSet.get(position).getSelected()) {
-
-            if (!MultiSelectDialog.selectedIdsForCallback.contains(mDataSet.get(position).getId())) {
-                MultiSelectDialog.selectedIdsForCallback.add(mDataSet.get(position).getId());
-            }
-        }
-
-        if (checkForSelection(mDataSet.get(position).getId())) {
-            holder.dialog_item_checkbox.setChecked(true);
-        } else {
-            holder.dialog_item_checkbox.setChecked(false);
-        }
-
-        /*holder.dialog_item_checkbox.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (holder.dialog_item_checkbox.isChecked()) {
-                    MultiSelectDialog.selectedIdsForCallback.add(mDataSet.get(holder.getAdapterPosition()).getId());
-                    holder.dialog_item_checkbox.setChecked(true);
-                } else {
-                    removeFromSelection(mDataSet.get(holder.getAdapterPosition()).getId());
-                    holder.dialog_item_checkbox.setChecked(false);
-                }
-            }
-        });*/
-
-        holder.main_container.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                if (!holder.dialog_item_checkbox.isChecked()) {
-                    MultiSelectDialog.selectedIdsForCallback.add(mDataSet.get(holder.getAdapterPosition()).getId());
-                    holder.dialog_item_checkbox.setChecked(true);
-                    mDataSet.get(holder.getAdapterPosition()).setSelected(true);
-                    notifyItemChanged(holder.getAdapterPosition());
-                } else {
-                    removeFromSelection(mDataSet.get(holder.getAdapterPosition()).getId());
-                    holder.dialog_item_checkbox.setChecked(false);
-                    mDataSet.get(holder.getAdapterPosition()).setSelected(false);
-                    notifyItemChanged(holder.getAdapterPosition());
-                }
-            }
-
-        });
-    }
-
-    private void setHighlightedText(int position, TextView textview) {
-
-        String name = mDataSet.get(position).getName();
-        SpannableString str = new SpannableString(name);
-        int endLength = name.toLowerCase().indexOf(mSearchQuery) + mSearchQuery.length();
-        ColorStateList highlightedColor = new ColorStateList(new int[][]{new int[]{}}, new int[]{ContextCompat.getColor(mContext, R.color.colorAccent)});
-        TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan(null, Typeface.NORMAL, -1, highlightedColor, null);
-        str.setSpan(textAppearanceSpan, name.toLowerCase().indexOf(mSearchQuery), endLength, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        textview.setText(str);
-
-    }
-
-    private void removeFromSelection(Integer id) {
-
-        for (int i = 0; i < MultiSelectDialog.selectedIdsForCallback.size(); i++) {
-            if (id.equals(MultiSelectDialog.selectedIdsForCallback.get(i))) {
-                MultiSelectDialog.selectedIdsForCallback.remove(i);
-            }
-        }
-
-    }
-
-    private boolean checkForSelection(Integer id) {
-
-        for (int i = 0; i < MultiSelectDialog.selectedIdsForCallback.size(); i++) {
-            if (id.equals(MultiSelectDialog.selectedIdsForCallback.get(i))) {
-                return true;
-            }
-        }
-        return false;
-
-    }
-
-    /*//get selected name string separated by coma
-    public String getDataString() {
-        String data = "";
-        for (int i = 0; i < mDataSet.size(); i++) {
-            if (checkForSelection(mDataSet.get(i).getId())) {
-                data = data + ", " + mDataSet.get(i).getName();
-            }
-        }
-        if (data.length() > 0) {
-            return data.substring(1);
-        } else {
-            return "";
-        }
-    }
-    //get selected name ararylist
-    public ArrayList<String> getSelectedNameList() {
-        ArrayList<String> names = new ArrayList<>();
-        for (int i = 0; i < mDataSet.size(); i++) {
-            if (checkForSelection(mDataSet.get(i).getId())) {
-                names.add(mDataSet.get(i).getName());
-            }
-        }
-        //  return names.toArray(new String[names.size()]);
-        return names;
-    }*/
-
-    @Override
-    public int getItemCount() {
-        return mDataSet.size();
-    }
-
-    public void setData(List<MultiSelectModel> data, String query, MutliSelectAdapter mutliSelectAdapter) {
-
-        this.mDataSet = data;
-        this.mSearchQuery = query;
-        mutliSelectAdapter.notifyDataSetChanged();
-
-    }
-
-    class MultiSelectDialogViewHolder extends RecyclerView.ViewHolder {
-
-        private TextView dialog_name_item;
-        private AppCompatCheckBox dialog_item_checkbox;
-        private LinearLayout main_container;
-
-        MultiSelectDialogViewHolder(View view) {
-
-            super(view);
-            dialog_name_item = view.findViewById(R.id.dialog_item_name);
-            dialog_item_checkbox = view.findViewById(R.id.dialog_item_checkbox);
-            main_container = view.findViewById(R.id.main_container);
-
-        }
-
-    }
-}

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

@@ -291,7 +291,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
-		holder.repoFullName.setText(currentItem.getFullname());
+		holder.repoFullName.setText(currentItem.getFullName());
 		if(currentItem.getPrivateFlag()) {
 			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
@@ -344,7 +344,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 				String filterPattern = constraint.toString().toLowerCase().trim();
 
 				for(UserRepositories item : reposListFull) {
-					if(item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
 						filteredList.add(item);
 					}
 				}

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

@@ -44,7 +44,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 		private LinearLayout frame;
 		private TextView subject;
 		private TextView repository;
-		private ImageView type;
+		private ImageView typePr;
+		private ImageView typeIssue;
+		private ImageView typeUnknown;
 		private ImageView pinned;
 		private ImageView more;
 
@@ -55,7 +57,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 			frame = itemView.findViewById(R.id.frame);
 			subject = itemView.findViewById(R.id.subject);
 			repository = itemView.findViewById(R.id.repository);
-			type = itemView.findViewById(R.id.type);
+			typePr = itemView.findViewById(R.id.typePr);
+			typeIssue = itemView.findViewById(R.id.typeIssue);
+			typeUnknown = itemView.findViewById(R.id.typeUnknown);
 			pinned = itemView.findViewById(R.id.pinned);
 			more = itemView.findViewById(R.id.more);
 
@@ -81,7 +85,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 			.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());
+		holder.repository.setText(notificationThread.getRepository().getFullName());
 
 		if(notificationThread.isPinned()) {
 			holder.pinned.setVisibility(View.VISIBLE);
@@ -93,15 +97,21 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 		switch(notificationThread.getSubject().getType()) {
 
 			case "Pull":
-				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_pull_request, null));
+				holder.typePr.setVisibility(View.VISIBLE);
+				holder.typeIssue.setVisibility(View.GONE);
+				holder.typeUnknown.setVisibility(View.GONE);
 				break;
 
 			case "Issue":
-				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_issue, null));
+				holder.typePr.setVisibility(View.GONE);
+				holder.typeIssue.setVisibility(View.VISIBLE);
+				holder.typeUnknown.setVisibility(View.GONE);
 				break;
 
 			default:
-				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_question, null));
+				holder.typePr.setVisibility(View.GONE);
+				holder.typeIssue.setVisibility(View.GONE);
+				holder.typeUnknown.setVisibility(View.VISIBLE);
 				break;
 
 		}
@@ -110,7 +120,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 
 			onNotificationClickedListener.onNotificationClicked(notificationThread);
 
-			String[] parts = notificationThread.getRepository().getFullname().split("/");
+			String[] parts = notificationThread.getRepository().getFullName().split("/");
 			final String repoOwner = parts[0];
 			final String repoName = parts[1];
 

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

@@ -175,7 +175,7 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 				repoDescription.setVisibility(View.VISIBLE);
 				repoDescription.setText(forksModel.getDescription());
 			}
-			fullName.setText(forksModel.getFullname());
+			fullName.setText(forksModel.getFullName());
 
 			if(forksModel.getPrivateFlag()) {
 				repoPrivatePublic.setImageResource(R.drawable.ic_lock);

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

@@ -292,7 +292,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
-		holder.fullName.setText(currentItem.getFullname());
+		holder.fullName.setText(currentItem.getFullName());
 		if(currentItem.getPrivateFlag()) {
 			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
@@ -344,7 +344,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 				String filterPattern = constraint.toString().toLowerCase().trim();
 
 				for(UserRepositories item : reposListFull) {
-					if(item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+					if(item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
 						filteredList.add(item);
 					}
 				}

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

@@ -292,7 +292,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
             holder.repoDescription.setVisibility(View.VISIBLE);
             holder.repoDescription.setText(currentItem.getDescription());
         }
-        holder.fullName.setText(currentItem.getFullname());
+        holder.fullName.setText(currentItem.getFullName());
         if(currentItem.getPrivateFlag()) {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
             holder.repoType.setText(R.string.strPrivate);
@@ -340,7 +340,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
                 for (UserRepositories item : reposListFull) {
-                    if (item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+                    if (item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
                 }

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

@@ -0,0 +1,172 @@
+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;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.IssueDetailActivity;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.database.api.RepositoriesApi;
+import org.mian.gitnex.database.models.Repository;
+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;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Author M M Arif
+ */
+
+public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapter.SearchViewHolder> {
+
+	private List<Issues> searchedList;
+	private Context mCtx;
+	private TinyDB tinyDb;
+
+	public SearchIssuesAdapter(List<Issues> dataList, Context mCtx) {
+
+		this.mCtx = mCtx;
+		this.searchedList = dataList;
+		this.tinyDb = new TinyDB(mCtx);
+	}
+
+	class SearchViewHolder extends RecyclerView.ViewHolder {
+
+		private TextView issueNumber;
+		private ImageView issueAssigneeAvatar;
+		private TextView issueTitle;
+		private TextView issueCreatedTime;
+		private TextView issueCommentsCount;
+		private TextView repoFullName;
+
+		private SearchViewHolder(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);
+			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
+			repoFullName = itemView.findViewById(R.id.repoFullName);
+
+			issueTitle.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+
+				Intent intent = new Intent(context, IssueDetailActivity.class);
+				intent.putExtra("issueNumber", issueNumber.getText());
+
+				tinyDb.putString("issueNumber", issueNumber.getText().toString());
+				tinyDb.putString("issueType", "Issue");
+
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
+
+				String[] parts = repoFullName.getText().toString().split("/");
+				final String repoOwner = parts[0];
+				final String repoName = parts[1];
+
+				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
+
+				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);
+			});
+		}
+
+	}
+
+	@NonNull
+	@Override
+	public SearchIssuesAdapter.SearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issues, parent, false);
+		return new SearchIssuesAdapter.SearchViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull final SearchIssuesAdapter.SearchViewHolder holder, int position) {
+
+		Issues currentItem = searchedList.get(position);
+
+		String locale = tinyDb.getString("locale");
+		String timeFormat = tinyDb.getString("dateFormat");
+
+		if(!currentItem.getUser().getFull_name().equals("")) {
+			holder.issueAssigneeAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCreator) + currentItem.getUser().getFull_name(), mCtx));
+		}
+		else {
+			holder.issueAssigneeAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCreator) + currentItem.getUser().getLogin(), mCtx));
+		}
+
+		PicassoService
+			.getInstance(mCtx).get().load(currentItem.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueAssigneeAvatar);
+
+		String issueNumber_ = "<font color='" + mCtx.getResources().getColor(R.color.lightGray) + "'>" + currentItem.getRepository().getFull_name() + mCtx.getResources().getString(R.string.hash) + currentItem.getNumber() + "</font>";
+		holder.issueTitle.setText(Html.fromHtml(issueNumber_ + " " + currentItem.getTitle()));
+
+		holder.issueNumber.setText(String.valueOf(currentItem.getNumber()));
+		holder.issueCommentsCount.setText(String.valueOf(currentItem.getComments()));
+		holder.repoFullName.setText(currentItem.getRepository().getFull_name());
+
+		switch(timeFormat) {
+			case "pretty": {
+				PrettyTime prettyTime = new PrettyTime(new Locale(locale));
+				String createdTime = prettyTime.format(currentItem.getCreated_at());
+				holder.issueCreatedTime.setText(createdTime);
+				holder.issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getCreated_at()), mCtx));
+				break;
+			}
+			case "normal": {
+				DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+				String createdTime = formatter.format(currentItem.getCreated_at());
+				holder.issueCreatedTime.setText(createdTime);
+				break;
+			}
+			case "normal1": {
+				DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+				String createdTime = formatter.format(currentItem.getCreated_at());
+				holder.issueCreatedTime.setText(createdTime);
+				break;
+			}
+		}
+	}
+
+	@Override
+	public int getItemCount() {
+
+		return searchedList.size();
+	}
+
+	public void notifyDataChanged() {
+
+		notifyDataSetChanged();
+	}
+}

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

@@ -295,7 +295,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
             holder.repoDescription.setVisibility(View.VISIBLE);
             holder.repoDescription.setText(currentItem.getDescription());
         }
-        holder.fullName.setText(currentItem.getFullname());
+        holder.fullName.setText(currentItem.getFullName());
         if(currentItem.getPrivateFlag()) {
             holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
             holder.repoType.setText(R.string.strPrivate);
@@ -342,7 +342,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 String filterPattern = constraint.toString().toLowerCase().trim();
 
                 for (UserRepositories item : reposListFull) {
-                    if (item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+                    if (item.getFullName().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
                         filteredList.add(item);
                     }
                 }

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

@@ -1,6 +1,5 @@
 package org.mian.gitnex.adapters;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,32 +24,33 @@ import io.mikael.urlbuilder.UrlBuilder;
 public class UserAccountsListDialogAdapter extends ArrayAdapter<UserAccount> {
 
 	private final Context mCtx;
-	private final List<UserAccount> userAccountsList;
+	private final TinyDB tinyDB;
+	private final List<UserAccount> userAccounts;
 
-	public UserAccountsListDialogAdapter(@NonNull Context mCtx, int resource, @NonNull List<UserAccount> objects) {
+	public UserAccountsListDialogAdapter(@NonNull Context mCtx, int resource, @NonNull List<UserAccount> userAccounts) {
 
-		super(mCtx, resource, objects);
-		userAccountsList = objects;
+		super(mCtx, resource, userAccounts);
+
+		tinyDB = new TinyDB(mCtx);
+		this.userAccounts = userAccounts;
 		this.mCtx = mCtx;
+
 	}
 
-	@SuppressLint("ViewHolder")
 	@NonNull
 	@Override
 	public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
 
-		LayoutInflater inflater = (LayoutInflater) mCtx.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-		assert inflater != null;
-		View rowView = inflater.inflate(R.layout.custom_user_accounts_list, parent, false);
+		if(convertView == null) {
+			convertView = LayoutInflater.from(mCtx).inflate(R.layout.custom_user_accounts_list, parent, false);
+		}
 
-		TinyDB tinyDB = new TinyDB(mCtx);
+		ImageView profileImage = convertView.findViewById(R.id.profileImage);
+		TextView userName = convertView.findViewById(R.id.userName);
+		TextView accountUrl = convertView.findViewById(R.id.accountUrl);
+		ImageView activeAccount = convertView.findViewById(R.id.activeAccount);
 
-		ImageView profileImage = rowView.findViewById(R.id.profileImage);
-		TextView userName = rowView.findViewById(R.id.userName);
-		TextView accountUrl = rowView.findViewById(R.id.accountUrl);
-		ImageView activeAccount = rowView.findViewById(R.id.activeAccount);
-
-		UserAccount currentItem = userAccountsList.get(position);
+		UserAccount currentItem = userAccounts.get(position);
 
 		String url = UrlBuilder.fromString(currentItem.getInstanceUrl())
 			.withPath("/")
@@ -62,11 +62,15 @@ public class UserAccountsListDialogAdapter extends ArrayAdapter<UserAccount> {
 		if(tinyDB.getInt("currentActiveAccountId") == currentItem.getAccountId()) {
 			activeAccount.setVisibility(View.VISIBLE);
 		}
+		else {
+			activeAccount.setVisibility(View.GONE);
+		}
 
 		PicassoService
 			.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(profileImage);
 
-		return rowView;
+		return convertView;
+
 	}
 
 }

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

@@ -97,7 +97,7 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 	private void customDialogUserAccountsList(List<UserAccount> allAccountsList) {
 
 		TinyDB tinyDB = new TinyDB(mCtx);
-		Dialog dialog = new Dialog(mCtx);
+		Dialog dialog = new Dialog(mCtx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
 		dialog.setContentView(R.layout.custom_user_accounts_dialog);
 
 		ListView listView = dialog.findViewById(R.id.accountsList);

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

@@ -50,7 +50,7 @@ public class DraftsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.draftsRepository, e.toString());
+			Log.e(StaticGlobalVariables.draftsApi, e.toString());
 		}
 
 		return draftId;
@@ -66,7 +66,7 @@ public class DraftsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.draftsRepository, e.toString());
+			Log.e(StaticGlobalVariables.draftsApi, e.toString());
 		}
 
 		return draftId;
@@ -82,7 +82,7 @@ public class DraftsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.draftsRepository, e.toString());
+			Log.e(StaticGlobalVariables.draftsApi, e.toString());
 		}
 
 		return checkDraftFlag;

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

@@ -47,7 +47,7 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return repositoryId;
@@ -63,7 +63,7 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return repository;
@@ -89,7 +89,7 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return checkRepository;
@@ -105,7 +105,7 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return repository;
@@ -121,12 +121,17 @@ public class RepositoriesApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.repositoriesRepository, e.toString());
+			Log.e(StaticGlobalVariables.repositoriesApi, e.toString());
 		}
 
 		return repository;
 	}
 
+	public static void updateRepositoryOwnerAndName(String repositoryOwner, String repositoryName, int repositoryId) {
+
+		new Thread(() -> repositoriesDao.updateRepositoryOwnerAndName(repositoryOwner, repositoryName, repositoryId)).start();
+	}
+
 	public static void deleteRepositoriesByAccount(final int repoAccountId) {
 
 		new Thread(() -> repositoriesDao.deleteRepositoriesByAccount(repoAccountId)).start();

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

@@ -17,6 +17,7 @@ public class UserAccountsApi {
 
 	private static UserAccountsDao userAccountsDao;
 	private static UserAccount userAccount;
+	private static List<UserAccount> userAccounts;
 	private static Integer checkAccount;
 	private static long accountId;
 
@@ -49,7 +50,7 @@ public class UserAccountsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.userAccountsRepository, e.toString());
+			Log.e(StaticGlobalVariables.userAccountsApi, e.toString());
 		}
 
 		return accountId;
@@ -80,7 +81,7 @@ public class UserAccountsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.userAccountsRepository, e.toString());
+			Log.e(StaticGlobalVariables.userAccountsApi, e.toString());
 		}
 
 		return userAccount;
@@ -96,7 +97,7 @@ public class UserAccountsApi {
 		}
 		catch(InterruptedException e) {
 
-			Log.e(StaticGlobalVariables.userAccountsRepository, e.toString());
+			Log.e(StaticGlobalVariables.userAccountsApi, e.toString());
 		}
 
 		return checkAccount;
@@ -107,6 +108,22 @@ public class UserAccountsApi {
 		return userAccountsDao.fetchAllAccounts();
 	}
 
+	public List<UserAccount> usersAccounts() {
+
+		try {
+
+			Thread thread = new Thread(() -> userAccounts = userAccountsDao.userAccounts());
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(StaticGlobalVariables.userAccountsApi, e.toString());
+		}
+
+		return userAccounts;
+	}
+
 	public void deleteAccount(final int accountId) {
 
 		new Thread(() -> userAccountsDao.deleteAccount(accountId)).start();

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

@@ -20,6 +20,9 @@ public interface UserAccountsDao {
     @Query("SELECT * FROM UserAccounts ORDER BY accountId ASC")
     LiveData<List<UserAccount>> fetchAllAccounts();
 
+	@Query("SELECT * FROM UserAccounts ORDER BY accountId ASC")
+	List<UserAccount> userAccounts();
+
     @Query("SELECT COUNT(accountId) FROM UserAccounts WHERE accountName = :accountName")
     Integer getCount(String accountName);
 

app/src/main/java/org/mian/gitnex/fragments/AboutFragment.java

@@ -6,14 +6,13 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.databinding.FragmentAboutBinding;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.TinyDB;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -21,30 +20,19 @@ import java.util.Objects;
 
 public class AboutFragment extends Fragment {
 
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-        View v = inflater.inflate(R.layout.fragment_about, container, false);
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
+		FragmentAboutBinding viewBinding = FragmentAboutBinding.inflate(inflater, container, false);
         TinyDB tinyDb = new TinyDB(getContext());
 
-        final TextView appVerBuild;
-        final TextView donationLink;
-        final TextView donationLinkPatreon;
-        final TextView translateLink;
-        final TextView appWebsite;
-        final TextView appRepo;
+	    viewBinding.appVersion.setText(AppUtil.getAppVersion(requireContext()));
+	    viewBinding.userServerVersion.setText(tinyDb.getString("giteaVersion"));
+	    viewBinding.appBuild.setText(String.valueOf(AppUtil.getAppBuildNo(requireContext())));
 
-        appVerBuild = v.findViewById(R.id.appVerBuild);
-        TextView viewTextGiteaVersion = v.findViewById(R.id.giteaVersion);
-        donationLink = v.findViewById(R.id.donationLink);
-        donationLinkPatreon = v.findViewById(R.id.donationLinkPatreon);
-        translateLink = v.findViewById(R.id.translateLink);
-        appWebsite = v.findViewById(R.id.appWebsite);
-        appRepo = v.findViewById(R.id.appRepo);
+		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.pageTitleAbout));
 
-        appVerBuild.setText(getString(R.string.appVerBuild, AppUtil.getAppVersion(Objects.requireNonNull(getContext())), AppUtil.getAppBuildNo(getContext())));
-
-        donationLink.setOnClickListener(v1 -> {
+		viewBinding.donationLinkLiberapay.setOnClickListener(v1 -> {
 
             Intent intent = new Intent();
             intent.setAction(Intent.ACTION_VIEW);
@@ -53,7 +41,7 @@ public class AboutFragment extends Fragment {
             startActivity(intent);
         });
 
-        donationLinkPatreon.setOnClickListener(v12 -> {
+		viewBinding.donationLinkPatreon.setOnClickListener(v12 -> {
 
             Intent intent = new Intent();
             intent.setAction(Intent.ACTION_VIEW);
@@ -62,7 +50,7 @@ public class AboutFragment extends Fragment {
             startActivity(intent);
         });
 
-        translateLink.setOnClickListener(v13 -> {
+		viewBinding.translateLink.setOnClickListener(v13 -> {
 
             Intent intent = new Intent();
             intent.setAction(Intent.ACTION_VIEW);
@@ -71,7 +59,7 @@ public class AboutFragment extends Fragment {
             startActivity(intent);
         });
 
-        appWebsite.setOnClickListener(v14 -> {
+		viewBinding.appWebsite.setOnClickListener(v14 -> {
 
             Intent intent = new Intent();
             intent.setAction(Intent.ACTION_VIEW);
@@ -80,19 +68,15 @@ public class AboutFragment extends Fragment {
             startActivity(intent);
         });
 
-        appRepo.setOnClickListener(v15 -> {
+		if(AppUtil.isPro(requireContext())) {
 
-            Intent intent = new Intent();
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.addCategory(Intent.CATEGORY_BROWSABLE);
-            intent.setData(Uri.parse(getResources().getString(R.string.appRepoLink)));
-            startActivity(intent);
-        });
+			viewBinding.supportHeader.setVisibility(View.GONE);
+			viewBinding.dividerSupport.setVisibility(View.GONE);
+			viewBinding.donationLinkLiberapay.setVisibility(View.GONE);
+			viewBinding.donationLinkPatreon.setVisibility(View.GONE);
+		}
 
-        String commit = getResources().getString(R.string.commitPage) + tinyDb.getString("giteaVersion");
-        viewTextGiteaVersion.setText(commit);
-
-        return v;
+	    return viewBinding.getRoot();
     }
 
 }

app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java

@@ -0,0 +1,237 @@
+package org.mian.gitnex.fragments;
+
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import org.mian.gitnex.R;
+import org.mian.gitnex.actions.ActionResult;
+import org.mian.gitnex.actions.IssueActions;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.database.api.DraftsApi;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
+import java.util.Objects;
+
+/**
+ * @author opyale
+ */
+
+public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
+
+	private TinyDB tinyDB;
+	private DraftsApi draftsApi;
+
+	private int repositoryId;
+	private int currentActiveAccountId;
+	private int issueNumber;
+	private long draftId;
+
+	private TextView draftsHint;
+
+	@Override
+	public void onAttach(@NonNull Context context) {
+
+		tinyDB = new TinyDB(context);
+		draftsApi = new DraftsApi(context);
+
+		repositoryId = (int) tinyDB.getLong("repositoryId", 0);
+		currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
+		issueNumber = Integer.parseInt(tinyDB.getString("issueNumber"));
+
+		super.onAttach(context);
+	}
+
+	@SuppressLint("ClickableViewAccessibility")
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+		View view = inflater.inflate(R.layout.bottom_sheet_reply_layout, container, false);
+		Bundle arguments = requireArguments();
+
+		draftsHint = view.findViewById(R.id.drafts_hint);
+
+		EditText commentContent = view.findViewById(R.id.comment);
+		TextView toolbarTitle = view.findViewById(R.id.toolbar_title);
+		ImageButton close = view.findViewById(R.id.close);
+		ImageButton drafts = view.findViewById(R.id.drafts);
+		ImageButton send = view.findViewById(R.id.send);
+
+		send.setEnabled(false);
+
+		if(Objects.equals(arguments.getString("commentAction"), "edit")) {
+
+			send.setVisibility(View.GONE);
+		}
+
+		if(arguments.getString("draftId") != null) {
+
+			draftId = Long.parseLong(arguments.getString("draftId"));
+		}
+
+		if(!tinyDB.getString("issueTitle").isEmpty()) {
+
+			toolbarTitle.setText(tinyDB.getString("issueTitle"));
+		}
+		else if(arguments.getString("draftTitle") != null) {
+
+			toolbarTitle.setText(arguments.getString("draftTitle"));
+		}
+
+		if(arguments.getString("commentBody") != null) {
+
+			send.setEnabled(true);
+			send.setAlpha(1f);
+
+			commentContent.setText(arguments.getString("commentBody"));
+
+			if(arguments.getBoolean("cursorToEnd", false)) {
+
+				commentContent.setSelection(commentContent.length());
+			}
+		}
+
+		commentContent.requestFocus();
+		commentContent.setOnTouchListener((v, event) -> {
+
+			BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from((View) view.getParent());
+
+			switch(event.getAction()) {
+
+				case MotionEvent.ACTION_DOWN:
+				case MotionEvent.ACTION_SCROLL:
+					bottomSheetBehavior.setDraggable(false);
+					break;
+
+				default:
+					bottomSheetBehavior.setDraggable(true);
+			}
+
+			return false;
+
+		});
+
+		commentContent.addTextChangedListener(new TextWatcher() {
+
+			@Override
+			public void afterTextChanged(Editable s) {
+
+				String text = commentContent.getText().toString();
+
+				if(text.isEmpty()) {
+
+					send.setEnabled(false);
+					send.setAlpha(0.5f);
+					saveDraft(null, true);
+				}
+				else {
+
+					send.setEnabled(true);
+					send.setAlpha(1f);
+					saveDraft(text, false);
+				}
+			}
+
+			@Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+			@Override public void onTextChanged(CharSequence s, int start, int before, int count) {}
+		});
+
+		close.setOnClickListener(v -> dismiss());
+
+		drafts.setOnClickListener(v -> {
+
+			Intent intent = new Intent(getContext(), MainActivity.class);
+			intent.putExtra("launchFragment", "drafts");
+			startActivity(intent);
+
+			dismiss();
+		});
+
+		send.setOnClickListener(v -> IssueActions
+			.reply(getContext(), commentContent.getText().toString(), issueNumber)
+			.accept((status, result) -> {
+
+				if(status == ActionResult.Status.SUCCESS) {
+
+					Toasty.success(getContext(), getString(R.string.commentSuccess));
+
+					tinyDB.putBoolean("commentPosted", true);
+					tinyDB.putBoolean("resumeIssues", true);
+					tinyDB.putBoolean("resumePullRequests", true);
+
+					if(draftId != 0 && tinyDB.getBoolean("draftsCommentsDeletionEnabled")) {
+
+						draftsApi.deleteSingleDraft((int) draftId);
+					}
+
+					dismiss();
+				}
+				else {
+
+					Toasty.error(getContext(), getString(R.string.commentError));
+					dismiss();
+				}
+			}));
+
+		return view;
+	}
+
+	private void saveDraft(String text, boolean remove) {
+
+		ValueAnimator valueAnimator = ValueAnimator.ofFloat(0f, 1f);
+		valueAnimator.setDuration(500);
+		valueAnimator.addUpdateListener(animation -> {
+
+			float value = (Float) animation.getAnimatedValue();
+
+			if(value == 0f)  {
+				draftsHint.setVisibility((remove) ? View.GONE : View.VISIBLE);
+			}
+
+			draftsHint.setAlpha(value);
+		});
+
+		if(remove) {
+
+			draftsApi.deleteSingleDraft((int) draftId);
+			draftId = 0;
+
+			valueAnimator.reverse();
+		}
+		else {
+
+			if(draftId == 0) {
+				draftId = draftsApi.insertDraft(repositoryId, currentActiveAccountId, issueNumber, text, StaticGlobalVariables.draftTypeComment, "TODO");
+			} else {
+				DraftsApi.updateDraft(text, (int) draftId, "TODO");
+			}
+
+			draftsHint.setVisibility(View.VISIBLE);
+			valueAnimator.start();
+		}
+	}
+
+	public static BottomSheetReplyFragment newInstance(Bundle bundle) {
+
+		BottomSheetReplyFragment fragment = new BottomSheetReplyFragment();
+		fragment.setArguments(bundle);
+
+		return fragment;
+	}
+}

app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java

@@ -41,6 +41,9 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
         TextView unWatchRepository = v.findViewById(R.id.unWatchRepository);
         TextView shareRepository = v.findViewById(R.id.shareRepository);
 	    TextView copyRepoUrl = v.findViewById(R.id.copyRepoUrl);
+	    View repoSettingsDivider = v.findViewById(R.id.repoSettingsDivider);
+	    TextView repoSettings = v.findViewById(R.id.repoSettings);
+	    TextView createPullRequest = v.findViewById(R.id.createPullRequest);
 
         createLabel.setOnClickListener(v112 -> {
 
@@ -49,6 +52,7 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
         });
 
         if(tinyDb.getBoolean("hasIssues")) {
+
             createIssue.setVisibility(View.VISIBLE);
             createIssue.setOnClickListener(v12 -> {
 
@@ -57,9 +61,24 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
             });
         }
         else {
+
             createIssue.setVisibility(View.GONE);
         }
 
+	    if(tinyDb.getBoolean("hasPullRequests")) {
+
+		    createPullRequest.setVisibility(View.VISIBLE);
+		    createPullRequest.setOnClickListener(vPr -> {
+
+			    bmListener.onButtonClicked("newPullRequest");
+			    dismiss();
+		    });
+	    }
+	    else {
+
+		    createPullRequest.setVisibility(View.GONE);
+	    }
+
         createMilestone.setOnClickListener(v13 -> {
 
             bmListener.onButtonClicked("newMilestone");
@@ -67,13 +86,24 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
         });
 
 		if (tinyDb.getBoolean("isRepoAdmin")) {
+
+			repoSettings.setOnClickListener(repoSettingsView -> {
+
+				bmListener.onButtonClicked("repoSettings");
+				dismiss();
+			});
+
 			addCollaborator.setOnClickListener(v1 -> {
 
 				bmListener.onButtonClicked("addCollaborator");
 				dismiss();
 			});
-		} else {
+		}
+		else {
+
 			addCollaborator.setVisibility(View.GONE);
+			repoSettingsDivider.setVisibility(View.GONE);
+			repoSettings.setVisibility(View.GONE);
 		}
 
         createRelease.setOnClickListener(v14 -> {

app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java

@@ -14,8 +14,6 @@ import androidx.annotation.Nullable;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.IssueActions;
-import org.mian.gitnex.activities.AddRemoveAssigneesActivity;
-import org.mian.gitnex.activities.AddRemoveLabelsActivity;
 import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.FileDiffActivity;
 import org.mian.gitnex.activities.MergePullRequestActivity;
@@ -30,6 +28,8 @@ import java.util.Objects;
 
 public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
+	private BottomSheetListener bmListener;
+
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -78,42 +78,36 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 		else {
 
 			mergePullRequest.setVisibility(View.GONE);
-
 		}
 
 		mergePullRequest.setOnClickListener(v13 -> {
 
 			startActivity(new Intent(ctx, MergePullRequestActivity.class));
 			dismiss();
-
 		});
 
 		openFilesDiff.setOnClickListener(v14 -> {
 
 			startActivity(new Intent(ctx, FileDiffActivity.class));
 			dismiss();
-
 		});
 
 		editIssue.setOnClickListener(v15 -> {
 
 			startActivity(new Intent(ctx, EditIssueActivity.class));
 			dismiss();
-
 		});
 
 		editLabels.setOnClickListener(v16 -> {
 
-			startActivity(new Intent(ctx, AddRemoveLabelsActivity.class));
+			bmListener.onButtonClicked("showLabels");
 			dismiss();
-
 		});
 
 		addRemoveAssignees.setOnClickListener(v17 -> {
 
-			startActivity(new Intent(ctx, AddRemoveAssigneesActivity.class));
+			bmListener.onButtonClicked("showAssignees");
 			dismiss();
-
 		});
 
 		shareIssue.setOnClickListener(v1 -> {
@@ -125,7 +119,6 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 			startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")));
 
 			dismiss();
-
 		});
 
 		copyIssueUrl.setOnClickListener(v12 -> {
@@ -139,7 +132,6 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 			Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
 
 			dismiss();
-
 		});
 
 		if(tinyDB.getString("issueType").equalsIgnoreCase("Issue")) {
@@ -183,14 +175,12 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
 			IssueActions.subscribe(ctx);
 			dismiss();
-
 		});
 
 		unsubscribeIssue.setOnClickListener(unsubscribeToIssue -> {
 
 			IssueActions.unsubscribe(ctx);
 			dismiss();
-
 		});
 
 		if(new Version(tinyDB.getString("giteaVersion")).less("1.12.0")) {
@@ -209,4 +199,23 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 		return v;
 	}
 
+	public interface BottomSheetListener {
+
+		void onButtonClicked(String text);
+	}
+
+	@Override
+	public void onAttach(@NonNull Context context) {
+
+		super.onAttach(context);
+
+		try {
+
+			bmListener = (BottomSheetListener) context;
+		}
+		catch(ClassCastException e) {
+
+			throw new ClassCastException(context.toString() + " must implement BottomSheetListener");
+		}
+	}
 }

app/src/main/java/org/mian/gitnex/fragments/BranchesFragment.java

@@ -1,149 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.BranchesAdapter;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.Branches;
-import org.mian.gitnex.viewmodels.BranchesViewModel;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class BranchesFragment extends Fragment {
-
-    private ProgressBar mProgressBar;
-    private BranchesAdapter adapter;
-    private RecyclerView mRecyclerView;
-    private TextView noDataBranches;
-    private static String repoNameF = "param2";
-    private static String repoOwnerF = "param1";
-
-    private String repoName;
-    private String repoOwner;
-
-    private OnFragmentInteractionListener mListener;
-
-    public BranchesFragment() {
-    }
-
-    public static BranchesFragment newInstance(String param1, String param2) {
-        BranchesFragment fragment = new BranchesFragment();
-        Bundle args = new Bundle();
-        args.putString(repoOwnerF, param1);
-        args.putString(repoNameF, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            repoName = getArguments().getString(repoNameF);
-            repoOwner = getArguments().getString(repoOwnerF);
-        }
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.fragment_branches, container, false);
-
-        TinyDB tinyDb = new TinyDB(getContext());
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-        final String locale = tinyDb.getString("locale");
-        final String timeFormat = tinyDb.getString("dateFormat");
-        noDataBranches = v.findViewById(R.id.noDataBranches);
-
-        final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
-
-        mRecyclerView = v.findViewById(R.id.recyclerView);
-        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-                DividerItemDecoration.VERTICAL);
-        mRecyclerView.addItemDecoration(dividerItemDecoration);
-
-        mProgressBar = v.findViewById(R.id.progress_bar);
-
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        BranchesViewModel.loadBranchesList(instanceUrl, instanceToken, repoOwner, repoName, getContext());
-                    }
-                }, 50);
-            }
-        });
-
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
-
-        return v;
-    }
-
-    public void onButtonPressed(Uri uri) {
-        if (mListener != null) {
-            mListener.onFragmentInteraction(uri);
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
-
-    public interface OnFragmentInteractionListener {
-        void onFragmentInteraction(Uri uri);
-    }
-
-    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo) {
-
-        BranchesViewModel branchesModel = new ViewModelProvider(this).get(BranchesViewModel.class);
-
-        branchesModel.getBranchesList(instanceUrl, instanceToken, owner, repo, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Branches>>() {
-            @Override
-            public void onChanged(@Nullable List<Branches> branchesListMain) {
-                adapter = new BranchesAdapter(getContext(), branchesListMain);
-                if(adapter.getItemCount() > 0) {
-                    mRecyclerView.setAdapter(adapter);
-                    noDataBranches.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mRecyclerView.setAdapter(adapter);
-                    noDataBranches.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
-            }
-        });
-
-    }
-
-}

app/src/main/java/org/mian/gitnex/fragments/DraftsFragment.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -19,6 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.DraftsAdapter;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.database.models.DraftWithRepository;
@@ -50,6 +52,8 @@ public class DraftsFragment extends Fragment {
 	    ctx = getContext();
         setHasOptionsMenu(true);
 
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.titleDrafts));
+
         TinyDB tinyDb = new TinyDB(ctx);
 
 	    draftsList_ = new ArrayList<>();
@@ -66,11 +70,9 @@ public class DraftsFragment extends Fragment {
                 DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-	    adapter = new DraftsAdapter(getContext(), draftsList_);
-
+	    adapter = new DraftsAdapter(getContext(), getChildFragmentManager(), draftsList_);
 	    currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-
-        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 	        draftsList_.clear();
             fetchDataAsync(currentActiveAccountId);

app/src/main/java/org/mian/gitnex/fragments/ExploreFragment.java

@@ -0,0 +1,129 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import com.google.android.material.tabs.TabLayout;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.helpers.TinyDB;
+
+/**
+ * Author M M Arif
+ */
+
+public class ExploreFragment extends Fragment {
+
+	private Context ctx;
+	private TinyDB tinyDB;
+
+	private int tabsCount;
+	public ViewPager mViewPager;
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+		View v = inflater.inflate(R.layout.fragment_explore, container,false);
+		ctx = getContext();
+		tinyDB = new TinyDB(ctx);
+
+		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navExplore));
+
+		TabLayout tabLayout = v.findViewById(R.id.tabsExplore);
+
+		ViewGroup viewGroup = (ViewGroup) tabLayout.getChildAt(0);
+		tabsCount = viewGroup.getChildCount();
+
+		Typeface myTypeface;
+
+		switch(tinyDB.getInt("customFontId", -1)) {
+
+			case 0:
+				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
+				break;
+
+			case 2:
+				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
+				break;
+
+			default:
+				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
+				break;
+
+		}
+
+		for(int j = 0; j < tabsCount; j++) {
+
+			ViewGroup vgTab = (ViewGroup) viewGroup.getChildAt(j);
+			int tabChildCount = vgTab.getChildCount();
+
+			for(int i = 0; i < tabChildCount; i++) {
+
+				View tabViewChild = vgTab.getChildAt(i);
+
+				if(tabViewChild instanceof TextView) {
+					((TextView) tabViewChild).setTypeface(myTypeface);
+				}
+			}
+		}
+
+		mViewPager = v.findViewById(R.id.containerExplore);
+
+		mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
+
+		SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getChildFragmentManager());
+		mViewPager.setAdapter(mSectionsPagerAdapter);
+
+		return v;
+	}
+
+	public class SectionsPagerAdapter extends FragmentPagerAdapter {
+
+		SectionsPagerAdapter(FragmentManager fm) {
+
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+		}
+
+		@NonNull
+		@Override
+		public Fragment getItem(int position) {
+
+			Fragment fragment = null;
+
+			switch(position) {
+
+				case 0: // Repositories
+					fragment = new ExploreRepositoriesFragment();
+					break;
+
+				case 1: // Issues
+					fragment = new SearchIssuesFragment();
+					break;
+			}
+
+			assert fragment != null;
+			return fragment;
+
+		}
+
+		@Override
+		public int getCount() {
+
+			return tabsCount;
+		}
+
+	}
+
+}

app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java

@@ -1,27 +1,38 @@
 package org.mian.gitnex.fragments;
 
+import android.app.Dialog;
 import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
-import android.widget.ProgressBar;
-import android.widget.TextView;
+import android.view.inputmethod.InputMethodManager;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.ExploreRepositoriesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.databinding.CustomExploreRepositoriesDialogBinding;
+import org.mian.gitnex.databinding.FragmentExploreRepoBinding;
+import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.InfiniteScrollListener;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.ExploreRepositories;
 import org.mian.gitnex.models.UserRepositories;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import retrofit2.Call;
@@ -29,189 +40,304 @@ import retrofit2.Callback;
 import retrofit2.Response;
 
 /**
- * Template Author Author M M Arif
+ * Template Author M M Arif
  * Author 6543
  */
 
 public class ExploreRepositoriesFragment extends Fragment {
 
-	private static String repoNameF = "param2";
-	private static String repoOwnerF = "param1";
-	private ProgressBar mProgressBar;
-	private RecyclerView mRecyclerView;
-	private TextView noData;
-	private TextView searchKeyword;
-	private Boolean repoTypeInclude = true;
+	private FragmentExploreRepoBinding viewBinding;
+	private Context ctx;
+	private TinyDB tinyDb;
+
+	private int pageCurrentIndex = 1;
+	private boolean repoTypeInclude = true;
 	private String sort = "updated";
 	private String order = "desc";
-	private int limit = 50;
+	private int limit = 10;
+	private List<UserRepositories> dataList;
+	private ExploreRepositoriesAdapter adapter;
 
-	private OnFragmentInteractionListener mListener;
+	private String instanceUrl;
+	private String loginUid;
+	private String instanceToken;
 
-	public ExploreRepositoriesFragment() {
-
-	}
-
-	public static ExploreRepositoriesFragment newInstance(String param1, String param2) {
-
-		ExploreRepositoriesFragment fragment = new ExploreRepositoriesFragment();
-		Bundle args = new Bundle();
-		args.putString(repoOwnerF, param1);
-		args.putString(repoNameF, param2);
-		fragment.setArguments(args);
-		return fragment;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
-			String repoName = getArguments().getString(repoNameF);
-			String repoOwner = getArguments().getString(repoOwnerF);
-		}
-	}
+	private Dialog dialogFilterOptions;
+	private CustomExploreRepositoriesDialogBinding filterBinding;
 
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-		final View v = inflater.inflate(R.layout.fragment_explore_repo, container, false);
-		//setHasOptionsMenu(true);
+		viewBinding = FragmentExploreRepoBinding.inflate(inflater, container, false);
+		setHasOptionsMenu(true);
 
-		TinyDB tinyDb = new TinyDB(getContext());
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		ctx = getContext();
+		tinyDb = new TinyDB(getContext());
 
-		searchKeyword = v.findViewById(R.id.searchKeyword);
-		noData = v.findViewById(R.id.noData);
-		mProgressBar = v.findViewById(R.id.progress_bar);
-		mRecyclerView = v.findViewById(R.id.recyclerViewReposSearch);
+		instanceUrl = tinyDb.getString("instanceUrl");
+		loginUid = tinyDb.getString("loginUid");
+		instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-		mProgressBar.setVisibility(View.VISIBLE);
+		dataList = new ArrayList<>();
+		adapter = new ExploreRepositoriesAdapter(dataList, ctx);
 
-		searchKeyword.setOnEditorActionListener((v1, actionId, event) -> {
+		tinyDb.putBoolean("exploreRepoIncludeTopic", false);
+		tinyDb.putBoolean("exploreRepoIncludeDescription", false);
+		tinyDb.putBoolean("exploreRepoIncludeTemplate", false);
+		tinyDb.putBoolean("exploreRepoOnlyArchived", false);
+
+		// if gitea is 1.12 or higher use the new limit
+		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+			limit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+		}
+
+		LinearLayoutManager linearLayoutManager = new LinearLayoutManager(ctx);
+
+		viewBinding.recyclerViewReposSearch.setHasFixedSize(true);
+		viewBinding.recyclerViewReposSearch.setLayoutManager(linearLayoutManager);
+		viewBinding.recyclerViewReposSearch.setAdapter(adapter);
+
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.recyclerViewReposSearch.getContext(),
+			DividerItemDecoration.VERTICAL);
+		viewBinding.recyclerViewReposSearch.addItemDecoration(dividerItemDecoration);
+
+		viewBinding.searchKeyword.setOnEditorActionListener((v1, actionId, event) -> {
 
 			if(actionId == EditorInfo.IME_ACTION_SEND) {
-				if(!searchKeyword.getText().toString().equals("")) {
-					mProgressBar.setVisibility(View.VISIBLE);
-					mRecyclerView.setVisibility(View.GONE);
-					loadSearchReposList(instanceUrl, instanceToken, loginUid, searchKeyword.getText().toString(), repoTypeInclude, sort, order, getContext(), limit);
+
+				if(!Objects.requireNonNull(viewBinding.searchKeyword.getText()).toString().equals("")) {
+
+					InputMethodManager imm = (InputMethodManager) requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+					imm.hideSoftInputFromWindow(viewBinding.searchKeyword.getWindowToken(), 0);
+
+					// if gitea is 1.12 or higher use the new limit
+					if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+						limit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+					}
+					else {
+						limit = 10;
+					}
+
+					pageCurrentIndex = 1;
+					viewBinding.progressBar.setVisibility(View.VISIBLE);
+					loadData(false, viewBinding.searchKeyword.getText().toString(), tinyDb.getBoolean("exploreRepoIncludeTopic"), tinyDb.getBoolean("exploreRepoIncludeDescription"), tinyDb.getBoolean("exploreRepoIncludeTemplate"), tinyDb.getBoolean("exploreRepoOnlyArchived"));
 				}
 			}
 			return false;
 		});
 
-		int limitDefault = 25;
-		loadDefaultList(instanceUrl, instanceToken, loginUid, repoTypeInclude, sort, order, getContext(), limitDefault);
-
-		return v;
-
-	}
-
-	private void loadDefaultList(String instanceUrl, String instanceToken, String loginUid, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
-
-		Call<ExploreRepositories> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), null, repoTypeInclude, sort, order, limit);
-
-		call.enqueue(new Callback<ExploreRepositories>() {
+		viewBinding.recyclerViewReposSearch.addOnScrollListener(new InfiniteScrollListener(pageCurrentIndex, linearLayoutManager) {
 
 			@Override
-			public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
-
-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					getReposList(response.body().getSearchedData(), context);
-				}
-				else {
-					Log.i("onResponse", String.valueOf(response.code()));
-				}
+			public void onScrolledToEnd(int firstVisibleItemPosition) {
 
+				pageCurrentIndex++;
+				loadData(true, Objects.requireNonNull(viewBinding.searchKeyword.getText()).toString(), tinyDb.getBoolean("exploreRepoIncludeTopic"), tinyDb.getBoolean("exploreRepoIncludeDescription"), tinyDb.getBoolean("exploreRepoIncludeTemplate"), tinyDb.getBoolean("exploreRepoOnlyArchived"));
 			}
-
-			@Override
-			public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
-
-				Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
-			}
-
 		});
 
-	}
+		viewBinding.pullToRefresh.setOnRefreshListener(() -> {
 
-	private void loadSearchReposList(String instanceUrl, String instanceToken, String loginUid, String searchKeyword, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
-
-		Call<ExploreRepositories> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), searchKeyword, repoTypeInclude, sort, order, limit);
-
-		call.enqueue(new Callback<ExploreRepositories>() {
-
-			@Override
-			public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
-
-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					getReposList(response.body().getSearchedData(), context);
-				}
-				else {
-					Log.i("onResponse", String.valueOf(response.code()));
-				}
+			pageCurrentIndex = 1;
 
+			// if gitea is 1.12 or higher use the new limit
+			if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+				limit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+			}
+			else {
+				limit = 10;
 			}
 
-			@Override
-			public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
-
-				Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
-			}
-
+			loadData(false, Objects.requireNonNull(viewBinding.searchKeyword.getText()).toString(), tinyDb.getBoolean("exploreRepoIncludeTopic"), tinyDb.getBoolean("exploreRepoIncludeDescription"), tinyDb.getBoolean("exploreRepoIncludeTemplate"), tinyDb.getBoolean("exploreRepoOnlyArchived"));
 		});
 
+		loadData(false, "", tinyDb.getBoolean("exploreRepoIncludeTopic"), tinyDb.getBoolean("exploreRepoIncludeDescription"), tinyDb.getBoolean("exploreRepoIncludeTemplate"), tinyDb.getBoolean("exploreRepoOnlyArchived"));
+
+		return viewBinding.getRoot();
+
 	}
 
-	private void getReposList(List<UserRepositories> dataList, Context context) {
+	private void loadData(boolean append, String searchKeyword, boolean exploreRepoIncludeTopic, boolean exploreRepoIncludeDescription, boolean exploreRepoIncludeTemplate, boolean exploreRepoOnlyArchived) {
 
-		ExploreRepositoriesAdapter adapter = new ExploreRepositoriesAdapter(dataList, context);
+		viewBinding.noData.setVisibility(View.GONE);
 
-		mRecyclerView.setVisibility(View.VISIBLE);
+		int apiCallDefaultLimit = 10;
+		// if gitea is 1.12 or higher use the new limit
+		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+			apiCallDefaultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+		}
 
-		mRecyclerView.setHasFixedSize(true);
-		mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
-		mRecyclerView.addItemDecoration(dividerItemDecoration);
+		if(apiCallDefaultLimit > limit) {
+			return;
+		}
 
-		if(adapter.getItemCount() > 0) {
-
-			mRecyclerView.setAdapter(adapter);
-			noData.setVisibility(View.GONE);
-			mProgressBar.setVisibility(View.GONE);
+		if(pageCurrentIndex == 1 || !append) {
 
+			dataList.clear();
+			adapter.notifyDataSetChanged();
+			viewBinding.pullToRefresh.setRefreshing(false);
+			viewBinding.progressBar.setVisibility(View.VISIBLE);
 		}
 		else {
 
-			noData.setVisibility(View.VISIBLE);
-			mProgressBar.setVisibility(View.GONE);
-
+			viewBinding.loadingMoreView.setVisibility(View.VISIBLE);
 		}
 
+		Call<ExploreRepositories> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), searchKeyword, repoTypeInclude, sort, order, exploreRepoIncludeTopic, exploreRepoIncludeDescription, exploreRepoIncludeTemplate, exploreRepoOnlyArchived, limit, pageCurrentIndex);
+
+		call.enqueue(new Callback<ExploreRepositories>() {
+
+			@Override
+			public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
+
+				if(response.code() == 200) {
+
+					assert response.body() != null;
+
+					limit = response.body().getSearchedData().size();
+
+					if(!append) {
+
+						dataList.clear();
+					}
+
+					dataList.addAll(response.body().getSearchedData());
+					adapter.notifyDataSetChanged();
+
+				}
+				else {
+
+					dataList.clear();
+					adapter.notifyDataChanged();
+					viewBinding.noData.setVisibility(View.VISIBLE);
+
+				}
+
+				onCleanup();
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", Objects.requireNonNull(t.getMessage()));
+				onCleanup();
+
+			}
+
+			private void onCleanup() {
+
+				AppUtil.setMultiVisibility(View.GONE, viewBinding.loadingMoreView, viewBinding.progressBar);
+
+				if(dataList.isEmpty()) {
+
+					viewBinding.noData.setVisibility(View.VISIBLE);
+				}
+			}
+		});
+	}
+
+	@Override
+	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+		menu.clear();
+		inflater.inflate(R.menu.filter_menu, menu);
+		super.onCreateOptionsMenu(menu, inflater);
+
+		MenuItem filter = menu.findItem(R.id.filter);
+
+		filter.setOnMenuItemClickListener(filter_ -> {
+
+			showFilterOptions();
+			return false;
+		});
+
 	}
 
-	public void onButtonPressed(Uri uri) {
+	private void showFilterOptions() {
 
-		if(mListener != null) {
-			mListener.onFragmentInteraction(uri);
+		dialogFilterOptions = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+
+		if (dialogFilterOptions.getWindow() != null) {
+
+			dialogFilterOptions.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 		}
+
+		filterBinding = CustomExploreRepositoriesDialogBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = filterBinding.getRoot();
+		dialogFilterOptions.setContentView(view);
+
+		filterBinding.includeTopic.setOnClickListener(includeTopic -> {
+
+			if(filterBinding.includeTopic.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoIncludeTopic", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoIncludeTopic", false);
+			}
+		});
+
+		filterBinding.includeDesc.setOnClickListener(includeDesc -> {
+
+			if(filterBinding.includeDesc.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoIncludeDescription", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoIncludeDescription", false);
+			}
+		});
+
+		filterBinding.includeTemplate.setOnClickListener(includeTemplate -> {
+
+			if(filterBinding.includeTemplate.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoIncludeTemplate", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoIncludeTemplate", false);
+			}
+		});
+
+		filterBinding.onlyArchived.setOnClickListener(onlyArchived -> {
+
+			if(filterBinding.onlyArchived.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoOnlyArchived", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoOnlyArchived", false);
+			}
+		});
+
+
+		filterBinding.includeTopic.setChecked(tinyDb.getBoolean("exploreRepoIncludeTopic"));
+		filterBinding.includeDesc.setChecked(tinyDb.getBoolean("exploreRepoIncludeDescription"));
+		filterBinding.includeTemplate.setChecked(tinyDb.getBoolean("exploreRepoIncludeTemplate"));
+		filterBinding.onlyArchived.setChecked(tinyDb.getBoolean("exploreRepoOnlyArchived"));
+
+		filterBinding.cancel.setOnClickListener(editProperties -> {
+			dialogFilterOptions.dismiss();
+		});
+
+		dialogFilterOptions.show();
 	}
 
 	@Override
 	public void onDetach() {
 
 		super.onDetach();
-		mListener = null;
 	}
 
 	public interface OnFragmentInteractionListener {
 
 		void onFragmentInteraction(Uri uri);
-
 	}
 
 }

app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java

@@ -30,7 +30,6 @@ import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.viewmodels.FilesViewModel;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Objects;
 import moe.feng.common.view.breadcrumbs.BreadcrumbsView;
 import moe.feng.common.view.breadcrumbs.DefaultBreadcrumbsCallback;
 import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;
@@ -111,7 +110,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 		mBreadcrumbsView = v.findViewById(R.id.breadcrumbs_view);
 		mBreadcrumbsView.setItems(new ArrayList<>(Collections.singletonList(BreadcrumbItem.createSimpleItem(getResources().getString(R.string.filesBreadcrumbRoot) + getResources().getString(R.string.colonDivider) + ref))));
 
-		((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListenerFiles(repoBranch -> {
+		((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerFiles(repoBranch -> {
 
 			fileStructure.setText("");
 			ref = repoBranch;
@@ -198,7 +197,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 			intent.putExtra("singleFileName", fileName);
 		}
 
-		Objects.requireNonNull(getContext()).startActivity(intent);
+		requireContext().startActivity(intent);
 	}
 
 	private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo, String ref) {
@@ -208,17 +207,19 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		FilesViewModel filesModel = new ViewModelProvider(this).get(FilesViewModel.class);
 
-		filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, ref, getContext()).observe(getViewLifecycleOwner(), filesListMain -> {
+		filesModel.getFilesList(instanceUrl, instanceToken, owner, repo, ref, getContext(), mProgressBar, noDataFiles).observe(getViewLifecycleOwner(), filesListMain -> {
 
 			adapter = new FilesAdapter(getContext(), filesListMain, FilesFragment.this);
 			mBreadcrumbsView.removeItemAfter(1);
 
 			if(adapter.getItemCount() > 0) {
+
 				mRecyclerView.setAdapter(adapter);
 				AppUtil.setMultiVisibility(View.VISIBLE, mRecyclerView, filesFrame);
 				noDataFiles.setVisibility(View.GONE);
 			}
 			else {
+
 				adapter.notifyDataSetChanged();
 				mRecyclerView.setAdapter(adapter);
 				AppUtil.setMultiVisibility(View.VISIBLE, mRecyclerView, filesFrame, noDataFiles);
@@ -226,7 +227,6 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 			filesFrame.setVisibility(View.VISIBLE);
 			mProgressBar.setVisibility(View.GONE);
-
 		});
 
 	}
@@ -238,7 +238,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		FilesViewModel filesModel2 = new ViewModelProvider(this).get(FilesViewModel.class);
 
-		filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, ref, getContext()).observe(this, filesListMain2 -> {
+		filesModel2.getFilesList2(instanceUrl, instanceToken, owner, repo, filesDir, ref, getContext(), mProgressBar, noDataFiles).observe(this, filesListMain2 -> {
 
 			adapter = new FilesAdapter(getContext(), filesListMain2, FilesFragment.this);
 
@@ -263,6 +263,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 	@Override
 	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
+		menu.clear();
 		inflater.inflate(R.menu.search_menu, menu);
 		inflater.inflate(R.menu.files_switch_branches_menu, menu);
 		super.onCreateOptionsMenu(menu, inflater);

app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -32,7 +33,6 @@ import org.mian.gitnex.interfaces.ApiInterface;
 import org.mian.gitnex.models.Issues;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -88,7 +88,7 @@ public class IssuesFragment extends Fragment {
 		mProgressBar = v.findViewById(R.id.progress_bar);
 		noDataIssues = v.findViewById(R.id.noDataIssues);
 
-		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
 			swipeRefresh.setRefreshing(false);
 			loadInitial(instanceToken, repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
@@ -112,7 +112,7 @@ public class IssuesFragment extends Fragment {
 		recyclerView.setLayoutManager(new LinearLayoutManager(context));
 		recyclerView.setAdapter(adapter);
 
-		((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListener(issueState -> {
+		((RepoDetailActivity) requireActivity()).setFragmentRefreshListener(issueState -> {
 
 			if(issueState.equals("closed")) {
 				menu.getItem(1).setIcon(R.drawable.ic_filter_closed);

app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -87,18 +88,12 @@ public class LabelsFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        LabelsViewModel.loadLabelsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            LabelsViewModel.loadLabelsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getContext());
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
 

app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -27,7 +28,6 @@ import org.mian.gitnex.interfaces.ApiInterface;
 import org.mian.gitnex.models.Milestones;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -95,7 +95,7 @@ public class MilestonesFragment extends Fragment {
         viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
         viewBinding.recyclerView.setAdapter(adapter);
 
-        viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        viewBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
             dataList.clear();
             viewBinding.pullToRefresh.setRefreshing(false);
@@ -104,7 +104,7 @@ public class MilestonesFragment extends Fragment {
 
         }, 50));
 
-        ((RepoDetailActivity) Objects.requireNonNull(getActivity())).setFragmentRefreshListenerMilestone(milestoneState -> {
+        ((RepoDetailActivity) requireActivity()).setFragmentRefreshListenerMilestone(milestoneState -> {
 
             if(milestoneState.equals("closed")) {
                 menu.getItem(1).setIcon(R.drawable.ic_filter_closed);

app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -14,9 +15,7 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -25,14 +24,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateRepoActivity;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.MyReposListAdapter;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.viewmodels.MyRepositoriesViewModel;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -81,7 +78,7 @@ public class MyRepositoriesFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         final View v = inflater.inflate(R.layout.fragment_my_repositories, container, false);
         setHasOptionsMenu(true);
@@ -95,6 +92,8 @@ public class MyRepositoriesFragment extends Fragment {
 
         final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
 
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navMyRepos));
+
         noDataMyRepo = v.findViewById(R.id.noDataMyRepo);
         mProgressBar = v.findViewById(R.id.progress_bar);
         mRecyclerView = v.findViewById(R.id.recyclerView);
@@ -130,10 +129,11 @@ public class MyRepositoriesFragment extends Fragment {
             }
         });
 
-        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
             swipeRefresh.setRefreshing(false);
             MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
+
         }, 50));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, pageSize, resultLimit);
@@ -162,29 +162,28 @@ public class MyRepositoriesFragment extends Fragment {
 
         MyRepositoriesViewModel myRepoModel = new ViewModelProvider(this).get(MyRepositoriesViewModel.class);
 
-        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
-            @Override
-            public void onChanged(@Nullable List<UserRepositories> myReposListMain) {
-                adapter = new MyReposListAdapter(getContext(), myReposListMain);
-                if(adapter.getItemCount() > 0) {
-                    mRecyclerView.setAdapter(adapter);
-                    noDataMyRepo.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mRecyclerView.setAdapter(adapter);
-                    noDataMyRepo.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
-            }
-        });
+        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(),
+	        myReposListMain -> {
+
+	            adapter = new MyReposListAdapter(getContext(), myReposListMain);
+	            if(adapter.getItemCount() > 0) {
+	                mRecyclerView.setAdapter(adapter);
+	                noDataMyRepo.setVisibility(View.GONE);
+	            }
+	            else {
+	                adapter.notifyDataSetChanged();
+	                mRecyclerView.setAdapter(adapter);
+	                noDataMyRepo.setVisibility(View.VISIBLE);
+	            }
+	            mProgressBar.setVisibility(View.GONE);
+	        });
 
     }
 
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java

@@ -36,7 +36,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -79,7 +78,7 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 		View v = inflater.inflate(R.layout.fragment_notifications, container, false);
 		setHasOptionsMenu(true);
 
-		activity = Objects.requireNonNull(getActivity());
+		activity = requireActivity();
 		context = getContext();
 		tinyDB = new TinyDB(context);
 
@@ -337,7 +336,7 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 
 			tinyDB.putString("issueNumber", issueUrl.substring(issueUrl.lastIndexOf("/") + 1));
 			tinyDB.putString("issueType", notificationThread.getSubject().getType());
-			tinyDB.putString("repoFullName", notificationThread.getRepository().getFullname());
+			tinyDB.putString("repoFullName", notificationThread.getRepository().getFullName());
 
 			startActivity(intent);
 

app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -15,7 +16,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -24,14 +24,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateOrganizationActivity;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.OrganizationsListAdapter;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.models.UserOrganizations;
 import org.mian.gitnex.viewmodels.OrganizationListViewModel;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -52,7 +50,7 @@ public class OrganizationsFragment extends Fragment {
         final View v = inflater.inflate(R.layout.fragment_organizations, container, false);
         setHasOptionsMenu(true);
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         TinyDB tinyDb = new TinyDB(getContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -61,6 +59,8 @@ public class OrganizationsFragment extends Fragment {
 
         final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
 
+	    ((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navOrgs));
+
         mProgressBar = v.findViewById(R.id.progress_bar);
         noDataOrg = v.findViewById(R.id.noDataOrg);
         mRecyclerView = v.findViewById(R.id.recyclerView);
@@ -73,14 +73,10 @@ public class OrganizationsFragment extends Fragment {
 
         createNewOrganization = v.findViewById(R.id.addNewOrganization);
 
-        createNewOrganization.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), CreateOrganizationActivity.class);
-                startActivity(intent);
-            }
+        createNewOrganization.setOnClickListener(view -> {
 
+            Intent intent = new Intent(view.getContext(), CreateOrganizationActivity.class);
+            startActivity(intent);
         });
 
         mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -99,18 +95,12 @@ public class OrganizationsFragment extends Fragment {
             }
         });
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
-                    }
-                }, 50);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            OrganizationListViewModel.loadOrgsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
+
+        }, 50));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 
@@ -136,21 +126,19 @@ public class OrganizationsFragment extends Fragment {
 
         OrganizationListViewModel orgModel = new ViewModelProvider(this).get(OrganizationListViewModel.class);
 
-        orgModel.getUserOrgs(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserOrganizations>>() {
-            @Override
-            public void onChanged(@Nullable List<UserOrganizations> orgsListMain) {
-                adapter = new OrganizationsListAdapter(getContext(), orgsListMain);
-                if(adapter.getItemCount() > 0) {
-                    mRecyclerView.setAdapter(adapter);
-                    noDataOrg.setVisibility(View.GONE);
-                }
-                else {
-                    adapter.notifyDataSetChanged();
-                    mRecyclerView.setAdapter(adapter);
-                    noDataOrg.setVisibility(View.VISIBLE);
-                }
-                mProgressBar.setVisibility(View.GONE);
+        orgModel.getUserOrgs(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), orgsListMain -> {
+            adapter = new OrganizationsListAdapter(getContext(), orgsListMain);
+
+            if(adapter.getItemCount() > 0) {
+                mRecyclerView.setAdapter(adapter);
+                noDataOrg.setVisibility(View.GONE);
             }
+            else {
+                adapter.notifyDataSetChanged();
+                mRecyclerView.setAdapter(adapter);
+                noDataOrg.setVisibility(View.VISIBLE);
+            }
+            mProgressBar.setVisibility(View.GONE);
         });
 
     }
@@ -158,7 +146,7 @@ public class OrganizationsFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(requireContext());
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

app/src/main/java/org/mian/gitnex/fragments/ProfileEmailsFragment.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -88,18 +89,12 @@ public class ProfileEmailsFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        ProfileEmailsViewModel.loadEmailsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            ProfileEmailsViewModel.loadEmailsList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 

app/src/main/java/org/mian/gitnex/fragments/ProfileFollowersFragment.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -88,18 +89,12 @@ public class ProfileFollowersFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        ProfileFollowersViewModel.loadFollowersList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            ProfileFollowersViewModel.loadFollowersList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 

app/src/main/java/org/mian/gitnex/fragments/ProfileFollowingFragment.java

@@ -3,6 +3,7 @@ package org.mian.gitnex.fragments;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -88,18 +89,12 @@ public class ProfileFollowingFragment extends Fragment {
 
         mProgressBar = v.findViewById(R.id.progress_bar);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        ProfileFollowingViewModel.loadFollowingList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
-                    }
-                }, 200);
-            }
-        });
+        swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            ProfileFollowingViewModel.loadFollowingList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
+
+        }, 200));
 
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));