Merge pull request 'Release 2.5.1' (#479) from prepare-release-2.5.1 into release-2.5

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/479

.drone.yml

@@ -24,6 +24,32 @@ steps:
     commands:
       - ./gradlew build
 
+  - name: sign
+    image: nextcloudci/android:android-49
+    environment:
+      TOKEN:
+        from_secret: BOT_TOKEN
+      KS_PASS:
+        from_secret: KS_PASS
+      KEY_PASS:
+        from_secret: KEY_PASS
+      OUTPUT: signed.apk
+      GITEA: https://gitea.com
+      KS_FILE: ci_keystore.jks
+      KS_REPO:
+        from_secret: KS_REPO
+    commands:
+      - ./scripts/sign-build.sh
+
+  - name: publish
+    image: vividboarder/drone-webdav
+    environment:
+      WEBDAV_USERNAME: GitNexBot
+      WEBDAV_PASSWORD:
+        from_secret: NC_TOKEN
+      PLUGIN_FILE: signed.apk
+      PLUGIN_DESTINATION: https://cloud.swatian.com/remote.php/dav/files/GitNexBot/GitNex-Builds/latest.apk
+
 trigger:
   event:
     - push

.gitea/issue_template.md

@@ -0,0 +1,31 @@
+## # What do you want to address?
+(This step is required; examples are shown below)
+
+- [ ] Bug
+- [ ] Feature
+- [ ] Suggestion
+
+## # Describe your matter briefly
+(This step is required)
+
+
+##### What did you expect? (Useful when addressing bugs)
+---
+_(This step is optional)_
+
+
+##### Some additional details (Useful, when we are trying to reproduce a bug)
+---
+_(This step is optional; an example is shown below)_
+
+* The version of **Gitea** you are using: 
+* The version of **GitNex** you are using: 
+* The type of certificate you are using (self-signed, signed): 
+* How you used to log in (via password or token): 
+
+
+##### We would appreciate some screenshots or stacktrace's, but this is also not required.
+---
+_(Screenshots and stacktrace's can go here)_
+
+#### Thank you for your time.

.gitea/pull_request_template.md

@@ -0,0 +1,8 @@
+Please check the following:
+
+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)
+
+**You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.**

.gitignore

@@ -8,6 +8,9 @@
 *.ap_
 *.aab
 
+# Release dir
+app/release/*
+
 # Files for the ART/Dalvik VM
 *.dex
 
@@ -48,6 +51,7 @@ captures/
 .idea/dictionaries
 .idea/libraries
 .idea/caches
+!.idea/codeStyles
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.

.idea/codeStyles/Project.xml

@@ -0,0 +1,159 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="android" withSubpackages="true" static="false" />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <package name="com" withSubpackages="true" static="false" />
+          <package name="junit" withSubpackages="true" static="false" />
+          <package name="net" withSubpackages="true" static="false" />
+          <package name="org" withSubpackages="true" static="false" />
+          <package name="java" withSubpackages="true" static="false" />
+          <package name="javax" withSubpackages="true" static="false" />
+          <package name="" withSubpackages="true" static="false" />
+          <package name="" withSubpackages="true" static="true" />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="RIGHT_MARGIN" value="220" />
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+      <option name="BLANK_LINES_BEFORE_METHOD_BODY" value="1" />
+      <option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="BLANK_LINES_AFTER_ANONYMOUS_CLASS_HEADER" value="1" />
+      <option name="BLANK_LINES_BEFORE_CLASS_END" value="1" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_TRY_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="WRAP_ON_TYPING" value="1" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

CONTRIBUTING.md

@@ -7,6 +7,11 @@ Patches, enhancements, features are always welcome. The PR should focus on the s
 
 Please ask if you are not sure about the scope of work to be submitted to avoid waste of time spent on the work.
 
+**Code Standards**
+Please follow the code standards, this will help other developers to understand your code too.  
+It also helps maintaining the code afterwards.  
+It is documented in the Wiki: [Code-Standards](https://gitea.com/gitnex/GitNex/wiki/Code-Standards)
+
 **How to submit a PR**  
 Fork this repository. Pull the forked repository from your namespace to your local machine. Create new branch and work on the bug/feature/enhancement you would like to submit. Push it to your forked version. From there create Pull Request(PR) against **master** branch.
 

README.md

@@ -2,6 +2,7 @@
 [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://gitea.com/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://gitea.com/gitnex/GitNex/releases)
 [![Build Status](https://drone.gitea.com/api/badges/gitnex/GitNex/status.svg)](https://drone.gitea.com/gitnex/GitNex)
 [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex)
+[![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
 
 [<img alt="Become a Patroen" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif)
 [<img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="40"/>](https://liberapay.com/mmarif/donate)
@@ -90,5 +91,7 @@ Open source libraries
 - Caverock/androidsvg
 - Droidsonroids.gif/android-gif-drawable
 - Barteksc/AndroidPdfViewer
+- Mikepenz/fastadapter
+- Ge0rg/MemorizingTrustManager
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)

app/build.gradle

@@ -6,13 +6,14 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 90
-        versionName "2.4.0"
+        versionCode 251
+        versionName "2.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
             minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -20,31 +21,42 @@ android {
         //checkReleaseBuilds false
         abortOnError false
     }
+    compileOptions {
+        targetCompatibility = "8"
+        sourceCompatibility = "8"
+    }
+}
+
+configurations {
+    cleanedAnnotations
+    compile.exclude group: 'org.jetbrains', module: 'annotations'
 }
 
 dependencies {
     def lifecycle_version = "2.2.0"
-    final def markwon_version = "4.1.1"
+    def markwon_version = '4.3.1'
+    def fastadapter = "3.3.1"
+    def acra = "5.5.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "com.google.android.material:material:1.2.0-alpha05"
+    implementation "com.google.android.material:material:1.2.0-alpha06"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    testImplementation "junit:junit:4.12"
+    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:3.12.1"
-    implementation "com.google.code.gson:gson:2.8.5"
+    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
+    implementation "com.google.code.gson:gson:2.8.6"
     implementation "com.squareup.picasso:picasso:2.71828"
     implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
-    implementation "com.squareup.retrofit2:retrofit:2.5.0"
-    implementation "com.squareup.retrofit2:converter-gson:2.5.0"
-    implementation "com.squareup.retrofit2:converter-scalars:2.5.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:3.12.1"
-    implementation "org.ocpsoft.prettytime:prettytime:4.0.1.Final"
-    implementation "com.vdurmont:emoji-java:4.0.0"
+    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
+    implementation 'com.squareup.retrofit2:converter-scalars:2.8.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.5.0'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.4.Final'
+    implementation "com.vdurmont:emoji-java:5.1.1"
     implementation "com.pes.materialcolorpicker:library:1.2.5"
     implementation "io.noties.markwon:core:$markwon_version"
     implementation "io.noties.markwon:ext-latex:$markwon_version"
@@ -66,8 +78,16 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
-    implementation "commons-io:commons-io:2.6"
+    implementation "commons-io:commons-io:20030203.000550"
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
     implementation "com.pddstudio:highlightjs-android:1.5.0"
     implementation "com.github.barteksc:android-pdf-viewer:3.2.0-beta.1"
+    //noinspection GradleDependency
+    implementation "com.mikepenz:fastadapter:$fastadapter"
+    implementation "com.mikepenz:fastadapter-commons:$fastadapter"
+    implementation "com.mikepenz:fastadapter-extensions:$fastadapter"
+    implementation "ch.acra:acra-mail:$acra"
+    implementation "ch.acra:acra-limiter:$acra"
+    implementation "ch.acra:acra-notification:$acra"
+
 }

app/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
             android:name=".activities.FileViewActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".activities.NewFileActivity"
+            android:name=".activities.CreateFileActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activities.RepoWatchersActivity"
@@ -41,16 +41,16 @@
         <activity android:name=".activities.ProfileEmailActivity" />
         <activity android:name=".activities.AddCollaboratorToRepositoryActivity" />
         <activity android:name=".activities.CreateTeamByOrgActivity" />
-        <activity android:name=".activities.OrgTeamMembersActivity" />
+        <activity android:name=".activities.OrganizationTeamMembersActivity" />
         <activity
-            android:name=".activities.OrgDetailActivity"
+            android:name=".activities.OrganizationDetailActivity"
             android:label="@string/title_activity_org_detail"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity android:name=".activities.SponsorsActivity" />
         <activity android:name=".activities.CreditsActivity" />
         <activity android:name=".activities.CreateLabelActivity" />
         <activity android:name=".activities.CreateIssueActivity" />
-        <activity android:name=".activities.NewMilestoneActivity" />
+        <activity android:name=".activities.CreateMilestoneActivity" />
         <activity android:name=".activities.ReplyToIssueActivity" />
         <activity
             android:name=".activities.IssueDetailActivity"
@@ -59,7 +59,7 @@
             android:name=".activities.RepoDetailActivity"
             android:label="@string/title_activity_repo_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -68,11 +68,13 @@
         </activity>
         <activity
             android:name=".activities.LoginActivity"
-            android:launchMode="singleTask" />
-        <activity android:name=".activities.NewRepoActivity" />
-        <activity android:name=".activities.NewOrganizationActivity" />
+            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" />
     </application>
 
 </manifest>

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

@@ -2,6 +2,8 @@ package org.mian.gitnex.actions;
 
 import android.content.Context;
 import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ReplyToIssueActivity;
@@ -22,9 +24,9 @@ import retrofit2.Callback;
 
 public class IssueActions {
 
-    public static void editIssueComment(final Context context, final int commentId, final String commentBody) {
+    public static void editIssueComment(final Context ctx, final int commentId, final String commentBody) {
 
-        final TinyDB tinyDb = new TinyDB(context);
+        final TinyDB tinyDb = new TinyDB(ctx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@@ -37,9 +39,9 @@ public class IssueActions {
         Call<IssueComments> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, context)
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .patchIssueComment(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, commentId, commentBodyJson);
+                .patchIssueComment(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, commentId, commentBodyJson);
 
         call.enqueue(new Callback<IssueComments>() {
 
@@ -50,32 +52,32 @@ public class IssueActions {
                     if(response.code() == 200) {
 
                         tinyDb.putBoolean("commentEdited", true);
-                        Toasty.info(context, context.getString(R.string.editCommentUpdatedText));
-                        ((ReplyToIssueActivity)context).finish();
+                        Toasty.info(ctx, ctx.getString(R.string.editCommentUpdatedText));
+                        ((ReplyToIssueActivity)ctx).finish();
 
                     }
                 }
                 else if(response.code() == 401) {
 
-                    AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                            context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
                 }
                 else if(response.code() == 403) {
 
-                    Toasty.info(context, context.getString(R.string.authorizeError));
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));
 
                 }
                 else if(response.code() == 404) {
 
-                    Toasty.info(context, context.getString(R.string.apiNotFound));
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
 
                 }
                 else {
 
-                    Toasty.info(context, context.getString(R.string.genericError));
+                    Toasty.info(ctx, ctx.getString(R.string.genericError));
 
                 }
 
@@ -89,9 +91,9 @@ public class IssueActions {
 
     }
 
-    public static void closeReopenIssue(final Context context, final int issueIndex, final String issueState) {
+    public static void closeReopenIssue(final Context ctx, final int issueIndex, final String issueState) {
 
-        final TinyDB tinyDb = new TinyDB(context);
+        final TinyDB tinyDb = new TinyDB(ctx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@@ -104,9 +106,9 @@ public class IssueActions {
         Call<JsonElement> call;
 
         call = RetrofitClient
-                .getInstance(instanceUrl, context)
+                .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .closeReopenIssue(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);
+                .closeReopenIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);
 
         call.enqueue(new Callback<JsonElement>() {
 
@@ -118,36 +120,43 @@ public class IssueActions {
 
                         tinyDb.putBoolean("resumeIssues", true);
                         tinyDb.putBoolean("resumeClosedIssues", true);
+
                         if(issueState.equals("closed")) {
-                            Toasty.info(context, context.getString(R.string.issueStateClosed));
+
+                            Toasty.info(ctx, ctx.getString(R.string.issueStateClosed));
+                            tinyDb.putString("issueState", "closed");
+
                         }
                         else if(issueState.equals("open")) {
-                            Toasty.info(context, context.getString(R.string.issueStateReopened));
+
+                            Toasty.info(ctx, ctx.getString(R.string.issueStateReopened));
+                            tinyDb.putString("issueState", "open");
+
                         }
 
                     }
                 }
                 else if(response.code() == 401) {
 
-                    AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
-                            context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
-                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
-                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 
                 }
                 else if(response.code() == 403) {
 
-                    Toasty.info(context, context.getString(R.string.authorizeError));
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));
 
                 }
                 else if(response.code() == 404) {
 
-                    Toasty.info(context, context.getString(R.string.apiNotFound));
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
 
                 }
                 else {
 
-                    Toasty.info(context, context.getString(R.string.genericError));
+                    Toasty.info(ctx, ctx.getString(R.string.genericError));
 
                 }
 
@@ -161,4 +170,127 @@ public class IssueActions {
 
     }
 
+    public static void subscribe(final Context ctx, final TextView subscribeIssue, final TextView unsubscribeIssue) {
+
+        final TinyDB tinyDB = new TinyDB(ctx);
+
+        final String instanceUrl = tinyDB.getString("instanceUrl");
+        String repoFullName = tinyDB.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String loginUid = tinyDB.getString("loginUid");
+        final String userLogin = tinyDB.getString("userLogin");
+        final String token = "token " + tinyDB.getString(loginUid + "-token");
+        final int issueNr = Integer.parseInt(tinyDB.getString("issueNumber"));
+
+        Call<Void> call;
+
+        call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .addIssueSubscriber(token, repoOwner, repoName, issueNr, userLogin);
+
+        call.enqueue(new Callback<Void>() {
+
+            @Override
+            public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+
+                if(response.isSuccessful()) {
+
+                    if(response.code() == 201) {
+
+                        unsubscribeIssue.setVisibility(View.VISIBLE);
+                        subscribeIssue.setVisibility(View.GONE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "unsubscribeToIssue");
+
+                    }
+
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else {
+
+                    Toasty.info(ctx, ctx.getString(R.string.issueSubscribtionError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+                Toasty.info(ctx, ctx.getString(R.string.issueSubscribtionError));
+            }
+        });
+
+    }
+
+    public static void unsubscribe(final Context ctx, final TextView subscribeIssue, final TextView unsubscribeIssue) {
+
+        final TinyDB tinyDB = new TinyDB(ctx);
+
+        final String instanceUrl = tinyDB.getString("instanceUrl");
+        String repoFullName = tinyDB.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+        final String loginUid = tinyDB.getString("loginUid");
+        final String userLogin = tinyDB.getString("userLogin");
+        final String token = "token " + tinyDB.getString(loginUid + "-token");
+        final int issueNr = Integer.parseInt(tinyDB.getString("issueNumber"));
+
+        Call<Void> call;
+
+        call = RetrofitClient
+                .getInstance(instanceUrl, ctx)
+                .getApiInterface()
+                .delIssueSubscriber(token, repoOwner, repoName, issueNr, userLogin);
+
+        call.enqueue(new Callback<Void>() {
+
+            @Override
+            public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
+
+                if(response.isSuccessful()) {
+
+                    if(response.code() == 201) {
+
+                        unsubscribeIssue.setVisibility(View.GONE);
+                        subscribeIssue.setVisibility(View.VISIBLE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "subscribeToIssue");
+
+                    }
+
+                }
+                else if(response.code() == 401) {
+
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+                }
+                else {
+
+                    Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtionError));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
+                Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtionError));
+            }
+        });
+    }
+
 }

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

@@ -0,0 +1,143 @@
+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.clients.RetrofitClient;
+import org.mian.gitnex.helpers.AlertDialogs;
+import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.models.Milestones;
+import org.mian.gitnex.util.TinyDB;
+import org.mian.gitnex.viewmodels.MilestonesViewModel;
+import retrofit2.Call;
+import retrofit2.Callback;
+
+/**
+ * Author M M Arif
+ */
+
+public class MilestoneActions {
+
+	static final private String TAG = "MilestoneActions : ";
+
+	public static void closeMilestone(final Context ctx, int milestoneId_) {
+
+		final TinyDB tinyDB = new TinyDB(ctx);
+
+		final String instanceUrl = tinyDB.getString("instanceUrl");
+		String repoFullName = tinyDB.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		final String repoOwner = parts[0];
+		final String repoName = parts[1];
+		final String loginUid = tinyDB.getString("loginUid");
+		final String token = "token " + tinyDB.getString(loginUid + "-token");
+
+		Milestones milestoneStateJson = new Milestones("closed");
+		Call<JsonElement> call;
+
+		call = RetrofitClient
+				.getInstance(instanceUrl, ctx)
+				.getApiInterface()
+				.closeReopenMilestone(token, repoOwner, repoName, milestoneId_, milestoneStateJson);
+
+		call.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				if(response.isSuccessful()) {
+
+					Toasty.info(ctx, ctx.getString(R.string.milestoneStatusUpdate));
+					MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, token), repoOwner, repoName, "all", ctx);
+
+				}
+				else if(response.code() == 401) {
+
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+							ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+				}
+				else {
+
+					Toasty.info(ctx, ctx.getString(R.string.genericError));
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
+				Log.e(TAG, t.toString());
+
+			}
+
+		});
+
+
+	}
+
+	public static void openMilestone(final Context ctx, int milestoneId_) {
+
+		final TinyDB tinyDB = new TinyDB(ctx);
+
+		final String instanceUrl = tinyDB.getString("instanceUrl");
+		String repoFullName = tinyDB.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		final String repoOwner = parts[0];
+		final String repoName = parts[1];
+		final String loginUid = tinyDB.getString("loginUid");
+		final String token = "token " + tinyDB.getString(loginUid + "-token");
+
+		Milestones milestoneStateJson = new Milestones("open");
+		Call<JsonElement> call;
+
+		call = RetrofitClient
+				.getInstance(instanceUrl, ctx)
+				.getApiInterface()
+				.closeReopenMilestone(token, repoOwner, repoName, milestoneId_, milestoneStateJson);
+
+		call.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				if(response.isSuccessful()) {
+
+					Toasty.info(ctx, ctx.getString(R.string.milestoneStatusUpdate));
+					MilestonesViewModel.loadMilestonesList(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, token), repoOwner, repoName, "all", ctx);
+
+				}
+				else if(response.code() == 401) {
+
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+							ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+							ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+				}
+				else {
+
+					Toasty.info(ctx, ctx.getString(R.string.genericError));
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
+				Log.e(TAG, t.toString());
+
+			}
+
+		});
+
+	}
+
+}

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

@@ -13,6 +13,7 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -48,6 +49,8 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -61,6 +64,10 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
         mProgressBar = findViewById(R.id.progress_bar);
         noData = findViewById(R.id.noData);
 
+        addCollaboratorSearch.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(addCollaboratorSearch, InputMethodManager.SHOW_IMPLICIT);
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 

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

@@ -21,7 +21,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.AdminGetUsersAdapter;
-import org.mian.gitnex.fragments.AdminUsersBottomSheetFragment;
+import org.mian.gitnex.fragments.BottomSheetAdminUsersFragment;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.AppUtil;
@@ -34,7 +34,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class AdminGetUsersActivity extends BaseActivity implements AdminUsersBottomSheetFragment.BottomSheetListener {
+public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAdminUsersFragment.BottomSheetListener {
 
     private View.OnClickListener onClickListener;
     final Context ctx = this;
@@ -171,7 +171,7 @@ public class AdminGetUsersActivity extends BaseActivity implements AdminUsersBot
                 finish();
                 return true;
             case R.id.genericMenu:
-                AdminUsersBottomSheetFragment bottomSheet = new AdminUsersBottomSheetFragment();
+                BottomSheetAdminUsersFragment bottomSheet = new BottomSheetAdminUsersFragment();
                 bottomSheet.show(getSupportFragmentManager(), "usersBottomSheet");
                 return true;
             default:

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

@@ -2,67 +2,107 @@ package org.mian.gitnex.activities;
 
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
+import org.acra.ACRA;
+import org.acra.BuildConfig;
+import org.acra.annotation.AcraNotification;
+import org.acra.config.CoreConfigurationBuilder;
+import org.acra.config.LimiterConfigurationBuilder;
+import org.acra.config.MailSenderConfigurationBuilder;
+import org.acra.data.StringFormat;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.FontsOverride;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 
 /**
  * Author M M Arif
  */
 
+@AcraNotification(resIcon = R.drawable.gitnex_transparent,
+		resTitle = R.string.crashTitle,
+		resChannelName = R.string.setCrashReports,
+		resText = R.string.crashMessage)
+
 public abstract class BaseActivity extends AppCompatActivity {
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-        if(tinyDb.getInt("themeId") == 1) {
-            setTheme(R.style.AppThemeLight);
-        }
-        else {
-            setTheme(R.style.AppTheme);
-        }
+		if(tinyDb.getInt("themeId") == 1) {
+			setTheme(R.style.AppThemeLight);
+		}
+		else if(tinyDb.getInt("themeId") == 2) {
 
-        super.onCreate(savedInstanceState);
-        setContentView(getLayoutResourceId());
+			boolean timeSetterFlag = TimeHelper.timeBetweenHours(18, 6); // 6pm to 6am
 
-        if(tinyDb.getInt("customFontId") == 0) {
+			if(timeSetterFlag) {
+				setTheme(R.style.AppTheme);
+			}
+			else {
+				setTheme(R.style.AppThemeLight);
+			}
 
-            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");
+		}
+		else {
+			setTheme(R.style.AppTheme);
+		}
 
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
+		super.onCreate(savedInstanceState);
+		setContentView(getLayoutResourceId());
 
-            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");
+		switch(tinyDb.getInt("customFontId", -1)) {
 
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
+			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;
 
-            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");
+			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;
 
-        }
-        else {
+			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;
 
-            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");
+		}
 
-        }
+		// 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");
+		}
 
-    protected abstract int getLayoutResourceId();
+		if (tinyDb.getBoolean("crashReportingEnabled")) {
+
+			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);
+			ACRABuilder.setBuildConfigClass(BuildConfig.class).setReportFormat(StringFormat.KEY_VALUE_LIST);
+			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo(getResources().getString(R.string.appEmail)).setSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(getApplicationContext()))).setEnabled(true);
+			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
+			ACRA.init(getApplication(), ACRABuilder);
+
+		}
+
+	}
+
+	protected abstract int getLayoutResourceId();
 
 }
 

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

@@ -0,0 +1,325 @@
+package org.mian.gitnex.activities;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.method.ScrollingMovementMethod;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.mikepenz.fastadapter.IItemAdapter;
+import com.mikepenz.fastadapter.adapters.ItemAdapter;
+import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
+import com.mikepenz.fastadapter.listeners.ItemFilterListener;
+import com.mikepenz.fastadapter_extensions.items.ProgressItem;
+import com.mikepenz.fastadapter_extensions.scroll.EndlessRecyclerOnScrollListener;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.adapters.CommitsAdapter;
+import org.mian.gitnex.models.Commits;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import static com.mikepenz.fastadapter.adapters.ItemAdapter.items;
+
+/**
+ * Author M M Arif
+ */
+
+public class CommitsActivity extends BaseActivity implements ItemFilterListener<CommitsAdapter> {
+
+    private View.OnClickListener onClickListener;
+    private TextView noData;
+    private ProgressBar progressBar;
+    private SwipeRefreshLayout swipeRefreshLayout;
+    private String TAG = "CommitsActivity - ";
+    private int resultLimit = 50;
+    private boolean loadNextFlag = false;
+
+    private List<CommitsAdapter> items = new ArrayList<>();
+    private FastItemAdapter<CommitsAdapter> fastItemAdapter;
+    private ItemAdapter footerAdapter;
+    private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
+
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_commits;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        final String instanceUrl = tinyDb.getString("instanceUrl");
+        final String loginUid = tinyDb.getString("loginUid");
+        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        String branchName = getIntent().getStringExtra("branchName");
+
+        TextView toolbar_title = findViewById(R.id.toolbar_title);
+        toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+        toolbar_title.setText(branchName);
+
+        ImageView closeActivity = findViewById(R.id.close);
+        noData = findViewById(R.id.noDataCommits);
+        progressBar = findViewById(R.id.progress_bar);
+        swipeRefreshLayout = findViewById(R.id.pullToRefresh);
+
+        RecyclerView recyclerView = findViewById(R.id.recyclerView);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        recyclerView.setHasFixedSize(true);
+
+        initCloseListener();
+        closeActivity.setOnClickListener(onClickListener);
+
+        fastItemAdapter = new FastItemAdapter<>();
+        fastItemAdapter.withSelectable(true);
+
+        footerAdapter = items();
+        //noinspection unchecked
+        fastItemAdapter.addAdapter(1, footerAdapter);
+
+        fastItemAdapter.getItemFilter().withFilterPredicate((IItemAdapter.Predicate<CommitsAdapter>) (item, constraint) -> item.getCommitTitle().toLowerCase().contains(Objects.requireNonNull(constraint).toString().toLowerCase()));
+
+        fastItemAdapter.getItemFilter().withItemFilterListener(this);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        recyclerView.setItemAnimator(new DefaultItemAnimator());
+        recyclerView.setAdapter(fastItemAdapter);
+
+        endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(footerAdapter) {
+
+            @Override
+            public void onLoadMore(final int currentPage) {
+
+                loadNext(instanceUrl, instanceToken, repoOwner, repoName, currentPage, branchName);
+
+            }
+
+        };
+
+        swipeRefreshLayout.setOnRefreshListener(() -> {
+
+            progressBar.setVisibility(View.VISIBLE);
+            fastItemAdapter.clear();
+            endlessRecyclerOnScrollListener.resetPageCount();
+            swipeRefreshLayout.setRefreshing(false);
+
+        });
+
+        recyclerView.addOnScrollListener(endlessRecyclerOnScrollListener);
+
+        loadInitial(instanceUrl, instanceToken, repoOwner, repoName, branchName);
+
+        assert savedInstanceState != null;
+        fastItemAdapter.withSavedInstanceState(savedInstanceState);
+
+    }
+
+    private void loadInitial(String instanceUrl, String token, String repoOwner, String repoName, String branchName) {
+
+        Call<List<Commits>> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getRepositoryCommits(token, repoOwner, repoName,  1, branchName);
+
+        call.enqueue(new Callback<List<Commits>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
+
+                if (response.isSuccessful()) {
+
+                    assert response.body() != null;
+
+                    if(response.body().size() > 0) {
+
+                        if(response.body().size() == resultLimit) {
+                            loadNextFlag = true;
+                        }
+
+                        for (int i = 0; i < response.body().size(); i++) {
+
+                            items.add(new CommitsAdapter(getApplicationContext()).withNewItems(response.body().get(i).getCommit().getMessage(), response.body().get(i).getHtml_url(),
+                                    response.body().get(i).getCommit().getCommitter().getName(), response.body().get(i).getCommit().getCommitter().getDate()));
+
+                        }
+
+                        fastItemAdapter.add(items);
+
+                    }
+                    else {
+
+                        noData.setVisibility(View.VISIBLE);
+
+                    }
+
+                    progressBar.setVisibility(View.GONE);
+
+                }
+                else {
+
+                    Log.e(TAG, String.valueOf(response.code()));
+
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
+
+                Log.e(TAG, t.toString());
+
+            }
+
+        });
+
+    }
+
+    private void loadNext(String instanceUrl, String token, String repoOwner, String repoName, final int currentPage, String branchName) {
+
+        footerAdapter.clear();
+        //noinspection unchecked
+        footerAdapter.add(new ProgressItem().withEnabled(false));
+        Handler handler = new Handler();
+
+        handler.postDelayed(() -> {
+
+            Call<List<Commits>> call = RetrofitClient
+                    .getInstance(instanceUrl, getApplicationContext())
+                    .getApiInterface()
+                    .getRepositoryCommits(token, repoOwner, repoName, currentPage + 1, branchName);
+
+            call.enqueue(new Callback<List<Commits>>() {
+
+                @Override
+                public void onResponse(@NonNull Call<List<Commits>> call, @NonNull Response<List<Commits>> response) {
+
+                    if (response.isSuccessful()) {
+
+                        assert response.body() != null;
+
+                        if (response.body().size() > 0) {
+
+                            loadNextFlag = response.body().size() == resultLimit;
+
+                            for (int i = 0; i < response.body().size(); i++) {
+
+                                fastItemAdapter.add(fastItemAdapter.getAdapterItemCount(), new CommitsAdapter(getApplicationContext()).withNewItems(response.body().get(i).getCommit().getMessage(),
+                                        response.body().get(i).getHtml_url(), response.body().get(i).getCommit().getCommitter().getName(),
+                                        response.body().get(i).getCommit().getCommitter().getDate()));
+
+                            }
+
+                            footerAdapter.clear();
+
+                        }
+                        else {
+
+                            footerAdapter.clear();
+                        }
+
+                        progressBar.setVisibility(View.GONE);
+
+                    }
+                    else {
+
+                        Log.e(TAG, String.valueOf(response.code()));
+
+                    }
+
+                }
+
+                @Override
+                public void onFailure(@NonNull Call<List<Commits>> call, @NonNull Throwable t) {
+
+                    Log.e(TAG, t.toString());
+
+                }
+
+            });
+
+        }, 1000);
+
+        if(!loadNextFlag) {
+
+            footerAdapter.clear();
+
+        }
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.search_menu, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
+        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                fastItemAdapter.filter(newText);
+                return true;
+            }
+
+        });
+
+        endlessRecyclerOnScrollListener.enable();
+        return super.onCreateOptionsMenu(menu);
+
+    }
+
+    @Override
+    public void itemsFiltered(@Nullable CharSequence constraint, @Nullable List<CommitsAdapter> results) {
+        endlessRecyclerOnScrollListener.disable();
+    }
+
+    @Override
+    public void onReset() {
+        endlessRecyclerOnScrollListener.enable();
+    }
+
+    private void initCloseListener() {
+        onClickListener = view -> {
+            getIntent().removeExtra("branchName");
+            finish();
+        };
+    }
+
+}
+
+

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

@@ -6,6 +6,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -32,7 +33,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewFileActivity extends BaseActivity {
+public class CreateFileActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -59,6 +60,8 @@ public class NewFileActivity extends BaseActivity {
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -74,6 +77,10 @@ public class NewFileActivity extends BaseActivity {
         newFileBranchName = findViewById(R.id.newFileBranchName);
         newFileCommitMessage = findViewById(R.id.newFileCommitMessage);
 
+        newFileName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(newFileName, InputMethodManager.SHOW_IMPLICIT);
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
@@ -286,7 +293,7 @@ public class NewFileActivity extends BaseActivity {
                             }
                         }
 
-                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(getApplicationContext(),
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateFileActivity.this,
                                 R.layout.spinner_item, branchesList);
 
                         adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);

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

@@ -11,6 +11,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.DatePicker;
@@ -77,6 +78,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -96,6 +99,10 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         newIssueDescription = findViewById(R.id.newIssueDescription);
         labelsIdHolder = findViewById(R.id.labelsIdHolder);
 
+        newIssueTitle.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(newIssueTitle, InputMethodManager.SHOW_IMPLICIT);
+
         defaultMentionAdapter = new MentionArrayAdapter<>(this);
         loadCollaboratorsList();
 
@@ -360,7 +367,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
                             }
                         }
 
-                        ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(getApplicationContext(),
+                        ArrayAdapter<Milestones> adapter = new ArrayAdapter<>(CreateIssueActivity.this,
                                 R.layout.spinner_item, milestonesList);
 
                         adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);

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

@@ -11,6 +11,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -50,6 +51,8 @@ public class CreateLabelActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
@@ -61,7 +64,7 @@ public class CreateLabelActivity extends BaseActivity {
 
         if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("delete")) {
 
-            deleteLabel(instanceUrl, instanceToken, repoOwner, repoName, Integer.valueOf(Objects.requireNonNull(getIntent().getStringExtra("labelId"))), loginUid);
+            deleteLabel(instanceUrl, instanceToken, repoOwner, repoName, Integer.parseInt(Objects.requireNonNull(getIntent().getStringExtra("labelId"))), loginUid);
             finish();
             return;
 
@@ -74,6 +77,10 @@ public class CreateLabelActivity extends BaseActivity {
         labelName = findViewById(R.id.labelName);
         createLabelButton = findViewById(R.id.createLabelButton);
 
+        labelName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(labelName, InputMethodManager.SHOW_IMPLICIT);
+
         final ColorPicker cp = new ColorPicker(CreateLabelActivity.this, 235, 113, 33);
 
         initCloseListener();

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

@@ -9,6 +9,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
@@ -28,7 +29,7 @@ import java.util.Calendar;
  * Author M M Arif
  */
 
-public class NewMilestoneActivity extends BaseActivity implements View.OnClickListener {
+public class CreateMilestoneActivity extends BaseActivity implements View.OnClickListener {
 
     private EditText milestoneDueDate;
     private View.OnClickListener onClickListener;
@@ -48,12 +49,18 @@ public class NewMilestoneActivity extends BaseActivity implements View.OnClickLi
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         milestoneDueDate = findViewById(R.id.milestoneDueDate);
         ImageView closeActivity = findViewById(R.id.close);
         createNewMilestoneButton = findViewById(R.id.createNewMilestoneButton);
         milestoneTitle = findViewById(R.id.milestoneTitle);
         milestoneDescription = findViewById(R.id.milestoneDescription);
 
+        milestoneTitle.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(milestoneTitle, InputMethodManager.SHOW_IMPLICIT);
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
         milestoneDueDate.setOnClickListener(this);

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

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.util.Log;
 import android.util.Patterns;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -47,6 +48,8 @@ public class CreateNewUserActivity extends BaseActivity {
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         ImageView closeActivity = findViewById(R.id.close);
         createUserButton = findViewById(R.id.createUserButton);
         fullName = findViewById(R.id.fullName);
@@ -54,6 +57,10 @@ public class CreateNewUserActivity extends BaseActivity {
         userEmail = findViewById(R.id.userEmail);
         userPassword = findViewById(R.id.userPassword);
 
+        fullName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(fullName, InputMethodManager.SHOW_IMPLICIT);
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 

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

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -24,7 +25,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewOrganizationActivity extends BaseActivity {
+public class CreateOrganizationActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -45,10 +46,16 @@ public class NewOrganizationActivity extends BaseActivity {
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         closeActivity = findViewById(R.id.close);
         orgName = findViewById(R.id.newOrganizationName);
         orgDesc = findViewById(R.id.newOrganizationDescription);
 
+        orgName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(orgName, InputMethodManager.SHOW_IMPLICIT);
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 

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

@@ -9,6 +9,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -59,6 +60,8 @@ public class CreateReleaseActivity extends BaseActivity {
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
@@ -75,6 +78,10 @@ public class CreateReleaseActivity extends BaseActivity {
         releaseType = findViewById(R.id.releaseType);
         releaseDraft = findViewById(R.id.releaseDraft);
 
+        releaseTagName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(releaseTagName, InputMethodManager.SHOW_IMPLICIT);
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
@@ -253,7 +260,7 @@ public class CreateReleaseActivity extends BaseActivity {
                             }
                         }
 
-                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(getApplicationContext(),
+                        ArrayAdapter<Branches> adapter = new ArrayAdapter<>(CreateReleaseActivity.this,
                                 R.layout.spinner_item, branchesList);
 
                         adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);

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

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -24,7 +25,9 @@ import org.mian.gitnex.models.OrganizationRepository;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Pattern;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -32,7 +35,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewRepoActivity extends BaseActivity {
+public class CreateRepoActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -43,13 +46,17 @@ public class NewRepoActivity extends BaseActivity {
     private CheckBox repoAccess;
     final Context ctx = this;
 
-    List<OrgOwner> orgsList = new ArrayList<>();
+    List<OrgOwner> organizationsList = new ArrayList<>();
+
+    //https://github.com/go-gitea/gitea/blob/52cfd2743c0e85b36081cf80a850e6a5901f1865/models/repo.go#L964-L967
+    final List<String> reservedRepoNames = Arrays.asList(".", "..");
+    final Pattern reservedRepoPatterns = Pattern.compile("\\.(git|wiki)$");
 
     @Override
     protected int getLayoutResourceId(){
         return R.layout.activity_new_repo;
     }
-    
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -62,17 +69,23 @@ public class NewRepoActivity extends BaseActivity {
         final String userLogin = tinyDb.getString("userLogin");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         closeActivity = findViewById(R.id.close);
         repoName = findViewById(R.id.newRepoName);
         repoDesc = findViewById(R.id.newRepoDescription);
         repoAccess = findViewById(R.id.newRepoPrivate);
 
+        repoName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(repoName, InputMethodManager.SHOW_IMPLICIT);
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
         spinner = findViewById(R.id.ownerSpinner);
         spinner.getBackground().setColorFilter(getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
-        getOrgs(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), userLogin);
+        getOrganizations(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), userLogin);
         spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@@ -98,7 +111,6 @@ public class NewRepoActivity extends BaseActivity {
             createRepo.setOnClickListener(createRepoListener);
 
         }
-
     }
 
     private View.OnClickListener createRepoListener = new View.OnClickListener() {
@@ -146,15 +158,23 @@ public class NewRepoActivity extends BaseActivity {
 
             Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorInvalid));
 
+        }
+        else if (reservedRepoNames.contains(newRepoName)) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedName));
+
+        }
+        else if (reservedRepoPatterns.matcher(newRepoName).find()) {
+
+            Toasty.info(getApplicationContext(), getString(R.string.repoNameErrorReservedPatterns));
+
         }
         else {
 
-            //Log.i("repoOwner", String.valueOf(repoOwner));
             disableProcessButton();
             createNewRepository(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), loginUid, newRepoName, newRepoDesc, repoOwner, newRepoAccess);
 
         }
-
     }
 
     private void createNewRepository(final String instanceUrl, final String token, String loginUid, String repoName, String repoDesc, String repoOwner, boolean isPrivate) {
@@ -222,10 +242,11 @@ public class NewRepoActivity extends BaseActivity {
                 enableProcessButton();
             }
         });
-
     }
 
-    private void getOrgs(String instanceUrl, String instanceToken, final String userLogin) {
+    private void getOrganizations(String instanceUrl, String instanceToken, final String userLogin) {
+
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         Call<List<OrgOwner>> call = RetrofitClient
                 .getInstance(instanceUrl, getApplicationContext())
@@ -240,26 +261,39 @@ public class NewRepoActivity extends BaseActivity {
                 if(response.isSuccessful()) {
                     if(response.code() == 200) {
 
-                        List<OrgOwner> orgsList_ = response.body();
+                        int organizationId = 0;
 
-                        orgsList.add(new OrgOwner(userLogin));
-                        assert orgsList_ != null;
-                        if(orgsList_.size() > 0) {
-                            for (int i = 0; i < orgsList_.size(); i++) {
+                        List<OrgOwner> organizationsList_ = response.body();
 
+                        organizationsList.add(new OrgOwner(userLogin));
+                        assert organizationsList_ != null;
+                        if(organizationsList_.size() > 0) {
+                            for (int i = 0; i < organizationsList_.size(); i++) {
+
+                                if(!tinyDb.getString("organizationId").isEmpty()) {
+                                    if (Integer.parseInt(tinyDb.getString("organizationId")) == organizationsList_.get(i).getId()) {
+                                        organizationId = i + 1;
+                                    }
+                                }
                                 OrgOwner data = new OrgOwner(
-                                        orgsList_.get(i).getUsername()
+                                        organizationsList_.get(i).getUsername()
                                 );
-                                orgsList.add(data);
+                                organizationsList.add(data);
 
                             }
                         }
 
-                        ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(getApplicationContext(),
-                                R.layout.spinner_item, orgsList);
+                        ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(CreateRepoActivity.this,
+                                R.layout.spinner_item, organizationsList);
 
                         adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
                         spinner.setAdapter(adapter);
+
+                        if (tinyDb.getBoolean("organizationAction") & organizationId != 0) {
+                            spinner.setSelection(organizationId);
+                            tinyDb.putBoolean("organizationAction", false);
+                        }
+
                         enableProcessButton();
 
                     }
@@ -282,7 +316,6 @@ public class NewRepoActivity extends BaseActivity {
                 enableProcessButton();
             }
         });
-
     }
 
     private void initCloseListener() {

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

@@ -9,6 +9,7 @@ import android.content.DialogInterface;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -76,6 +77,8 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         ImageView closeActivity = findViewById(R.id.close);
         teamName = findViewById(R.id.teamName);
         teamDesc = findViewById(R.id.teamDesc);
@@ -85,6 +88,10 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         teamAccessControlsArray = findViewById(R.id.teamAccessControlsArray);
         createTeamButton = findViewById(R.id.createTeamButton);
 
+        teamName.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(teamName, InputMethodManager.SHOW_IMPLICIT);
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 

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

@@ -12,6 +12,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.DatePicker;
@@ -70,6 +71,8 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
         super.onCreate(savedInstanceState);
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -88,6 +91,10 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         editIssueDescription = findViewById(R.id.editIssueDescription);
         editIssueDueDate = findViewById(R.id.editIssueDueDate);
 
+        editIssueTitle.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(editIssueTitle, InputMethodManager.SHOW_IMPLICIT);
+
         defaultMentionAdapter = new MentionArrayAdapter<>(this);
         loadCollaboratorsList();
 
@@ -381,7 +388,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
                                         }
                                     }
 
-                                    ArrayAdapter<Milestones> adapter_ = new ArrayAdapter<>(getApplicationContext(),
+                                    ArrayAdapter<Milestones> adapter_ = new ArrayAdapter<>(EditIssueActivity.this,
                                             R.layout.spinner_item, milestonesList);
 
                                     adapter_.setDropDownViewResource(R.layout.spinner_dropdown_item);

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

@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.FilesDiffAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -72,18 +72,18 @@ public class FileDiffActivity extends BaseActivity {
 
         mProgressBar.setVisibility(View.VISIBLE);
 
-        String fileDiffName = tinyDb.getString("issueNumber")+".diff";
+        String pullIndex = tinyDb.getString("issueNumber");
 
-        getFileContents(tinyDb.getString("instanceUrlWithProtocol"), repoOwner, repoName, fileDiffName);
+        getPullDiffContent(tinyDb.getString("instanceUrlWithProtocol"), repoOwner, repoName, pullIndex);
 
     }
 
-    private void getFileContents(String instanceUrl, String owner, String repo, String filename) {
+    private void getPullDiffContent(String instanceUrl, String owner, String repo, String filename) {
 
         Call<ResponseBody> call = RetrofitClient
                 .getInstance(instanceUrl, getApplicationContext())
-                .getApiInterface()
-                .getFileDiffContents(owner, repo, filename);
+                .getWebInterface()
+                .getPullDiffContent(owner, repo, filename);
 
         call.enqueue(new Callback<ResponseBody>() {
 
@@ -121,7 +121,7 @@ public class FileDiffActivity extends BaseActivity {
                                         }
                                     }
 
-                                    String fileExtension = FilenameUtils.getExtension(fileNameFinal);
+                                    String fileExtension = FileUtils.getExtension(fileNameFinal);
 
                                     String fileContentsFinalWithBlankLines = fileContentsFinal.replaceAll( ".*@@.*", "" );
                                     String fileContentsFinalWithoutBlankLines = fileContentsFinal.replaceAll( ".*@@.*(\r?\n|\r)?", "" );
@@ -140,9 +140,9 @@ public class FileDiffActivity extends BaseActivity {
                                     String binaryFileRaw = binaryFile[1].substring(binaryFile[1].indexOf('\n')+1);
                                     String binaryFileFinal = binaryFile[1].substring(binaryFileRaw.indexOf('\n')+1);
 
-                                    String fileExtension = FilenameUtils.getExtension(getFileNameFinal);
+                                    String fileExtension = FileUtils.getExtension(getFileNameFinal);
 
-                                    if(appUtil.imageExtension(FilenameUtils.getExtension(getFileNameFinal))) {
+                                    if(appUtil.imageExtension(FileUtils.getExtension(getFileNameFinal))) {
 
                                         fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension), "", binaryFileFinal));
                                     }

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
@@ -13,6 +14,7 @@ import android.text.method.ScrollingMovementMethod;
 import android.util.Base64;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -30,7 +32,7 @@ import com.github.barteksc.pdfviewer.util.FitPolicy;
 import com.github.chrisbanes.photoview.PhotoView;
 import com.pddstudio.highlightjs.HighlightJsView;
 import com.pddstudio.highlightjs.models.Theme;
-import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.FileUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetFileViewerFragment;
@@ -54,340 +56,367 @@ import retrofit2.Callback;
 
 public class FileViewActivity extends BaseActivity implements BottomSheetFileViewerFragment.BottomSheetListener {
 
-    private View.OnClickListener onClickListener;
-    private TextView singleFileContents;
-    private LinearLayout singleFileContentsFrame;
-    private HighlightJsView singleCodeContents;
-    private PhotoView imageView;
-    final Context ctx = this;
-    private ProgressBar mProgressBar;
-    private byte[] imageData;
-    private PDFView pdfView;
-    private LinearLayout pdfViewFrame;
-    private byte[] decodedPdf;
-    private Boolean pdfNightMode;
-    private static final int PERMISSION_REQUEST_CODE = 1;
+	private View.OnClickListener onClickListener;
+	private TextView singleFileContents;
+	private LinearLayout singleFileContentsFrame;
+	private LinearLayout highlightJs;
+	//private HighlightJsView singleCodeContents;
+	private PhotoView imageView;
+	final Context ctx = this;
+	private ProgressBar mProgressBar;
+	private byte[] imageData;
+	private PDFView pdfView;
+	private LinearLayout pdfViewFrame;
+	private byte[] decodedPdf;
+	private Boolean pdfNightMode;
+	private static final int PERMISSION_REQUEST_CODE = 1;
 
-    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_file_view;
-    }
+	@Override
+	protected int getLayoutResourceId() {
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+		return R.layout.activity_file_view;
+	}
 
-        super.onCreate(savedInstanceState);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-        String repoFullName = tinyDb.getString("repoFullName");
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		super.onCreate(savedInstanceState);
+		Toolbar toolbar = findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
 
-        ImageView closeActivity = findViewById(R.id.close);
-        singleFileContents = findViewById(R.id.singleFileContents);
-        singleCodeContents = findViewById(R.id.singleCodeContents);
-        imageView = findViewById(R.id.imageView);
-        mProgressBar = findViewById(R.id.progress_bar);
-        pdfView = findViewById(R.id.pdfView);
-        pdfViewFrame = findViewById(R.id.pdfViewFrame);
-        singleFileContentsFrame = findViewById(R.id.singleFileContentsFrame);
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		final String repoOwner = parts[0];
+		final String repoName = parts[1];
+		final String instanceUrl = tinyDb.getString("instanceUrl");
+		final String loginUid = tinyDb.getString("loginUid");
+		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        String singleFileName = getIntent().getStringExtra("singleFileName");
+		ImageView closeActivity = findViewById(R.id.close);
+		singleFileContents = findViewById(R.id.singleFileContents);
+		highlightJs = findViewById(R.id.highlightJs);
+		//singleCodeContents = findViewById(R.id.singleCodeContents);
+		imageView = findViewById(R.id.imageView);
+		mProgressBar = findViewById(R.id.progress_bar);
+		pdfView = findViewById(R.id.pdfView);
+		pdfViewFrame = findViewById(R.id.pdfViewFrame);
+		singleFileContentsFrame = findViewById(R.id.singleFileContentsFrame);
 
-        TextView toolbar_title = findViewById(R.id.toolbar_title);
-        toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+		String singleFileName = getIntent().getStringExtra("singleFileName");
 
-        initCloseListener();
-        closeActivity.setOnClickListener(onClickListener);
-
-        tinyDb.putString("downloadFileContents", "");
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
+		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
 
-        try {
-
-            singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
-            singleFileName = singleFileName.replaceAll("//", "/");
-            singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
-
-        }
-        catch (UnsupportedEncodingException e) {
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
 
-            assert singleFileName != null;
-            Log.i("singleFileName", singleFileName);
+		tinyDb.putString("downloadFileContents", "");
 
-        }
-
-        toolbar_title.setText(singleFileName);
+		try {
 
-        getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);
-
-    }
+			singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
+			singleFileName = singleFileName.replaceAll("//", "/");
+			singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
 
-    private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {
+		}
+		catch(UnsupportedEncodingException e) {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+			assert singleFileName != null;
+			Log.i("singleFileName", singleFileName);
 
-        Call<Files> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
-                .getApiInterface()
-                .getSingleFileContents(token, owner, repo, filename);
+		}
 
-        call.enqueue(new Callback<Files>() {
+		toolbar_title.setText(singleFileName);
 
-            @Override
-            public void onResponse(@NonNull Call<Files> call, @NonNull retrofit2.Response<Files> response) {
+		getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);
 
-                if (response.code() == 200) {
+	}
 
-                    AppUtil appUtil = new AppUtil();
-                    assert response.body() != null;
+	private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {
 
-                    if(!response.body().getContent().equals("")) {
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-                        String fileExtension = FilenameUtils.getExtension(filename);
-                        mProgressBar.setVisibility(View.GONE);
+		Call<Files> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getSingleFileContents(token, owner, repo, filename);
 
-                        // download file meta
-                        tinyDb.putString("downloadFileName", filename);
-                        tinyDb.putString("downloadFileContents", response.body().getContent());
+		call.enqueue(new Callback<Files>() {
 
-                        if(appUtil.imageExtension(fileExtension)) { // file is image
+			@Override
+			public void onResponse(@NonNull Call<Files> call, @NonNull retrofit2.Response<Files> response) {
 
-                            singleFileContentsFrame.setVisibility(View.GONE);
-                            singleCodeContents.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.GONE);
-                            imageView.setVisibility(View.VISIBLE);
+				if(response.code() == 200) {
 
-                            imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
-                            Drawable imageDrawable = new BitmapDrawable(getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
-                            imageView.setImageDrawable(imageDrawable);
+					AppUtil appUtil = new AppUtil();
+					assert response.body() != null;
 
-                        }
-                        else if (appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
+					if(!response.body().getContent().equals("")) {
 
-                            imageView.setVisibility(View.GONE);
-                            singleFileContentsFrame.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.GONE);
-                            singleCodeContents.setVisibility(View.VISIBLE);
+						String fileExtension = FileUtils.getExtension(filename);
+						mProgressBar.setVisibility(View.GONE);
 
-                            singleCodeContents.setTheme(Theme.GRUVBOX_DARK);
-                            singleCodeContents.setShowLineNumbers(true);
-                            singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
+						// download file meta
+						tinyDb.putString("downloadFileName", filename);
+						tinyDb.putString("downloadFileContents", response.body().getContent());
 
-                        }
-                        else if (appUtil.pdfExtension(fileExtension)) { // file is pdf
+						if(appUtil.imageExtension(fileExtension)) { // file is image
 
-                            imageView.setVisibility(View.GONE);
-                            singleFileContentsFrame.setVisibility(View.GONE);
-                            singleCodeContents.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.VISIBLE);
+							singleFileContentsFrame.setVisibility(View.GONE);
+							highlightJs.setVisibility(View.GONE);
+							//singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							imageView.setVisibility(View.VISIBLE);
 
-                            pdfNightMode = tinyDb.getBoolean("enablePdfMode");
+							imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+							Drawable imageDrawable = new BitmapDrawable(getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
+							imageView.setImageDrawable(imageDrawable);
 
-                            decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
-                            pdfView.fromBytes(decodedPdf)
-                                    .enableSwipe(true)
-                                    .swipeHorizontal(false)
-                                    .enableDoubletap(true)
-                                    .defaultPage(0)
-                                    .enableAnnotationRendering(false)
-                                    .password(null)
-                                    .scrollHandle(null)
-                                    .enableAntialiasing(true)
-                                    .spacing(0)
-                                    .autoSpacing(true)
-                                    .pageFitPolicy(FitPolicy.WIDTH)
-                                    .fitEachPage(true)
-                                    .pageSnap(false)
-                                    .pageFling(true)
-                                    .nightMode(pdfNightMode)
-                                    .load();
+						}
+						else if(appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
 
-                        }
-                        else if (appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded
+							pdfViewFrame.setVisibility(View.GONE);
+							imageView.setVisibility(View.GONE);
 
-                            imageView.setVisibility(View.GONE);
-                            singleCodeContents.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.GONE);
-                            singleFileContentsFrame.setVisibility(View.VISIBLE);
+							if(Build.VERSION.SDK_INT > 23) {
 
-                            singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
-                            singleFileContents.setGravity(Gravity.CENTER);
-                            singleFileContents.setTypeface(null, Typeface.BOLD);
+								highlightJs.setVisibility(View.VISIBLE);
+								LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+								assert inflater != null;
+								@SuppressLint("InflateParams") View mView = inflater.inflate(R.layout.custom_highlightjs, null);
+								HighlightJsView singleCodeContents = mView.findViewById(R.id.singleCodeContents);
+								highlightJs.addView(mView);
 
-                        }
-                        else { // file type not known - plain text view
+								singleFileContentsFrame.setVisibility(View.GONE);
+								singleCodeContents.setVisibility(View.VISIBLE);
 
-                            imageView.setVisibility(View.GONE);
-                            singleCodeContents.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.GONE);
-                            singleFileContentsFrame.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);
+								}
 
-                            singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
+								singleCodeContents.setShowLineNumbers(true);
+								singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
 
-                        }
+							}
+							else {
 
-                    }
-                    else {
-                        singleFileContents.setText("");
-                        mProgressBar.setVisibility(View.GONE);
-                    }
+								singleFileContents.setVisibility(View.VISIBLE);
+								singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
 
-                }
-                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(appUtil.pdfExtension(fileExtension)) { // file is pdf
 
-                }
-                else if(response.code() == 403) {
+							imageView.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.GONE);
+							highlightJs.setVisibility(View.GONE);
+							//singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.VISIBLE);
 
-                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));
+							pdfNightMode = tinyDb.getBoolean("enablePdfMode");
 
-                }
-                else if(response.code() == 404) {
-
-                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+							decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+							pdfView.fromBytes(decodedPdf).enableSwipe(true).swipeHorizontal(false).enableDoubletap(true).defaultPage(0).enableAnnotationRendering(false).password(null).scrollHandle(null).enableAntialiasing(true).spacing(0).autoSpacing(true).pageFitPolicy(FitPolicy.WIDTH).fitEachPage(true).pageSnap(false).pageFling(true).nightMode(pdfNightMode).load();
 
-                }
-                else {
-
-                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
-
-                }
+						}
+						else if(appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded
 
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<Files> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-            }
-        });
-
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        int id = item.getItemId();
-
-        switch (id) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.genericMenu:
-                BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
-                bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-
-    }
-
-    @Override
-    public void onButtonClicked(String text) {
-
-        switch (text) {
-            case "downloadFile":
-
-                if (Build.VERSION.SDK_INT >= 23)
-                {
-                    if (checkPermission())
-                    {
-                        requestFileDownload();
-                    }
-                    else {
-                        requestPermission();
-                    }
-                }
-                else
-                {
-                    requestFileDownload();
-                }
-                break;
-
-        }
-
-    }
-
-    private void requestFileDownload() {
-
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-
-        if(!tinyDb.getString("downloadFileContents").isEmpty()) {
-
-            File outputFileName = new File(tinyDb.getString("downloadFileName"));
-            final File downloadFilePath = new File(Environment.getExternalStorageDirectory().getPath() + "/Download/" + outputFileName.getName());
-
-            byte[] pdfAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
-            FileOutputStream fileOutputStream = null;
-
-            try {
-
-                fileOutputStream = new FileOutputStream(downloadFilePath, false);
-                Objects.requireNonNull(fileOutputStream).write(pdfAsBytes);
-                fileOutputStream.flush();
-                fileOutputStream.close();
-                Toasty.info(getApplicationContext(), getString(R.string.downloadFileSaved));
-
-            }
-            catch (IOException e) {
-                Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
-            }
-
-        }
-        else {
-            Toasty.error(getApplicationContext(), getString(R.string.waitLoadingDownloadFile));
-        }
-
-    }
-
-    private boolean checkPermission() {
-        int result = ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
-        return result == PackageManager.PERMISSION_GRANTED;
-    }
-
-    private void requestPermission() {
-        ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        switch (requestCode) {
-            case PERMISSION_REQUEST_CODE:
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    Log.i("PermissionsCheck", "Permission Granted");
-                }
-                else {
-                    Log.e("PermissionsCheck", "Permission Denied");
-                }
-                break;
-        }
-    }
-
-    private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                getIntent().removeExtra("singleFileName");
-                finish();
-            }
-        };
-    }
+							imageView.setVisibility(View.GONE);
+							highlightJs.setVisibility(View.GONE);
+							//singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							singleFileContentsFrame.setVisibility(View.VISIBLE);
+
+							singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
+							singleFileContents.setGravity(Gravity.CENTER);
+							singleFileContents.setTypeface(null, Typeface.BOLD);
+
+						}
+						else { // file type not known - plain text view
+
+							imageView.setVisibility(View.GONE);
+							highlightJs.setVisibility(View.GONE);
+							//singleCodeContents.setVisibility(View.GONE);
+							pdfViewFrame.setVisibility(View.GONE);
+							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.info(ctx, ctx.getString(R.string.authorizeError));
+
+				}
+				else if(response.code() == 404) {
+
+					Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+
+				}
+				else {
+
+					Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<Files> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+			}
+		});
+
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+
+		int id = item.getItemId();
+
+		switch(id) {
+			case android.R.id.home:
+				finish();
+				return true;
+			case R.id.genericMenu:
+				BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
+				bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+
+	}
+
+	@Override
+	public void onButtonClicked(String text) {
+
+		switch(text) {
+			case "downloadFile":
+
+				if(Build.VERSION.SDK_INT >= 23) {
+					if(checkPermission()) {
+						requestFileDownload();
+					}
+					else {
+						requestPermission();
+					}
+				}
+				else {
+					requestFileDownload();
+				}
+				break;
+
+		}
+
+	}
+
+	private void requestFileDownload() {
+
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+		if(!tinyDb.getString("downloadFileContents").isEmpty()) {
+
+			File outputFileName = new File(tinyDb.getString("downloadFileName"));
+			final File downloadFilePath = new File(Environment.getExternalStorageDirectory().getPath() + "/Download/" + outputFileName.getName());
+
+			byte[] pdfAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
+			FileOutputStream fileOutputStream = null;
+
+			try {
+
+				fileOutputStream = new FileOutputStream(downloadFilePath, false);
+				Objects.requireNonNull(fileOutputStream).write(pdfAsBytes);
+				fileOutputStream.flush();
+				fileOutputStream.close();
+				Toasty.info(getApplicationContext(), getString(R.string.downloadFileSaved));
+
+			}
+			catch(IOException e) {
+				Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
+			}
+
+		}
+		else {
+			Toasty.error(getApplicationContext(), getString(R.string.waitLoadingDownloadFile));
+		}
+
+	}
+
+	private boolean checkPermission() {
+
+		int result = ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
+		return result == PackageManager.PERMISSION_GRANTED;
+	}
+
+	private void requestPermission() {
+
+		ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+
+		switch(requestCode) {
+			case PERMISSION_REQUEST_CODE:
+				if(grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+					Log.i("PermissionsCheck", "Permission Granted");
+				}
+				else {
+					Log.e("PermissionsCheck", "Permission Denied");
+				}
+				break;
+		}
+	}
+
+	private void initCloseListener() {
+
+		onClickListener = new View.OnClickListener() {
+
+			@Override
+			public void onClick(View view) {
+
+				getIntent().removeExtra("singleFileName");
+				finish();
+			}
+		};
+	}
 
 }

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

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -17,7 +17,6 @@ import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.ext.tables.TablePlugin;
 import io.noties.markwon.ext.tasklist.TaskListPlugin;
 import io.noties.markwon.html.HtmlPlugin;
-import io.noties.markwon.image.AsyncDrawable;
 import io.noties.markwon.image.DefaultMediaDecoder;
 import io.noties.markwon.image.ImageItem;
 import io.noties.markwon.image.ImagesPlugin;
@@ -29,10 +28,12 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.Html;
@@ -50,14 +51,15 @@ import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
-import com.squareup.picasso.Picasso;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.IssueCommentsAdapter;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.fragments.SingleIssueBottomSheetFragment;
+import org.mian.gitnex.fragments.BottomSheetSingleIssueFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.LabelWidthCalculator;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.UserMentions;
 import org.mian.gitnex.models.IssueComments;
@@ -67,7 +69,6 @@ import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.viewmodels.IssueCommentsViewModel;
-import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
@@ -95,6 +96,7 @@ public class IssueDetailActivity extends BaseActivity {
     private HorizontalScrollView assigneesScrollView;
     private ScrollView scrollViewComments;
     private TextView issueModified;
+    private ImageView createNewComment;
     final Context ctx = this;
     private LinearLayout labelsLayout;
     private LinearLayout assigneesLayout;
@@ -132,6 +134,7 @@ public class IssueDetailActivity extends BaseActivity {
         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);
 
@@ -147,42 +150,56 @@ public class IssueDetailActivity extends BaseActivity {
         mRecyclerView.setNestedScrollingEnabled(false);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
 
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-                DividerItemDecoration.VERTICAL);
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        swipeRefresh.setRefreshing(false);
-                        IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, getApplicationContext());
-                    }
-                }, 500);
-            }
-        });
+        createNewComment.setOnClickListener(v -> startActivity(new Intent(ctx, ReplyToIssueActivity.class)));
+
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+
+            scrollViewComments.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+
+                if ((scrollY - oldScrollY) > 0 && createNewComment.isShown()) {
+                    createNewComment.setVisibility(View.GONE);
+                }
+                else if ((scrollY - oldScrollY) < 0) {
+                    createNewComment.setVisibility(View.VISIBLE);
+                }
+
+                if (!scrollViewComments.canScrollVertically(1)) { // bottom
+                    createNewComment.setVisibility(View.GONE);
+                }
+
+                if (!scrollViewComments.canScrollVertically(-1)) { // top
+                    createNewComment.setVisibility(View.VISIBLE);
+                }
+
+            });
+
+        }
+
+        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
+
+            swipeRefresh.setRefreshing(false);
+            IssueCommentsViewModel.loadIssueComments(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, getApplicationContext());
+
+        }, 500));
 
         Typeface myTypeface;
-        if(tinyDb.getInt("customFontId") == 0) {
 
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+        switch(tinyDb.getInt("customFontId", -1)) {
 
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
+            case 1:
+                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
+                break;
 
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
+            case 2:
+                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
+                break;
 
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+            default:
+                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+                break;
 
         }
 
@@ -211,7 +228,7 @@ public class IssueDetailActivity extends BaseActivity {
                 finish();
                 return true;
             case R.id.genericMenu:
-                SingleIssueBottomSheetFragment bottomSheet = new SingleIssueBottomSheetFragment();
+                BottomSheetSingleIssueFragment bottomSheet = new BottomSheetSingleIssueFragment();
                 bottomSheet.show(getSupportFragmentManager(), "singleIssueBottomSheet");
                 return true;
             default:
@@ -293,7 +310,7 @@ public class IssueDetailActivity extends BaseActivity {
 
     private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo, int index, String loginUid) {
 
-        IssueCommentsViewModel issueCommentsModel = ViewModelProviders.of(this).get(IssueCommentsViewModel.class);
+        IssueCommentsViewModel issueCommentsModel = new ViewModelProvider(this).get(IssueCommentsViewModel.class);
 
         issueCommentsModel.getIssueCommentList(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), owner, repo, index, getApplicationContext()).observe(this, new Observer<List<IssueComments>>() {
             @Override
@@ -326,44 +343,35 @@ public class IssueDetailActivity extends BaseActivity {
 
                         final Markwon markwon = Markwon.builder(Objects.requireNonNull(getApplicationContext()))
                                 .usePlugin(CorePlugin.create())
-                                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-                                    @Override
-                                    public void configureImages(@NonNull ImagesPlugin plugin) {
-                                        plugin.addSchemeHandler(new SchemeHandler() {
-                                            @NonNull
-                                            @Override
-                                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+                                .usePlugin(ImagesPlugin.create(plugin -> {
+                                    plugin.addSchemeHandler(new SchemeHandler() {
+                                        @NonNull
+                                        @Override
+                                        public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
 
-                                                final int resourceId = getApplicationContext().getResources().getIdentifier(
-                                                        raw.substring("drawable://".length()),
-                                                        "drawable",
-                                                        getApplicationContext().getPackageName());
+                                            final int resourceId = getApplicationContext().getResources().getIdentifier(
+                                                    raw.substring("drawable://".length()),
+                                                    "drawable",
+                                                    getApplicationContext().getPackageName());
 
-                                                final Drawable drawable = getApplicationContext().getDrawable(resourceId);
+                                            final Drawable drawable = getApplicationContext().getDrawable(resourceId);
 
-                                                assert drawable != null;
-                                                return ImageItem.withResult(drawable);
-                                            }
+                                            assert drawable != null;
+                                            return ImageItem.withResult(drawable);
+                                        }
 
-                                            @NonNull
-                                            @Override
-                                            public Collection<String> supportedSchemes() {
-                                                return Collections.singleton("drawable");
-                                            }
-                                        });
-                                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
-                                            @Nullable
-                                            @Override
-                                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
-                                                return null;
-                                            }
-                                        });
-                                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
-                                        plugin.addMediaDecoder(SvgMediaDecoder.create(getApplicationContext().getResources()));
-                                        plugin.addMediaDecoder(SvgMediaDecoder.create());
-                                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(getApplicationContext().getResources()));
-                                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-                                    }
+                                        @NonNull
+                                        @Override
+                                        public Collection<String> supportedSchemes() {
+                                            return Collections.singleton("drawable");
+                                        }
+                                    });
+                                    plugin.placeholderProvider(drawable -> null);
+                                    plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                                    plugin.addMediaDecoder(SvgMediaDecoder.create(getApplicationContext().getResources()));
+                                    plugin.addMediaDecoder(SvgMediaDecoder.create());
+                                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create(getApplicationContext().getResources()));
+                                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
 
                                 }))
                                 .usePlugin(new AbstractMarkwonPlugin() {
@@ -388,7 +396,7 @@ public class IssueDetailActivity extends BaseActivity {
                         tinyDb.putString("issueState", singleIssue.getState());
                         tinyDb.putString("issueTitle", singleIssue.getTitle());
 
-                        Picasso.get().load(singleIssue.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+                        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);
                         String issueNumber_ = "<font color='" + getApplicationContext().getResources().getColor(R.color.lightGray) + "'>" + getApplicationContext().getResources().getString(R.string.hash) + singleIssue.getNumber() + "</font>";
                         issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle()));
                         String cleanIssueDescription = singleIssue.getBody().trim();
@@ -406,7 +414,7 @@ public class IssueDetailActivity extends BaseActivity {
 
                                 ImageView assigneesView = new ImageView(getApplicationContext());
 
-                                Picasso.get().load(singleIssue.getAssignees().get(i).getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop().into(assigneesView);
+                                PicassoService.getInstance(ctx).get().load(singleIssue.getAssignees().get(i).getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop().into(assigneesView);
 
                                 assigneesLayout.addView(assigneesView);
                                 assigneesView.setLayoutParams(params1);
@@ -427,7 +435,7 @@ public class IssueDetailActivity extends BaseActivity {
 
                         if(singleIssue.getLabels() != null) {
                             labelsScrollView.setVisibility(View.VISIBLE);
-                            int width = 33;
+                            int width = 25;
                             for (int i = 0; i < singleIssue.getLabels().size(); i++) {
 
                                 String labelColor = singleIssue.getLabels().get(i).getColor();
@@ -443,11 +451,11 @@ public class IssueDetailActivity extends BaseActivity {
                                         .beginConfig()
                                         .useFont(Typeface.DEFAULT)
                                         .textColor(new ColorInverter().getContrastColor(color))
-                                        .fontSize(36)
-                                        .width((width * labelName.length()) - ((width / 4) * labelName.length()))
-                                        .height(60)
+                                        .fontSize(30)
+                                        .width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, 30, 15))
+                                        .height(50)
                                         .endConfig()
-                                        .buildRoundRect(labelName, color, 8);
+                                        .buildRoundRect(labelName, color, 10);
                                 labelsView.setImageDrawable(drawable);
 
                                 labelsLayout.addView(labelsView);
@@ -506,29 +514,11 @@ public class IssueDetailActivity extends BaseActivity {
                             issueDescription.setLayoutParams(paramsDesc);
                         }
 
-                        switch (timeFormat) {
-                            case "pretty": {
-                                PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-                                String createdTime = prettyTime.format(singleIssue.getCreated_at());
-                                issueCreatedTime.setText(createdTime);
-                                issueCreatedTime.setVisibility(View.VISIBLE);
-                                issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getCreated_at()), getApplicationContext()));
-                                break;
-                            }
-                            case "normal": {
-                                DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                                String createdTime = formatter.format(singleIssue.getCreated_at());
-                                issueCreatedTime.setText(createdTime);
-                                issueCreatedTime.setVisibility(View.VISIBLE);
-                                break;
-                            }
-                            case "normal1": {
-                                DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                                String createdTime = formatter.format(singleIssue.getCreated_at());
-                                issueCreatedTime.setText(createdTime);
-                                issueCreatedTime.setVisibility(View.VISIBLE);
-                                break;
-                            }
+                        issueCreatedTime.setText(TimeHelper.formatTime(singleIssue.getCreated_at(), new Locale(locale), timeFormat, ctx));
+                        issueCreatedTime.setVisibility(View.VISIBLE);
+
+                        if(timeFormat.equals("pretty")) {
+                            issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(singleIssue.getCreated_at()), ctx));
                         }
 
                         if(singleIssue.getMilestone() != null) {
@@ -567,12 +557,7 @@ public class IssueDetailActivity extends BaseActivity {
     }
 
     private void initCloseListener() {
-        View.OnClickListener onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
+        View.OnClickListener onClickListener = view -> finish();
     }
 
 }

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.GradientDrawable;
@@ -16,6 +15,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.RadioGroup;
+import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
@@ -23,7 +23,8 @@ import androidx.appcompat.app.AlertDialog;
 import com.tooltip.Tooltip;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.NetworkObserver;
+import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.models.GiteaVersion;
 import org.mian.gitnex.models.UserInfo;
@@ -32,6 +33,7 @@ import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -52,6 +54,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     private RadioGroup loginMethod;
     final Context ctx = this;
     private String device_id = "token";
+    private ScrollView layoutView;
 
     @Override
     protected int getLayoutResourceId(){
@@ -64,7 +67,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         super.onCreate(savedInstanceState);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+        NetworkObserver networkMonitor = new NetworkObserver(this);
 
         loginButton = findViewById(R.id.login_button);
         instanceUrlET = findViewById(R.id.instance_url);
@@ -77,57 +80,94 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         protocolSpinner = findViewById(R.id.httpsSpinner);
         loginMethod = findViewById(R.id.loginMethod);
         loginTokenCode = findViewById(R.id.loginTokenCode);
+        layoutView = findViewById(R.id.loginForm);
 
         viewTextAppVersion.setText(AppUtil.getAppVersion(getApplicationContext()));
 
         Resources res = getResources();
         String[] allProtocols = res.getStringArray(R.array.protocolValues);
 
-        final ArrayAdapter<String> adapterProtocols = new ArrayAdapter<String>(Objects.requireNonNull(getApplicationContext()),
+        final ArrayAdapter<String> adapterProtocols = new ArrayAdapter<String>(LoginActivity.this,
                 R.layout.spinner_item, allProtocols);
 
         adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item);
         protocolSpinner.setAdapter(adapterProtocols);
 
         protocolSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+
             public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
 
                 String value = getResources().getStringArray(R.array.protocolValues)[pos];
                 if(value.toLowerCase().equals("http")) {
-                    Toasty.info(getApplicationContext(), getResources().getString(R.string.protocolError));
+                    SnackBar.warning(getApplicationContext(), layoutView,getResources().getString(R.string.protocolError));
                 }
 
             }
+
             public void onNothingSelected(AdapterView<?> parent) {
             }
+
         });
 
         info_button.setOnClickListener(infoListener);
 
-        if(!connToInternet) {
+        if(tinyDb.getString("loginType").equals("basic")) { // username/password
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
-            return;
+            loginMethod.check(R.id.loginUsernamePassword);
+
+            loginUidET.setVisibility(View.VISIBLE);
+            loginPassword.setVisibility(View.VISIBLE);
+            otpCode.setVisibility(View.VISIBLE);
+            otpInfo.setVisibility(View.VISIBLE);
+            loginTokenCode.setVisibility(View.GONE);
+
+        }
+        else {
+
+            loginMethod.check(R.id.loginToken);
+
+            loginUidET.setVisibility(View.GONE);
+            loginPassword.setVisibility(View.GONE);
+            otpCode.setVisibility(View.GONE);
+            otpInfo.setVisibility(View.GONE);
+            loginTokenCode.setVisibility(View.VISIBLE);
 
         }
 
-        loginMethod.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup group, int checkedId) {
-                if(checkedId == R.id.loginUsernamePassword){
-                    loginUidET.setVisibility(View.VISIBLE);
-                    loginPassword.setVisibility(View.VISIBLE);
-                    otpCode.setVisibility(View.VISIBLE);
-                    otpInfo.setVisibility(View.VISIBLE);
-                    loginTokenCode.setVisibility(View.GONE);
-                } else {
-                    loginUidET.setVisibility(View.GONE);
-                    loginPassword.setVisibility(View.GONE);
-                    otpCode.setVisibility(View.GONE);
-                    otpInfo.setVisibility(View.GONE);
-                    loginTokenCode.setVisibility(View.VISIBLE);
-                }
+        loginMethod.setOnCheckedChangeListener((group, checkedId) -> {
+
+            if(checkedId == R.id.loginToken) {
+
+                loginUidET.setVisibility(View.GONE);
+                loginPassword.setVisibility(View.GONE);
+                otpCode.setVisibility(View.GONE);
+                otpInfo.setVisibility(View.GONE);
+                loginTokenCode.setVisibility(View.VISIBLE);
+
             }
+            else {
+
+                loginUidET.setVisibility(View.VISIBLE);
+                loginPassword.setVisibility(View.VISIBLE);
+                otpCode.setVisibility(View.VISIBLE);
+                otpInfo.setVisibility(View.VISIBLE);
+                loginTokenCode.setVisibility(View.GONE);
+
+            }
+
+        });
+
+        networkMonitor.onInternetStateListener(isAvailable -> {
+
+            if(isAvailable) {
+                enableProcessButton();
+                SnackBar.success(getApplicationContext(), layoutView, getResources().getString(R.string.netConnectionIsBack));
+            }
+            else {
+                disableProcessButton();
+                SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.checkNetConnection));
+            }
+
         });
 
         //login_button.setOnClickListener(this);
@@ -176,20 +216,16 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         }
     };
 
-    private View.OnClickListener infoListener = new View.OnClickListener() {
-        public void onClick(View v) {
-        new Tooltip.Builder(v)
-            .setText(R.string.urlInfoTooltip)
-            .setTextColor(getResources().getColor(R.color.white))
-            .setBackgroundColor(getResources().getColor(R.color.tooltipBackground))
-            .setCancelable(true)
-            .setDismissOnClick(true)
-            .setPadding(30)
-            .setCornerRadius(R.dimen.tooltipCornor)
-            .setGravity(Gravity.BOTTOM)
-            .show();
-        }
-    };
+    private View.OnClickListener infoListener = v -> new Tooltip.Builder(v)
+        .setText(R.string.urlInfoTooltip)
+        .setTextColor(getResources().getColor(R.color.white))
+        .setBackgroundColor(getResources().getColor(R.color.tooltipBackground))
+        .setCancelable(true)
+        .setDismissOnClick(true)
+        .setPadding(30)
+        .setCornerRadius(R.dimen.tooltipCornor)
+        .setGravity(Gravity.BOTTOM)
+        .show();
 
     @SuppressLint("ResourceAsColor")
     private void login() {
@@ -208,6 +244,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
         if(loginMethodType == R.id.loginUsernamePassword) {
 
+            tinyDb.putString("loginType", "basic");
+
             if(instanceUrl.contains("@")) {
 
                 String[] urlForHttpAuth = instanceUrl.split("@");
@@ -244,7 +282,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             }
             else {
                 instanceUrl = "http://" + instanceHost + "/api/v1/";
-                instanceUrlWithProtocol = "https://" + instanceHost;
+                instanceUrlWithProtocol = "http://" + instanceHost;
             }
 
             tinyDb.putString("instanceUrlRaw", instanceHost);
@@ -256,7 +294,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
                 if(instanceUrlET.getText().toString().equals("")) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldURL));
+                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldURL));
                     enableProcessButton();
                     loginButton.setText(R.string.btnLogin);
                     return;
@@ -264,7 +302,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 }
                 if(loginUid.equals("")) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldUsername));
+                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldUsername));
                     enableProcessButton();
                     loginButton.setText(R.string.btnLogin);
                     return;
@@ -272,7 +310,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 }
                 if(loginPassword.getText().toString().equals("")) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldPassword));
+                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldPassword));
                     enableProcessButton();
                     loginButton.setText(R.string.btnLogin);
                     return;
@@ -284,11 +322,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
                     if(appUtil.checkIntegers(loginOTP_)) {
 
-                        loginOTP = Integer.valueOf(loginOTP_);
+                        loginOTP = Integer.parseInt(loginOTP_);
                     }
                     else {
 
-                        Toasty.info(getApplicationContext(), getString(R.string.loginOTPTypeError));
+                        SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.loginOTPTypeError));
                         enableProcessButton();
                         loginButton.setText(R.string.btnLogin);
                         return;
@@ -302,13 +340,15 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             }
             else {
 
-                Toasty.info(getApplicationContext(), getString(R.string.checkNetConnection));
+                SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.checkNetConnection));
 
             }
 
         }
         else {
 
+            tinyDb.putString("loginType", "token");
+
             String instanceHost;
             if(AppUtil.httpCheck(instanceUrl)) {
 
@@ -333,11 +373,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             }
             else {
                 instanceUrl = "http://" + instanceHost + "/api/v1/";
-                instanceUrlWithProtocol = "https://" + instanceHost;
+                instanceUrlWithProtocol = "http://" + instanceHost;
             }
 
             tinyDb.putString("instanceUrlRaw", instanceHost);
-            //tinyDb.putString("loginUid", loginUid);
             tinyDb.putString("instanceUrl", instanceUrl);
             tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol);
 
@@ -345,7 +384,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
                 if (instanceUrlET.getText().toString().equals("")) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldURL));
+                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldURL));
                     enableProcessButton();
                     loginButton.setText(R.string.btnLogin);
                     return;
@@ -353,7 +392,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 }
                 if (loginToken_.equals("")) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.loginTokenError));
+                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.loginTokenError));
                     enableProcessButton();
                     loginButton.setText(R.string.btnLogin);
                     return;
@@ -364,7 +403,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             }
             else {
 
-                Toasty.info(getApplicationContext(), getString(R.string.checkNetConnection));
+                SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.checkNetConnection));
 
             }
 
@@ -374,12 +413,28 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
     private void versionCheck(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String loginToken_, final int loginType) {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-
-        Call<GiteaVersion> callVersion = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
-                .getApiInterface()
-                .getGiteaVersion();
+        Call<GiteaVersion> callVersion;
+        if (!loginToken_.isEmpty()) {
+            callVersion = RetrofitClient
+                    .getInstance(instanceUrl, getApplicationContext())
+                    .getApiInterface()
+                    .getGiteaVersionWithToken(loginToken_);
+        }
+        else {
+            final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
+            if (loginOTP != 0) {
+                callVersion = RetrofitClient
+                        .getInstance(instanceUrl, getApplicationContext())
+                        .getApiInterface()
+                        .getGiteaVersionWithOTP(credential,loginOTP);
+            }
+            else {
+                callVersion = RetrofitClient
+                        .getInstance(instanceUrl, getApplicationContext())
+                        .getApiInterface()
+                        .getGiteaVersionWithBasic(credential);
+            }
+        }
 
         callVersion.enqueue(new Callback<GiteaVersion>() {
 
@@ -395,7 +450,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
                     switch (vt) {
                         case UNSUPPORTED_NEW:
-                            //Toasty.info(getApplicationContext(), getString(R.string.versionUnsupportedNew));
+                            //SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.versionUnsupportedNew));
                         case SUPPORTED_LATEST:
                         case SUPPORTED_OLD:
                         case DEVELOPMENT:
@@ -410,21 +465,17 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                                     .setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
                                     .setCancelable(true)
                                     .setIcon(R.drawable.ic_warning)
-                                    .setNegativeButton(getString(R.string.cancelButton), new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            dialog.dismiss();
-                                            enableProcessButton();
-                                        }
+                                    .setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {
+
+                                        dialog.dismiss();
+                                        enableProcessButton();
+
                                     })
-                                    .setPositiveButton(getString(R.string.textContinue), new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
+                                    .setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
 
-                                            dialog.dismiss();
-                                            login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
+                                        dialog.dismiss();
+                                        login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
 
-                                        }
                                     });
 
                             AlertDialog alertDialog = alertDialogBuilder.create();
@@ -432,30 +483,37 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                             alertDialog.show();
                             return;
                         default: // UNKNOWN
-                            Toasty.info(getApplicationContext(), getString(R.string.versionUnknow));
+                            SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.versionUnknow));
                             enableProcessButton();
 
                     }
 
                 }
                 else if (responseVersion.code() == 403) {
+
                     login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
+
                 }
             }
 
             private void login(int loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken_) {
+
                 if (loginType == 1) {
                     letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);
                 }
                 else if (loginType == 2) { // token
                     letTheUserInViaToken(instanceUrl, loginToken_);
                 }
+
             }
 
             @Override
             public void onFailure(@NonNull Call<GiteaVersion> callVersion, Throwable t) {
 
                 Log.e("onFailure-version", t.toString());
+                SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.errorOnLogin));
+                enableProcessButton();
+                loginButton.setText(R.string.btnLogin);
 
             }
 
@@ -482,11 +540,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 if (response.isSuccessful()) {
 
                     if (response.code() == 200) {
-                        
+
                         tinyDb.putBoolean("loggedInMode", true);
                         assert userDetails != null;
                         tinyDb.putString(userDetails.getLogin() + "-token", loginToken_);
                         tinyDb.putString("loginUid", userDetails.getLogin());
+                        tinyDb.putString("userLogin", userDetails.getUsername());
 
                         enableProcessButton();
                         loginButton.setText(R.string.btnLogin);
@@ -498,18 +557,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 }
                 else if(response.code() == 401) {
 
-                    String toastError = getResources().getString(R.string.unauthorizedApiError);
-                    Toasty.info(getApplicationContext(), toastError);
-
+                    SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.unauthorizedApiError));
                     enableProcessButton();
                     loginButton.setText(R.string.btnLogin);
 
                 }
                 else {
 
-                    String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
-                    Toasty.info(getApplicationContext(), toastError);
-
+                    SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
                     enableProcessButton();
                     loginButton.setText(R.string.btnLogin);
 
@@ -519,10 +574,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
             @Override
             public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
+
                 Log.e("onFailure", t.toString());
-                Toasty.info(getApplicationContext(), getResources().getString(R.string.genericError));
+                SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericError));
                 enableProcessButton();
                 loginButton.setText(R.string.btnLogin);
+
             }
         });
 
@@ -530,20 +587,24 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
     private void letTheUserIn(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP) {
 
-        final String credential = Credentials.basic(loginUid, loginPass);
+        final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
 
         Call<List<UserTokens>> call;
         if(loginOTP != 0) {
+
             call = RetrofitClient
                     .getInstance(instanceUrl, getApplicationContext())
                     .getApiInterface()
                     .getUserTokensWithOTP(credential, loginOTP, loginUid);
+
         }
         else {
+
             call = RetrofitClient
                     .getInstance(instanceUrl, getApplicationContext())
                     .getApiInterface()
                     .getUserTokens(credential, loginUid);
+
         }
 
         call.enqueue(new Callback<List<UserTokens>>() {
@@ -596,16 +657,20 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
                             Call<UserTokens> callCreateToken;
                             if(loginOTP != 0) {
+
                                 callCreateToken = RetrofitClient
                                         .getInstance(instanceUrl, getApplicationContext())
                                         .getApiInterface()
                                         .createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken);
+
                             }
                             else {
+
                                 callCreateToken = RetrofitClient
                                         .getInstance(instanceUrl, getApplicationContext())
                                         .getApiInterface()
                                         .createNewToken(credential, loginUid, createUserToken);
+
                             }
 
                             callCreateToken.enqueue(new Callback<UserTokens>() {
@@ -623,14 +688,62 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
                                             if (!newToken.getSha1().equals("")) {
 
-                                                tinyDb.remove("loginPass");
-                                                tinyDb.putBoolean("loggedInMode", true);
-                                                tinyDb.putString(loginUid + "-token", newToken.getSha1());
-                                                tinyDb.putString(loginUid + "-token-last-eight", appUtil.getLastCharactersOfWord(newToken.getSha1(), 8));
-                                                //Log.i("Tokens", "new:" + newToken.getSha1() + " old:" + tinyDb.getString(loginUid + "-token"));
+                                                Call<UserInfo> call = RetrofitClient
+                                                        .getInstance(instanceUrl, getApplicationContext())
+                                                        .getApiInterface()
+                                                        .getUserInfo("token " + newToken.getSha1());
 
-                                                startActivity(new Intent(LoginActivity.this, MainActivity.class));
-                                                finish();
+                                                call.enqueue(new Callback<UserInfo>() {
+
+                                                    @Override
+                                                    public void onResponse(@NonNull Call<UserInfo> call, @NonNull retrofit2.Response<UserInfo> response) {
+
+                                                        UserInfo userDetails = response.body();
+
+                                                        if (response.isSuccessful()) {
+
+                                                            if (response.code() == 200) {
+
+                                                                tinyDb.remove("loginPass");
+                                                                tinyDb.putBoolean("loggedInMode", true);
+                                                                assert userDetails != null;
+                                                                tinyDb.putString("userLogin", userDetails.getUsername());
+                                                                tinyDb.putString(loginUid + "-token", newToken.getSha1());
+                                                                tinyDb.putString(loginUid + "-token-last-eight", appUtil.getLastCharactersOfWord(newToken.getSha1(), 8));
+
+                                                                startActivity(new Intent(LoginActivity.this, MainActivity.class));
+                                                                finish();
+
+                                                            }
+
+                                                        }
+                                                        else if(response.code() == 401) {
+
+                                                            SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.unauthorizedApiError));
+                                                            enableProcessButton();
+                                                            loginButton.setText(R.string.btnLogin);
+
+                                                        }
+                                                        else {
+
+                                                            SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
+                                                            enableProcessButton();
+                                                            loginButton.setText(R.string.btnLogin);
+
+                                                        }
+
+                                                    }
+
+                                                    @Override
+                                                    public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
+
+                                                        Log.e("onFailure", t.toString());
+                                                        SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericError));
+                                                        enableProcessButton();
+                                                        loginButton.setText(R.string.btnLogin);
+
+                                                    }
+                                                });
 
                                             }
 
@@ -639,8 +752,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                                     }
                                     else if(responseCreate.code() == 500) {
 
-                                        String toastError = getResources().getString(R.string.genericApiStatusError) + responseCreate.code();
-                                        Toasty.info(getApplicationContext(), toastError);
+                                        SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.genericApiStatusError) + responseCreate.code());
                                         enableProcessButton();
                                         loginButton.setText(R.string.btnLogin);
 
@@ -649,7 +761,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                                 }
 
                                 @Override
-                                public void onFailure(@NonNull Call<UserTokens> createUserToken, Throwable t) {
+                                public void onFailure(@NonNull Call<UserTokens> createUserToken, @NonNull Throwable t) {
+
+                                    Log.e("onFailure-token", t.toString());
 
                                 }
 
@@ -657,10 +771,61 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                         }
                         else {
 
-                            //Log.i("Current Token", tinyDb.getString(loginUid + "-token"));
-                            tinyDb.putBoolean("loggedInMode", true);
-                            startActivity(new Intent(LoginActivity.this, MainActivity.class));
-                            finish();
+                            String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+
+                            Call<UserInfo> callGetUsername = RetrofitClient
+                                    .getInstance(instanceUrl, getApplicationContext())
+                                    .getApiInterface()
+                                    .getUserInfo(instanceToken);
+
+                            callGetUsername.enqueue(new Callback<UserInfo>() {
+
+                                @Override
+                                public void onResponse(@NonNull Call<UserInfo> call, @NonNull retrofit2.Response<UserInfo> response) {
+
+                                    UserInfo userDetails = response.body();
+
+                                    if (response.isSuccessful()) {
+
+                                        if (response.code() == 200) {
+
+                                            assert userDetails != null;
+                                            tinyDb.putString("userLogin", userDetails.getUsername());
+
+                                            tinyDb.putBoolean("loggedInMode", true);
+                                            startActivity(new Intent(LoginActivity.this, MainActivity.class));
+                                            finish();
+
+                                        }
+
+                                    }
+                                    else if(response.code() == 401) {
+
+                                        SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.unauthorizedApiError));
+                                        enableProcessButton();
+                                        loginButton.setText(R.string.btnLogin);
+
+                                    }
+                                    else {
+
+                                        SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
+                                        enableProcessButton();
+                                        loginButton.setText(R.string.btnLogin);
+
+                                    }
+
+                                }
+
+                                @Override
+                                public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
+
+                                    Log.e("onFailure", t.toString());
+                                    SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericError));
+                                    enableProcessButton();
+                                    loginButton.setText(R.string.btnLogin);
+
+                                }
+                            });
 
                         }
 
@@ -669,18 +834,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                 }
                 else if(response.code() == 500) {
 
-                    String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
-                    Toasty.info(getApplicationContext(), toastError);
+                    SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.genericApiStatusError) + response.code());
                     enableProcessButton();
                     loginButton.setText(R.string.btnLogin);
 
                 }
                 else {
 
-                    String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
-                    //Log.i("error message else4", String.valueOf(response.code()));
-
-                    Toasty.info(getApplicationContext(), toastError);
+                    SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.genericApiStatusError) + response.code());
                     enableProcessButton();
                     loginButton.setText(R.string.btnLogin);
 
@@ -690,10 +851,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
             @Override
             public void onFailure(@NonNull Call<List<UserTokens>> call, @NonNull Throwable t) {
+
                 Log.e("onFailure-login", t.toString());
-                Toasty.info(getApplicationContext(), getResources().getString(R.string.malformedJson));
+                SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.malformedJson));
                 enableProcessButton();
                 loginButton.setText(R.string.btnLogin);
+
             }
         });
 

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;
 
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -11,6 +12,8 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
@@ -20,18 +23,19 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.squareup.picasso.NetworkPolicy;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.AboutFragment;
 import org.mian.gitnex.fragments.ExploreRepositoriesFragment;
 import org.mian.gitnex.fragments.MyRepositoriesFragment;
-import org.mian.gitnex.fragments.NavSubMenuBottomSheetFragment;
+import org.mian.gitnex.fragments.BottomSheetNavSubMenuFragment;
 import org.mian.gitnex.fragments.OrganizationsFragment;
 import org.mian.gitnex.fragments.SettingsFragment;
 import org.mian.gitnex.fragments.StarredRepositoriesFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.ChangeLog;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.GiteaVersion;
 import org.mian.gitnex.models.UserInfo;
@@ -98,31 +102,26 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         if(!tinyDb.getBoolean("loggedInMode")) {
-            logout();
+            logout(this, ctx);
             return;
         }
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
 
-        if(tinyDb.getInt("customFontId") == 0) {
+        switch(tinyDb.getInt("customFontId", -1)) {
 
-            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
+            case 0:
+                myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
+                break;
 
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
+            case 2:
+                myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf");
+                break;
 
-            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
+            default:
+                myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf");
+                break;
 
         }
 
@@ -156,12 +155,12 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
         drawer = findViewById(R.id.drawer_layout);
         NavigationView navigationView = findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
-        final View hView =  navigationView.getHeaderView(0);
+        final View hView = navigationView.getHeaderView(0);
 
         ImageView navSubMenu = hView.findViewById(R.id.navSubMenu);
         navSubMenu.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-                NavSubMenuBottomSheetFragment bottomSheet = new NavSubMenuBottomSheetFragment();
+                BottomSheetNavSubMenuFragment bottomSheet = new BottomSheetNavSubMenuFragment();
                 bottomSheet.show(getSupportFragmentManager(), "adminMenuBottomSheet");
             }
         });
@@ -204,7 +203,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
                 userAvatar = hView.findViewById(R.id.userAvatar);
                 if (!userAvatarNav.equals("")) {
-                    Picasso.get().load(userAvatarNav).networkPolicy(NetworkPolicy.OFFLINE).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
+                    PicassoService.getInstance(ctx).get().load(userAvatarNav).networkPolicy(NetworkPolicy.OFFLINE).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
                 }
 
                 userAvatar.setOnClickListener(new View.OnClickListener() {
@@ -285,6 +284,23 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
         }
 
+        // Changelog popup
+        int versionCode = 0;
+        try {
+            PackageInfo packageInfo = getApplicationContext().getPackageManager()
+                    .getPackageInfo(getApplicationContext().getPackageName(), 0);
+            versionCode = packageInfo.versionCode;
+        }
+        catch (PackageManager.NameNotFoundException e) {
+            Log.e("changelogDialog", Objects.requireNonNull(e.getMessage()));
+        }
+
+        if (versionCode > tinyDb.getInt("versionCode")) {
+            tinyDb.putInt("versionCode", versionCode);
+            tinyDb.putBoolean("versionFlag", true);
+            ChangeLog changelogDialog = new ChangeLog(this);
+            changelogDialog.showDialog();
+        }
     }
 
     public void setActionBarTitle (@NonNull String title) {
@@ -334,7 +350,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
                         new SettingsFragment()).commit();
                 break;
             case R.id.nav_logout:
-                logout();
+                logout(this, ctx);
                 overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
                 break;
             case R.id.nav_about:
@@ -372,15 +388,15 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
         }
     }
 
-    public void logout() {
+    public static void logout(Activity activity, Context ctx) {
 
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+        TinyDB tinyDb = new TinyDB(ctx.getApplicationContext());
         tinyDb.putBoolean("loggedInMode", false);
         tinyDb.remove("basicAuthPassword");
         tinyDb.putBoolean("basicAuthFlag", false);
         //tinyDb.clear();
-        finish();
-        startActivity(new Intent(MainActivity.this, LoginActivity.class));
+        activity.finish();
+        ctx.startActivity(new Intent(ctx, LoginActivity.class));
 
     }
 
@@ -388,10 +404,12 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
+        final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
+
         Call<GiteaVersion> callVersion = RetrofitClient
                 .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .getGiteaVersion();
+                .getGiteaVersionWithToken(token);
 
         callVersion.enqueue(new Callback<GiteaVersion>() {
 
@@ -468,7 +486,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
                         userAvatar = hView.findViewById(R.id.userAvatar);
                         if (!Objects.requireNonNull(userDetails).getAvatar().equals("")) {
-                            Picasso.get().load(userDetails.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
+                            PicassoService.getInstance(ctx).get().load(userDetails.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
                         } else {
                             userAvatar.setImageResource(R.mipmap.app_logo_round);
                         }

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

@@ -1,15 +1,20 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.NonNull;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.Spinner;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
 import com.hendraanggrian.appcompat.socialview.Mention;
 import com.hendraanggrian.appcompat.widget.MentionArrayAdapter;
 import com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView;
@@ -18,10 +23,13 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.MergePullRequest;
+import org.mian.gitnex.models.MergePullRequestSpinner;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
 import java.util.List;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
@@ -34,228 +42,267 @@ import retrofit2.Response;
 
 public class MergePullRequestActivity extends BaseActivity {
 
-    public ImageView closeActivity;
-    private View.OnClickListener onClickListener;
+	public ImageView closeActivity;
+	private View.OnClickListener onClickListener;
 
-    final Context ctx = this;
+	final Context ctx = this;
 
-    private SocialAutoCompleteTextView mergePR;
-    private ArrayAdapter<Mention> defaultMentionAdapter;
-    private Button mergeButton;
+	private SocialAutoCompleteTextView mergeDescription;
+	private EditText mergeTitle;
+	private Spinner mergeModeSpinner;
+	private ArrayAdapter<Mention> defaultMentionAdapter;
+	private Button mergeButton;
+	private String Do;
 
-    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_merge_pull_request;
-    }
+	@Override
+	protected int getLayoutResourceId() {
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+		return R.layout.activity_merge_pull_request;
+	}
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+	@SuppressLint("SetTextI18n")
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
 
-        mergePR = findViewById(R.id.mergePR);
-        mergePR.setShowSoftInputOnFocus(true);
+		super.onCreate(savedInstanceState);
 
-        defaultMentionAdapter = new MentionArrayAdapter<>(this);
-        loadCollaboratorsList();
+		boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+		TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-        mergePR.setMentionAdapter(defaultMentionAdapter);
+		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        closeActivity = findViewById(R.id.close);
-        TextView toolbar_title = findViewById(R.id.toolbar_title);
+		mergeModeSpinner = findViewById(R.id.mergeSpinner);
+		mergeDescription = findViewById(R.id.mergeDescription);
+		mergeTitle = findViewById(R.id.mergeTitle);
 
-        if(!tinyDb.getString("issueTitle").isEmpty()) {
-            toolbar_title.setText(tinyDb.getString("issueTitle"));
-        }
+		mergeTitle.requestFocus();
+		assert imm != null;
+		imm.showSoftInput(mergeTitle, InputMethodManager.SHOW_IMPLICIT);
 
-        initCloseListener();
-        closeActivity.setOnClickListener(onClickListener);
+		setMergeAdapter();
 
-        mergeButton = findViewById(R.id.mergeButton);
+		mergeModeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
 
-        if(!connToInternet) {
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
 
-            disableProcessButton();
+				MergePullRequestSpinner mergeId = (MergePullRequestSpinner) parent.getSelectedItem();
+				Do = mergeId.getId();
 
-        } else {
+			}
 
-            mergeButton.setOnClickListener(mergePullRequest);
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
 
-        }
+			}
 
-    }
+		});
 
-    public void loadCollaboratorsList() {
+		defaultMentionAdapter = new MentionArrayAdapter<>(this);
+		loadCollaboratorsList();
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+		mergeDescription.setMentionAdapter(defaultMentionAdapter);
 
-        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];
+		closeActivity = findViewById(R.id.close);
+		TextView toolbar_title = findViewById(R.id.toolbar_title);
 
-        Call<List<Collaborators>> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
-                .getApiInterface()
-                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
+		if(!tinyDb.getString("issueTitle").isEmpty()) {
+			toolbar_title.setText(tinyDb.getString("issueTitle"));
+			mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber")+ ")");
+		}
 
-        call.enqueue(new Callback<List<Collaborators>>() {
+		initCloseListener();
+		closeActivity.setOnClickListener(onClickListener);
 
-            @Override
-            public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
+		mergeButton = findViewById(R.id.mergeButton);
 
-                if (response.isSuccessful()) {
+		if(!connToInternet) {
 
-                    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()));
-                    }
+			disableProcessButton();
 
-                }
-                else {
+		}
+		else {
 
-                    Log.i("onResponse", String.valueOf(response.code()));
+			mergeButton.setOnClickListener(mergePullRequest);
 
-                }
+		}
 
-            }
+	}
 
-            @Override
-            public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
-                Log.i("onFailure", t.toString());
-            }
+	private void setMergeAdapter() {
 
-        });
-    }
+		TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-    private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
-    }
+		ArrayList<MergePullRequestSpinner> mergeList = new ArrayList<>();
 
-    private View.OnClickListener mergePullRequest = new View.OnClickListener() {
-        public void onClick(View v) {
-            processMergePullRequest();
-        }
-    };
+		mergeList.add(new MergePullRequestSpinner("merge", getResources().getString(R.string.mergeOptionMerge)));
+		mergeList.add(new MergePullRequestSpinner("rebase", getResources().getString(R.string.mergeOptionRebase)));
+		mergeList.add(new MergePullRequestSpinner("rebase-merge", getResources().getString(R.string.mergeOptionRebaseCommit)));
+		//squash merge works only on gitea v1.11.5 and higher due to a bug
+		if(VersionCheck.compareVersion("1.11.5", tinyDb.getString("giteaVersion")) < 1) {
+			mergeList.add(new MergePullRequestSpinner("squash", getResources().getString(R.string.mergeOptionSquash)));
+		}
 
-    private void processMergePullRequest() {
+		ArrayAdapter<MergePullRequestSpinner> adapter = new ArrayAdapter<>(MergePullRequestActivity.this, R.layout.spinner_item, mergeList);
+		adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+		mergeModeSpinner.setAdapter(adapter);
 
-        String mergePRDT = mergePR.getText().toString();
-        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
+	}
 
-        if(!connToInternet) {
+	public void loadCollaboratorsList() {
 
-            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
-            return;
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-        }
+		final String instanceUrl = tinyDb.getString("instanceUrl");
+		final String loginUid = tinyDb.getString("loginUid");
+		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		final String repoOwner = parts[0];
+		final String repoName = parts[1];
 
-        disableProcessButton();
-        String doWhat = "merge";
-        mergeFunction(doWhat, mergePRDT);
+		Call<List<Collaborators>> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
-    }
+		call.enqueue(new Callback<List<Collaborators>>() {
 
-    private void mergeFunction(String doWhat, String mergePRDT) {
+			@Override
+			public void onResponse(@NonNull Call<List<Collaborators>> call, @NonNull Response<List<Collaborators>> response) {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+				if(response.isSuccessful()) {
 
-        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"));
+					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()));
+					}
 
-        MergePullRequest mergePR = new MergePullRequest(doWhat, mergePRDT, null);
+				}
+				else {
 
-        Call<ResponseBody> call = RetrofitClient
-                .getInstance(instanceUrl, getApplicationContext())
-                .getApiInterface()
-                .mergePullRequest(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
+					Log.i("onResponse", String.valueOf(response.code()));
 
-        call.enqueue(new Callback<ResponseBody>() {
+				}
 
-            @Override
-            public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
+			}
 
-                if(response.code() == 200) {
+			@Override
+			public void onFailure(@NonNull Call<List<Collaborators>> call, @NonNull Throwable t) {
 
-                    Toasty.info(getApplicationContext(), getString(R.string.mergePRSuccessMsg));
-                    tinyDb.putBoolean("prMerged", true);
-                    tinyDb.putBoolean("resumePullRequests", true);
-                    finish();
+				Log.i("onFailure", t.toString());
+			}
 
-                }
-                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));
+	private void initCloseListener() {
 
-                }
-                else if(response.code() == 404) {
+		onClickListener = view -> finish();
+	}
 
-                    enableProcessButton();
-                    Toasty.info(getApplicationContext(), getString(R.string.mergePR404ErrorMsg));
+	private View.OnClickListener mergePullRequest = v -> processMergePullRequest();
 
-                }
-                else {
+	private void processMergePullRequest() {
 
-                    enableProcessButton();
-                    Toasty.info(getApplicationContext(), getString(R.string.genericError));
+		String mergePRDesc = mergeDescription.getText().toString();
+		String mergePRTitle = mergeTitle.getText().toString();
 
-                }
+		boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
-            }
+		if(!connToInternet) {
 
-            @Override
-            public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
-                Log.e("onFailure", t.toString());
-                enableProcessButton();
-            }
+			Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+			return;
 
-        });
+		}
 
-    }
+		disableProcessButton();
+		mergeFunction(Do, mergePRDesc, mergePRTitle);
 
-    private void disableProcessButton() {
+	}
 
-        mergeButton.setEnabled(false);
-        GradientDrawable shape =  new GradientDrawable();
-        shape.setCornerRadius( 8 );
-        shape.setColor(getResources().getColor(R.color.hintColor));
-        mergeButton.setBackground(shape);
+	private void mergeFunction(String Do, String mergePRDT, String mergeTitle) {
 
-    }
+		final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-    private void enableProcessButton() {
+		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"));
 
-        mergeButton.setEnabled(true);
-        GradientDrawable shape =  new GradientDrawable();
-        shape.setCornerRadius( 8 );
-        shape.setColor(getResources().getColor(R.color.btnBackground));
-        mergeButton.setBackground(shape);
+		MergePullRequest mergePR = new MergePullRequest(Do, mergePRDT, mergeTitle);
 
-    }
+		Call<ResponseBody> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().mergePullRequest(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, prIndex, mergePR);
+
+		call.enqueue(new Callback<ResponseBody>() {
+
+			@Override
+			public void onResponse(@NonNull Call<ResponseBody> call, @NonNull retrofit2.Response<ResponseBody> response) {
+
+				if(response.code() == 200) {
+
+					Toasty.info(getApplicationContext(), getString(R.string.mergePRSuccessMsg));
+					tinyDb.putBoolean("prMerged", true);
+					tinyDb.putBoolean("resumePullRequests", true);
+					finish();
+
+				}
+				else if(response.code() == 401) {
+
+					enableProcessButton();
+					AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
+
+				}
+				else if(response.code() == 404) {
+
+					enableProcessButton();
+					Toasty.info(getApplicationContext(), getString(R.string.mergePR404ErrorMsg));
+
+				}
+				else {
+
+					enableProcessButton();
+					Toasty.info(getApplicationContext(), getString(R.string.genericError));
+
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+				enableProcessButton();
+			}
+
+		});
+
+	}
+
+	private void disableProcessButton() {
+
+		mergeButton.setEnabled(false);
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.hintColor));
+		mergeButton.setBackground(shape);
+
+	}
+
+	private void enableProcessButton() {
+
+		mergeButton.setEnabled(true);
+		GradientDrawable shape = new GradientDrawable();
+		shape.setCornerRadius(8);
+		shape.setColor(getResources().getColor(R.color.btnBackground));
+		mergeButton.setBackground(shape);
+
+	}
 
 }

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

@@ -18,7 +18,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.fragments.MembersByOrgFragment;
-import org.mian.gitnex.fragments.OrgBottomSheetFragment;
+import org.mian.gitnex.fragments.BottomSheetOrganizationFragment;
 import org.mian.gitnex.fragments.OrganizationInfoFragment;
 import org.mian.gitnex.fragments.RepositoriesByOrgFragment;
 import org.mian.gitnex.fragments.TeamsByOrgFragment;
@@ -29,7 +29,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFragment.BottomSheetListener {
+public class OrganizationDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener {
 
     @Override
     protected int getLayoutResourceId(){
@@ -50,7 +50,7 @@ public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFra
         Objects.requireNonNull(getSupportActionBar()).setTitle(orgName);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        OrgDetailActivity.SectionsPagerAdapter mSectionsPagerAdapter = new OrgDetailActivity.SectionsPagerAdapter(getSupportFragmentManager());
+        OrganizationDetailActivity.SectionsPagerAdapter mSectionsPagerAdapter = new OrganizationDetailActivity.SectionsPagerAdapter(getSupportFragmentManager());
 
         ViewPager mViewPager = findViewById(R.id.container);
         mViewPager.setAdapter(mSectionsPagerAdapter);
@@ -58,24 +58,20 @@ public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFra
         TabLayout tabLayout = findViewById(R.id.tabs);
 
         Typeface myTypeface;
-        if(tinyDb.getInt("customFontId") == 0) {
 
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+        switch(tinyDb.getInt("customFontId", -1)) {
 
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
+            case 0:
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf");
+                break;
 
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
+            case 2:
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf");
+                break;
 
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+            default:
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf");
+                break;
 
         }
 
@@ -118,7 +114,7 @@ public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFra
                 finish();
                 return true;
             case R.id.repoMenu:
-                OrgBottomSheetFragment bottomSheet = new OrgBottomSheetFragment();
+                BottomSheetOrganizationFragment bottomSheet = new BottomSheetOrganizationFragment();
                 bottomSheet.show(getSupportFragmentManager(), "orgBottomSheet");
                 return true;
             default:
@@ -130,9 +126,15 @@ public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFra
     @Override
     public void onButtonClicked(String text) {
 
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+
         switch (text) {
+            case "repository":
+                tinyDb.putBoolean("organizationAction", true);
+                startActivity(new Intent(OrganizationDetailActivity.this, CreateRepoActivity.class));
+                break;
             case "team":
-                startActivity(new Intent(OrgDetailActivity.this, CreateTeamByOrgActivity.class));
+                startActivity(new Intent(OrganizationDetailActivity.this, CreateTeamByOrgActivity.class));
                 break;
         }
         //Log.i("clicked", text);
@@ -142,7 +144,7 @@ public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFra
     public class SectionsPagerAdapter extends FragmentPagerAdapter {
 
         SectionsPagerAdapter(FragmentManager fm) {
-            super(fm);
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         }
 
         @NonNull
@@ -151,7 +153,7 @@ public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFra
 
             TinyDB tinyDb = new TinyDB(getApplicationContext());
             String orgName;
-            if(getIntent().getStringExtra("orgName") != null || !getIntent().getStringExtra("orgName").equals("")) {
+            if(getIntent().getStringExtra("orgName") != null || !Objects.equals(getIntent().getStringExtra("orgName"), "")) {
                 orgName = getIntent().getStringExtra("orgName");
             }
             else {

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

@@ -21,7 +21,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class OrgTeamMembersActivity extends BaseActivity {
+public class OrganizationTeamMembersActivity extends BaseActivity {
 
     private TextView noDataMembers;
     private View.OnClickListener onClickListener;

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

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.util.Log;
 import android.util.Patterns;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -47,10 +48,16 @@ public class ProfileEmailActivity extends BaseActivity {
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         ImageView closeActivity = findViewById(R.id.close);
         userEmail = findViewById(R.id.userEmail);
         addEmailButton = findViewById(R.id.addEmailButton);
 
+        userEmail.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(userEmail, InputMethodManager.SHOW_IMPLICIT);
+
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 

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

@@ -9,6 +9,7 @@ import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -53,6 +54,8 @@ public class ReplyToIssueActivity extends BaseActivity {
 
         super.onCreate(savedInstanceState);
 
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         TinyDB tinyDb = new TinyDB(getApplicationContext());
 
@@ -67,6 +70,10 @@ public class ReplyToIssueActivity extends BaseActivity {
         closeActivity = findViewById(R.id.close);
         TextView toolbar_title = findViewById(R.id.toolbar_title);
 
+        addComment.requestFocus();
+        assert imm != null;
+        imm.showSoftInput(addComment, InputMethodManager.SHOW_IMPLICIT);
+
         if(!tinyDb.getString("issueTitle").isEmpty()) {
             toolbar_title.setText(tinyDb.getString("issueTitle"));
         }

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

@@ -25,18 +25,18 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.fragments.BottomSheetRepoFragment;
 import org.mian.gitnex.fragments.BranchesFragment;
-import org.mian.gitnex.fragments.ClosedIssuesFragment;
 import org.mian.gitnex.fragments.CollaboratorsFragment;
 import org.mian.gitnex.fragments.FilesFragment;
-import org.mian.gitnex.fragments.IssuesFragment;
+import org.mian.gitnex.fragments.IssuesMainFragment;
 import org.mian.gitnex.fragments.LabelsFragment;
 import org.mian.gitnex.fragments.MilestonesFragment;
 import org.mian.gitnex.fragments.PullRequestsFragment;
 import org.mian.gitnex.fragments.ReleasesFragment;
-import org.mian.gitnex.fragments.RepoBottomSheetFragment;
 import org.mian.gitnex.fragments.RepoInfoFragment;
 import org.mian.gitnex.helpers.Authorization;
+import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.AppUtil;
@@ -48,9 +48,11 @@ import android.net.Uri;
  * Author M M Arif
  */
 
-public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetFragment.BottomSheetListener {
+public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoFragment.BottomSheetListener {
 
-    private TextView textViewBadge;
+    private TextView textViewBadgeIssue;
+    private TextView textViewBadgePull;
+    private TextView textViewBadgeRelease;
 
     @Override
     protected int getLayoutResourceId(){
@@ -89,24 +91,20 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
         TabLayout tabLayout = findViewById(R.id.tabs);
 
         Typeface myTypeface;
-        if(tinyDb.getInt("customFontId") == 0) {
 
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+        switch(tinyDb.getInt("customFontId", -1)) {
 
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
+            case 0:
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf");
+                break;
 
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
+            case 2:
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf");
+                break;
 
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
+            default:
+                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf");
+                break;
 
         }
 
@@ -126,28 +124,69 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
             }
         }
 
+        // only show Collaborators if you have permission to
+        final View collaboratorTab = vg.getChildAt(8);
+        if (tinyDb.getBoolean("isRepoAdmin")) {
+            collaboratorTab.setVisibility(View.VISIBLE);
+        }
+        else {
+            collaboratorTab.setVisibility(View.GONE);
+        }
+
         mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 
-        if(tinyDb.getBoolean("enableCounterIssueBadge")) {
+        if(tinyDb.getBoolean("enableCounterBadges")) {
 
-            @SuppressLint("InflateParams") View tabHeader = LayoutInflater.from(this).inflate(R.layout.badge, null);
-            textViewBadge = tabHeader.findViewById(R.id.counterBadge);
-            if(!tinyDb.getString("issuesCounter").isEmpty()) {
-                getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
-            }
-            Objects.requireNonNull(tabLayout.getTabAt(2)).setCustomView(tabHeader);
+            @SuppressLint("InflateParams") View tabHeader2 = LayoutInflater.from(this).inflate(R.layout.badge_issue, null);
+            textViewBadgeIssue = tabHeader2.findViewById(R.id.counterBadgeIssue);
 
-            TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(2);
+            @SuppressLint("InflateParams") View tabHeader4 = LayoutInflater.from(this).inflate(R.layout.badge_pull, null);
+            textViewBadgePull = tabHeader4.findViewById(R.id.counterBadgePull);
+
+            @SuppressLint("InflateParams") View tabHeader6 = LayoutInflater.from(this).inflate(R.layout.badge_release, null);
+            textViewBadgeRelease = tabHeader6.findViewById(R.id.counterBadgeRelease);
+
+            textViewBadgeIssue.setVisibility(View.GONE);
+            textViewBadgePull.setVisibility(View.GONE);
+            textViewBadgeRelease.setVisibility(View.GONE);
+
+            getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
             ColorStateList textColor = tabLayout.getTabTextColors();
-            assert tabOpenIssues != null;
-            TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeText);
-            openIssueTabView.setTextColor(textColor);
 
+            // issue count
+            if (textViewBadgeIssue.getText() != "") {
+                TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(2);
+                Objects.requireNonNull(tabLayout.getTabAt(2)).setCustomView(tabHeader2);
+                assert tabOpenIssues != null;
+                TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeIssueText);
+                openIssueTabView.setTextColor(textColor);
+            }
+
+            // pull count
+            if (textViewBadgePull.getText() != "") { // only show if API returned a number
+                Objects.requireNonNull(tabLayout.getTabAt(4)).setCustomView(tabHeader4);
+                TabLayout.Tab tabOpenPulls = tabLayout.getTabAt(4);
+                assert tabOpenPulls != null;
+                TextView openPullTabView = Objects.requireNonNull(tabOpenPulls.getCustomView()).findViewById(R.id.counterBadgePullText);
+                openPullTabView.setTextColor(textColor);
+            }
+
+            // release count
+            if (VersionCheck.compareVersion("1.11.5", tinyDb.getString("giteaVersion")) < 1) {
+                if(textViewBadgeRelease.getText() != "") { // only show if API returned a number
+                    Objects.requireNonNull(tabLayout.getTabAt(5)).setCustomView(tabHeader6);
+                    TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(5);
+                    assert tabOpenRelease != null;
+                    TextView openReleaseTabView = Objects.requireNonNull(tabOpenRelease.getCustomView()).findViewById(R.id.counterBadgeReleaseText);
+                    openReleaseTabView.setTextColor(textColor);
+                }
+            }
         }
 
         checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
         checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
+
     }
 
     @Override
@@ -166,13 +205,16 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
         if(tinyDb.getBoolean("enableCounterIssueBadge")) {
             getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
         }
+
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.repo_dotted_menu, menu);
         return true;
+
     }
 
     @Override
@@ -185,7 +227,7 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
                 finish();
                 return true;
             case R.id.repoMenu:
-                RepoBottomSheetFragment bottomSheet = new RepoBottomSheetFragment();
+                BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
                 bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
                 return true;
             default:
@@ -197,6 +239,8 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
     @Override
     public void onButtonClicked(String text) {
 
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+
         switch (text) {
             case "label":
                 startActivity(new Intent(RepoDetailActivity.this, CreateLabelActivity.class));
@@ -205,7 +249,7 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
                 startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
                 break;
             case "newMilestone":
-                startActivity(new Intent(RepoDetailActivity.this, NewMilestoneActivity.class));
+                startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
                 break;
             case "addCollaborator":
                 startActivity(new Intent(RepoDetailActivity.this, AddCollaboratorToRepositoryActivity.class));
@@ -214,18 +258,18 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
                 startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
                 break;
             case "openWebRepo":
-                TinyDB tinyDb = new TinyDB(getApplicationContext());
-                String repoFullName = tinyDb.getString("repoFullName");
-                String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw");
-                if(!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) {
-                    instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol");
-                }
-                Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullName);
-                Intent i = new Intent(Intent.ACTION_VIEW, url);
+                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 "newFile":
-                startActivity(new Intent(RepoDetailActivity.this, NewFileActivity.class));
+                startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
                 break;
         }
 
@@ -249,42 +293,42 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
 
             Fragment fragment = null;
             switch (position) {
-                case 0: // information
-                    return RepoInfoFragment.newInstance(repoOwner, repoName);
-                case 1: // files
+                case 0: // files
                     return FilesFragment.newInstance(repoOwner, repoName);
+                case 1: // information
+                    return RepoInfoFragment.newInstance(repoOwner, repoName);
                 case 2: // issues
-                    fragment = new IssuesFragment();
-                    break;
-                case 3: // closed issues
-                    fragment = new ClosedIssuesFragment();
+                    fragment = new IssuesMainFragment();
                     break;
+                case 3: // branches
+                    return BranchesFragment.newInstance(repoOwner, repoName);
                 case 4: // pull requests
                     fragment = new PullRequestsFragment();
                     break;
-                case 5: // milestones
-                    return MilestonesFragment.newInstance(repoOwner, repoName);
-                case 6: // labels
-                    return LabelsFragment.newInstance(repoOwner, repoName);
-                case 7: // branches
-                    return BranchesFragment.newInstance(repoOwner, repoName);
-                case 8: // releases
+                case 5: // releases
                     return ReleasesFragment.newInstance(repoOwner, repoName);
-                case 9: // collaborators
+                case 6: // milestones
+                    return MilestonesFragment.newInstance(repoOwner, repoName);
+                case 7: // labels
+                    return LabelsFragment.newInstance(repoOwner, repoName);
+                case 8: // collaborators
                     return CollaboratorsFragment.newInstance(repoOwner, repoName);
             }
+            assert fragment != null;
             return fragment;
         }
 
         @Override
         public int getCount() {
-            return 10;
+            return 9;
         }
 
     }
 
     private void getRepoInfo(String instanceUrl, String token, final String owner, String repo) {
 
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
+
         Call<UserRepositories> call = RetrofitClient
                 .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
@@ -301,8 +345,24 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
 
                     if (response.code() == 200) {
 
-                        assert repoInfo != null;
-                        textViewBadge.setText(repoInfo.getOpen_issues_count());
+                        if(tinyDb.getBoolean("enableCounterBadges")) {
+                            assert repoInfo != null;
+
+                            if(repoInfo.getOpen_issues_count() != null) {
+                                textViewBadgeIssue.setVisibility(View.VISIBLE);
+                                textViewBadgeIssue.setText(repoInfo.getOpen_issues_count());
+                            }
+
+                            if(repoInfo.getOpen_pull_count() != null) {
+                                textViewBadgePull.setVisibility(View.VISIBLE);
+                                textViewBadgePull.setText(repoInfo.getOpen_pull_count());
+                            }
+
+                            if(repoInfo.getRelease_count() != null) {
+                                textViewBadgeRelease.setVisibility(View.VISIBLE);
+                                textViewBadgeRelease.setText(repoInfo.getRelease_count());
+                            }
+                        }
 
                     }
 
@@ -317,6 +377,7 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
             public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
                 Log.e("onFailure", t.toString());
             }
+
         });
 
     }

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

@@ -11,8 +11,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
 import java.util.ArrayList;
@@ -57,7 +57,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
     @NonNull
     @Override
     public AdminGetUsersAdapter.UsersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.admin_users_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_admin_users, parent, false);
         return new AdminGetUsersAdapter.UsersViewHolder(v);
     }
 
@@ -98,7 +98,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
             holder.userRole.setVisibility(View.GONE);
         }
 
-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
     }
 
     @Override

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

@@ -1,16 +1,17 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
+import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.CommitsActivity;
 import org.mian.gitnex.models.Branches;
 import org.mian.gitnex.util.TinyDB;
 import java.util.List;
+import java.util.Objects;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -27,14 +28,23 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.Branch
 
         private TextView branchNameTv;
         private TextView branchCommitAuthor;
-        private TextView branchCommitHash;
 
         private BranchesViewHolder(View itemView) {
             super(itemView);
 
             branchNameTv = itemView.findViewById(R.id.branchName);
             branchCommitAuthor = itemView.findViewById(R.id.branchCommitAuthor);
-            branchCommitHash = itemView.findViewById(R.id.branchCommitHash);
+            TextView 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);
+
+                }
+            });
 
         }
     }
@@ -47,7 +57,7 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.Branch
     @NonNull
     @Override
     public BranchesAdapter.BranchesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.branches_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_branches, parent, false);
         return new BranchesAdapter.BranchesViewHolder(v);
     }
 
@@ -67,10 +77,6 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchesAdapter.Branch
             holder.branchCommitAuthor.setText(mCtx.getResources().getString(R.string.commitAuthor, currentItem.getCommit().getAuthor().getUsername()));
         }
 
-        holder.branchCommitHash.setText(
-                Html.fromHtml("<a href='" + currentItem.getCommit().getUrl() + "'>" + mCtx.getResources().getString(R.string.commitLinkBranchesTab) + "</a> "));
-        holder.branchCommitHash.setMovementMethod(LinkMovementMethod.getInstance());
-
     }
 
     @Override

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

@@ -1,291 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.text.Html;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Filter;
-import android.widget.Filterable;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import com.squareup.picasso.Picasso;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.IssueDetailActivity;
-import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.models.Issues;
-import org.mian.gitnex.util.TinyDB;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-/**
- * Author M M Arif
- */
-
-public class ClosedIssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
-
-    private Context context;
-    private final int TYPE_LOAD = 0;
-    private List<Issues> issuesList;
-    private List<Issues> issuesListFull;
-    private ClosedIssuesAdapter.OnLoadMoreListener loadMoreListener;
-    private boolean isLoading = false, isMoreDataAvailable = true;
-
-    public ClosedIssuesAdapter(Context context, List<Issues> issuesListMain) {
-
-        this.context = context;
-        this.issuesList = issuesListMain;
-        issuesListFull = new ArrayList<>(issuesList);
-
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-        LayoutInflater inflater = LayoutInflater.from(context);
-
-        if(viewType == TYPE_LOAD){
-            return new ClosedIssuesAdapter.IssuesHolder(inflater.inflate(R.layout.repo_detail_issues_list, parent,false));
-        }
-        else {
-            return new ClosedIssuesAdapter.LoadHolder(inflater.inflate(R.layout.row_load,parent,false));
-        }
-
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-
-        if(position >= getItemCount()-1 && isMoreDataAvailable && !isLoading && loadMoreListener!=null) {
-
-            isLoading = true;
-            loadMoreListener.onLoadMore();
-
-        }
-
-        if(getItemViewType(position) == TYPE_LOAD) {
-
-            ((ClosedIssuesAdapter.IssuesHolder)holder).bindData(issuesList.get(position));
-
-        }
-
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-
-        if(issuesList.get(position).getTitle() != null) {
-            return TYPE_LOAD;
-        }
-        else {
-            return 1;
-        }
-
-    }
-
-    @Override
-    public int getItemCount() {
-
-        return issuesList.size();
-
-    }
-
-    class IssuesHolder extends RecyclerView.ViewHolder {
-
-        private TextView issueNumber;
-        private ImageView issueAssigneeAvatar;
-        private TextView issueTitle;
-        private TextView issueCreatedTime;
-        private TextView issueCommentsCount;
-        private RelativeLayout relativeLayoutFrame;
-
-        IssuesHolder(View itemView) {
-
-            super(itemView);
-
-            issueNumber = itemView.findViewById(R.id.issueNumber);
-            issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
-            issueTitle = itemView.findViewById(R.id.issueTitle);
-            issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
-            LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
-            issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
-            relativeLayoutFrame = itemView.findViewById(R.id.relativeLayoutFrame);
-
-            issueTitle.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-
-                    Context context = v.getContext();
-                    //Log.i("issueNumber", issueNumber.getText().toString());
-
-                    Intent intent = new Intent(context, IssueDetailActivity.class);
-                    intent.putExtra("issueNumber", issueNumber.getText());
-
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
-                    tinyDb.putString("issueType", "issue");
-                    context.startActivity(intent);
-
-                }
-            });
-            frameCommentsCount.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-
-                    Context context = v.getContext();
-                    //Log.i("issueNumber", issueNumber.getText().toString());
-
-                    Intent intent = new Intent(context, IssueDetailActivity.class);
-                    intent.putExtra("issueNumber", issueNumber.getText());
-
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
-                    tinyDb.putString("issueType", "issue");
-                    context.startActivity(intent);
-
-                }
-            });
-
-        }
-
-        @SuppressLint("SetTextI18n")
-        void bindData(Issues issuesModel){
-
-            final TinyDB tinyDb = new TinyDB(context);
-            final String locale = tinyDb.getString("locale");
-            final String timeFormat = tinyDb.getString("dateFormat");
-
-            /*if(issuesModel.getPull_request() != null) {
-                if (issuesModel.getPull_request().isMerged()) {
-                    relativeLayoutFrame.setVisibility(View.GONE);
-                    relativeLayoutFrame.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
-                }
-            }*/
-
-            if (!issuesModel.getUser().getFull_name().equals("")) {
-                issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
-            } else {
-                issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
-            }
-
-            if (issuesModel.getUser().getAvatar_url() != null) {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
-            } else {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
-            }
-
-            String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
-            issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
-
-            issueNumber.setText(String.valueOf(issuesModel.getNumber()));
-            issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
-
-            switch (timeFormat) {
-                case "pretty": {
-                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-                    String createdTime = prettyTime.format(issuesModel.getCreated_at());
-                    issueCreatedTime.setText(createdTime);
-                    issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issuesModel.getCreated_at()), context));
-                    break;
-                }
-                case "normal": {
-                    DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                    String createdTime = formatter.format(issuesModel.getCreated_at());
-                    issueCreatedTime.setText(createdTime);
-                    break;
-                }
-                case "normal1": {
-                    DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                    String createdTime = formatter.format(issuesModel.getCreated_at());
-                    issueCreatedTime.setText(createdTime);
-                    break;
-                }
-            }
-
-        }
-
-    }
-
-    static class LoadHolder extends RecyclerView.ViewHolder {
-
-        LoadHolder(View itemView) {
-            super(itemView);
-        }
-
-    }
-
-    public void setMoreDataAvailable(boolean moreDataAvailable) {
-
-        isMoreDataAvailable = moreDataAvailable;
-
-    }
-
-    public void notifyDataChanged() {
-
-        notifyDataSetChanged();
-        isLoading = false;
-
-    }
-
-    public interface OnLoadMoreListener {
-
-        void onLoadMore();
-
-    }
-
-    public void setLoadMoreListener(ClosedIssuesAdapter.OnLoadMoreListener loadMoreListener) {
-
-        this.loadMoreListener = loadMoreListener;
-
-    }
-
-    @Override
-    public Filter getFilter() {
-        return issuesFilter;
-    }
-
-    private Filter issuesFilter = new Filter() {
-        @Override
-        protected FilterResults performFiltering(CharSequence constraint) {
-            List<Issues> filteredList = new ArrayList<>();
-
-            if (constraint == null || constraint.length() == 0) {
-                filteredList.addAll(issuesList);
-            } else {
-                String filterPattern = constraint.toString().toLowerCase().trim();
-
-                for (Issues item : issuesList) {
-                    if (item.getTitle().toLowerCase().contains(filterPattern) || item.getBody().toLowerCase().contains(filterPattern)) {
-                        filteredList.add(item);
-                    }
-                }
-            }
-
-            FilterResults results = new FilterResults();
-            results.values = filteredList;
-
-            return results;
-        }
-
-        @Override
-        protected void publishResults(CharSequence constraint, FilterResults results) {
-            issuesList.clear();
-            issuesList.addAll((List) results.values);
-            notifyDataSetChanged();
-        }
-    };
-
-}

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

@@ -8,8 +8,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import java.util.List;
@@ -61,7 +61,7 @@ public class CollaboratorsAdapter extends BaseAdapter  {
         ViewHolder viewHolder = null;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.collaborators_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_collaborators, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -77,7 +77,7 @@ public class CollaboratorsAdapter extends BaseAdapter  {
     private void initData(ViewHolder viewHolder, int position) {
 
         Collaborators currentItem = collaboratorsList.get(position);
-        Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);
 
         if(!currentItem.getFull_name().equals("")) {
             viewHolder.collaboratorName.setText(currentItem.getFull_name());

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

@@ -0,0 +1,161 @@
+package org.mian.gitnex.adapters;
+
+import android.content.Context;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.view.View;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import com.mikepenz.fastadapter.FastAdapter;
+import com.mikepenz.fastadapter.items.AbstractItem;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.ClickListener;
+import org.mian.gitnex.helpers.TimeHelper;
+import org.mian.gitnex.util.TinyDB;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Author M M Arif
+ */
+
+public class CommitsAdapter extends AbstractItem<CommitsAdapter, CommitsAdapter.ViewHolder> {
+
+    final private Context ctx;
+    private String commitTitle;
+    private String commitHtmlUrl;
+    private String commitCommitter;
+    private Date commitDate;
+
+    private boolean isSelectable = true;
+
+    public CommitsAdapter(Context ctx) {
+        this.ctx = ctx;
+    }
+
+    public CommitsAdapter withNewItems(String commitTitle, String commitHtmlUrl, String commitCommitter, Date commitDate) {
+
+        this.setNewItems(commitTitle, commitHtmlUrl, commitCommitter, commitDate);
+        return this;
+
+    }
+
+    private void setNewItems(String commitTitle, String commitHtmlUrl, String commitCommitter, Date commitDate) {
+
+        this.commitTitle = commitTitle;
+        this.commitHtmlUrl = commitHtmlUrl;
+        this.commitCommitter = commitCommitter;
+        this.commitDate = commitDate;
+
+    }
+
+    public String getCommitTitle() {
+        return commitTitle;
+    }
+
+    private String getCommitHtmlUrl() {
+        return commitHtmlUrl;
+    }
+
+    private String getcommitCommitter() {
+        return commitCommitter;
+    }
+
+    private Date getcommitDate() {
+        return commitDate;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    @Override
+    public CommitsAdapter withEnabled(boolean enabled) {
+        return null;
+    }
+
+    @Override
+    public boolean isSelectable() {
+        return isSelectable;
+    }
+
+    @Override
+    public CommitsAdapter withSelectable(boolean selectable) {
+
+        this.isSelectable = selectable;
+        return this;
+
+    }
+
+    @Override
+    public int getType() {
+        return R.id.commitList;
+    }
+
+    @Override
+    public int getLayoutRes() {
+        return R.layout.list_commits;
+    }
+
+    @NonNull
+    @Override
+    public CommitsAdapter.ViewHolder getViewHolder(@NonNull View v) {
+
+        return new CommitsAdapter.ViewHolder(v);
+
+    }
+
+    public class ViewHolder extends FastAdapter.ViewHolder<CommitsAdapter> {
+
+        final TinyDB tinyDb = new TinyDB(ctx);
+        final String locale = tinyDb.getString("locale");
+        final String timeFormat = tinyDb.getString("dateFormat");
+
+        TextView commitTitleVw;
+        TextView commitCommitterVw;
+        TextView commitDateVw;
+        TextView commitHtmlUrlVw;
+
+        public ViewHolder(View itemView) {
+
+            super(itemView);
+
+            commitTitleVw = itemView.findViewById(R.id.commitTitleVw);
+            commitCommitterVw = itemView.findViewById(R.id.commitCommitterVw);
+            commitDateVw = itemView.findViewById(R.id.commitDateVw);
+            commitHtmlUrlVw = itemView.findViewById(R.id.commitHtmlUrlVw);
+
+        }
+
+        @Override
+        public void bindView(CommitsAdapter item, @NonNull List<Object> payloads) {
+
+            commitTitleVw.setText(item.getCommitTitle());
+            commitCommitterVw.setText(ctx.getString(R.string.commitCommittedBy, item.getcommitCommitter()));
+
+            commitDateVw.setText(TimeHelper.formatTime(item.getcommitDate(), new Locale(locale), timeFormat, ctx));
+
+            if(timeFormat.equals("pretty")) {
+                commitDateVw.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(item.getcommitDate()), ctx));
+            }
+
+            commitHtmlUrlVw.setText(Html.fromHtml("<a href='" + item.getCommitHtmlUrl() + "'>" + ctx.getResources().getString(R.string.viewInBrowser) + "</a> "));
+            commitHtmlUrlVw.setMovementMethod(LinkMovementMethod.getInstance());
+
+        }
+
+        @Override
+        public void unbindView(@NonNull CommitsAdapter item) {
+
+            commitTitleVw.setText(null);
+            commitCommitterVw.setText(null);
+            commitDateVw.setText(null);
+            commitHtmlUrlVw.setText(null);
+
+        }
+
+    }
+
+}

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

@@ -1,32 +1,35 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
-import java.lang.reflect.Field;
 import java.util.List;
-import java.util.Objects;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -35,183 +38,216 @@ import java.util.Objects;
 public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepositoriesAdapter.ReposSearchViewHolder> {
 
 
-    private List<UserRepositories> searchedReposList;
-    private Context mCtx;
+	private List<UserRepositories> searchedReposList;
+	private Context mCtx;
 
-    public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context mCtx) {
-        this.mCtx = mCtx;
-        this.searchedReposList = dataList;
-    }
+	public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context mCtx) {
 
-    static class ReposSearchViewHolder extends RecyclerView.ViewHolder {
+		this.mCtx = mCtx;
+		this.searchedReposList = dataList;
+	}
 
-        private ImageView image;
-        private TextView mTextView1;
-        private TextView mTextView2;
-        private TextView fullName;
-        private ImageView repoPrivatePublic;
-        private TextView repoStars;
-        private TextView repoForks;
-        private TextView repoOpenIssuesCount;
+	static class ReposSearchViewHolder extends RecyclerView.ViewHolder {
 
-        private ReposSearchViewHolder(View itemView) {
-            super(itemView);
+		private ImageView image;
+		private TextView repoName;
+		private TextView repoDescription;
+		private TextView fullName;
+		private CheckBox isRepoAdmin;
+		private ImageView repoPrivatePublic;
+		private TextView repoStars;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
 
-            mTextView1 = itemView.findViewById(R.id.repoName);
-            mTextView2 = itemView.findViewById(R.id.repoDescription);
-            image = itemView.findViewById(R.id.imageAvatar);
-            fullName = itemView.findViewById(R.id.repoFullName);
-            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
-            repoStars = itemView.findViewById(R.id.repoStars);
-            repoForks = itemView.findViewById(R.id.repoForks);
-            repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
-            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+		private ReposSearchViewHolder(View itemView) {
 
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+			super(itemView);
 
-                    Context context = v.getContext();
-                    TextView repoFullName = v.findViewById(R.id.repoFullName);
+			repoName = itemView.findViewById(R.id.repoName);
+			repoDescription = itemView.findViewById(R.id.repoDescription);
+			image = itemView.findViewById(R.id.imageAvatar);
+			fullName = itemView.findViewById(R.id.repoFullName);
+			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
+			repoStars = itemView.findViewById(R.id.repoStars);
+			repoForks = itemView.findViewById(R.id.repoForks);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
 
-                    Intent intent = new Intent(context, RepoDetailActivity.class);
-                    intent.putExtra("repoFullName", repoFullName.getText().toString());
+			itemView.setOnClickListener(v -> {
 
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("repoFullName", repoFullName.getText().toString());
-                    tinyDb.putBoolean("resumeIssues", true);
-                    context.startActivity(intent);
+				Context context = v.getContext();
+				TextView repoFullName = v.findViewById(R.id.repoFullName);
 
-                }
-            });
+				Intent intent = new Intent(context, RepoDetailActivity.class);
+				intent.putExtra("repoFullName", repoFullName.getText().toString());
 
-            reposDropdownMenu.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+				TinyDB tinyDb = new TinyDB(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
+				tinyDb.putBoolean("resumeIssues", true);
+				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
 
-                    final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+				//store if user is watching this repo
+				{
+					final String instanceUrl = tinyDb.getString("instanceUrl");
+					String[] parts = repoFullName.getText().toString().split("/");
+					final String repoOwner = parts[0];
+					final String repoName = parts[1];
+					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
-                    popupMenu.inflate(R.menu.repo_dotted_list_menu);
+					WatchRepository watch = new WatchRepository();
 
-                    Object menuHelper;
-                    Class[] argTypes;
-                    try {
+					Call<WatchRepository> call;
 
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
-                        fMenuHelper.setAccessible(true);
-                        menuHelper = fMenuHelper.get(popupMenu);
-                        argTypes = new Class[] { boolean.class };
-                        Objects.requireNonNull(menuHelper).getClass().getDeclaredMethod("setForceShowIcon",
-                                argTypes).invoke(menuHelper, true);
+					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    } catch (Exception e) {
+					call.enqueue(new Callback<WatchRepository>() {
 
-                        popupMenu.show();
-                        return;
+						@Override
+						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
-                    }
+							if(response.isSuccessful()) {
 
-                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            switch (item.getItemId()) {
-                                case R.id.repoStargazers:
+								assert response.body() != null;
+								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
-                                    intent.putExtra("repoFullNameForStars", fullName.getText());
-                                    context.startActivity(intent);
-                                    break;
+							} else {
 
-                                case R.id.repoWatchers:
+								tinyDb.putBoolean("repoWatch", false);
 
-                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
-                                    context.startActivity(intentW);
-                                    break;
+								if(response.code() != 404) {
 
-                                case R.id.repoOpenInBrowser:
+									Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
-                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
-                                    context.startActivity(intentOpenInBrowser);
-                                    break;
+								}
 
-                            }
-                            return false;
-                        }
-                    });
+							}
 
-                    popupMenu.show();
+						}
 
-                }
-            });
+						@Override
+						public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
 
-        }
+							tinyDb.putBoolean("repoWatch", false);
+							Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
-    }
+						}
+					});
+				}
 
-    @NonNull
-    @Override
-    public ExploreRepositoriesAdapter.ReposSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.repos_list, parent, false);
-        return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
-    }
+				context.startActivity(intent);
 
-    @Override
-    public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int position) {
+			});
 
-        final UserRepositories currentItem = searchedReposList.get(position);
+			reposDropdownMenu.setOnClickListener(v -> {
+
+				final Context context = v.getContext();
+
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+				bottomSheetHeader.setText(fullName.getText());
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
+
+				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+					intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+					context.startActivity(intentOpenInBrowser);
+					dialog.dismiss();
+
+				});
+
+				repoStargazers.setOnClickListener(stargazers -> {
+
+					Intent intent = new Intent(context, RepoStargazersActivity.class);
+					intent.putExtra("repoFullNameForStars", fullName.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
+
+				});
+
+				repoWatchers.setOnClickListener(watchers -> {
+
+					Intent intentW = new Intent(context, RepoWatchersActivity.class);
+					intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+			});
+
+		}
+
+	}
+
+	@NonNull
+	@Override
+	public ExploreRepositoriesAdapter.ReposSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repos, parent, false);
+		return new ExploreRepositoriesAdapter.ReposSearchViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int position) {
+
+		final UserRepositories currentItem = searchedReposList.get(position);
 
 
-        holder.mTextView2.setVisibility(View.GONE);
+		holder.repoDescription.setVisibility(View.GONE);
 
-        ColorGenerator generator = ColorGenerator.MATERIAL;
-        int color = generator.getColor(currentItem.getName());
-        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+		ColorGenerator generator = ColorGenerator.MATERIAL;
+		int color = generator.getColor(currentItem.getName());
+		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
 
-        TextDrawable drawable = TextDrawable.builder()
-                .beginConfig()
-                .useFont(Typeface.DEFAULT)
-                .fontSize(18)
-                .toUpperCase()
-                .width(28)
-                .height(28)
-                .endConfig()
-                .buildRoundRect(firstCharacter, color, 3);
+		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
-        if (currentItem.getAvatar_url() != null) {
-            if (!currentItem.getAvatar_url().equals("")) {
-                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
-            } else {
-                holder.image.setImageDrawable(drawable);
-            }
-        }
-        else {
-            holder.image.setImageDrawable(drawable);
-        }
+		if(currentItem.getAvatar_url() != null) {
+			if(!currentItem.getAvatar_url().equals("")) {
+				PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
+			}
+			else {
+				holder.image.setImageDrawable(drawable);
+			}
+		}
+		else {
+			holder.image.setImageDrawable(drawable);
+		}
 
-        holder.mTextView1.setText(currentItem.getName());
-        if (!currentItem.getDescription().equals("")) {
-            holder.mTextView2.setVisibility(View.VISIBLE);
-            holder.mTextView2.setText(currentItem.getDescription());
-        }
-        holder.fullName.setText(currentItem.getFullname());
-        if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
-        }
-        else {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
-        }
-        holder.repoStars.setText(currentItem.getStars_count());
-        holder.repoForks.setText(currentItem.getForks_count());
-        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+		holder.repoName.setText(currentItem.getName());
+		if(!currentItem.getDescription().equals("")) {
+			holder.repoDescription.setVisibility(View.VISIBLE);
+			holder.repoDescription.setText(currentItem.getDescription());
+		}
+		holder.fullName.setText(currentItem.getFullname());
+		if(currentItem.getPrivateFlag()) {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+		}
+		else {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+		}
+		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoForks.setText(currentItem.getForks_count());
+		holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+		if(holder.isRepoAdmin == null) {
+			holder.isRepoAdmin = new CheckBox(mCtx);
+		}
+		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
 
-    }
+	}
+
+	@Override
+	public int getItemCount() {
+
+		return searchedReposList.size();
+	}
 
-    @Override
-    public int getItemCount() {
-        return searchedReposList.size();
-    }
 }

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

@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Files;
+import org.mian.gitnex.util.AppUtil;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -38,6 +39,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         private ImageView fileTypeImage;
         private TextView fileName;
         private TextView fileType;
+        private TextView fileInfo;
 
         private FilesViewHolder(View itemView) {
 
@@ -45,6 +47,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
             fileName = itemView.findViewById(R.id.fileName);
             fileTypeImage = itemView.findViewById(R.id.fileImage);
             fileType = itemView.findViewById(R.id.fileType);
+            fileInfo = itemView.findViewById(R.id.fileInfo);
 
             //ImageView filesDropdownMenu = itemView.findViewById(R.id.filesDropdownMenu);
 
@@ -144,7 +147,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
     @NonNull
     @Override
     public FilesAdapter.FilesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.files_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_files, parent, false);
         return new FilesAdapter.FilesViewHolder(v);
     }
 
@@ -158,6 +161,8 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 
         if(currentItem.getType().equals("file")) {
             holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file_new));
+            holder.fileInfo.setVisibility(View.VISIBLE);
+            holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
         }
         else if(currentItem.getType().equals("dir")) {
             holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_folder_24));

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

@@ -53,13 +53,14 @@ public class FilesDiffAdapter extends RecyclerView.Adapter<FilesDiffAdapter.File
     @NonNull
     @Override
     public FilesDiffAdapter.FilesDiffViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.files_diffs_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_files_diffs, parent, false);
         return new FilesDiffAdapter.FilesDiffViewHolder(v);
     }
 
     @Override
     public void onBindViewHolder(@NonNull FilesDiffViewHolder holder, int position) {
 
+        holder.setIsRecyclable(false);
         FileDiffView data = dataList.get(position);
 
         if(data.isFileType()) {

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

@@ -7,15 +7,15 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.Spanned;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 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.helpers.TimeHelper;
 import org.mian.gitnex.helpers.UserMentions;
 import org.mian.gitnex.models.IssueComments;
@@ -23,7 +23,7 @@ import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.helpers.ClickListener;
 import org.ocpsoft.prettytime.PrettyTime;
-import java.lang.reflect.Field;
+import java.sql.Time;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
@@ -33,8 +33,6 @@ import java.util.Locale;
 import java.util.Objects;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
@@ -59,232 +57,223 @@ import io.noties.markwon.linkify.LinkifyPlugin;
 
 public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdapter.IssueCommentViewHolder> {
 
-    private List<IssueComments> issuesComments;
-    private Context mCtx;
+	private List<IssueComments> issuesComments;
+	private Context mCtx;
 
-    static class IssueCommentViewHolder extends RecyclerView.ViewHolder {
+	static class IssueCommentViewHolder extends RecyclerView.ViewHolder {
 
-        private TextView issueNumber;
-        private TextView commendId;
-        private ImageView issueCommenterAvatar;
-        private TextView issueComment;
-        private TextView issueCommentDate;
-        private ImageView commentsOptionsMenu;
-        private TextView commendBodyRaw;
-        private TextView commentModified;
+		private TextView issueNumber;
+		private TextView commendId;
+		private ImageView issueCommenterAvatar;
+		private TextView issueComment;
+		private TextView issueCommentDate;
+		private ImageView commentsOptionsMenu;
+		private TextView commendBodyRaw;
+		private TextView commentModified;
+		private TextView commenterUsername;
+		private TextView htmlUrl;
 
-        private IssueCommentViewHolder(View itemView) {
-            super(itemView);
+		private IssueCommentViewHolder(View itemView) {
 
-            issueNumber = itemView.findViewById(R.id.issueNumber);
-            commendId = itemView.findViewById(R.id.commendId);
-            issueCommenterAvatar = itemView.findViewById(R.id.issueCommenterAvatar);
-            issueComment = itemView.findViewById(R.id.issueComment);
-            issueCommentDate = itemView.findViewById(R.id.issueCommentDate);
-            commentsOptionsMenu = itemView.findViewById(R.id.commentsOptionsMenu);
-            commendBodyRaw = itemView.findViewById(R.id.commendBodyRaw);
-            commentModified = itemView.findViewById(R.id.commentModified);
+			super(itemView);
 
-            commentsOptionsMenu.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+			issueNumber = itemView.findViewById(R.id.issueNumber);
+			commendId = itemView.findViewById(R.id.commendId);
+			issueCommenterAvatar = itemView.findViewById(R.id.issueCommenterAvatar);
+			issueComment = itemView.findViewById(R.id.issueComment);
+			issueCommentDate = itemView.findViewById(R.id.issueCommentDate);
+			commentsOptionsMenu = itemView.findViewById(R.id.commentsOptionsMenu);
+			commendBodyRaw = itemView.findViewById(R.id.commendBodyRaw);
+			commentModified = itemView.findViewById(R.id.commentModified);
+			commenterUsername = itemView.findViewById(R.id.commenterUsername);
+			htmlUrl = itemView.findViewById(R.id.htmlUrl);
 
-                    final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+			commentsOptionsMenu.setOnClickListener(v -> {
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
-                    popupMenu.inflate(R.menu.issue_comment_menu);
+				final Context context = v.getContext();
+				final TinyDB tinyDb = new TinyDB(context);
+				final String loginUid = tinyDb.getString("loginUid");
 
-                    Object menuHelper;
-                    Class[] argTypes;
-                    try {
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_issue_comments, null);
 
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
-                        fMenuHelper.setAccessible(true);
-                        menuHelper = fMenuHelper.get(popupMenu);
-                        argTypes = new Class[] { boolean.class };
-                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
-                                argTypes).invoke(menuHelper, true);
+				TextView commentMenuEdit = view.findViewById(R.id.commentMenuEdit);
+				TextView commentShare = view.findViewById(R.id.issueCommentShare);
+				//TextView commentMenuDelete = view.findViewById(R.id.commentMenuDelete);
 
-                    } catch (Exception e) {
+				if(!loginUid.contentEquals(commenterUsername.getText())) {
+					commentMenuEdit.setVisibility(View.GONE);
+					//commentMenuDelete.setVisibility(View.GONE);
+				}
 
-                        popupMenu.show();
-                        return;
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
 
-                    }
+				commentMenuEdit.setOnClickListener(ediComment -> {
 
-                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            switch (item.getItemId()) {
-                                case R.id.commentMenuEdit:
+					Intent intent = new Intent(context, ReplyToIssueActivity.class);
+					intent.putExtra("commentId", commendId.getText());
+					intent.putExtra("commentAction", "edit");
+					intent.putExtra("commentBody", commendBodyRaw.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
 
-                                    Intent intent = new Intent(context, ReplyToIssueActivity.class);
-                                    intent.putExtra("commentId", commendId.getText());
-                                    intent.putExtra("commentAction", "edit");
-                                    intent.putExtra("commentBody", commendBodyRaw.getText());
-                                    context.startActivity(intent);
-                                    break;
+				});
 
-                                case R.id.commentMenuDelete:
+				commentShare.setOnClickListener(ediComment -> {
 
-                                    break;
+					// get comment Url
+					CharSequence commentUrl = htmlUrl.getText();
 
-                            }
-                            return false;
-                        }
-                    });
+					// share issue comment
+					Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+					sharingIntent.setType("text/plain");
+					String intentHeader = tinyDb.getString("issueNumber") + context.getResources().getString(R.string.hash) + "issuecomment-" + commendId.getText() + " " + tinyDb.getString("issueTitle");
+					sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, intentHeader);
+					sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, commentUrl);
+					context.startActivity(Intent.createChooser(sharingIntent, intentHeader));
 
-                    popupMenu.show();
+					dialog.dismiss();
 
-                }
-            });
+				});
 
-        }
-    }
+                /*commentMenuDelete.setOnClickListener(deleteComment -> {
 
-    public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
-        this.mCtx = mCtx;
-        this.issuesComments = issuesCommentsMain;
-    }
+                    dialog.dismiss();
 
-    @NonNull
-    @Override
-    public IssueCommentsAdapter.IssueCommentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.issue_comments, parent, false);
-        return new IssueCommentsAdapter.IssueCommentViewHolder(v);
-    }
+                });*/
 
-    @SuppressLint("SetTextI18n")
-    @Override
-    public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
+			});
 
-        final TinyDB tinyDb = new TinyDB(mCtx);
-        final String locale = tinyDb.getString("locale");
-        final String timeFormat = tinyDb.getString("dateFormat");
-        final String loginUid = tinyDb.getString("loginUid");
+		}
 
-        IssueComments currentItem = issuesComments.get(position);
+	}
 
-        if(!loginUid.equals(currentItem.getUser().getUsername())) {
-            holder.commentsOptionsMenu.setVisibility(View.INVISIBLE);
-        }
-        holder.commendId.setText(String.valueOf(currentItem.getId()));
-        holder.commendBodyRaw.setText(currentItem.getBody());
+	public IssueCommentsAdapter(Context mCtx, List<IssueComments> issuesCommentsMain) {
 
-        if (!currentItem.getUser().getFull_name().equals("")) {
-            holder.issueCommenterAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCommenter) + currentItem.getUser().getFull_name(), mCtx));
-        } else {
-            holder.issueCommenterAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCommenter) + currentItem.getUser().getLogin(), mCtx));
-        }
+		this.mCtx = mCtx;
+		this.issuesComments = issuesCommentsMain;
 
-        if (currentItem.getUser().getAvatar_url() != null) {
-            Picasso.get().load(currentItem.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueCommenterAvatar);
-        } else {
-            Picasso.get().load(currentItem.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueCommenterAvatar);
-        }
+	}
 
-        String cleanIssueComments = currentItem.getBody().trim();
+	@NonNull
+	@Override
+	public IssueCommentsAdapter.IssueCommentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-        final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx))
-                .usePlugin(CorePlugin.create())
-                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-                    @Override
-                    public void configureImages(@NonNull ImagesPlugin plugin) {
-                        plugin.addSchemeHandler(new SchemeHandler() {
-                            @NonNull
-                            @Override
-                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issue_comments, parent, false);
+		return new IssueCommentsAdapter.IssueCommentViewHolder(v);
 
-                                final int resourceId = mCtx.getResources().getIdentifier(
-                                        raw.substring("drawable://".length()),
-                                        "drawable",
-                                        mCtx.getPackageName());
+	}
 
-                                final Drawable drawable = mCtx.getDrawable(resourceId);
+	@SuppressLint("SetTextI18n")
+	@Override
+	public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
 
-                                assert drawable != null;
-                                return ImageItem.withResult(drawable);
-                            }
+		final TinyDB tinyDb = new TinyDB(mCtx);
+		final String locale = tinyDb.getString("locale");
+		final String timeFormat = tinyDb.getString("dateFormat");
 
-                            @NonNull
-                            @Override
-                            public Collection<String> supportedSchemes() {
-                                return Collections.singleton("drawable");
-                            }
-                        });
-                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
-                            @Nullable
-                            @Override
-                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
-                                return null;
-                            }
-                        });
-                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
-                        plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
-                        plugin.addMediaDecoder(SvgMediaDecoder.create());
-                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
-                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-                    }
-                }))
-                .usePlugin(new AbstractMarkwonPlugin() {
-                    @Override
-                    public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-                        builder
-                                .codeTextColor(tinyDb.getInt("codeBlockColor"))
-                                .codeBackgroundColor(tinyDb.getInt("codeBlockBackground"))
-                                .linkColor(mCtx.getResources().getColor(R.color.lightBlue));
-                    }
-                })
-                .usePlugin(TablePlugin.create(mCtx))
-                .usePlugin(TaskListPlugin.create(mCtx))
-                .usePlugin(HtmlPlugin.create())
-                .usePlugin(StrikethroughPlugin.create())
-                .usePlugin(LinkifyPlugin.create())
-                .build();
+		IssueComments currentItem = issuesComments.get(position);
 
-        Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueComments));
-        markwon.setParsedMarkdown(holder.issueComment, UserMentions.UserMentionsFunc(mCtx, bodyWithMD, cleanIssueComments));
+		holder.htmlUrl.setText(currentItem.getHtml_url());
+		holder.commenterUsername.setText(currentItem.getUser().getUsername());
+		holder.commendId.setText(String.valueOf(currentItem.getId()));
+		holder.commendBodyRaw.setText(currentItem.getBody());
 
-        String edited;
+		if(!currentItem.getUser().getFull_name().equals("")) {
+			holder.issueCommenterAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCommenter) + currentItem.getUser().getFull_name(), mCtx));
+		}
+		else {
+			holder.issueCommenterAvatar.setOnClickListener(new ClickListener(mCtx.getResources().getString(R.string.issueCommenter) + currentItem.getUser().getLogin(), mCtx));
+		}
 
-        if(!currentItem.getUpdated_at().equals(currentItem.getCreated_at())) {
-            edited = mCtx.getResources().getString(R.string.colorfulBulletSpan) + mCtx.getResources().getString(R.string.modifiedText);
-            holder.commentModified.setVisibility(View.VISIBLE);
-            holder.commentModified.setText(edited);
-            holder.commentModified.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getUpdated_at()), mCtx));
-        }
-        else {
-            holder.commentModified.setVisibility(View.INVISIBLE);
-        }
+		PicassoService.getInstance(mCtx).get().load(currentItem.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.issueCommenterAvatar);
 
-        switch (timeFormat) {
-            case "pretty": {
-                PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-                String createdTime = prettyTime.format(currentItem.getCreated_at());
-                holder.issueCommentDate.setText(createdTime);
-                holder.issueCommentDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getCreated_at()), mCtx));
-                break;
-            }
-            case "normal": {
-                DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                String createdTime = formatter.format(currentItem.getCreated_at());
-                holder.issueCommentDate.setText(createdTime);
-                break;
-            }
-            case "normal1": {
-                DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                String createdTime = formatter.format(currentItem.getCreated_at());
-                holder.issueCommentDate.setText(createdTime);
-                break;
-            }
-        }
+		String cleanIssueComments = currentItem.getBody().trim();
 
-    }
+		final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx)).usePlugin(CorePlugin.create()).usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
 
-    @Override
-    public int getItemCount() {
-        return issuesComments.size();
-    }
+			@Override
+			public void configureImages(@NonNull ImagesPlugin plugin) {
+
+				plugin.addSchemeHandler(new SchemeHandler() {
+
+					@NonNull
+					@Override
+					public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+
+						final int resourceId = mCtx.getResources().getIdentifier(raw.substring("drawable://".length()), "drawable", mCtx.getPackageName());
+
+						final Drawable drawable = mCtx.getDrawable(resourceId);
+
+						assert drawable != null;
+						return ImageItem.withResult(drawable);
+
+					}
+
+					@NonNull
+					@Override
+					public Collection<String> supportedSchemes() {
+
+						return Collections.singleton("drawable");
+					}
+				});
+				plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
+
+					@Nullable
+					@Override
+					public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
+
+						return null;
+					}
+				});
+				plugin.addMediaDecoder(GifMediaDecoder.create(false));
+				plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
+				plugin.addMediaDecoder(SvgMediaDecoder.create());
+				plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
+				plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
+			}
+		})).usePlugin(new AbstractMarkwonPlugin() {
+
+			@Override
+			public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
+
+				builder.codeTextColor(tinyDb.getInt("codeBlockColor")).codeBackgroundColor(tinyDb.getInt("codeBlockBackground")).linkColor(mCtx.getResources().getColor(R.color.lightBlue));
+			}
+
+		}).usePlugin(TablePlugin.create(mCtx)).usePlugin(TaskListPlugin.create(mCtx)).usePlugin(HtmlPlugin.create()).usePlugin(StrikethroughPlugin.create()).usePlugin(LinkifyPlugin.create()).build();
+
+		Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueComments));
+		markwon.setParsedMarkdown(holder.issueComment, UserMentions.UserMentionsFunc(mCtx, bodyWithMD, cleanIssueComments));
+
+		String edited;
+
+		if(!currentItem.getUpdated_at().equals(currentItem.getCreated_at())) {
+
+			edited = mCtx.getResources().getString(R.string.colorfulBulletSpan) + mCtx.getResources().getString(R.string.modifiedText);
+			holder.commentModified.setVisibility(View.VISIBLE);
+			holder.commentModified.setText(edited);
+			holder.commentModified.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getUpdated_at()), mCtx));
+
+		}
+		else {
+
+			holder.commentModified.setVisibility(View.INVISIBLE);
+
+		}
+
+		holder.issueCommentDate.setText(TimeHelper.formatTime(currentItem.getCreated_at(), new Locale(locale), timeFormat, mCtx));
+
+		if(timeFormat.equals("pretty")) {
+			holder.issueCommentDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getCreated_at()), mCtx));
+		}
+	}
+
+	@Override
+	public int getItemCount() {
+
+		return issuesComments.size();
+
+	}
 
 }

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

@@ -1,291 +1,245 @@
 package org.mian.gitnex.adapters;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.text.Html;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Filter;
-import android.widget.Filterable;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import com.mikepenz.fastadapter.FastAdapter;
+import com.mikepenz.fastadapter.items.AbstractItem;
+import com.mikepenz.fastadapter.listeners.ClickEventHook;
+import com.mikepenz.fastadapter.utils.EventHookUtil;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.util.TinyDB;
 import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Author M M Arif
  */
 
-public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements Filterable {
+public class IssuesAdapter extends AbstractItem<IssuesAdapter, IssuesAdapter.ViewHolder> {
+
+	final private Context ctx;
+	private String issueTitle;
+	private int issueNumber;
+	private String issueAssigneeAvatar;
+	private Date issueCreatedTime;
+	private int issueCommentsCount;
+	private String userFullname;
+	private String userLogin;
+
+	private boolean isSelectable = true;
+
+	public IssuesAdapter(Context ctx) {
+		this.ctx = ctx;
+	}
 
-    private Context context;
-    private final int TYPE_LOAD = 0;
-    private List<Issues> issuesList;
-    private List<Issues> issuesListFull;
-    private OnLoadMoreListener loadMoreListener;
-    private boolean isLoading = false, isMoreDataAvailable = true;
+	public IssuesAdapter withNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
 
-    public IssuesAdapter(Context context, List<Issues> issuesListMain) {
+		this.setNewItems(issueTitle, issueNumber, issueAssigneeAvatar, issueCreatedTime, issueCommentsCount, userFullname, userLogin);
+		return this;
+
+	}
+
+	private void setNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
 
-        this.context = context;
-        this.issuesList = issuesListMain;
-        issuesListFull = new ArrayList<>(issuesList);
+		this.issueTitle = issueTitle;
+		this.issueNumber = issueNumber;
+		this.issueAssigneeAvatar = issueAssigneeAvatar;
+		this.issueCreatedTime = issueCreatedTime;
+		this.issueCommentsCount = issueCommentsCount;
+		this.userFullname = userFullname;
+		this.userLogin = userLogin;
+
+	}
+
+	private int getIssueNumber() {
+		return issueNumber;
+	}
 
-    }
+	public String getIssueTitle() {
+		return issueTitle;
+	}
 
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+	private String getIssueAssigneeAvatar() {
+		return issueAssigneeAvatar;
+	}
 
-        LayoutInflater inflater = LayoutInflater.from(context);
+	private Date getIssueCreatedTime() {
+		return issueCreatedTime;
+	}
+
+	private int getIssueCommentsCount() {
+		return issueCommentsCount;
+	}
+
+	private String getUserFullname() {
+		return userFullname;
+	}
+
+	private String getUserLogin() {
+		return userLogin;
+	}
+
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
+
+	@Override
+	public IssuesAdapter withEnabled(boolean enabled) {
+		return null;
+	}
+
+	@Override
+	public boolean isSelectable() {
+		return isSelectable;
+	}
+
+	@Override
+	public IssuesAdapter withSelectable(boolean selectable) {
+		this.isSelectable = selectable;
+		return this;
+	}
+
+	@Override
+	public int getType() {
+		return R.id.relativeLayoutFrameIssuesList;
+	}
 
-        if(viewType == TYPE_LOAD){
-            return new IssuesHolder(inflater.inflate(R.layout.repo_detail_issues_list, parent,false));
-        }
-        else {
-            return new LoadHolder(inflater.inflate(R.layout.row_load,parent,false));
-        }
+	@Override
+	public int getLayoutRes() {
+		return R.layout.list_issues;
+	}
 
-    }
+	@NonNull
+	@Override
+	public IssuesAdapter.ViewHolder getViewHolder(@NonNull View v) {
+		return new IssuesAdapter.ViewHolder(v);
+	}
 
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+	public class ViewHolder extends FastAdapter.ViewHolder<IssuesAdapter> {
 
-        if(position >= getItemCount()-1 && isMoreDataAvailable && !isLoading && loadMoreListener!=null) {
+		final TinyDB tinyDb = new TinyDB(ctx);
+		final String locale = tinyDb.getString("locale");
+		final String timeFormat = tinyDb.getString("dateFormat");
 
-            isLoading = true;
-            loadMoreListener.onLoadMore();
+		private TextView issueNumber;
+		private ImageView issueAssigneeAvatar;
+		private TextView issueTitle;
+		private TextView issueCreatedTime;
+		private TextView issueCommentsCount;
 
-        }
+		public ViewHolder(View itemView) {
 
-        if(getItemViewType(position) == TYPE_LOAD) {
+			super(itemView);
 
-            ((IssuesHolder)holder).bindData(issuesList.get(position));
+			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);
 
-        }
+		}
 
-    }
+		@Override
+		public void bindView(@NonNull IssuesAdapter item, @NonNull List<Object> payloads) {
 
-    @Override
-    public int getItemViewType(int position) {
+			if (!item.getUserFullname().equals("")) {
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + item.getUserFullname(), ctx));
+			}
+			else {
+				issueAssigneeAvatar.setOnClickListener(new ClickListener(ctx.getResources().getString(R.string.issueCreator) + item.getUserLogin(), ctx));
+			}
 
-        if(issuesList.get(position).getTitle() != null) {
-            return TYPE_LOAD;
-        }
-        else {
-            return 1;
-        }
+			PicassoService.getInstance(ctx).get().load(item.getIssueAssigneeAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
 
-    }
+			String issueNumber_ = "<font color='" + ctx.getResources().getColor(R.color.lightGray) + "'>" + ctx.getResources().getString(R.string.hash) + item.getIssueNumber() + "</font>";
+			issueTitle.setText(Html.fromHtml(issueNumber_ + " " + item.getIssueTitle()));
 
-    @Override
-    public int getItemCount() {
+			issueNumber.setText(String.valueOf(item.getIssueNumber()));
+			issueCommentsCount.setText(String.valueOf(item.getIssueCommentsCount()));
 
-        return issuesList.size();
+			switch (timeFormat) {
 
-    }
+				case "pretty": {
+					PrettyTime prettyTime = new PrettyTime(new Locale(locale));
+					String createdTime = prettyTime.format(item.getIssueCreatedTime());
+					issueCreatedTime.setText(createdTime);
+					issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(item.getIssueCreatedTime()), ctx));
+					break;
+				}
+				case "normal": {
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					String createdTime = formatter.format(item.getIssueCreatedTime());
+					issueCreatedTime.setText(createdTime);
+					break;
+				}
+				case "normal1": {
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + ctx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
+					String createdTime = formatter.format(item.getIssueCreatedTime());
+					issueCreatedTime.setText(createdTime);
+					break;
+				}
 
-    class IssuesHolder extends RecyclerView.ViewHolder {
+			}
 
-        private TextView issueNumber;
-        private ImageView issueAssigneeAvatar;
-        private TextView issueTitle;
-        private TextView issueCreatedTime;
-        private TextView issueCommentsCount;
-        private RelativeLayout relativeLayoutFrame;
+		}
 
-        IssuesHolder(View itemView) {
+		@Override
+		public void unbindView(@NonNull IssuesAdapter item) {
 
-            super(itemView);
+			issueTitle.setText(null);
+			issueCommentsCount.setText(null);
+			issueCreatedTime.setText(null);
 
-            issueNumber = itemView.findViewById(R.id.issueNumber);
-            issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
-            issueTitle = itemView.findViewById(R.id.issueTitle);
-            issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
-            LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
-            issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
-            relativeLayoutFrame = itemView.findViewById(R.id.relativeLayoutFrame);
+		}
 
-            issueTitle.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+	}
 
-                    Context context = v.getContext();
-                    //Log.i("issueNumber", issueNumber.getText().toString());
+	public static class IssueTitleClickEvent extends ClickEventHook<IssuesAdapter> {
 
-                    Intent intent = new Intent(context, IssueDetailActivity.class);
-                    intent.putExtra("issueNumber", issueNumber.getText());
+		@Nullable
+		@Override
+		public List<View> onBindMany(@NonNull RecyclerView.ViewHolder viewHolder) {
 
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
-                    tinyDb.putString("issueType", "issue");
-                    context.startActivity(intent);
+			if (viewHolder instanceof IssuesAdapter.ViewHolder) {
+				return EventHookUtil.toList(((ViewHolder) viewHolder).issueTitle);
+			}
 
-                }
-            });
-            frameCommentsCount.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+			return super.onBindMany(viewHolder);
 
-                    Context context = v.getContext();
-                    //Log.i("issueNumber", issueNumber.getText().toString());
+		}
 
-                    Intent intent = new Intent(context, IssueDetailActivity.class);
-                    intent.putExtra("issueNumber", issueNumber.getText());
+		@Override
+		public void onClick(View v, int position, @NonNull FastAdapter<IssuesAdapter> fastAdapter, IssuesAdapter item) {
 
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
-                    tinyDb.putString("issueType", "issue");
-                    context.startActivity(intent);
+			Context context = v.getContext();
 
-                }
-            });
+			Intent intent = new Intent(context, IssueDetailActivity.class);
+			intent.putExtra("issueNumber", item.getIssueNumber());
 
-        }
+			TinyDB tinyDb = new TinyDB(context);
+			tinyDb.putString("issueNumber", String.valueOf(item.getIssueNumber()));
+			tinyDb.putString("issueType", "issue");
+			context.startActivity(intent);
 
-        @SuppressLint("SetTextI18n")
-        void bindData(Issues issuesModel){
+		}
 
-            final TinyDB tinyDb = new TinyDB(context);
-            final String locale = tinyDb.getString("locale");
-            final String timeFormat = tinyDb.getString("dateFormat");
-
-            /*if(issuesModel.getPull_request() != null) {
-                if (!issuesModel.getPull_request().isMerged()) {
-                    relativeLayoutFrame.setVisibility(View.GONE);
-                    relativeLayoutFrame.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
-                }
-            }*/
-
-            if (!issuesModel.getUser().getFull_name().equals("")) {
-                issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getFull_name(), context));
-            } else {
-                issueAssigneeAvatar.setOnClickListener(new ClickListener(context.getResources().getString(R.string.issueCreator) + issuesModel.getUser().getLogin(), context));
-            }
-
-            if (issuesModel.getUser().getAvatar_url() != null) {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
-            } else {
-                Picasso.get().load(issuesModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
-            }
-
-            String issueNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + issuesModel.getNumber() + "</font>";
-            issueTitle.setText(Html.fromHtml(issueNumber_ + " " + issuesModel.getTitle()));
-
-            issueNumber.setText(String.valueOf(issuesModel.getNumber()));
-            issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));
-
-            switch (timeFormat) {
-                case "pretty": {
-                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-                    String createdTime = prettyTime.format(issuesModel.getCreated_at());
-                    issueCreatedTime.setText(createdTime);
-                    issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issuesModel.getCreated_at()), context));
-                    break;
-                }
-                case "normal": {
-                    DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                    String createdTime = formatter.format(issuesModel.getCreated_at());
-                    issueCreatedTime.setText(createdTime);
-                    break;
-                }
-                case "normal1": {
-                    DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                    String createdTime = formatter.format(issuesModel.getCreated_at());
-                    issueCreatedTime.setText(createdTime);
-                    break;
-                }
-            }
-
-        }
-
-    }
-
-    static class LoadHolder extends RecyclerView.ViewHolder {
-
-        LoadHolder(View itemView) {
-            super(itemView);
-        }
-
-    }
-
-    public void setMoreDataAvailable(boolean moreDataAvailable) {
-
-        isMoreDataAvailable = moreDataAvailable;
-
-    }
-
-    public void notifyDataChanged() {
-
-        notifyDataSetChanged();
-        isLoading = false;
-
-    }
-
-    public interface OnLoadMoreListener {
-
-        void onLoadMore();
-
-    }
-
-    public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-
-        this.loadMoreListener = loadMoreListener;
-
-    }
-
-    @Override
-    public Filter getFilter() {
-        return issuesFilter;
-    }
-
-    private Filter issuesFilter = new Filter() {
-        @Override
-        protected FilterResults performFiltering(CharSequence constraint) {
-            List<Issues> filteredList = new ArrayList<>();
-
-            if (constraint == null || constraint.length() == 0) {
-                filteredList.addAll(issuesList);
-            } else {
-                String filterPattern = constraint.toString().toLowerCase().trim();
-
-                for (Issues item : issuesList) {
-                    if (item.getTitle().toLowerCase().contains(filterPattern) || item.getBody().toLowerCase().contains(filterPattern)) {
-                        filteredList.add(item);
-                    }
-                }
-            }
-
-            FilterResults results = new FilterResults();
-            results.values = filteredList;
-
-            return results;
-        }
-
-        @Override
-        protected void publishResults(CharSequence constraint, FilterResults results) {
-            issuesList.clear();
-            issuesList.addAll((List) results.values);
-            notifyDataSetChanged();
-        }
-    };
+	}
 
 }

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

@@ -1,28 +1,27 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateLabelActivity;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ColorInverter;
 import org.mian.gitnex.helpers.LabelWidthCalculator;
 import org.mian.gitnex.models.Labels;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 
 /**
@@ -51,65 +50,45 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
             labelId = itemView.findViewById(R.id.labelId);
             labelColor = itemView.findViewById(R.id.labelColor);
 
-            labelsOptionsMenu.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+            labelsOptionsMenu.setOnClickListener(v -> {
 
-                    final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                final Context context = v.getContext();
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
-                    popupMenu.inflate(R.menu.labels_menu);
+                @SuppressLint("InflateParams")
+                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_labels_in_list, null);
 
-                    Object menuHelper;
-                    Class[] argTypes;
-                    try {
+                TextView labelMenuEdit = view.findViewById(R.id.labelMenuEdit);
+                TextView labelMenuDelete = view.findViewById(R.id.labelMenuDelete);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
-                        fMenuHelper.setAccessible(true);
-                        menuHelper = fMenuHelper.get(popupMenu);
-                        argTypes = new Class[] { boolean.class };
-                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
-                                argTypes).invoke(menuHelper, true);
+                bottomSheetHeader.setText(labelTitle.getText());
+                BottomSheetDialog dialog = new BottomSheetDialog(context);
+                dialog.setContentView(view);
+                dialog.show();
 
-                    } catch (Exception e) {
+                labelMenuEdit.setOnClickListener(editLabel -> {
 
-                        popupMenu.show();
-                        return;
+                    Intent intent = new Intent(context, CreateLabelActivity.class);
+                    intent.putExtra("labelId", labelId.getText());
+                    intent.putExtra("labelTitle", labelTitle.getText());
+                    intent.putExtra("labelColor", labelColor.getText());
+                    intent.putExtra("labelAction", "edit");
+                    context.startActivity(intent);
+                    dialog.dismiss();
 
-                    }
+                });
 
-                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            switch (item.getItemId()) {
-                                case R.id.labelMenuEdit:
+                labelMenuDelete.setOnClickListener(deleteLabel -> {
 
-                                    Intent intent = new Intent(context, CreateLabelActivity.class);
-                                    intent.putExtra("labelId", labelId.getText());
-                                    intent.putExtra("labelTitle", labelTitle.getText());
-                                    intent.putExtra("labelColor", labelColor.getText());
-                                    intent.putExtra("labelAction", "edit");
-                                    context.startActivity(intent);
-                                    break;
+                    AlertDialogs.labelDeleteDialog(context, labelTitle.getText().toString(), labelId.getText().toString(),
+                            context.getResources().getString(R.string.labelDeleteTitle),
+                            context.getResources().getString(R.string.labelDeleteMessage),
+                            context.getResources().getString(R.string.labelDeletePositiveButton),
+                            context.getResources().getString(R.string.labelDeleteNegativeButton));
+                    dialog.dismiss();
 
-                                case R.id.labelMenuDelete:
+                });
 
-                                    AlertDialogs.labelDeleteDialog(context, labelTitle.getText().toString(), labelId.getText().toString(),
-                                            context.getResources().getString(R.string.labelDeleteTitle),
-                                            context.getResources().getString(R.string.labelDeleteMessage),
-                                            context.getResources().getString(R.string.labelDeletePositiveButton),
-                                            context.getResources().getString(R.string.labelDeleteNegativeButton));
-                                    break;
-
-                            }
-                            return false;
-                        }
-                    });
-
-                    popupMenu.show();
-
-                }
             });
 
         }
@@ -123,7 +102,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
     @NonNull
     @Override
     public LabelsAdapter.LabelsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.labels_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_labels, parent, false);
         return new LabelsAdapter.LabelsViewHolder(v);
     }
 
@@ -131,7 +110,6 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
     public void onBindViewHolder(@NonNull LabelsAdapter.LabelsViewHolder holder, int position) {
 
         Labels currentItem = labelsList.get(position);
-        int width = 33;
 
         holder.labelTitle.setText(currentItem.getName());
         holder.labelId.setText(String.valueOf(currentItem.getId()));
@@ -139,35 +117,24 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
 
         String labelColor = currentItem.getColor();
         String labelName = currentItem.getName();
+
         int color = Color.parseColor("#" + labelColor);
 
         TextDrawable drawable = TextDrawable.builder()
                 .beginConfig()
-                //.useFont(Typeface.DEFAULT)
+                .useFont(Typeface.DEFAULT)
                 .bold()
                 .textColor(new ColorInverter().getContrastColor(color))
-                .fontSize(36)
-                .width(LabelWidthCalculator.customWidth(getMaxLabelLength()))
-                .height(60)
+                .fontSize(35)
+                .width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, 40, 20))
+                .height(55)
                 .endConfig()
-                .buildRoundRect(labelName, color, 8);
+                .buildRoundRect(labelName, color, 10);
+
         holder.labelsView.setImageDrawable(drawable);
 
     }
 
-    private int getMaxLabelLength() {
-
-        for(int i = 0; i < labelsList.size(); i++) {
-
-            Labels labelItem = labelsList.get(i);
-            labelsArray.add(labelItem.getName().length());
-
-        }
-
-        return Collections.max(labelsArray);
-
-    }
-
     @Override
     public int getItemCount() {
         return labelsList.size();

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

@@ -10,8 +10,8 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
 import java.util.ArrayList;
@@ -67,7 +67,7 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
         MembersByOrgAdapter.ViewHolder viewHolder = null;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_org_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_org, null);
             viewHolder = new MembersByOrgAdapter.ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -83,7 +83,7 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
     private void initData(MembersByOrgAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = membersList.get(position);
-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);
 
         if(!currentItem.getFullname().equals("")) {
             viewHolder.memberName.setText(currentItem.getFullname());

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

@@ -15,8 +15,10 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
+import org.mian.gitnex.actions.MilestoneActions;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.models.Milestones;
@@ -32,7 +34,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
@@ -42,7 +43,6 @@ import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
 import io.noties.markwon.ext.tables.TablePlugin;
 import io.noties.markwon.ext.tasklist.TaskListPlugin;
 import io.noties.markwon.html.HtmlPlugin;
-import io.noties.markwon.image.AsyncDrawable;
 import io.noties.markwon.image.DefaultMediaDecoder;
 import io.noties.markwon.image.ImageItem;
 import io.noties.markwon.image.ImagesPlugin;
@@ -63,6 +63,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
 
     static class MilestonesViewHolder extends RecyclerView.ViewHolder {
 
+        private TextView milestoneId;
         private TextView msTitle;
         private TextView msDescription;
         private TextView msOpenIssues;
@@ -70,10 +71,12 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
         private TextView msDueDate;
         private ImageView msStatus;
         private ProgressBar msProgress;
+	    private TextView milestoneStatus;
 
         private MilestonesViewHolder(View itemView) {
             super(itemView);
 
+            milestoneId = itemView.findViewById(R.id.milestoneId);
             msTitle = itemView.findViewById(R.id.milestoneTitle);
             msStatus = itemView.findViewById(R.id.milestoneState);
             msDescription = itemView.findViewById(R.id.milestoneDescription);
@@ -81,23 +84,52 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
             msClosedIssues = itemView.findViewById(R.id.milestoneIssuesClosed);
             msDueDate = itemView.findViewById(R.id.milestoneDueDate);
             msProgress = itemView.findViewById(R.id.milestoneProgress);
+	        ImageView milestonesMenu = itemView.findViewById(R.id.milestonesMenu);
+	        milestoneStatus = itemView.findViewById(R.id.milestoneStatus);
 
-            /*msTitle.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+            milestonesMenu.setOnClickListener(v -> {
 
-                    Context context = v.getContext();
-                    Log.i("issueNumber", issueNumber.getText().toString());
+                Context ctx = v.getContext();
+                int milestoneId_ = Integer.parseInt(milestoneId.getText().toString());
 
-                    Intent intent = new Intent(context, IssueDetailActivity.class);
-                    intent.putExtra("issueNumber", issueNumber.getText());
+                @SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_milestones_in_list, null);
 
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
-                    context.startActivity(intent);
+	            TextView closeMilestone = view.findViewById(R.id.closeMilestone);
+	            TextView openMilestone = view.findViewById(R.id.openMilestone);
+
+	            BottomSheetDialog dialog = new BottomSheetDialog(ctx);
+	            dialog.setContentView(view);
+	            dialog.show();
+
+	            if(milestoneStatus.getText().toString().equals("open")) {
+
+	            	closeMilestone.setVisibility(View.VISIBLE);
+		            openMilestone.setVisibility(View.GONE);
+
+	            }
+	            else {
+
+		            closeMilestone.setVisibility(View.GONE);
+		            openMilestone.setVisibility(View.VISIBLE);
+
+	            }
+
+	            closeMilestone.setOnClickListener(v12 -> {
+
+		            MilestoneActions.closeMilestone(ctx, milestoneId_);
+		            dialog.dismiss();
+
+	            });
+
+	            openMilestone.setOnClickListener(v12 -> {
+
+		            MilestoneActions.openMilestone(ctx, milestoneId_);
+		            dialog.dismiss();
+
+	            });
+
+            });
 
-                }
-            });*/
         }
     }
 
@@ -110,7 +142,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
     @NonNull
     @Override
     public MilestonesAdapter.MilestonesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.milestones_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_milestones, parent, false);
         return new MilestonesAdapter.MilestonesViewHolder(v);
     }
 
@@ -123,46 +155,40 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
 
         Milestones currentItem = milestonesList.get(position);
 
+        holder.milestoneId.setText(String.valueOf(currentItem.getId()));
+        holder.milestoneStatus.setText(currentItem.getState());
+
         final Markwon markwon = Markwon.builder(Objects.requireNonNull(mCtx))
                 .usePlugin(CorePlugin.create())
-                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
-                    @Override
-                    public void configureImages(@NonNull ImagesPlugin plugin) {
-                        plugin.addSchemeHandler(new SchemeHandler() {
-                            @NonNull
-                            @Override
-                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+                .usePlugin(ImagesPlugin.create(plugin -> {
+                    plugin.addSchemeHandler(new SchemeHandler() {
+                        @NonNull
+                        @Override
+                        public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
 
-                                final int resourceId = mCtx.getResources().getIdentifier(
-                                        raw.substring("drawable://".length()),
-                                        "drawable",
-                                        mCtx.getPackageName());
+                            final int resourceId = mCtx.getResources().getIdentifier(
+                                    raw.substring("drawable://".length()),
+                                    "drawable",
+                                    mCtx.getPackageName());
 
-                                final Drawable drawable = mCtx.getDrawable(resourceId);
+                            final Drawable drawable = mCtx.getDrawable(resourceId);
 
-                                assert drawable != null;
-                                return ImageItem.withResult(drawable);
-                            }
+                            assert drawable != null;
+                            return ImageItem.withResult(drawable);
+                        }
 
-                            @NonNull
-                            @Override
-                            public Collection<String> supportedSchemes() {
-                                return Collections.singleton("drawable");
-                            }
-                        });
-                        plugin.placeholderProvider(new ImagesPlugin.PlaceholderProvider() {
-                            @Nullable
-                            @Override
-                            public Drawable providePlaceholder(@NonNull AsyncDrawable drawable) {
-                                return null;
-                            }
-                        });
-                        plugin.addMediaDecoder(GifMediaDecoder.create(false));
-                        plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
-                        plugin.addMediaDecoder(SvgMediaDecoder.create());
-                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
-                        plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
-                    }
+                        @NonNull
+                        @Override
+                        public Collection<String> supportedSchemes() {
+                            return Collections.singleton("drawable");
+                        }
+                    });
+                    plugin.placeholderProvider(drawable -> null);
+                    plugin.addMediaDecoder(GifMediaDecoder.create(false));
+                    plugin.addMediaDecoder(SvgMediaDecoder.create(mCtx.getResources()));
+                    plugin.addMediaDecoder(SvgMediaDecoder.create());
+                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create(mCtx.getResources()));
+                    plugin.defaultMediaDecoder(DefaultMediaDecoder.create());
                 }))
                 .usePlugin(new AbstractMarkwonPlugin() {
                     @Override
@@ -182,7 +208,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
 
         Spanned msTitle = markwon.toMarkdown(currentItem.getTitle());
         markwon.setParsedMarkdown(holder.msTitle, msTitle);
-        //holder.msStatus.setText(currentItem.getState());
 
         if(currentItem.getState().equals("open")) {
 
@@ -224,7 +249,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
             holder.msDescription.setText(bodyWithMD);
         }
         else {
-            holder.msDescription.setVisibility(View.GONE);
+            holder.msDescription.setText("");
         }
 
         holder.msOpenIssues.setText(String.valueOf(currentItem.getOpen_issues()));
@@ -261,13 +286,14 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
-                String dueDate = formatter.format(date);
                 assert date != null;
+                String dueDate = formatter.format(date);
+
                 if(date.before(new Date())) {
                     holder.msDueDate.setTextColor(mCtx.getResources().getColor(R.color.darkRed));
                 }
 
-                holder.msDueDate.setText(dueDate);
+                holder.msDueDate.setText(mCtx.getResources().getString(R.string.dueDate, dueDate));
                 holder.msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToast(currentItem.getDue_on()), mCtx));
 
             } else if (timeFormat.equals("normal1")) {
@@ -278,13 +304,14 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
+                assert date1 != null;
                 String dueDate = formatter.format(date1);
-                holder.msDueDate.setText(dueDate);
+                holder.msDueDate.setText(mCtx.getResources().getString(R.string.dueDate, dueDate));
             }
 
         }
         else {
-            holder.msDueDate.setVisibility(View.GONE);
+            holder.msDueDate.setText("");
         }
 
     }
@@ -300,6 +327,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
     }
 
     private Filter milestoneFilter = new Filter() {
+
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
             List<Milestones> filteredList = new ArrayList<>();
@@ -328,6 +356,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
             milestonesList.addAll((List) results.values);
             notifyDataSetChanged();
         }
+
     };
 
 }

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

@@ -1,10 +1,10 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Filter;
@@ -13,22 +13,25 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -65,85 +68,114 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
             repoType = itemView.findViewById(R.id.repoType);
 
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+            itemView.setOnClickListener(v -> {
 
-                    Context context = v.getContext();
+                Context context = v.getContext();
 
-                    Intent intent = new Intent(context, RepoDetailActivity.class);
-                    intent.putExtra("repoFullName", fullNameMy.getText().toString());
+                Intent intent = new Intent(context, RepoDetailActivity.class);
+                intent.putExtra("repoFullName", fullNameMy.getText().toString());
 
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("repoFullName", fullNameMy.getText().toString());
-                    tinyDb.putString("repoType", repoType.getText().toString());
-                    tinyDb.putBoolean("resumeIssues", true);
-                    context.startActivity(intent);
+                TinyDB tinyDb = new TinyDB(context);
+                tinyDb.putString("repoFullName", fullNameMy.getText().toString());
+                tinyDb.putString("repoType", repoType.getText().toString());
+                //tinyDb.putBoolean("resumeIssues", true);
 
-                }
-            });
+                //store if user is watching this repo
+                {
+                    final String instanceUrl = tinyDb.getString("instanceUrl");
+                    String[] parts = fullNameMy.getText().toString().split("/");
+                    final String repoOwner = parts[0];
+                    final String repoName = parts[1];
+                    final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-            reposDropdownMenu.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+                    WatchRepository watch = new WatchRepository();
 
-                    final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Call<WatchRepository> call;
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
-                    popupMenu.inflate(R.menu.repo_dotted_list_menu);
+                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    Object menuHelper;
-                    Class[] argTypes;
-                    try {
+                    call.enqueue(new Callback<WatchRepository>() {
 
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
-                        fMenuHelper.setAccessible(true);
-                        menuHelper = fMenuHelper.get(popupMenu);
-                        argTypes = new Class[] { boolean.class };
-                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
-                                argTypes).invoke(menuHelper, true);
-
-                    } catch (Exception e) {
-
-                        popupMenu.show();
-                        return;
-
-                    }
-
-                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                         @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            switch (item.getItemId()) {
-                                case R.id.repoStargazers:
+                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
-                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
-                                    intent.putExtra("repoFullNameForStars", fullNameMy.getText());
-                                    context.startActivity(intent);
-                                    break;
+                            if(response.isSuccessful()) {
 
-                                case R.id.repoWatchers:
+                                assert response.body() != null;
+                                tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                                    intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText());
-                                    context.startActivity(intentW);
-                                    break;
+                            } else {
 
-                                case R.id.repoOpenInBrowser:
+                                tinyDb.putBoolean("repoWatch", false);
 
-                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullNameMy.getText());
-                                    context.startActivity(intentOpenInBrowser);
-                                    break;
+                                if(response.code() != 404) {
+
+                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+                                }
 
                             }
-                            return false;
+
+                        }
+
+                        @Override
+                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+
+                            tinyDb.putBoolean("repoWatch", false);
+                            Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
                         }
                     });
-
-                    popupMenu.show();
-
                 }
+
+                context.startActivity(intent);
+
+            });
+
+            reposDropdownMenu.setOnClickListener(v -> {
+
+                final Context context = v.getContext();
+
+                @SuppressLint("InflateParams")
+                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+                TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+                TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+                TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+                bottomSheetHeader.setText(fullNameMy.getText());
+                BottomSheetDialog dialog = new BottomSheetDialog(context);
+                dialog.setContentView(view);
+                dialog.show();
+
+                repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullNameMy.getText());
+                    context.startActivity(intentOpenInBrowser);
+                    dialog.dismiss();
+
+                });
+
+                repoStargazers.setOnClickListener(stargazers -> {
+
+                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                    intent.putExtra("repoFullNameForStars", fullNameMy.getText());
+                    context.startActivity(intent);
+                    dialog.dismiss();
+
+                });
+
+                repoWatchers.setOnClickListener(watchers -> {
+
+                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                    intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText());
+                    context.startActivity(intentW);
+                    dialog.dismiss();
+
+                });
+
             });
 
         }
@@ -158,7 +190,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
     @NonNull
     @Override
     public MyReposListAdapter.MyReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.my_repos_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_my_repos, parent, false);
         return new MyReposListAdapter.MyReposViewHolder(v);
     }
 
@@ -184,7 +216,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 
         if (currentItem.getAvatar_url() != null) {
             if (!currentItem.getAvatar_url().equals("")) {
-                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.imageMy);
+                PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.imageMy);
             } else {
                 holder.imageMy.setImageDrawable(drawable);
             }

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.adapters;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.view.LayoutInflater;
@@ -11,9 +12,9 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.OrgDetailActivity;
+import org.mian.gitnex.activities.OrganizationDetailActivity;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.models.UserOrganizations;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.util.TinyDB;
@@ -35,23 +36,27 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
         private ImageView image;
         private TextView mTextView1;
         private TextView mTextView2;
+        private TextView organizationId;
 
         private OrganizationsViewHolder(View itemView) {
             super(itemView);
             mTextView1 = itemView.findViewById(R.id.orgUsername);
             mTextView2 = itemView.findViewById(R.id.orgDescription);
             image = itemView.findViewById(R.id.imageAvatar);
+            organizationId = itemView.findViewById(R.id.organizationId);
 
             itemView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
 
                     Context context = v.getContext();
-                    Intent intent = new Intent(context, OrgDetailActivity.class);
+                    Intent intent = new Intent(context, OrganizationDetailActivity.class);
                     intent.putExtra("orgName", mTextView1.getText().toString());
 
                     TinyDB tinyDb = new TinyDB(context);
                     tinyDb.putString("orgName", mTextView1.getText().toString());
+                    tinyDb.putString("organizationId", organizationId.getText().toString());
+                    tinyDb.putBoolean("organizationAction", true);
                     context.startActivity(intent);
 
                 }
@@ -69,17 +74,19 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
     @NonNull
     @Override
     public OrganizationsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.organizations_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_organizations, parent, false);
         return new OrganizationsViewHolder(v);
     }
 
+    @SuppressLint("SetTextI18n")
     @Override
     public void onBindViewHolder(@NonNull OrganizationsViewHolder holder, int position) {
 
         UserOrganizations currentItem = orgList.get(position);
         holder.mTextView2.setVisibility(View.GONE);
+        holder.organizationId.setText(Integer.toString(currentItem.getId()));
 
-        Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
         holder.mTextView1.setText(currentItem.getUsername());
         if (!currentItem.getDescription().equals("")) {
             holder.mTextView2.setVisibility(View.VISIBLE);

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

@@ -44,7 +44,7 @@ public class ProfileEmailsAdapter extends RecyclerView.Adapter<ProfileEmailsAdap
     @NonNull
     @Override
     public ProfileEmailsAdapter.EmailsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.profile_emails_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_emails, parent, false);
         return new ProfileEmailsAdapter.EmailsViewHolder(v);
     }
 

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

@@ -6,8 +6,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
 import java.util.List;
@@ -47,7 +47,7 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowe
     @NonNull
     @Override
     public ProfileFollowersAdapter.FollowersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.profile_followers_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_followers, parent, false);
         return new ProfileFollowersAdapter.FollowersViewHolder(v);
     }
 
@@ -65,7 +65,7 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowe
             holder.userName.setVisibility(View.GONE);
         }
 
-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
     }
 
     @Override

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

@@ -6,8 +6,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
 import java.util.List;
@@ -47,7 +47,7 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowi
     @NonNull
     @Override
     public ProfileFollowingAdapter.FollowingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.profile_following_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_following, parent, false);
         return new ProfileFollowingAdapter.FollowingViewHolder(v);
     }
 
@@ -65,7 +65,7 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowi
             holder.userName.setVisibility(View.GONE);
         }
 
-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
     }
 
     @Override

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

@@ -14,9 +14,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TimeHelper;
@@ -57,7 +57,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         LayoutInflater inflater = LayoutInflater.from(context);
 
         if(viewType == TYPE_LOAD){
-            return new PullRequestsAdapter.PullRequestsHolder(inflater.inflate(R.layout.repo_pr_list, parent,false));
+            return new PullRequestsAdapter.PullRequestsHolder(inflater.inflate(R.layout.list_pr, parent,false));
         }
         else {
             return new PullRequestsAdapter.LoadHolder(inflater.inflate(R.layout.row_load,parent,false));
@@ -170,9 +170,9 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             }
 
             if (prModel.getUser().getAvatar_url() != null) {
-                Picasso.get().load(prModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+                PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
             } else {
-                Picasso.get().load(prModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+                PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
             }
 
             String prNumber_ = "<font color='" + context.getResources().getColor(R.color.lightGray) + "'>" + context.getResources().getString(R.string.hash) + prModel.getNumber() + "</font>";
@@ -181,26 +181,10 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             prNumber.setText(String.valueOf(prModel.getNumber()));
             prCommentsCount.setText(String.valueOf(prModel.getComments()));
 
-            switch (timeFormat) {
-                case "pretty": {
-                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-                    String createdTime = prettyTime.format(prModel.getCreated_at());
-                    prCreatedTime.setText(createdTime);
-                    prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(prModel.getCreated_at()), context));
-                    break;
-                }
-                case "normal": {
-                    DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                    String createdTime = formatter.format(prModel.getCreated_at());
-                    prCreatedTime.setText(createdTime);
-                    break;
-                }
-                case "normal1": {
-                    DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                    String createdTime = formatter.format(prModel.getCreated_at());
-                    prCreatedTime.setText(createdTime);
-                    break;
-                }
+            prCreatedTime.setText(TimeHelper.formatTime(prModel.getCreated_at(), new Locale(locale), timeFormat, context));
+
+            if(timeFormat.equals("pretty")) {
+                prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(prModel.getCreated_at()), context));
             }
 
         }

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

@@ -80,7 +80,7 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
     @NonNull
     @Override
     public ReleasesAdapter.ReleasesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.releases_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_releases, parent, false);
         return new ReleasesAdapter.ReleasesViewHolder(v);
     }
 

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

@@ -9,8 +9,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
@@ -63,7 +63,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
         RepoStargazersAdapter.ViewHolder viewHolder;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_stargazers_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_repo_stargazers, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -79,29 +79,24 @@ public class RepoStargazersAdapter extends BaseAdapter {
     private void initData(RepoStargazersAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = stargazersList.get(position);
-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
 
         final TinyDB tinyDb = new TinyDB(mCtx);
         Typeface myTypeface;
 
-        if(tinyDb.getInt("customFontId") == 0) {
+        switch(tinyDb.getInt("customFontId", -1)) {
 
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+            case 0:
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+                break;
 
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
+            case 2:
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
+                break;
 
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+            default:
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
+                break;
 
         }
 

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

@@ -9,8 +9,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
@@ -63,7 +63,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
         RepoWatchersAdapter.ViewHolder viewHolder;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_watchers_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_repo_watchers, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -79,29 +79,24 @@ public class RepoWatchersAdapter extends BaseAdapter {
     private void initData(RepoWatchersAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = watchersList.get(position);
-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
 
         final TinyDB tinyDb = new TinyDB(mCtx);
         Typeface myTypeface;
 
-        if(tinyDb.getInt("customFontId") == 0) {
+        switch(tinyDb.getInt("customFontId", -1)) {
 
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+            case 0:
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+                break;
 
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
+            case 2:
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
+                break;
 
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+            default:
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
+                break;
 
         }
 

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

@@ -1,34 +1,38 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
-import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -36,226 +40,262 @@ import java.util.List;
 
 public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.ReposViewHolder> implements Filterable {
 
-    private List<UserRepositories> reposList;
-    private Context mCtx;
-    private List<UserRepositories> reposListFull;
+	private List<UserRepositories> reposList;
+	private Context mCtx;
+	private List<UserRepositories> reposListFull;
 
-    static class ReposViewHolder extends RecyclerView.ViewHolder {
+	static class ReposViewHolder extends RecyclerView.ViewHolder {
 
-        private ImageView image;
-        private TextView mTextView1;
-        private TextView mTextView2;
-        private TextView fullName;
-        private ImageView repoPrivatePublic;
-        private TextView repoStars;
-        private TextView repoForks;
-        private TextView repoOpenIssuesCount;
-        private TextView repoType;
+		private ImageView image;
+		private TextView repoName;
+		private TextView repoDescription;
+		private TextView fullName;
+		private CheckBox isRepoAdmin;
+		private ImageView repoPrivatePublic;
+		private TextView repoStars;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
+		private TextView repoType;
 
-        private ReposViewHolder(View itemView) {
+		private ReposViewHolder(View itemView) {
 
-            super(itemView);
-            mTextView1 = itemView.findViewById(R.id.repoName);
-            mTextView2 = itemView.findViewById(R.id.repoDescription);
-            image = itemView.findViewById(R.id.imageAvatar);
-            fullName = itemView.findViewById(R.id.repoFullName);
-            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
-            repoStars = itemView.findViewById(R.id.repoStars);
-            repoForks = itemView.findViewById(R.id.repoForks);
-            repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
-            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
-            repoType = itemView.findViewById(R.id.repoType);
+			super(itemView);
+			repoName = itemView.findViewById(R.id.repoName);
+			repoDescription = itemView.findViewById(R.id.repoDescription);
+			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+			image = itemView.findViewById(R.id.imageAvatar);
+			fullName = itemView.findViewById(R.id.repoFullName);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
+			repoStars = itemView.findViewById(R.id.repoStars);
+			repoForks = itemView.findViewById(R.id.repoForks);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+			repoType = itemView.findViewById(R.id.repoType);
 
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+			itemView.setOnClickListener(v -> {
 
-                    Context context = v.getContext();
-                    TextView repoFullName = v.findViewById(R.id.repoFullName);
-                    TextView repoType_ = v.findViewById(R.id.repoType);
+				Context context = v.getContext();
+				TextView repoFullName = v.findViewById(R.id.repoFullName);
+				TextView repoType_ = v.findViewById(R.id.repoType);
 
-                    Intent intent = new Intent(context, RepoDetailActivity.class);
-                    intent.putExtra("repoFullName", repoFullName.getText().toString());
+				Intent intent = new Intent(context, RepoDetailActivity.class);
+				intent.putExtra("repoFullName", repoFullName.getText().toString());
 
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("repoFullName", repoFullName.getText().toString());
-                    tinyDb.putString("repoType", repoType_.getText().toString());
-                    tinyDb.putBoolean("resumeIssues", true);
-                    context.startActivity(intent);
+				TinyDB tinyDb = new TinyDB(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
+				tinyDb.putString("repoType", repoType_.getText().toString());
+				//tinyDb.putBoolean("resumeIssues", true);
+				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
 
-                }
-            });
+				//store if user is watching this repo
+				{
+					final String instanceUrl = tinyDb.getString("instanceUrl");
+					String[] parts = repoFullName.getText().toString().split("/");
+					final String repoOwner = parts[0];
+					final String repoName = parts[1];
+					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-            reposDropdownMenu.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+					WatchRepository watch = new WatchRepository();
 
-                    final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+					Call<WatchRepository> call;
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
-                    popupMenu.inflate(R.menu.repo_dotted_list_menu);
+					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    Object menuHelper;
-                    Class[] argTypes;
-                    try {
+					call.enqueue(new Callback<WatchRepository>() {
 
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
-                        fMenuHelper.setAccessible(true);
-                        menuHelper = fMenuHelper.get(popupMenu);
-                        argTypes = new Class[] { boolean.class };
-                        assert menuHelper != null;
-                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
-                                argTypes).invoke(menuHelper, true);
+						@Override
+						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
-                    } catch (Exception e) {
+							if(response.isSuccessful()) {
 
-                        popupMenu.show();
-                        return;
+								assert response.body() != null;
+								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-                    }
+							} else {
 
-                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            switch (item.getItemId()) {
-                                case R.id.repoStargazers:
+								tinyDb.putBoolean("repoWatch", false);
 
-                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
-                                    intent.putExtra("repoFullNameForStars", fullName.getText());
-                                    context.startActivity(intent);
-                                    break;
+								if(response.code() != 404) {
 
-                                case R.id.repoWatchers:
+									Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
-                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
-                                    context.startActivity(intentW);
-                                    break;
+								}
 
-                                case R.id.repoOpenInBrowser:
+							}
 
-                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
-                                    context.startActivity(intentOpenInBrowser);
-                                    break;
+						}
 
-                            }
-                            return false;
-                        }
-                    });
+						@Override
+						public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
 
-                    popupMenu.show();
+							tinyDb.putBoolean("repoWatch", false);
+							Toasty.info(context, context.getString(R.string.genericApiStatusError));
 
-                }
-            });
+						}
+					});
+				}
 
-        }
-    }
+				context.startActivity(intent);
 
-    public ReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {
-        this.mCtx = mCtx;
-        this.reposList = reposListMain;
-        reposListFull = new ArrayList<>(reposList);
-    }
+			});
 
-    @NonNull
-    @Override
-    public ReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.repos_list, parent, false);
-        return new ReposViewHolder(v);
-    }
+			reposDropdownMenu.setOnClickListener(v -> {
 
-    @Override
-    public void onBindViewHolder(@NonNull ReposViewHolder holder, int position) {
+				final Context context = v.getContext();
 
-        UserRepositories currentItem = reposList.get(position);
-        holder.mTextView2.setVisibility(View.GONE);
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
 
-        ColorGenerator generator = ColorGenerator.MATERIAL;
-        int color = generator.getColor(currentItem.getName());
-        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-        TextDrawable drawable = TextDrawable.builder()
-                .beginConfig()
-                .useFont(Typeface.DEFAULT)
-                .fontSize(18)
-                .toUpperCase()
-                .width(28)
-                .height(28)
-                .endConfig()
-                .buildRoundRect(firstCharacter, color, 3);
+				bottomSheetHeader.setText(fullName.getText());
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
 
-        if (currentItem.getAvatar_url() != null) {
-            if (!currentItem.getAvatar_url().equals("")) {
-                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
-            } else {
-                holder.image.setImageDrawable(drawable);
-            }
-        }
-        else {
-            holder.image.setImageDrawable(drawable);
-        }
+				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
 
-        holder.mTextView1.setText(currentItem.getName());
-        if (!currentItem.getDescription().equals("")) {
-            holder.mTextView2.setVisibility(View.VISIBLE);
-            holder.mTextView2.setText(currentItem.getDescription());
-        }
-        holder.fullName.setText(currentItem.getFullname());
-        if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
-            holder.repoType.setText(R.string.strPrivate);
-        }
-        else {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
-            holder.repoType.setText(R.string.strPublic);
-        }
-        holder.repoStars.setText(currentItem.getStars_count());
-        holder.repoForks.setText(currentItem.getForks_count());
-        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+					intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+					context.startActivity(intentOpenInBrowser);
+					dialog.dismiss();
 
-    }
+				});
 
-    @Override
-    public int getItemCount() {
-        return reposList.size();
-    }
+				repoStargazers.setOnClickListener(stargazers -> {
 
-    @Override
-    public Filter getFilter() {
-        return reposFilter;
-    }
+					Intent intent = new Intent(context, RepoStargazersActivity.class);
+					intent.putExtra("repoFullNameForStars", fullName.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
 
-    private Filter reposFilter = new Filter() {
-        @Override
-        protected FilterResults performFiltering(CharSequence constraint) {
-            List<UserRepositories> filteredList = new ArrayList<>();
+				});
 
-            if (constraint == null || constraint.length() == 0) {
-                filteredList.addAll(reposListFull);
-            } else {
-                String filterPattern = constraint.toString().toLowerCase().trim();
+				repoWatchers.setOnClickListener(watchers -> {
 
-                for (UserRepositories item : reposListFull) {
-                    if (item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
-                        filteredList.add(item);
-                    }
-                }
-            }
+					Intent intentW = new Intent(context, RepoWatchersActivity.class);
+					intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
 
-            FilterResults results = new FilterResults();
-            results.values = filteredList;
+				});
 
-            return results;
-        }
+			});
 
-        @Override
-        protected void publishResults(CharSequence constraint, FilterResults results) {
-            reposList.clear();
-            reposList.addAll((List) results.values);
-            notifyDataSetChanged();
-        }
-    };
+		}
+
+	}
+
+	public ReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {
+
+		this.mCtx = mCtx;
+		this.reposList = reposListMain;
+		reposListFull = new ArrayList<>(reposList);
+	}
+
+	@NonNull
+	@Override
+	public ReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repos, parent, false);
+		return new ReposViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(@NonNull ReposViewHolder holder, int position) {
+
+		UserRepositories currentItem = reposList.get(position);
+		holder.repoDescription.setVisibility(View.GONE);
+
+		ColorGenerator generator = ColorGenerator.MATERIAL;
+		int color = generator.getColor(currentItem.getName());
+		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
+
+		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
+
+		if(currentItem.getAvatar_url() != null) {
+			if(!currentItem.getAvatar_url().equals("")) {
+				PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
+			}
+			else {
+				holder.image.setImageDrawable(drawable);
+			}
+		}
+		else {
+			holder.image.setImageDrawable(drawable);
+		}
+
+		holder.repoName.setText(currentItem.getName());
+		if(!currentItem.getDescription().equals("")) {
+			holder.repoDescription.setVisibility(View.VISIBLE);
+			holder.repoDescription.setText(currentItem.getDescription());
+		}
+		holder.fullName.setText(currentItem.getFullname());
+		if(currentItem.getPrivateFlag()) {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+			holder.repoType.setText(R.string.strPrivate);
+		}
+		else {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+			holder.repoType.setText(R.string.strPublic);
+		}
+		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoForks.setText(currentItem.getForks_count());
+		holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+		if(holder.isRepoAdmin == null) {
+			holder.isRepoAdmin = new CheckBox(mCtx);
+		}
+		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
+
+	}
+
+	@Override
+	public int getItemCount() {
+
+		return reposList.size();
+	}
+
+	@Override
+	public Filter getFilter() {
+
+		return reposFilter;
+	}
+
+	private Filter reposFilter = new Filter() {
+
+		@Override
+		protected FilterResults performFiltering(CharSequence constraint) {
+
+			List<UserRepositories> filteredList = new ArrayList<>();
+
+			if(constraint == null || constraint.length() == 0) {
+				filteredList.addAll(reposListFull);
+			}
+			else {
+				String filterPattern = constraint.toString().toLowerCase().trim();
+
+				for(UserRepositories item : reposListFull) {
+					if(item.getFullname().toLowerCase().contains(filterPattern) || item.getDescription().toLowerCase().contains(filterPattern)) {
+						filteredList.add(item);
+					}
+				}
+			}
+
+			FilterResults results = new FilterResults();
+			results.values = filteredList;
+
+			return results;
+		}
+
+		@Override
+		protected void publishResults(CharSequence constraint, FilterResults results) {
+
+			reposList.clear();
+			reposList.addAll((List) results.values);
+			notifyDataSetChanged();
+		}
+	};
 
 }

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

@@ -1,34 +1,38 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -43,9 +47,10 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
     static class OrgReposViewHolder extends RecyclerView.ViewHolder {
 
         private ImageView image;
-        private TextView mTextView1;
-        private TextView mTextView2;
+        private TextView repoName;
+        private TextView repoDescription;
         private TextView fullName;
+        private CheckBox isRepoAdmin;
         private ImageView repoPrivatePublic;
         private TextView repoStars;
         private TextView repoForks;
@@ -54,8 +59,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 
         private OrgReposViewHolder(View itemView) {
             super(itemView);
-            mTextView1 = itemView.findViewById(R.id.repoName);
-            mTextView2 = itemView.findViewById(R.id.repoDescription);
+            repoName = itemView.findViewById(R.id.repoName);
+            repoDescription = itemView.findViewById(R.id.repoDescription);
+            isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
             image = itemView.findViewById(R.id.imageAvatar);
             fullName = itemView.findViewById(R.id.repoFullName);
             repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
@@ -65,85 +71,114 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
             repoType = itemView.findViewById(R.id.repoType);
 
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+            itemView.setOnClickListener(v -> {
 
-                    Context context = v.getContext();
+                Context context = v.getContext();
 
-                    Intent intent = new Intent(context, RepoDetailActivity.class);
-                    intent.putExtra("repoFullName", fullName.getText().toString());
+                Intent intent = new Intent(context, RepoDetailActivity.class);
+                intent.putExtra("repoFullName", fullName.getText().toString());
 
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("repoFullName", fullName.getText().toString());
-                    tinyDb.putString("repoType", repoType.getText().toString());
-                    tinyDb.putBoolean("resumeIssues", true);
-                    context.startActivity(intent);
+                TinyDB tinyDb = new TinyDB(context);
+                tinyDb.putString("repoFullName", fullName.getText().toString());
+                tinyDb.putString("repoType", repoType.getText().toString());
+                //tinyDb.putBoolean("resumeIssues", true);
+                tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
 
-                }
-            });
+                //store if user is watching this repo
+                {
+                    final String instanceUrl = tinyDb.getString("instanceUrl");
+                    String[] parts = fullName.getText().toString().split("/");
+                    final String repoOwner = parts[0];
+                    final String repoName = parts[1];
+                    final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-            reposDropdownMenu.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+                    WatchRepository watch = new WatchRepository();
 
-                    final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Call<WatchRepository> call;
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
-                    popupMenu.inflate(R.menu.repo_dotted_list_menu);
+                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    Object menuHelper;
-                    Class[] argTypes;
-                    try {
+                    call.enqueue(new Callback<WatchRepository>() {
 
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
-                        fMenuHelper.setAccessible(true);
-                        menuHelper = fMenuHelper.get(popupMenu);
-                        argTypes = new Class[] { boolean.class };
-                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
-                                argTypes).invoke(menuHelper, true);
-
-                    } catch (Exception e) {
-
-                        popupMenu.show();
-                        return;
-
-                    }
-
-                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                         @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            switch (item.getItemId()) {
-                                case R.id.repoStargazers:
+                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
-                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
-                                    intent.putExtra("repoFullNameForStars", fullName.getText());
-                                    context.startActivity(intent);
-                                    break;
+                            if(response.isSuccessful()) {
 
-                                case R.id.repoWatchers:
+                                assert response.body() != null;
+                                tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
-                                    context.startActivity(intentW);
-                                    break;
+                            } else {
 
-                                case R.id.repoOpenInBrowser:
+                                tinyDb.putBoolean("repoWatch", false);
 
-                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
-                                    context.startActivity(intentOpenInBrowser);
-                                    break;
+                                if(response.code() != 404) {
+
+                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+                                }
 
                             }
-                            return false;
+
+                        }
+
+                        @Override
+                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+
+                            tinyDb.putBoolean("repoWatch", false);
+                            Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
                         }
                     });
-
-                    popupMenu.show();
-
                 }
+
+                context.startActivity(intent);
+            });
+
+            reposDropdownMenu.setOnClickListener(v -> {
+
+                final Context context = v.getContext();
+
+                @SuppressLint("InflateParams")
+                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+                TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+                TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+                TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+                bottomSheetHeader.setText(fullName.getText());
+                BottomSheetDialog dialog = new BottomSheetDialog(context);
+                dialog.setContentView(view);
+                dialog.show();
+
+                repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+                    context.startActivity(intentOpenInBrowser);
+                    dialog.dismiss();
+
+                });
+
+                repoStargazers.setOnClickListener(openInBrowser -> {
+
+                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                    context.startActivity(intent);
+                    dialog.dismiss();
+
+                });
+
+                repoWatchers.setOnClickListener(openInBrowser -> {
+
+                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+                    context.startActivity(intentW);
+                    dialog.dismiss();
+
+                });
+
             });
 
         }
@@ -159,7 +194,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
     @NonNull
     @Override
     public RepositoriesByOrgAdapter.OrgReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.repositories_by_org_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_repositories_by_org, parent, false);
         return new RepositoriesByOrgAdapter.OrgReposViewHolder(v);
     }
 
@@ -167,7 +202,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
     public void onBindViewHolder(@NonNull RepositoriesByOrgAdapter.OrgReposViewHolder holder, int position) {
 
         UserRepositories currentItem = reposList.get(position);
-        holder.mTextView2.setVisibility(View.GONE);
+        holder.repoDescription.setVisibility(View.GONE);
 
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(currentItem.getName());
@@ -185,7 +220,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 
         if (currentItem.getAvatar_url() != null) {
             if (!currentItem.getAvatar_url().equals("")) {
-                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
+                PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
             } else {
                 holder.image.setImageDrawable(drawable);
             }
@@ -194,10 +229,10 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
             holder.image.setImageDrawable(drawable);
         }
 
-        holder.mTextView1.setText(currentItem.getName());
+        holder.repoName.setText(currentItem.getName());
         if (!currentItem.getDescription().equals("")) {
-            holder.mTextView2.setVisibility(View.VISIBLE);
-            holder.mTextView2.setText(currentItem.getDescription());
+            holder.repoDescription.setVisibility(View.VISIBLE);
+            holder.repoDescription.setText(currentItem.getDescription());
         }
         holder.fullName.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
@@ -212,6 +247,11 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
         holder.repoForks.setText(currentItem.getForks_count());
         holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
 
+        if (holder.isRepoAdmin == null) {
+            holder.isRepoAdmin = new CheckBox(mCtx);
+        }
+        holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
+
     }
 
     @Override

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

@@ -1,34 +1,38 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.activities.RepoStargazersActivity;
 import org.mian.gitnex.activities.RepoWatchersActivity;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.models.WatchRepository;
 import org.mian.gitnex.util.TinyDB;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
+import retrofit2.Call;
+import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -43,9 +47,10 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
     static class StarredReposViewHolder extends RecyclerView.ViewHolder {
 
         private ImageView image;
-        private TextView mTextView1;
-        private TextView mTextView2;
+        private TextView repoName;
+        private TextView repoDescription;
         private TextView fullName;
+        private CheckBox isRepoAdmin;
         private ImageView repoPrivatePublic;
         private TextView repoStars;
         private TextView repoForks;
@@ -54,8 +59,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 
         private StarredReposViewHolder(View itemView) {
             super(itemView);
-            mTextView1 = itemView.findViewById(R.id.repoName);
-            mTextView2 = itemView.findViewById(R.id.repoDescription);
+            repoName = itemView.findViewById(R.id.repoName);
+            repoDescription = itemView.findViewById(R.id.repoDescription);
+            isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
             image = itemView.findViewById(R.id.imageAvatar);
             fullName = itemView.findViewById(R.id.repoFullName);
             repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
@@ -65,85 +71,115 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
             ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
             repoType = itemView.findViewById(R.id.repoType);
 
-            itemView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+            itemView.setOnClickListener(v -> {
 
-                    Context context = v.getContext();
+                Context context = v.getContext();
 
-                    Intent intent = new Intent(context, RepoDetailActivity.class);
-                    intent.putExtra("repoFullName", fullName.getText().toString());
+                Intent intent = new Intent(context, RepoDetailActivity.class);
+                intent.putExtra("repoFullName", fullName.getText().toString());
 
-                    TinyDB tinyDb = new TinyDB(context);
-                    tinyDb.putString("repoFullName", fullName.getText().toString());
-                    tinyDb.putString("repoType", repoType.getText().toString());
-                    tinyDb.putBoolean("resumeIssues", true);
-                    context.startActivity(intent);
+                TinyDB tinyDb = new TinyDB(context);
+                tinyDb.putString("repoFullName", fullName.getText().toString());
+                tinyDb.putString("repoType", repoType.getText().toString());
+                //tinyDb.putBoolean("resumeIssues", true);
+                tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
 
-                }
-            });
+                //store if user is watching this repo
+                {
+                    final String instanceUrl = tinyDb.getString("instanceUrl");
+                    String[] parts = fullName.getText().toString().split("/");
+                    final String repoOwner = parts[0];
+                    final String repoName = parts[1];
+                    final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
-            reposDropdownMenu.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+                    WatchRepository watch = new WatchRepository();
 
-                    final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.AppThemeConfirmDialog);
+                    Call<WatchRepository> call;
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
-                    popupMenu.inflate(R.menu.repo_dotted_list_menu);
+                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
 
-                    Object menuHelper;
-                    Class[] argTypes;
-                    try {
+                    call.enqueue(new Callback<WatchRepository>() {
 
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
-                        fMenuHelper.setAccessible(true);
-                        menuHelper = fMenuHelper.get(popupMenu);
-                        argTypes = new Class[] { boolean.class };
-                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
-                                argTypes).invoke(menuHelper, true);
-
-                    } catch (Exception e) {
-
-                        popupMenu.show();
-                        return;
-
-                    }
-
-                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                         @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            switch (item.getItemId()) {
-                                case R.id.repoStargazers:
+                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
 
-                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
-                                    intent.putExtra("repoFullNameForStars", fullName.getText());
-                                    context.startActivity(intent);
-                                    break;
+                            if(response.isSuccessful()) {
 
-                                case R.id.repoWatchers:
+                                assert response.body() != null;
+                                tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
-                                    context.startActivity(intentW);
-                                    break;
+                            } else {
 
-                                case R.id.repoOpenInBrowser:
+                                tinyDb.putBoolean("repoWatch", false);
 
-                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
-                                    context.startActivity(intentOpenInBrowser);
-                                    break;
+                                if(response.code() != 404) {
+
+                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+                                }
 
                             }
-                            return false;
+
+                        }
+
+                        @Override
+                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
+
+                            tinyDb.putBoolean("repoWatch", false);
+                            Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
                         }
                     });
-
-                    popupMenu.show();
-
                 }
+
+                context.startActivity(intent);
+
+            });
+
+            reposDropdownMenu.setOnClickListener(v -> {
+
+                final Context context = v.getContext();
+
+                @SuppressLint("InflateParams")
+                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+                TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+                TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+                TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+                bottomSheetHeader.setText(fullName.getText());
+                BottomSheetDialog dialog = new BottomSheetDialog(context);
+                dialog.setContentView(view);
+                dialog.show();
+
+                repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+                    context.startActivity(intentOpenInBrowser);
+                    dialog.dismiss();
+
+                });
+
+                repoStargazers.setOnClickListener(stargazers -> {
+
+                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                    context.startActivity(intent);
+                    dialog.dismiss();
+
+                });
+
+                repoWatchers.setOnClickListener(watchers -> {
+
+                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+                    context.startActivity(intentW);
+                    dialog.dismiss();
+
+                });
+
             });
 
         }
@@ -159,7 +195,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
     @NonNull
     @Override
     public StarredReposListAdapter.StarredReposViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.starred_repos_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_starred_repos, parent, false);
         return new StarredReposListAdapter.StarredReposViewHolder(v);
     }
 
@@ -167,7 +203,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
     public void onBindViewHolder(@NonNull StarredReposListAdapter.StarredReposViewHolder holder, int position) {
 
         UserRepositories currentItem = reposList.get(position);
-        holder.mTextView2.setVisibility(View.GONE);
+        holder.repoDescription.setVisibility(View.GONE);
 
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(currentItem.getName());
@@ -185,7 +221,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 
         if (currentItem.getAvatar_url() != null) {
             if (!currentItem.getAvatar_url().equals("")) {
-                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
+                PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
             } else {
                 holder.image.setImageDrawable(drawable);
             }
@@ -194,10 +230,10 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
             holder.image.setImageDrawable(drawable);
         }
 
-        holder.mTextView1.setText(currentItem.getName());
+        holder.repoName.setText(currentItem.getName());
         if (!currentItem.getDescription().equals("")) {
-            holder.mTextView2.setVisibility(View.VISIBLE);
-            holder.mTextView2.setText(currentItem.getDescription());
+            holder.repoDescription.setVisibility(View.VISIBLE);
+            holder.repoDescription.setText(currentItem.getDescription());
         }
         holder.fullName.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
@@ -211,6 +247,10 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
         holder.repoStars.setText(currentItem.getStars_count());
         holder.repoForks.setText(currentItem.getForks_count());
         holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+        if (holder.isRepoAdmin == null) {
+            holder.isRepoAdmin = new CheckBox(mCtx);
+        }
+        holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
 
     }
 

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

@@ -9,8 +9,9 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.helpers.FontsOverride;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
@@ -64,7 +65,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
         TeamMembersByOrgAdapter.ViewHolder viewHolder = null;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_team_by_org_list, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_team_by_org, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -80,29 +81,24 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
     private void initData(TeamMembersByOrgAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = teamMembersList.get(position);
-        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
 
         final TinyDB tinyDb = new TinyDB(mCtx);
         Typeface myTypeface;
 
-        if(tinyDb.getInt("customFontId") == 0) {
+        switch(tinyDb.getInt("customFontId", -1)) {
 
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+            case 0:
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+                break;
 
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
+            case 2:
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
+                break;
 
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
+            default:
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
+                break;
 
         }
 

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

@@ -9,7 +9,7 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.OrgTeamMembersActivity;
+import org.mian.gitnex.activities.OrganizationTeamMembersActivity;
 import org.mian.gitnex.models.Teams;
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +46,7 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter<TeamsByOrgAdapter.Or
 
                     Context context = v.getContext();
 
-                    Intent intent = new Intent(context, OrgTeamMembersActivity.class);
+                    Intent intent = new Intent(context, OrganizationTeamMembersActivity.class);
                     intent.putExtra("teamTitle", teamTitle.getText().toString());
                     intent.putExtra("teamId", teamId.getText().toString());
                     context.startActivity(intent);
@@ -67,7 +67,7 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter<TeamsByOrgAdapter.Or
     @NonNull
     @Override
     public TeamsByOrgAdapter.OrgTeamsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.teams_by_org_list, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_teams_by_org, parent, false);
         return new TeamsByOrgAdapter.OrgTeamsViewHolder(v);
     }
 

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

@@ -9,9 +9,9 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.CollaboratorActions;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
@@ -120,7 +120,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
     @NonNull
     @Override
     public UserSearchAdapter.UserSearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.collaborators_list_search, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_collaborators_search, parent, false);
         return new UserSearchAdapter.UserSearchViewHolder(v);
     }
 
@@ -141,7 +141,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
         }
 
         if (!currentItem.getAvatar().equals("")) {
-            Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+            PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
         }
 
         if(getItemCount() > 0) {

app/src/main/java/org/mian/gitnex/clients/IssuesService.java

@@ -1,10 +1,16 @@
 package org.mian.gitnex.clients;
 
 import android.content.Context;
+import android.util.Log;
 import androidx.annotation.NonNull;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.util.AppUtil;
 import java.io.File;
 import java.io.IOException;
+import java.security.SecureRandom;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
 import okhttp3.Cache;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
@@ -20,42 +26,59 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class IssuesService {
 
-    public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {
+	public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {
 
-        final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
-        File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
-        int cacheSize = 50 * 1024 * 1024; // 50MB
-        Cache cache = new Cache(httpCacheDirectory, cacheSize);
+		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
+		int cacheSize = 50 * 1024 * 1024; // 50MB
+		Cache cache = new Cache(httpCacheDirectory, cacheSize);
 
-        HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
-        logging.setLevel(HttpLoggingInterceptor.Level.BODY);
+		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+		logging.setLevel(HttpLoggingInterceptor.Level.BODY);
 
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .cache(cache)
-                //.addInterceptor(logging)
-                .addInterceptor(new Interceptor() {
-                    @NonNull
-                    @Override public Response intercept(@NonNull Chain chain) throws IOException {
-                        Request request = chain.request();
-                        if (connToInternet) {
-                            request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
-                        } else {
-                            request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
-                        }
-                        return chain.proceed(request);
-                    }
-                })
-                .build();
+		try {
 
-        Retrofit.Builder builder = new Retrofit.Builder()
-                .baseUrl(instanceURL)
-                .client(okHttpClient)
-                .addConverterFactory(GsonConverterFactory.create());
+			SSLContext sslContext = SSLContext.getInstance("TLS");
 
-        Retrofit retrofit = builder.build();
+			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
+			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
 
-        return retrofit.create(serviceClass);
+			OkHttpClient okHttpClient = new OkHttpClient.Builder()
+					.cache(cache)
+					//.addInterceptor(logging)
+					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
+					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
+					.addInterceptor(new Interceptor() {
 
-    }
+				@NonNull
+				@Override
+				public Response intercept(@NonNull Chain chain) throws IOException {
+
+					Request request = chain.request();
+					if(connToInternet) {
+						request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
+					}
+					else {
+						request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
+					}
+					return chain.proceed(request);
+				}
+			}).build();
+
+			Retrofit.Builder builder = new Retrofit.Builder()
+					.baseUrl(instanceURL)
+					.client(okHttpClient)
+					.addConverterFactory(GsonConverterFactory.create());
+
+			Retrofit retrofit = builder.build();
+			return retrofit.create(serviceClass);
+
+		}
+		catch(Exception e) {
+			Log.e("onFailure", e.toString());
+		}
+
+		return null;
+	}
 
 }

app/src/main/java/org/mian/gitnex/clients/PicassoService.java

@@ -0,0 +1,76 @@
+package org.mian.gitnex.clients;
+
+import android.content.Context;
+import android.util.Log;
+import com.squareup.picasso.OkHttp3Downloader;
+import com.squareup.picasso.Picasso;
+import org.mian.gitnex.helpers.PicassoCache;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
+import java.io.File;
+import java.security.SecureRandom;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
+import okhttp3.OkHttpClient;
+
+/**
+ * Author anonTree1417
+ */
+
+public class PicassoService {
+
+	private static PicassoService picassoService;
+	private Picasso picasso;
+
+	private PicassoService(Context context) {
+
+		Picasso.Builder builder = new Picasso.Builder(context);
+
+		try {
+
+			SSLContext sslContext = SSLContext.getInstance("TLS");
+
+			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(context);
+			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
+
+			OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder()
+					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
+					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()));
+
+			builder.downloader(new OkHttp3Downloader(okHttpClient.build()));
+			builder.listener((picasso, uri, exception) -> {
+
+				//Log.e("PicassoService", Objects.requireNonNull(uri.toString()));
+				//Log.e("PicassoService", exception.toString());
+
+			});
+
+			File cachePath = new File(context.getCacheDir() + "/picasso_cache/");
+			//noinspection ResultOfMethodCallIgnored
+			cachePath.mkdirs();
+
+			picasso = builder.memoryCache(new PicassoCache(cachePath)).build();
+
+		}
+		catch(Exception e) {
+
+			Log.e("PicassoService", e.toString());
+		}
+
+	}
+
+	public Picasso get() {
+
+		return picasso;
+	}
+
+	public static synchronized PicassoService getInstance(Context context) {
+
+		if(picassoService == null) {
+			picassoService = new PicassoService(context);
+		}
+
+		return picassoService;
+	}
+
+}

app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java

@@ -1,10 +1,16 @@
 package org.mian.gitnex.clients;
 
 import android.content.Context;
+import android.util.Log;
 import androidx.annotation.NonNull;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.util.AppUtil;
 import java.io.File;
 import java.io.IOException;
+import java.security.SecureRandom;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
 import okhttp3.Cache;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
@@ -20,42 +26,58 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class PullRequestsService {
 
-    public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {
+	public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {
 
-        final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
-        File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
-        int cacheSize = 50 * 1024 * 1024; // 50MB
-        Cache cache = new Cache(httpCacheDirectory, cacheSize);
+		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
+		int cacheSize = 50 * 1024 * 1024; // 50MB
+		Cache cache = new Cache(httpCacheDirectory, cacheSize);
 
-        HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
-        logging.setLevel(HttpLoggingInterceptor.Level.BODY);
+		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+		logging.setLevel(HttpLoggingInterceptor.Level.BODY);
 
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .cache(cache)
-                //.addInterceptor(logging)
-                .addInterceptor(new Interceptor() {
-                    @NonNull
-                    @Override public Response intercept(@NonNull Chain chain) throws IOException {
-                        Request request = chain.request();
-                        if (connToInternet) {
-                            request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
-                        } else {
-                            request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
-                        }
-                        return chain.proceed(request);
-                    }
-                })
-                .build();
+		try {
 
-        Retrofit.Builder builder = new Retrofit.Builder()
-                .baseUrl(instanceURL)
-                .client(okHttpClient)
-                .addConverterFactory(GsonConverterFactory.create());
+			SSLContext sslContext = SSLContext.getInstance("TLS");
 
-        Retrofit retrofit = builder.build();
+			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
+			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
 
-        return retrofit.create(serviceClass);
+			OkHttpClient okHttpClient = new OkHttpClient.Builder()
+					.cache(cache)
+					//.addInterceptor(logging)
+					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
+					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
+					.addInterceptor(new Interceptor() {
 
-    }
+				@NonNull
+				@Override
+				public Response intercept(@NonNull Chain chain) throws IOException {
+
+					Request request = chain.request();
+					if(connToInternet) {
+						request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
+					}
+					else {
+						request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
+					}
+					return chain.proceed(request);
+				}
+			}).build();
+
+			Retrofit.Builder builder = new Retrofit.Builder()
+					.baseUrl(instanceURL)
+					.client(okHttpClient)
+					.addConverterFactory(GsonConverterFactory.create());
+
+			Retrofit retrofit = builder.build();
+			return retrofit.create(serviceClass);
+		}
+		catch(Exception e) {
+			Log.e("onFailure", e.toString());
+		}
+
+		return null;
+	}
 
 }

app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java

@@ -1,16 +1,19 @@
 package org.mian.gitnex.clients;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
+import android.util.Log;
 import org.mian.gitnex.interfaces.ApiInterface;
+import org.mian.gitnex.interfaces.WebInterface;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.util.AppUtil;
 import java.io.File;
-import java.io.IOException;
+import java.security.SecureRandom;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
 import okhttp3.Cache;
-import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -22,51 +25,67 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
 
 public class RetrofitClient {
 
-    private Retrofit retrofit;
+	private Retrofit retrofit;
 
-    private RetrofitClient(String instanceUrl, Context ctx) {
+	private RetrofitClient(String instanceUrl, Context ctx) {
 
-        final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
-        int cacheSize = 50 * 1024 * 1024; // 50MB
-        File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
-        Cache cache = new Cache(httpCacheDirectory, cacheSize);
+		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+		int cacheSize = 50 * 1024 * 1024; // 50MB
+		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
+		Cache cache = new Cache(httpCacheDirectory, cacheSize);
 
-        HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
-        logging.setLevel(HttpLoggingInterceptor.Level.BODY);
+		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+		logging.setLevel(HttpLoggingInterceptor.Level.BODY);
 
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .cache(cache)
-                //.addInterceptor(logging)
-                .addInterceptor(new Interceptor() {
-                    @NonNull
-                    @Override public Response intercept(@NonNull Chain chain) throws IOException {
-                        Request request = chain.request();
-                        if (connToInternet) {
-                            request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
-                        } else {
-                            request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
-                        }
-                        return chain.proceed(request);
-                    }
-                })
-                .build();
+		try {
 
-        Retrofit.Builder builder = new Retrofit.Builder()
-                .baseUrl(instanceUrl)
-                .client(okHttpClient)
-                .addConverterFactory(ScalarsConverterFactory.create())
-                .addConverterFactory(GsonConverterFactory.create());
+			SSLContext sslContext = SSLContext.getInstance("TLS");
 
-        retrofit = builder.build();
+			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
+			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
 
-    }
+			OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder()
+					.cache(cache)
+					//.addInterceptor(logging)
+					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
+					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
+					.addInterceptor(chain -> {
 
-    public static synchronized RetrofitClient getInstance(String instanceUrl, Context ctx) {
-        return new RetrofitClient(instanceUrl, ctx);
-    }
+						Request request = chain.request();
+						if(connToInternet) {
+							request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build();
+						}
+						else {
+							request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build();
+						}
+						return chain.proceed(request);
+					});
 
-    public ApiInterface getApiInterface() {
-        return retrofit.create(ApiInterface.class);
+			Retrofit.Builder builder = new Retrofit.Builder()
+					.baseUrl(instanceUrl)
+					.client(okHttpClient.build())
+					.addConverterFactory(ScalarsConverterFactory.create())
+					.addConverterFactory(GsonConverterFactory.create());
+
+			retrofit = builder.build();
+
+		}
+		catch(Exception e) {
+			Log.e("onFailure", e.toString());
+		}
+
+	}
+
+	public static synchronized RetrofitClient getInstance(String instanceUrl, Context ctx) {
+		return new RetrofitClient(instanceUrl, ctx);
+	}
+
+	public ApiInterface getApiInterface() {
+		return retrofit.create(ApiInterface.class);
+	}
+
+    public WebInterface getWebInterface() {
+        return retrofit.create(WebInterface.class);
     }
 
 }

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

@@ -15,14 +15,14 @@ import org.mian.gitnex.R;
  * Author M M Arif
  */
 
-public class AdminUsersBottomSheetFragment extends BottomSheetDialogFragment {
+public class BottomSheetAdminUsersFragment extends BottomSheetDialogFragment {
 
-    private AdminUsersBottomSheetFragment.BottomSheetListener bmListener;
+    private BottomSheetAdminUsersFragment.BottomSheetListener bmListener;
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.admin_users_bottom_sheet_layout, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_admin_users_layout, container, false);
 
         TextView createNewUser = v.findViewById(R.id.createNewUser);
 
@@ -46,7 +46,7 @@ public class AdminUsersBottomSheetFragment extends BottomSheetDialogFragment {
         super.onAttach(context);
 
         try {
-            bmListener = (AdminUsersBottomSheetFragment.BottomSheetListener) context;
+            bmListener = (BottomSheetAdminUsersFragment.BottomSheetListener) context;
         } catch (ClassCastException e) {
             throw new ClassCastException(context.toString()
                     + " must implement BottomSheetListener");

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

@@ -16,12 +16,12 @@ import androidx.annotation.Nullable;
  * Author M M Arif
  */
 
-public class NavSubMenuBottomSheetFragment extends BottomSheetDialogFragment {
+public class BottomSheetNavSubMenuFragment extends BottomSheetDialogFragment {
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.nav_sub_menu_bottom_sheet_layout, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_nav_sub_menu_layout, container, false);
 
         TextView adminUsers = v.findViewById(R.id.adminUsers);
 

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

@@ -15,16 +15,17 @@ import androidx.annotation.Nullable;
  * Author M M Arif
  */
 
-public class OrgBottomSheetFragment extends BottomSheetDialogFragment {
+public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
 
-    private OrgBottomSheetFragment.BottomSheetListener bmListener;
+    private BottomSheetOrganizationFragment.BottomSheetListener bmListener;
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.org_bottom_sheet_layout, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_organization_layout, container, false);
 
         TextView createTeam = v.findViewById(R.id.createTeam);
+        TextView createRepository = v.findViewById(R.id.createRepository);
 
         createTeam.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -34,6 +35,14 @@ public class OrgBottomSheetFragment extends BottomSheetDialogFragment {
             }
         });
 
+        createRepository.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                bmListener.onButtonClicked("repository");
+                dismiss();
+            }
+        });
+
         return v;
     }
 
@@ -46,7 +55,7 @@ public class OrgBottomSheetFragment extends BottomSheetDialogFragment {
         super.onAttach(context);
 
         try {
-            bmListener = (OrgBottomSheetFragment.BottomSheetListener) context;
+            bmListener = (BottomSheetOrganizationFragment.BottomSheetListener) context;
         } catch (ClassCastException e) {
             throw new ClassCastException(context.toString()
                     + " must implement BottomSheetListener");

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

@@ -16,12 +16,12 @@ import androidx.annotation.Nullable;
  * Author M M Arif
  */
 
-public class ProfileBottomSheetFragment extends BottomSheetDialogFragment {
+public class BottomSheetProfileFragment extends BottomSheetDialogFragment {
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.profile_bottom_sheet_layout, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_profile_layout, container, false);
 
         TextView addNewEmailAddress = v.findViewById(R.id.addNewEmailAddress);
 

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

@@ -17,14 +17,14 @@ import androidx.annotation.Nullable;
  * Author M M Arif
  */
 
-public class RepoBottomSheetFragment extends BottomSheetDialogFragment {
+public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
 
     private BottomSheetListener bmListener;
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.repo_bottom_sheet_layout, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_repo_layout, container, false);
 
         final TinyDB tinyDb = new TinyDB(getContext());
 
@@ -39,6 +39,7 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment {
         TextView unStarRepository = v.findViewById(R.id.unStarRepository);
         TextView watchRepository = v.findViewById(R.id.watchRepository);
         TextView unWatchRepository = v.findViewById(R.id.unWatchRepository);
+        TextView shareRepository = v.findViewById(R.id.shareRepository);
 
         createLabel.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -86,6 +87,14 @@ public class RepoBottomSheetFragment extends BottomSheetDialogFragment {
             }
         });
 
+        shareRepository.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                bmListener.onButtonClicked("shareRepo");
+                dismiss();
+            }
+        });
+
         openWebRepo.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.fragments;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -14,7 +15,6 @@ import org.mian.gitnex.activities.AddRemoveLabelsActivity;
 import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.FileDiffActivity;
 import org.mian.gitnex.activities.MergePullRequestActivity;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.util.TinyDB;
 import androidx.annotation.NonNull;
@@ -27,17 +27,17 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
+public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        View v = inflater.inflate(R.layout.single_issue_bottom_sheet_layout, container, false);
+        View v = inflater.inflate(R.layout.bottom_sheet_single_issue_layout, container, false);
 
-        final TinyDB tinyDB = new TinyDB(getContext());
+        final Context ctx = getContext();
+        final TinyDB tinyDB = new TinyDB(ctx);
 
-        TextView replyToIssue = v.findViewById(R.id.replyToIssue);
         TextView editIssue = v.findViewById(R.id.editIssue);
         TextView editLabels = v.findViewById(R.id.editLabels);
         TextView closeIssue = v.findViewById(R.id.closeIssue);
@@ -46,21 +46,15 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
         TextView copyIssueUrl = v.findViewById(R.id.copyIssueUrl);
         TextView openFilesDiff = v.findViewById(R.id.openFilesDiff);
         TextView mergePullRequest = v.findViewById(R.id.mergePullRequest);
-
-        replyToIssue.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                startActivity(new Intent(getContext(), ReplyToIssueActivity.class));
-                dismiss();
-
-            }
-        });
+        TextView shareIssue = v.findViewById(R.id.shareIssue);
+        TextView subscribeIssue = v.findViewById(R.id.subscribeIssue);
+        TextView unsubscribeIssue = v.findViewById(R.id.unsubscribeIssue);
 
         if(tinyDB.getString("issueType").equals("pr")) {
 
             editIssue.setText(R.string.editPrText);
             copyIssueUrl.setText(R.string.copyPrUrlText);
+            shareIssue.setText(R.string.sharePr);
 
             if(tinyDB.getBoolean("prMerged")) {
                 mergePullRequest.setVisibility(View.GONE);
@@ -87,7 +81,7 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
             @Override
             public void onClick(View v) {
 
-                startActivity(new Intent(getContext(), MergePullRequestActivity.class));
+                startActivity(new Intent(ctx, MergePullRequestActivity.class));
                 dismiss();
 
             }
@@ -97,7 +91,7 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
             @Override
             public void onClick(View v) {
 
-                startActivity(new Intent(getContext(), FileDiffActivity.class));
+                startActivity(new Intent(ctx, FileDiffActivity.class));
                 dismiss();
 
             }
@@ -107,7 +101,7 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
             @Override
             public void onClick(View v) {
 
-                startActivity(new Intent(getContext(), EditIssueActivity.class));
+                startActivity(new Intent(ctx, EditIssueActivity.class));
                 dismiss();
 
             }
@@ -117,7 +111,7 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
             @Override
             public void onClick(View v) {
 
-                startActivity(new Intent(getContext(), AddRemoveLabelsActivity.class));
+                startActivity(new Intent(ctx, AddRemoveLabelsActivity.class));
                 dismiss();
 
             }
@@ -127,12 +121,35 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
             @Override
             public void onClick(View v) {
 
-                startActivity(new Intent(getContext(), AddRemoveAssigneesActivity.class));
+                startActivity(new Intent(ctx, AddRemoveAssigneesActivity.class));
                 dismiss();
 
             }
         });
 
+        shareIssue.setOnClickListener(v1 -> {
+
+            // get url of repo
+            String repoFullName = tinyDB.getString("repoFullName");
+            String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
+            if (!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
+                instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
+            }
+
+            // get issue Url
+            String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
+
+            // share issue
+            Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+            sharingIntent.setType("text/plain");
+            sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle"));
+            sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, issueUrl);
+            startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")));
+
+            dismiss();
+
+        });
+
         copyIssueUrl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -148,14 +165,14 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
                 String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
 
                 // copy to clipboard
-                ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(getContext()).getSystemService(android.content.Context.CLIPBOARD_SERVICE);
+                ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(android.content.Context.CLIPBOARD_SERVICE);
                 ClipData clip = ClipData.newPlainText("issueUrl", issueUrl);
                 assert clipboard != null;
                 clipboard.setPrimaryClip(clip);
 
                 dismiss();
 
-                Toasty.info(getContext(), getContext().getString(R.string.copyIssueUrlToastMsg));
+                Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
 
             }
         });
@@ -165,29 +182,26 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
             if (tinyDB.getString("issueState").equals("open")) { // close issue
 
                 reOpenIssue.setVisibility(View.GONE);
+                closeIssue.setVisibility(View.VISIBLE);
 
-                closeIssue.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
+                closeIssue.setOnClickListener(closeSingleIssue -> {
 
-                        IssueActions.closeReopenIssue(getContext(), Integer.valueOf(tinyDB.getString("issueNumber")), "closed");
-                        dismiss();
+                    IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "closed");
+                    dismiss();
 
-                    }
                 });
 
-            } else if (tinyDB.getString("issueState").equals("closed")) {
+            }
+            else if (tinyDB.getString("issueState").equals("closed")) {
 
                 closeIssue.setVisibility(View.GONE);
+                reOpenIssue.setVisibility(View.VISIBLE);
 
-                reOpenIssue.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
+                reOpenIssue.setOnClickListener(reOpenSingleIssue -> {
 
-                        IssueActions.closeReopenIssue(getContext(), Integer.valueOf(tinyDB.getString("issueNumber")), "open");
-                        dismiss();
+                    IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "open");
+                    dismiss();
 
-                    }
                 });
 
             }
@@ -200,7 +214,28 @@ public class SingleIssueBottomSheetFragment extends BottomSheetDialogFragment {
 
         }
 
+        subscribeIssue.setOnClickListener(subscribeToIssue -> {
+
+            IssueActions.subscribe(ctx, subscribeIssue, unsubscribeIssue);
+            //dismiss();
+
+        });
+
+        unsubscribeIssue.setOnClickListener(unsubscribeToIssue -> {
+
+            IssueActions.unsubscribe(ctx, subscribeIssue, unsubscribeIssue);
+            //dismiss();
+
+        });
+
+        //if RepoWatch True Provide Unsubscribe first
+        // ToDo: API to check if user is subscribed to an issue (do not exist can be guessed by many api endpoints :/)
+        if (tinyDB.getBoolean("repoWatch")) {
+            subscribeIssue.setVisibility(View.GONE);
+            unsubscribeIssue.setVisibility(View.VISIBLE);
+        }
+
         return v;
     }
 
-}
+}

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

@@ -1,288 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-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 org.mian.gitnex.R;
-import org.mian.gitnex.adapters.ClosedIssuesAdapter;
-import org.mian.gitnex.clients.IssuesService;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.interfaces.ApiInterface;
-import org.mian.gitnex.models.Issues;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * Author M M Arif
- */
-
-public class ClosedIssuesFragment extends Fragment {
-
-    private ProgressBar mProgressBarClosed;
-    private RecyclerView recyclerViewClosed;
-    private List<Issues> issuesListClosed;
-    private ClosedIssuesAdapter adapterClosed;
-    private ApiInterface apiClosed;
-    private String TAG = "closedIssuesListFragment - ";
-    private Context context;
-    private int pageSize = 1;
-    private TextView noDataIssuesClosed;
-    private String issueState = "closed";
-    private int resultLimit = 50;
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-        final View v = inflater.inflate(R.layout.fragment_issues_closed, container, false);
-        setHasOptionsMenu(true);
-
-        TinyDB tinyDb = new TinyDB(getContext());
-        String repoFullName = tinyDb.getString("repoFullName");
-        //Log.i("repoFullName", tinyDb.getString("repoFullName"));
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-        final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefreshClosed);
-
-        context = getContext();
-        recyclerViewClosed = v.findViewById(R.id.recyclerViewClosed);
-        issuesListClosed = new ArrayList<>();
-
-        mProgressBarClosed = v.findViewById(R.id.progress_barClosed);
-        noDataIssuesClosed = v.findViewById(R.id.noDataIssuesClosed);
-
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-
-                        swipeRefresh.setRefreshing(false);
-                        loadInitial(instanceToken, repoOwner, repoName, issueState, resultLimit);
-                        adapterClosed.notifyDataChanged();
-
-                    }
-                }, 200);
-            }
-        });
-
-        adapterClosed = new ClosedIssuesAdapter(getContext(), issuesListClosed);
-        adapterClosed.setLoadMoreListener(new ClosedIssuesAdapter.OnLoadMoreListener() {
-            @Override
-            public void onLoadMore() {
-
-                recyclerViewClosed.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        if(issuesListClosed.size() == 10 || pageSize == 10) {
-
-                            int page = (issuesListClosed.size() + 10) / 10;
-                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, issueState, resultLimit);
-
-                        }
-                        /*else {
-
-                            Toasty.info(context, getString(R.string.noMoreData));
-
-                        }*/
-                    }
-                });
-
-            }
-        });
-
-        recyclerViewClosed.setHasFixedSize(true);
-        recyclerViewClosed.setLayoutManager(new LinearLayoutManager(context));
-        recyclerViewClosed.setAdapter(adapterClosed);
-
-        apiClosed = IssuesService.createService(ApiInterface.class, instanceUrl, getContext());
-        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit);
-
-        return v;
-
-    }
-
-    @Override
-    public void onResume() {
-
-        super.onResume();
-        TinyDB tinyDb = new TinyDB(getContext());
-        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");
-
-        if(tinyDb.getBoolean("resumeClosedIssues")) {
-
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit);
-            tinyDb.putBoolean("resumeClosedIssues", false);
-
-        }
-
-    }
-
-    private void loadInitial(String token, String repoOwner, String repoName, String issueState, int resultLimit) {
-
-        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName,  1, issueState, resultLimit);
-
-        call.enqueue(new Callback<List<Issues>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
-
-                if(response.isSuccessful()) {
-
-                    assert response.body() != null;
-                    if(response.body().size() > 0) {
-
-                        issuesListClosed.clear();
-                        issuesListClosed.addAll(response.body());
-                        adapterClosed.notifyDataChanged();
-                        noDataIssuesClosed.setVisibility(View.GONE);
-
-                    }
-                    else {
-                        issuesListClosed.clear();
-                        adapterClosed.notifyDataChanged();
-                        noDataIssuesClosed.setVisibility(View.VISIBLE);
-                    }
-                    mProgressBarClosed.setVisibility(View.GONE);
-                }
-                else {
-                    Log.e(TAG, String.valueOf(response.code()));
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
-                Log.e(TAG, t.toString());
-            }
-
-        });
-
-    }
-
-    private void loadMore(String token, String repoOwner, String repoName, int page, String issueState, int resultLimit){
-
-        //add loading progress view
-        issuesListClosed.add(new Issues("load"));
-        adapterClosed.notifyItemInserted((issuesListClosed.size() - 1));
-
-        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName, page, issueState, resultLimit);
-
-        call.enqueue(new Callback<List<Issues>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
-
-                if(response.isSuccessful()){
-
-                    //remove loading view
-                    issuesListClosed.remove(issuesListClosed.size()-1);
-
-                    List<Issues> result = response.body();
-
-                    assert result != null;
-                    if(result.size() > 0) {
-
-                        pageSize = result.size();
-                        issuesListClosed.addAll(result);
-
-                    }
-                    else {
-
-                        Toasty.info(context, getString(R.string.noMoreData));
-                        adapterClosed.setMoreDataAvailable(false);
-
-                    }
-
-                    adapterClosed.notifyDataChanged();
-
-                }
-                else {
-
-                    Log.e(TAG, String.valueOf(response.code()));
-
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
-
-                Log.e(TAG, t.toString());
-
-            }
-
-        });
-    }
-
-    @Override
-    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
-
-        inflater.inflate(R.menu.search_menu, menu);
-        super.onCreateOptionsMenu(menu, inflater);
-
-        MenuItem searchItem = menu.findItem(R.id.action_search);
-        androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
-        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
-
-        /*if(!connToInternet) {
-            return;
-        }*/
-
-        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-
-                adapterClosed.getFilter().filter(newText);
-                return false;
-
-            }
-
-        });
-
-    }
-
-}

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

@@ -30,187 +30,194 @@ import retrofit2.Callback;
 import retrofit2.Response;
 
 /**
-+ * Template Author M M Arif
-+ * Author 6543
-+ */
+ * + * 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 String sort = "updated";
-    private String order = "desc";
-    private int limit = 50;
+	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 String sort = "updated";
+	private String order = "desc";
+	private int limit = 50;
 
-    private OnFragmentInteractionListener mListener;
+	private OnFragmentInteractionListener mListener;
 
-    public ExploreRepositoriesFragment() {
-    }
+	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);
-        }
-    }
+	public static ExploreRepositoriesFragment newInstance(String param1, String param2) {
 
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+		ExploreRepositoriesFragment fragment = new ExploreRepositoriesFragment();
+		Bundle args = new Bundle();
+		args.putString(repoOwnerF, param1);
+		args.putString(repoNameF, param2);
+		fragment.setArguments(args);
+		return fragment;
+	}
 
-        final View v = inflater.inflate(R.layout.fragment_explore_repo, container, false);
-        //setHasOptionsMenu(true);
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
 
-        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");
+		super.onCreate(savedInstanceState);
+		if(getArguments() != null) {
+			String repoName = getArguments().getString(repoNameF);
+			String repoOwner = getArguments().getString(repoOwnerF);
+		}
+	}
 
-        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);
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-        mProgressBar.setVisibility(View.VISIBLE);
+		final View v = inflater.inflate(R.layout.fragment_explore_repo, container, false);
+		//setHasOptionsMenu(true);
 
-        searchKeyword.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent 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);
-                    }
-                }
-                return 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");
 
-        int limitDefault = 10;
-        loadDefaultList(instanceUrl, instanceToken, loginUid, repoTypeInclude, sort, order, getContext(), limitDefault);
+		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);
 
-        return v;
+		mProgressBar.setVisibility(View.VISIBLE);
 
-    }
+		searchKeyword.setOnEditorActionListener(new TextView.OnEditorActionListener() {
 
-    private void loadDefaultList(String instanceUrl, String instanceToken, String loginUid, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
+			@Override
+			public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
 
-        Call<ExploreRepositories> call = RetrofitClient
-                .getInstance(instanceUrl, getContext())
-                .getApiInterface()
-                .queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), null, repoTypeInclude, sort, order, limit);
+				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);
+					}
+				}
+				return false;
+			}
+		});
 
-        call.enqueue(new Callback<ExploreRepositories>() {
+		int limitDefault = 10;
+		loadDefaultList(instanceUrl, instanceToken, loginUid, repoTypeInclude, sort, order, getContext(), limitDefault);
 
-            @Override
-            public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
+		return v;
 
-                if (response.isSuccessful()) {
-                    assert response.body() != null;
-                    getReposList(response.body().getSearchedData(), context);
-                } else {
-                    Log.i("onResponse", String.valueOf(response.code()));
-                }
+	}
 
-            }
+	private void loadDefaultList(String instanceUrl, String instanceToken, String loginUid, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
 
-            @Override
-            public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
-                Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
-            }
+		Call<ExploreRepositories> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), null, repoTypeInclude, sort, order, limit);
 
-        });
+		call.enqueue(new Callback<ExploreRepositories>() {
 
-    }
+			@Override
+			public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
 
-    private void loadSearchReposList(String instanceUrl, String instanceToken, String loginUid, String searchKeyword, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
+				if(response.isSuccessful()) {
+					assert response.body() != null;
+					getReposList(response.body().getSearchedData(), context);
+				}
+				else {
+					Log.i("onResponse", String.valueOf(response.code()));
+				}
 
-        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 onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
 
-            @Override
-            public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
+				Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
+			}
 
-                if (response.isSuccessful()) {
-                    assert response.body() != null;
-                    getReposList(response.body().getSearchedData(), context);
-                } else {
-                    Log.i("onResponse", String.valueOf(response.code()));
-                }
+		});
 
-            }
+	}
 
-            @Override
-            public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
-                Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
-            }
+	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>() {
 
-    private void getReposList(List<UserRepositories> dataList, Context context) {
+			@Override
+			public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
 
-        ExploreRepositoriesAdapter adapter = new ExploreRepositoriesAdapter(dataList, context);
+				if(response.isSuccessful()) {
+					assert response.body() != null;
+					getReposList(response.body().getSearchedData(), context);
+				}
+				else {
+					Log.i("onResponse", String.valueOf(response.code()));
+				}
 
-        mRecyclerView.setVisibility(View.VISIBLE);
+			}
 
-        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-                DividerItemDecoration.VERTICAL);
-        mRecyclerView.addItemDecoration(dividerItemDecoration);
+			@Override
+			public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
 
-        if(adapter.getItemCount() > 0) {
+				Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
+			}
 
-            mRecyclerView.setAdapter(adapter);
-            noData.setVisibility(View.GONE);
-            mProgressBar.setVisibility(View.GONE);
+		});
 
-        }
-        else {
+	}
 
-            noData.setVisibility(View.VISIBLE);
-            mProgressBar.setVisibility(View.GONE);
+	private void getReposList(List<UserRepositories> dataList, Context context) {
 
-        }
+		ExploreRepositoriesAdapter adapter = new ExploreRepositoriesAdapter(dataList, context);
 
-    }
+		mRecyclerView.setVisibility(View.VISIBLE);
 
-    public void onButtonPressed(Uri uri) {
-        if (mListener != null) {
-            mListener.onFragmentInteraction(uri);
-        }
-    }
+		mRecyclerView.setHasFixedSize(true);
+		mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
+		mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
+		if(adapter.getItemCount() > 0) {
+
+			mRecyclerView.setAdapter(adapter);
+			noData.setVisibility(View.GONE);
+			mProgressBar.setVisibility(View.GONE);
+
+		}
+		else {
+
+			noData.setVisibility(View.VISIBLE);
+			mProgressBar.setVisibility(View.GONE);
+
+		}
+
+	}
+
+	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);
+
+	}
 
-    public interface OnFragmentInteractionListener {
-        void onFragmentInteraction(Uri uri);
-    }
 }

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.fragments;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -145,7 +146,9 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
         final String finalDirName_ = dirName_;
 
         mBreadcrumbsView.addItem(createItem(dirName));
+        //noinspection unchecked
         mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
+            @SuppressLint("SetTextI18n")
             @Override
             public void onNavigateBack(BreadcrumbItem item, int position) {
 
@@ -158,7 +161,10 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
                 String filterDir = fileStructure.getText().toString();
                 String result = filterDir.substring(0, filterDir.indexOf(item.getSelectedItem()));
                 fileStructure.setText(result + item.getSelectedItem());
-                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
+
+                String currentIndex = (result + item.getSelectedItem()).substring(1);
+
+                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, currentIndex);
 
             }
 

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

@@ -0,0 +1,305 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+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 org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import org.mian.gitnex.helpers.VersionCheck;
+import org.mian.gitnex.adapters.IssuesAdapter;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.mikepenz.fastadapter.IItemAdapter;
+import com.mikepenz.fastadapter.adapters.ItemAdapter;
+import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
+import com.mikepenz.fastadapter.listeners.ItemFilterListener;
+import com.mikepenz.fastadapter_extensions.items.ProgressItem;
+import com.mikepenz.fastadapter_extensions.scroll.EndlessRecyclerOnScrollListener;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import static com.mikepenz.fastadapter.adapters.ItemAdapter.items;
+
+/**
+ * Author M M Arif
+ */
+
+public class IssuesClosedFragment extends Fragment implements ItemFilterListener<IssuesAdapter> {
+
+    private Context ctx;
+    private ProgressBar mProgressBarClosed;
+    private boolean loadNextFlag = false;
+    private String TAG = StaticGlobalVariables.tagIssuesListClosed;
+    private TextView noDataIssuesClosed;
+    private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+    private String requestType = StaticGlobalVariables.issuesRequestType;
+    private String issueState = StaticGlobalVariables.issueStateClosed;
+
+    private List<IssuesAdapter> items = new ArrayList<>();
+    private FastItemAdapter<IssuesAdapter> fastItemAdapter;
+    private ItemAdapter footerAdapter;
+    private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        final View v = inflater.inflate(R.layout.fragment_issues_closed, 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");
+        String repoFullName = tinyDb.getString("repoFullName");
+        String[] parts = repoFullName.split("/");
+        final String repoOwner = parts[0];
+        final String repoName = parts[1];
+
+        if (VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) < 1) {
+            resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+        }
+
+        noDataIssuesClosed = v.findViewById(R.id.noDataIssuesClosed);
+        mProgressBarClosed = v.findViewById(R.id.progress_barClosed);
+        final SwipeRefreshLayout swipeRefreshLayout = v.findViewById(R.id.pullToRefreshClosed);
+
+        RecyclerView recyclerView = v.findViewById(R.id.recyclerViewClosed);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        recyclerView.setHasFixedSize(true);
+
+        fastItemAdapter = new FastItemAdapter<>();
+        fastItemAdapter.withSelectable(true);
+
+        footerAdapter = items();
+        //noinspection unchecked
+        fastItemAdapter.addAdapter(StaticGlobalVariables.issuesPageInit, footerAdapter);
+
+        fastItemAdapter.getItemFilter().withFilterPredicate((IItemAdapter.Predicate<IssuesAdapter>) (item, constraint) -> item.getIssueTitle().toLowerCase().contains(constraint.toString().toLowerCase()));
+
+        fastItemAdapter.getItemFilter().withItemFilterListener(this);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        recyclerView.setItemAnimator(new DefaultItemAnimator());
+        recyclerView.setAdapter(fastItemAdapter);
+
+        endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(footerAdapter) {
+
+            @Override
+            public void onLoadMore(final int currentPage) {
+
+                loadNext(instanceUrl, instanceToken, repoOwner, repoName, resultLimit, issueState, requestType, currentPage);
+
+            }
+
+        };
+
+        swipeRefreshLayout.setOnRefreshListener(() -> {
+
+            mProgressBarClosed.setVisibility(View.VISIBLE);
+            fastItemAdapter.clear();
+            endlessRecyclerOnScrollListener.resetPageCount();
+            swipeRefreshLayout.setRefreshing(false);
+
+        });
+
+        recyclerView.addOnScrollListener(endlessRecyclerOnScrollListener);
+
+        loadInitial(instanceUrl, instanceToken, repoOwner, repoName, issueState, resultLimit, requestType);
+
+        fastItemAdapter.withEventHook(new IssuesAdapter.IssueTitleClickEvent());
+
+        assert savedInstanceState != null;
+        fastItemAdapter.withSavedInstanceState(savedInstanceState);
+
+        return v;
+
+    }
+
+    @Override
+    public void onResume() {
+
+        super.onResume();
+        TinyDB tinyDb = new TinyDB(getContext());
+
+        if(tinyDb.getBoolean("resumeClosedIssues")) {
+
+            mProgressBarClosed.setVisibility(View.VISIBLE);
+            fastItemAdapter.clear();
+            endlessRecyclerOnScrollListener.resetPageCount();
+            tinyDb.putBoolean("resumeClosedIssues", false);
+
+        }
+
+    }
+
+    private void loadInitial(String instanceUrl, String token, String repoOwner, String repoName, String issueState, int resultLimit, String requestType) {
+
+        Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getClosedIssues(token, repoOwner, repoName, 1, issueState, resultLimit, requestType);
+
+        call.enqueue(new Callback<List<Issues>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
+                if(response.isSuccessful()) {
+
+                    assert response.body() != null;
+                    if(response.body().size() > 0) {
+
+                        if(response.body().size() == resultLimit) {
+                            loadNextFlag = true;
+                        }
+
+                        for(int i = 0; i < response.body().size(); i++) {
+                            items.add(new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
+                        }
+
+                        fastItemAdapter.add(items);
+                        noDataIssuesClosed.setVisibility(View.GONE);
+
+                    }
+                    else {
+                        noDataIssuesClosed.setVisibility(View.VISIBLE);
+                    }
+
+                    mProgressBarClosed.setVisibility(View.GONE);
+
+                }
+                else {
+                    Log.i(TAG, String.valueOf(response.code()));
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
+                Log.e(TAG, t.toString());
+            }
+
+        });
+
+    }
+
+    private void loadNext(String instanceUrl, String token, String repoOwner, String repoName, int resultLimit, String issueState, String requestType, final int currentPage) {
+
+        footerAdapter.clear();
+        //noinspection unchecked
+        footerAdapter.add(new ProgressItem().withEnabled(false));
+
+        Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getClosedIssues(token, repoOwner, repoName, currentPage + 1, issueState, resultLimit, requestType);
+
+        call.enqueue(new Callback<List<Issues>>() {
+
+            @Override
+            public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
+                if(response.isSuccessful()) {
+
+                    assert response.body() != null;
+
+                    if(response.body().size() > 0) {
+
+                        loadNextFlag = response.body().size() == resultLimit;
+
+                        for(int i = 0; i < response.body().size(); i++) {
+
+                            fastItemAdapter.add(fastItemAdapter.getAdapterItemCount(), new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
+
+                        }
+
+                        footerAdapter.clear();
+                        mProgressBarClosed.setVisibility(View.GONE);
+
+                    }
+                    else {
+                        footerAdapter.clear();
+                    }
+
+                    mProgressBarClosed.setVisibility(View.GONE);
+
+                }
+                else {
+                    Log.i(TAG, String.valueOf(response.code()));
+                }
+
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
+                Log.i(TAG, t.toString());
+            }
+
+        });
+
+        if(!loadNextFlag) {
+            footerAdapter.clear();
+        }
+
+    }
+
+    @Override
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+        inflater.inflate(R.menu.search_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
+        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+
+                fastItemAdapter.filter(newText);
+                return true;
+            }
+
+        });
+
+        endlessRecyclerOnScrollListener.enable();
+
+    }
+
+    @Override
+    public void itemsFiltered(@Nullable CharSequence constraint, @Nullable List<IssuesAdapter> results) {
+
+        endlessRecyclerOnScrollListener.disable();
+    }
+
+    @Override
+    public void onReset() {
+
+        endlessRecyclerOnScrollListener.enable();
+    }
+
+}

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

@@ -1,287 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-import android.os.Handler;
-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 org.mian.gitnex.R;
-import org.mian.gitnex.adapters.IssuesAdapter;
-import org.mian.gitnex.clients.IssuesService;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.interfaces.ApiInterface;
-import org.mian.gitnex.models.Issues;
-import org.mian.gitnex.util.AppUtil;
-import org.mian.gitnex.util.TinyDB;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Author M M Arif
- */
-
-public class IssuesFragment extends Fragment {
-
-    private ProgressBar mProgressBar;
-    private RecyclerView recyclerView;
-    private List<Issues> issuesList;
-    private IssuesAdapter adapter;
-    private ApiInterface api;
-    private String TAG = "IssuesListFragment - ";
-    private Context context;
-    private int pageSize = 1;
-    private TextView noDataIssues;
-    private int resultLimit = 50;
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-        final View v = inflater.inflate(R.layout.fragment_issues, container, false);
-        setHasOptionsMenu(true);
-
-        TinyDB tinyDb = new TinyDB(getContext());
-        String repoFullName = tinyDb.getString("repoFullName");
-        //Log.i("repoFullName", tinyDb.getString("repoFullName"));
-        String[] parts = repoFullName.split("/");
-        final String repoOwner = parts[0];
-        final String repoName = parts[1];
-        final String instanceUrl = tinyDb.getString("instanceUrl");
-        final String loginUid = tinyDb.getString("loginUid");
-        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-        final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
-
-        context = getContext();
-        recyclerView = v.findViewById(R.id.recyclerView);
-        issuesList = new ArrayList<>();
-
-        mProgressBar = v.findViewById(R.id.progress_bar);
-        noDataIssues = v.findViewById(R.id.noDataIssues);
-
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                new Handler().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-
-                        swipeRefresh.setRefreshing(false);
-                        loadInitial(instanceToken, repoOwner, repoName, resultLimit);
-                        adapter.notifyDataChanged();
-
-                    }
-                }, 200);
-            }
-        });
-
-        adapter = new IssuesAdapter(getContext(), issuesList);
-        adapter.setLoadMoreListener(new IssuesAdapter.OnLoadMoreListener() {
-            @Override
-            public void onLoadMore() {
-
-                recyclerView.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        if(issuesList.size() == 10 || pageSize == 10) {
-
-                            int page = (issuesList.size() + 10) / 10;
-                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit);
-
-                        }
-                        /*else {
-
-                            Toasty.info(context, getString(R.string.noMoreData));
-
-                        }*/
-                    }
-                });
-
-            }
-        });
-
-        recyclerView.setHasFixedSize(true);
-        recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        recyclerView.setAdapter(adapter);
-
-        api = IssuesService.createService(ApiInterface.class, instanceUrl, getContext());
-        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit);
-
-        return v;
-
-    }
-
-    @Override
-    public void onResume() {
-
-        super.onResume();
-        TinyDB tinyDb = new TinyDB(getContext());
-        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");
-
-        if(tinyDb.getBoolean("resumeIssues")) {
-
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit);
-            tinyDb.putBoolean("resumeIssues", false);
-
-        }
-
-    }
-
-    private void loadInitial(String token, String repoOwner, String repoName, int resultLimit) {
-
-        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName,  1, resultLimit);
-
-        call.enqueue(new Callback<List<Issues>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
-
-                if(response.isSuccessful()) {
-
-                    assert response.body() != null;
-                    if(response.body().size() > 0) {
-
-                        issuesList.clear();
-                        issuesList.addAll(response.body());
-                        adapter.notifyDataChanged();
-                        noDataIssues.setVisibility(View.GONE);
-
-                    }
-                    else {
-                        issuesList.clear();
-                        adapter.notifyDataChanged();
-                        noDataIssues.setVisibility(View.VISIBLE);
-                    }
-                    mProgressBar.setVisibility(View.GONE);
-                }
-                else {
-                    Log.e(TAG, String.valueOf(response.code()));
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
-                Log.e(TAG, t.toString());
-            }
-
-        });
-
-    }
-
-    private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit){
-
-        //add loading progress view
-        issuesList.add(new Issues("load"));
-        adapter.notifyItemInserted((issuesList.size() - 1));
-
-        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, page, resultLimit);
-
-        call.enqueue(new Callback<List<Issues>>() {
-
-            @Override
-            public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
-
-                if(response.isSuccessful()){
-
-                    //remove loading view
-                    issuesList.remove(issuesList.size()-1);
-
-                    List<Issues> result = response.body();
-
-                    assert result != null;
-                    if(result.size() > 0) {
-
-                        pageSize = result.size();
-                        issuesList.addAll(result);
-
-                    }
-                    else {
-
-                        Toasty.info(context, getString(R.string.noMoreData));
-                        adapter.setMoreDataAvailable(false);
-
-                    }
-
-                    adapter.notifyDataChanged();
-
-                }
-                else {
-
-                    Log.e(TAG, String.valueOf(response.code()));
-
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
-
-                Log.e(TAG, t.toString());
-
-            }
-
-        });
-    }
-
-    @Override
-    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
-
-        inflater.inflate(R.menu.search_menu, menu);
-        super.onCreateOptionsMenu(menu, inflater);
-
-        MenuItem searchItem = menu.findItem(R.id.action_search);
-        androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
-        searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        //searchView.setQueryHint(getContext().getString(R.string.strFilter));
-
-        /*if(!connToInternet) {
-            return;
-        }*/
-
-        searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
-
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-
-                adapter.getFilter().filter(newText);
-                return false;
-
-            }
-
-        });
-
-    }
-
-}

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

@@ -0,0 +1,155 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+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.widget.TextView;
+import com.google.android.material.tabs.TabLayout;
+import org.mian.gitnex.R;
+import org.mian.gitnex.util.TinyDB;
+import java.util.Objects;
+
+/**
+ * Author M M Arif
+ */
+
+public class IssuesMainFragment extends Fragment {
+
+	private Context ctx;
+
+	public IssuesMainFragment() {
+
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+		View v = inflater.inflate(R.layout.fragment_issues_main, container, false);
+		setHasOptionsMenu(true);
+
+		TinyDB tinyDb = new TinyDB(getContext());
+
+		SectionsPagerAdapter mSectionsPagerAdapter = new IssuesMainFragment.SectionsPagerAdapter(getChildFragmentManager());
+
+		ViewPager mViewPager = v.findViewById(R.id.issuesContainer);
+		mViewPager.setAdapter(mSectionsPagerAdapter);
+
+		Typeface myTypeface;
+		if(tinyDb.getInt("customFontId") == 0) {
+
+			myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+
+		}
+		else if (tinyDb.getInt("customFontId") == 1) {
+
+			myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf");
+
+		}
+		else if (tinyDb.getInt("customFontId") == 2) {
+
+			myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
+
+		}
+		else {
+
+			myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+
+		}
+
+		TabLayout tabLayout = v.findViewById(R.id.tabs);
+
+		ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
+		int tabsCount = vg.getChildCount();
+
+		for (int j = 0; j < tabsCount; j++) {
+
+			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
+			int tabChildCount = vgTab.getChildCount();
+
+			for (int i = 0; i < tabChildCount; i++) {
+
+				View tabViewChild = vgTab.getChildAt(i);
+				if (tabViewChild instanceof TextView) {
+					((TextView) tabViewChild).setTypeface(myTypeface);
+				}
+
+			}
+
+		}
+
+		mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
+		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
+
+		return v;
+
+	}
+
+	public static class SectionsPagerAdapter extends FragmentStatePagerAdapter {
+
+		SectionsPagerAdapter(FragmentManager fm) {
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+		}
+
+		@NonNull
+		@Override
+		public Fragment getItem(int position) {
+
+			Fragment fragment = null;
+			switch (position) {
+				case 0: // open issues
+					fragment = new IssuesOpenFragment();
+					break;
+				case 1: // closed issues
+					fragment = new IssuesClosedFragment();
+					break;
+			}
+			assert fragment != null;
+			return fragment;
+		}
+
+		@Override
+		public int getCount() {
+			return 2;
+		}
+
+	}
+
+	@Override
+	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+		menu.clear();
+		Objects.requireNonNull(getActivity()).getMenuInflater().inflate(R.menu.repo_dotted_menu, menu);
+		super.onCreateOptionsMenu(menu, inflater);
+
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+
+		int id = item.getItemId();
+
+		switch (id) {
+			case android.R.id.home:
+				return true;
+			case R.id.repoMenu:
+				BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
+				bottomSheet.show(getChildFragmentManager(), "repoBottomSheet");
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+
+	}
+
+}

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

@@ -0,0 +1,302 @@
+package org.mian.gitnex.fragments;
+
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+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 com.mikepenz.fastadapter.IItemAdapter;
+import com.mikepenz.fastadapter.adapters.ItemAdapter;
+import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter;
+import com.mikepenz.fastadapter.listeners.ItemFilterListener;
+import com.mikepenz.fastadapter_extensions.items.ProgressItem;
+import com.mikepenz.fastadapter_extensions.scroll.EndlessRecyclerOnScrollListener;
+import org.mian.gitnex.R;
+import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.helpers.StaticGlobalVariables;
+import org.mian.gitnex.helpers.VersionCheck;
+import org.mian.gitnex.adapters.IssuesAdapter;
+import org.mian.gitnex.models.Issues;
+import org.mian.gitnex.util.TinyDB;
+import java.util.ArrayList;
+import java.util.List;
+import static com.mikepenz.fastadapter.adapters.ItemAdapter.items;
+
+/**
+ * Author M M Arif
+ */
+
+public class IssuesOpenFragment extends Fragment implements ItemFilterListener<IssuesAdapter> {
+
+	private ProgressBar mProgressBar;
+	private boolean loadNextFlag = false;
+	private String TAG = StaticGlobalVariables.tagIssuesListOpen;
+	private TextView noDataIssues;
+	private int resultLimit = StaticGlobalVariables.resultLimitOldGiteaInstances;
+	private String requestType = StaticGlobalVariables.issuesRequestType;
+
+	private List<IssuesAdapter> items = new ArrayList<>();
+	private FastItemAdapter<IssuesAdapter> fastItemAdapter;
+	private ItemAdapter footerAdapter;
+	private EndlessRecyclerOnScrollListener endlessRecyclerOnScrollListener;
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+		final View v = inflater.inflate(R.layout.fragment_issues, 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");
+		String repoFullName = tinyDb.getString("repoFullName");
+		String[] parts = repoFullName.split("/");
+		final String repoOwner = parts[0];
+		final String repoName = parts[1];
+
+		if (VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) < 1) {
+			resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances;
+		}
+
+		noDataIssues = v.findViewById(R.id.noDataIssues);
+		mProgressBar = v.findViewById(R.id.progress_bar);
+		final SwipeRefreshLayout swipeRefreshLayout = v.findViewById(R.id.pullToRefresh);
+
+		RecyclerView recyclerView = v.findViewById(R.id.recyclerView);
+		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		recyclerView.setHasFixedSize(true);
+
+		fastItemAdapter = new FastItemAdapter<>();
+		fastItemAdapter.withSelectable(true);
+
+		footerAdapter = items();
+		//noinspection unchecked
+		fastItemAdapter.addAdapter(StaticGlobalVariables.issuesPageInit, footerAdapter);
+
+		fastItemAdapter.getItemFilter().withFilterPredicate((IItemAdapter.Predicate<IssuesAdapter>) (item, constraint) -> item.getIssueTitle().toLowerCase().contains(constraint.toString().toLowerCase()));
+
+		fastItemAdapter.getItemFilter().withItemFilterListener(this);
+
+		recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+		recyclerView.setItemAnimator(new DefaultItemAnimator());
+		recyclerView.setAdapter(fastItemAdapter);
+
+		endlessRecyclerOnScrollListener = new EndlessRecyclerOnScrollListener(footerAdapter) {
+
+			@Override
+			public void onLoadMore(final int currentPage) {
+
+				loadNext(instanceUrl, instanceToken, repoOwner, repoName, resultLimit, requestType, currentPage);
+
+			}
+
+		};
+
+		swipeRefreshLayout.setOnRefreshListener(() -> {
+
+			mProgressBar.setVisibility(View.VISIBLE);
+			fastItemAdapter.clear();
+			endlessRecyclerOnScrollListener.resetPageCount();
+			swipeRefreshLayout.setRefreshing(false);
+
+		});
+
+		recyclerView.addOnScrollListener(endlessRecyclerOnScrollListener);
+
+		loadInitial(instanceUrl, instanceToken, repoOwner, repoName, resultLimit, requestType);
+
+		fastItemAdapter.withEventHook(new IssuesAdapter.IssueTitleClickEvent());
+
+		assert savedInstanceState != null;
+		fastItemAdapter.withSavedInstanceState(savedInstanceState);
+
+		return v;
+
+	}
+
+	@Override
+	public void onResume() {
+
+		super.onResume();
+		TinyDB tinyDb = new TinyDB(getContext());
+
+		if(tinyDb.getBoolean("resumeIssues")) {
+
+			mProgressBar.setVisibility(View.VISIBLE);
+			fastItemAdapter.clear();
+			endlessRecyclerOnScrollListener.resetPageCount();
+			tinyDb.putBoolean("resumeIssues", false);
+
+		}
+
+	}
+
+	private void loadInitial(String instanceUrl, String token, String repoOwner, String repoName, int resultLimit, String requestType) {
+
+		Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getIssues(token, repoOwner, repoName, 1, resultLimit, requestType);
+
+		call.enqueue(new Callback<List<Issues>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
+				if(response.isSuccessful()) {
+
+					assert response.body() != null;
+					if(response.body().size() > 0) {
+
+						if(response.body().size() == resultLimit) {
+							loadNextFlag = true;
+						}
+
+						for(int i = 0; i < response.body().size(); i++) {
+							items.add(new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
+						}
+
+						fastItemAdapter.add(items);
+						noDataIssues.setVisibility(View.GONE);
+
+					}
+					else {
+						noDataIssues.setVisibility(View.VISIBLE);
+					}
+
+					mProgressBar.setVisibility(View.GONE);
+
+				}
+				else {
+					Log.i(TAG, String.valueOf(response.code()));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
+				Log.e(TAG, t.toString());
+			}
+
+		});
+
+	}
+
+	private void loadNext(String instanceUrl, String token, String repoOwner, String repoName, int resultLimit, String requestType, final int currentPage) {
+
+		footerAdapter.clear();
+		//noinspection unchecked
+		footerAdapter.add(new ProgressItem().withEnabled(false));
+
+		Call<List<Issues>> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().getIssues(token, repoOwner, repoName, currentPage + 1, resultLimit, requestType);
+
+		call.enqueue(new Callback<List<Issues>>() {
+
+			@Override
+			public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
+				if(response.isSuccessful()) {
+
+					assert response.body() != null;
+
+					if(response.body().size() > 0) {
+
+						loadNextFlag = response.body().size() == resultLimit;
+
+						for(int i = 0; i < response.body().size(); i++) {
+
+							fastItemAdapter.add(fastItemAdapter.getAdapterItemCount(), new IssuesAdapter(getContext()).withNewItems(response.body().get(i).getTitle(), response.body().get(i).getNumber(), response.body().get(i).getUser().getAvatar_url(), response.body().get(i).getCreated_at(), response.body().get(i).getComments(), response.body().get(i).getUser().getFull_name(), response.body().get(i).getUser().getLogin()));
+
+						}
+
+						footerAdapter.clear();
+						noDataIssues.setVisibility(View.GONE);
+
+					}
+					else {
+						footerAdapter.clear();
+					}
+
+					mProgressBar.setVisibility(View.GONE);
+
+				}
+				else {
+					Log.i(TAG, String.valueOf(response.code()));
+				}
+
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
+				Log.i(TAG, t.toString());
+			}
+
+		});
+
+		if(!loadNextFlag) {
+			footerAdapter.clear();
+		}
+
+	}
+
+	@Override
+	public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+
+		inflater.inflate(R.menu.search_menu, menu);
+		super.onCreateOptionsMenu(menu, inflater);
+
+		MenuItem searchItem = menu.findItem(R.id.action_search);
+		androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
+		searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
+		searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+
+			@Override
+			public boolean onQueryTextSubmit(String query) {
+
+				return false;
+			}
+
+			@Override
+			public boolean onQueryTextChange(String newText) {
+
+				fastItemAdapter.filter(newText);
+				return true;
+			}
+
+		});
+
+		endlessRecyclerOnScrollListener.enable();
+
+	}
+
+	@Override
+	public void itemsFiltered(@Nullable CharSequence constraint, @Nullable List<IssuesAdapter> results) {
+
+		endlessRecyclerOnScrollListener.disable();
+	}
+
+	@Override
+	public void onReset() {
+
+		endlessRecyclerOnScrollListener.enable();
+	}
+
+}

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

@@ -24,7 +24,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.NewRepoActivity;
+import org.mian.gitnex.activities.CreateRepoActivity;
 import org.mian.gitnex.adapters.MyReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.UserRepositories;
@@ -91,6 +91,7 @@ public class MyRepositoriesFragment extends Fragment {
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         final String userLogin =  tinyDb.getString("userLogin");
+        tinyDb.putBoolean("isRepoAdmin", true);
 
         final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);
 
@@ -100,18 +101,18 @@ public class MyRepositoriesFragment extends Fragment {
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-                DividerItemDecoration.VERTICAL);
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
         createNewRepo = v.findViewById(R.id.addNewRepo);
-
         createNewRepo.setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), NewRepoActivity.class);
+
+                Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
                 startActivity(intent);
+
             }
 
         });
@@ -119,12 +120,13 @@ public class MyRepositoriesFragment extends Fragment {
         mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+
                 if (dy > 0 && createNewRepo.isShown()) {
                     createNewRepo.setVisibility(View.GONE);
-                } else if (dy < 0 ) {
+                } else if (dy < 0) {
                     createNewRepo.setVisibility(View.VISIBLE);
-
                 }
+
             }
 
             @Override

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

@@ -14,8 +14,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -104,7 +104,7 @@ public class OrganizationInfoFragment extends Fragment {
                     if (response.code() == 200) {
 
                         assert orgInfo != null;
-                        Picasso.get().load(orgInfo.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
+                        PicassoService.getInstance(ctx).get().load(orgInfo.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
                         orgDescInfo.setText(orgInfo.getDescription());
                         orgWebsiteInfo.setText(orgInfo.getWebsite());
                         orgLocationInfo.setText(orgInfo.getLocation());

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

@@ -23,7 +23,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.NewOrganizationActivity;
+import org.mian.gitnex.activities.CreateOrganizationActivity;
 import org.mian.gitnex.adapters.OrganizationsListAdapter;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.util.AppUtil;
@@ -77,7 +77,7 @@ public class OrganizationsFragment extends Fragment {
 
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), NewOrganizationActivity.class);
+                Intent intent = new Intent(view.getContext(), CreateOrganizationActivity.class);
                 startActivity(intent);
             }
 

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

@@ -18,9 +18,9 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.google.android.material.tabs.TabLayout;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.util.TinyDB;
 import java.util.Objects;
@@ -48,34 +48,30 @@ public class ProfileFragment extends Fragment {
         TextView userEmail = v.findViewById(R.id.userEmail);
 
         userFullName.setText(tinyDb.getString("userFullname"));
-        Picasso.get().load(tinyDb.getString("userAvatar")).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(userAvatar);
+        PicassoService.getInstance(ctx).get().load(tinyDb.getString("userAvatar")).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(userAvatar);
         userLogin.setText(getString(R.string.usernameWithAt, tinyDb.getString("userLogin")));
         userEmail.setText(tinyDb.getString("userEmail"));
 
-        ProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter = new ProfileFragment.SectionsPagerAdapter(getFragmentManager());
+        ProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getChildFragmentManager());
 
         ViewPager mViewPager = v.findViewById(R.id.container);
         mViewPager.setAdapter(mSectionsPagerAdapter);
 
         Typeface myTypeface;
-        if(tinyDb.getInt("customFontId") == 0) {
 
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+        switch(tinyDb.getInt("customFontId", -1)) {
 
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
+            case 0:
+                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+                break;
 
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf");
+            case 2:
+                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
+                break;
 
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
+            default:
+                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf");
+                break;
 
         }
 
@@ -101,10 +97,10 @@ public class ProfileFragment extends Fragment {
 
     }
 
-    public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
+    public static class SectionsPagerAdapter extends FragmentStatePagerAdapter {
 
         SectionsPagerAdapter(FragmentManager fm) {
-            super(fm);
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         }
 
         @NonNull
@@ -147,9 +143,8 @@ public class ProfileFragment extends Fragment {
                 ((MainActivity)ctx).finish();
                 return true;
             case R.id.profileMenu:
-                ProfileBottomSheetFragment bottomSheet = new ProfileBottomSheetFragment();
-                assert getFragmentManager() != null;
-                bottomSheet.show(getFragmentManager(), "profileBottomSheet");
+                BottomSheetProfileFragment bottomSheet = new BottomSheetProfileFragment();
+                bottomSheet.show(getChildFragmentManager(), "profileBottomSheet");
                 return true;
             default:
                 return super.onOptionsItemSelected(item);

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

@@ -151,6 +151,7 @@ public class PullRequestsFragment extends Fragment {
 
             loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
             tinyDb.putBoolean("resumePullRequests", false);
+            tinyDb.putBoolean("prMerged", false);
 
         }
 

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

@@ -6,6 +6,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
@@ -30,6 +31,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
@@ -44,9 +46,6 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
@@ -58,7 +57,7 @@ import java.util.Objects;
 
 public class RepoInfoFragment extends Fragment {
 
-    private Context ctx = getContext();
+    private Context ctx;
     private ProgressBar mProgressBar;
     private LinearLayout pageContent;
     private static String repoNameF = "param2";
@@ -66,17 +65,17 @@ public class RepoInfoFragment extends Fragment {
 
     private String repoName;
     private String repoOwner;
-    private TextView repoNameInfo;
-    private TextView repoOwnerInfo;
-    private TextView repoDescriptionInfo;
-    private TextView repoWebsiteInfo;
-    private TextView repoSizeInfo;
-    private TextView repoDefaultBranchInfo;
-    private TextView repoSshUrlInfo;
-    private TextView repoCloneUrlInfo;
-    private TextView repoRepoUrlInfo;
-    private TextView repoForksCountInfo;
-    private TextView repoCreatedAtInfo;
+    private TextView repoMetaName;
+    private TextView repoMetaDescription;
+    private TextView repoMetaStars;
+    private TextView repoMetaPullRequests;
+    private LinearLayout repoMetaPullRequestsFrame;
+    private TextView repoMetaForks;
+    private TextView repoMetaSize;
+    private TextView repoMetaWatchers;
+    private TextView repoMetaCreatedAt;
+    private TextView repoMetaWebsite;
+    private Button repoAdditionalButton;
     private TextView repoFileContents;
     private LinearLayout repoMetaFrame;
     private ImageView repoMetaDataExpandCollapse;
@@ -120,25 +119,26 @@ public class RepoInfoFragment extends Fragment {
         final String locale = tinyDb.getString("locale");
         final String timeFormat = tinyDb.getString("dateFormat");
 
+        ctx = getActivity();
+
         pageContent = v.findViewById(R.id.repoInfoLayout);
         pageContent.setVisibility(View.GONE);
 
         mProgressBar = v.findViewById(R.id.progress_bar);
-        repoNameInfo = v.findViewById(R.id.repoNameInfo);
-        repoOwnerInfo = v.findViewById(R.id.repoOwnerInfo);
-        repoDescriptionInfo = v.findViewById(R.id.repoDescriptionInfo);
-        repoWebsiteInfo = v.findViewById(R.id.repoWebsiteInfo);
-        repoSizeInfo = v.findViewById(R.id.repoSizeInfo);
-        repoDefaultBranchInfo = v.findViewById(R.id.repoDefaultBranchInfo);
-        repoSshUrlInfo = v.findViewById(R.id.repoSshUrlInfo);
-        repoCloneUrlInfo = v.findViewById(R.id.repoCloneUrlInfo);
-        repoRepoUrlInfo = v.findViewById(R.id.repoRepoUrlInfo);
-        repoForksCountInfo = v.findViewById(R.id.repoForksCountInfo);
-        repoCreatedAtInfo = v.findViewById(R.id.repoCreatedAtInfo);
+        repoMetaName = v.findViewById(R.id.repoMetaName);
+        repoMetaDescription = v.findViewById(R.id.repoMetaDescription);
+        repoMetaStars = v.findViewById(R.id.repoMetaStars);
+        repoMetaPullRequests = v.findViewById(R.id.repoMetaPullRequests);
+        repoMetaPullRequestsFrame = v.findViewById(R.id.repoMetaPullRequestsFrame);
+        repoMetaForks = v.findViewById(R.id.repoMetaForks);
+        repoMetaSize = v.findViewById(R.id.repoMetaSize);
+        repoMetaWatchers = v.findViewById(R.id.repoMetaWatchers);
+        repoMetaCreatedAt = v.findViewById(R.id.repoMetaCreatedAt);
+        repoMetaWebsite = v.findViewById(R.id.repoMetaWebsite);
+	    repoAdditionalButton = v.findViewById(R.id.repoAdditionalButton);
         repoFileContents = v.findViewById(R.id.repoFileContents);
-        TextView repoFilename = v.findViewById(R.id.repoFilename);
         repoMetaFrame = v.findViewById(R.id.repoMetaFrame);
-        TextView repoMetaData = v.findViewById(R.id.repoMetaData);
+        LinearLayout repoMetaFrameHeader = v.findViewById(R.id.repoMetaFrameHeader);
         repoMetaDataExpandCollapse = v.findViewById(R.id.repoMetaDataExpandCollapse);
         repoFilenameExpandCollapse = v.findViewById(R.id.repoFilenameExpandCollapse);
         fileContentsFrameHeader = v.findViewById(R.id.fileContentsFrameHeader);
@@ -149,15 +149,23 @@ public class RepoInfoFragment extends Fragment {
         getRepoInfo(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, locale, timeFormat);
         getFileContents(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, getResources().getString(R.string.defaultFilename));
 
-        repoFilename.setOnClickListener(new View.OnClickListener() {
+        if(isExpandViewVisible()) {
+        	toggleExpandView();
+        }
+
+        if(!isExpandViewMetaVisible()) {
+        	toggleExpandViewMeta();
+        }
+
+        fileContentsFrameHeader.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-                collapseExpandView();
+                toggleExpandView();
             }
         });
 
-        repoMetaData.setOnClickListener(new View.OnClickListener() {
+        repoMetaFrameHeader.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-                collapseExpandViewMeta();
+                toggleExpandViewMeta();
             }
         });
 
@@ -180,7 +188,7 @@ public class RepoInfoFragment extends Fragment {
         void onFragmentInteraction(Uri uri);
     }
 
-    private void collapseExpandView() {
+    private void toggleExpandView() {
 
         if (repoFileContents.getVisibility() == View.GONE) {
             repoFilenameExpandCollapse.setImageResource(R.drawable.ic_arrow_up);
@@ -194,10 +202,14 @@ public class RepoInfoFragment extends Fragment {
             //Animation slide_up = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
             //fileContentsFrame.startAnimation(slide_up);
         }
-
     }
 
-    private void collapseExpandViewMeta() {
+    private boolean isExpandViewVisible() {
+    	return repoFileContents.getVisibility() == View.VISIBLE;
+    }
+
+    private void toggleExpandViewMeta() {
+
         if (repoMetaFrame.getVisibility() == View.GONE) {
             repoMetaDataExpandCollapse.setImageResource(R.drawable.ic_arrow_up);
             repoMetaFrame.setVisibility(View.VISIBLE);
@@ -210,9 +222,12 @@ public class RepoInfoFragment extends Fragment {
             //Animation slide_up = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
             //repoMetaFrame.startAnimation(slide_up);
         }
-
     }
 
+	private boolean isExpandViewMetaVisible() {
+		return repoMetaFrame.getVisibility() == View.VISIBLE;
+	}
+
     private void getRepoInfo(String instanceUrl, String token, final String owner, String repo, final String locale, final String timeFormat) {
 
         final TinyDB tinyDb = new TinyDB(getContext());
@@ -236,16 +251,64 @@ public class RepoInfoFragment extends Fragment {
                         if (response.code() == 200) {
 
                             assert repoInfo != null;
-                            repoNameInfo.setText(repoInfo.getName());
-                            repoOwnerInfo.setText(owner);
-                            repoDescriptionInfo.setText(repoInfo.getDescription());
-                            repoWebsiteInfo.setText(repoInfo.getWebsite());
-                            repoSizeInfo.setText(AppUtil.formatFileSize(repoInfo.getSize()));
-                            repoDefaultBranchInfo.setText(repoInfo.getDefault_branch());
-                            repoSshUrlInfo.setText(repoInfo.getSsh_url());
-                            repoCloneUrlInfo.setText(repoInfo.getClone_url());
-                            repoRepoUrlInfo.setText(repoInfo.getHtml_url());
-                            repoForksCountInfo.setText(repoInfo.getForks_count());
+                            repoMetaName.setText(repoInfo.getName());
+                            repoMetaDescription.setText(repoInfo.getDescription());
+                            repoMetaStars.setText(repoInfo.getStars_count());
+
+                            if(repoInfo.getOpen_pull_count() != null) {
+                                repoMetaPullRequests.setText(repoInfo.getOpen_pull_count());
+                            }
+                            else {
+                                repoMetaPullRequestsFrame.setVisibility(View.GONE);
+                            }
+
+                            repoMetaForks.setText(repoInfo.getForks_count());
+                            repoMetaWatchers.setText(repoInfo.getWatchers_count());
+
+                            if(repoInfo.getSize() != 0) {
+                                repoMetaSize.setText(AppUtil.formatFileSize(repoInfo.getSize()));
+                            }
+                            else {
+                                repoMetaSize.setText("0");
+                            }
+
+                            repoMetaCreatedAt.setText(TimeHelper.formatTime(repoInfo.getCreated_at(), new Locale(locale), timeFormat, ctx));
+                            if(timeFormat.equals("pretty")) {
+                                repoMetaCreatedAt.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(repoInfo.getCreated_at()), ctx));
+                            }
+
+                            String repoMetaUpdatedAt = TimeHelper.formatTime(repoInfo.getUpdated_at(), new Locale(locale), timeFormat, ctx);
+
+                            String website = (repoInfo.getWebsite().isEmpty()) ? getResources().getString(R.string.noDataWebsite) : repoInfo.getWebsite();
+                            repoMetaWebsite.setText(website);
+
+                            repoAdditionalButton.setOnClickListener(v -> {
+
+                                StringBuilder message = new StringBuilder();
+
+                                message.append(getResources().getString(R.string.infoTabRepoDefaultBranch))
+                                        .append(" :\n").append(repoInfo.getDefault_branch()).append("\n\n");
+
+                                message.append(getResources().getString(R.string.infoTabRepoUpdatedAt))
+                                        .append(" :\n").append(repoMetaUpdatedAt).append("\n\n");
+
+                                message.append(getResources().getString(R.string.infoTabRepoSshUrl))
+                                        .append(" :\n").append(repoInfo.getSsh_url()).append("\n\n");
+
+                                message.append(getResources().getString(R.string.infoTabRepoCloneUrl))
+                                        .append(" :\n").append(repoInfo.getClone_url()).append("\n\n");
+
+                                message.append(getResources().getString(R.string.infoTabRepoRepoUrl))
+                                        .append(" :\n").append(repoInfo.getHtml_url());
+
+                                AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx);
+
+                                alertDialog.setTitle(getResources().getString(R.string.infoMoreInformation));
+                                alertDialog.setMessage(message);
+                                alertDialog.setPositiveButton(getResources().getString(R.string.close), (dialog, which) -> dialog.dismiss());
+                                alertDialog.create().show();
+
+                            });
 
                             if(repoInfo.getHas_issues() != null) {
                                 tinyDb.putBoolean("hasIssues", repoInfo.getHas_issues());
@@ -254,27 +317,7 @@ public class RepoInfoFragment extends Fragment {
                                 tinyDb.putBoolean("hasIssues", true);
                             }
 
-                            switch (timeFormat) {
-                                case "pretty": {
-                                    PrettyTime prettyTime = new PrettyTime(new Locale(locale));
-                                    String createdTime = prettyTime.format(repoInfo.getCreated_at());
-                                    repoCreatedAtInfo.setText(createdTime);
-                                    repoCreatedAtInfo.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(repoInfo.getCreated_at()), getContext()));
-                                    break;
-                                }
-                                case "normal": {
-                                    DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                                    String createdTime = formatter.format(repoInfo.getCreated_at());
-                                    repoCreatedAtInfo.setText(createdTime);
-                                    break;
-                                }
-                                case "normal1": {
-                                    DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
-                                    String createdTime = formatter.format(repoInfo.getCreated_at());
-                                    repoCreatedAtInfo.setText(createdTime);
-                                    break;
-                                }
-                            }
+                            tinyDb.putString("repoHtmlUrl", repoInfo.getHtml_url());
 
                             mProgressBar.setVisibility(View.GONE);
                             pageContent.setVisibility(View.VISIBLE);
@@ -374,13 +417,14 @@ public class RepoInfoFragment extends Fragment {
                             .build();
 
                         Spanned bodyWithMD = null;
+
                         if (response.body() != null) {
                             bodyWithMD = markwon.toMarkdown(response.body());
                         }
+
                         assert bodyWithMD != null;
                         markwon.setParsedMarkdown(repoFileContents, bodyWithMD);
 
-
                     } else if (response.code() == 401) {
 
                         AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),

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

@@ -22,7 +22,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.NewRepoActivity;
+import org.mian.gitnex.activities.CreateRepoActivity;
 import org.mian.gitnex.adapters.ReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.UserRepositories;
@@ -79,7 +79,7 @@ public class RepositoriesFragment extends Fragment {
 
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), NewRepoActivity.class);
+                Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
                 startActivity(intent);
             }
 

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

@@ -1,25 +1,25 @@
 package org.mian.gitnex.fragments;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.util.TinyDB;
-import java.util.Objects;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.helpers.Toasty;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
+import org.mian.gitnex.util.TinyDB;
+import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -27,462 +27,519 @@ import androidx.fragment.app.Fragment;
 
 public class SettingsFragment extends Fragment {
 
-    private Context ctx = null;
+	private Context ctx = null;
 
-    private static String[] langList = {"Arabic", "Chinese", "English", "Finnish", "French", "German", "Italian", "Latvian", "Persian", "Portuguese/Brazilian", "Russian", "Serbian", "Turkish", "Ukrainian"};
-    private static int langSelectedChoice = 0;
+	private static String[] langList = {"Arabic", "Chinese", "English", "Finnish", "French", "German", "Italian", "Latvian", "Persian", "Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish", "Ukrainian"};
+	private static int langSelectedChoice = 0;
 
-    private static String[] timeList = {"Pretty", "Normal"};
-    private static int timeSelectedChoice = 0;
+	private static String[] timeList = {"Pretty", "Normal"};
+	private static int timeSelectedChoice = 0;
 
-    private static String[] codeBlockList = {"Green - Black", "White - Black", "Grey - Black", "White - Grey", "Dark - White"};
-    private static int codeBlockSelectedChoice = 0;
+	private static String[] codeBlockList = {"Green - Black", "White - Black", "Grey - Black", "White - Grey", "Dark - White"};
+	private static int codeBlockSelectedChoice = 0;
 
-    private static String[] homeScreenList = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile"};
-    private static int homeScreenSelectedChoice = 0;
+	private static String[] homeScreenList = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile"};
+	private static int homeScreenSelectedChoice = 0;
 
-    private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
-    private static int customFontSelectedChoice = 0;
+	private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
+	private static int customFontSelectedChoice = 0;
 
-    private static String[] themeList = {"Dark", "Light"};
-    private static int themeSelectedChoice = 0;
+	private static String[] themeList = {"Dark", "Light", "Auto (Day/Night)"};
+	private static int themeSelectedChoice = 0;
 
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	private static String[] fileveiwerSourceCodeThemesList = {"Sublime", "Arduino Light", "Github", "Far ", "Ir Black", "Android Studio"};
+	private static int fileveiwerSourceCodeThemesSelectedChoice = 0;
 
-        View v = inflater.inflate(R.layout.fragment_settings, container, false);
-        final TinyDB tinyDb = new TinyDB(getContext());
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        final TextView tvLanguageSelected = v.findViewById(R.id.tvLanguageSelected); // setter for en, fr
-        final TextView tvDateTimeSelected = v.findViewById(R.id.tvDateTimeSelected); // setter for time
-        final TextView codeBlockSelected = v.findViewById(R.id.codeBlockSelected); // setter for code block
-        final TextView homeScreenSelected = v.findViewById(R.id.homeScreenSelected); // setter for home screen
-        final TextView customFontSelected = v.findViewById(R.id.customFontSelected); // setter for custom font
-        final TextView themeSelected = v.findViewById(R.id.themeSelected); // setter for theme
+		View v = inflater.inflate(R.layout.fragment_settings, container, false);
+		final TinyDB tinyDb = new TinyDB(getContext());
 
-        LinearLayout langFrame = v.findViewById(R.id.langFrame);
-        LinearLayout timeFrame = v.findViewById(R.id.timeFrame);
-        LinearLayout codeBlockFrame = v.findViewById(R.id.codeBlockFrame);
-        LinearLayout homeScreenFrame = v.findViewById(R.id.homeScreenFrame);
-        LinearLayout customFontFrame = v.findViewById(R.id.customFontFrame);
-        LinearLayout themeFrame = v.findViewById(R.id.themeSelectionFrame);
+		final TextView tvLanguageSelected = v.findViewById(R.id.tvLanguageSelected); // setter for en, fr
+		final TextView tvDateTimeSelected = v.findViewById(R.id.tvDateTimeSelected); // setter for time
+		final TextView codeBlockSelected = v.findViewById(R.id.codeBlockSelected); // setter for code block
+		final TextView homeScreenSelected = v.findViewById(R.id.homeScreenSelected); // setter for home screen
+		final TextView customFontSelected = v.findViewById(R.id.customFontSelected); // setter for custom font
+		final TextView themeSelected = v.findViewById(R.id.themeSelected); // setter for theme
+		final TextView fileveiwerSourceCodeThemesSelected = v.findViewById(R.id.sourceCodeThemeSelected); // setter for fileviewer theme
 
-        Switch issuesSwitch =  v.findViewById(R.id.switchIssuesBadge);
-        Switch pdfModeSwitch =  v.findViewById(R.id.switchPdfMode);
-        TextView helpTranslate = v.findViewById(R.id.helpTranslate);
+		LinearLayout langFrame = v.findViewById(R.id.langFrame);
+		LinearLayout timeFrame = v.findViewById(R.id.timeFrame);
+		LinearLayout codeBlockFrame = v.findViewById(R.id.codeBlockFrame);
+		LinearLayout homeScreenFrame = v.findViewById(R.id.homeScreenFrame);
+		LinearLayout customFontFrame = v.findViewById(R.id.customFontFrame);
+		LinearLayout themeFrame = v.findViewById(R.id.themeSelectionFrame);
+		LinearLayout certsFrame = v.findViewById(R.id.certsFrame);
+		LinearLayout sourceCodeThemeFrame = v.findViewById(R.id.sourceCodeThemeFrame);
 
-        helpTranslate.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.addCategory(Intent.CATEGORY_BROWSABLE);
-                intent.setData(Uri.parse(getResources().getString(R.string.crowdInLink)));
-                startActivity(intent);
-            }
-        });
+		Switch counterBadgesSwitch = v.findViewById(R.id.switchCounterBadge);
+		Switch pdfModeSwitch = v.findViewById(R.id.switchPdfMode);
+		Switch crashReportsSwitch = v.findViewById(R.id.crashReportsSwitch);
+		TextView helpTranslate = v.findViewById(R.id.helpTranslate);
 
-        if(!tinyDb.getString("localeStr").isEmpty()) {
-            tvLanguageSelected.setText(tinyDb.getString("localeStr"));
-        }
+		helpTranslate.setOnClickListener(v12 -> {
 
-        if(!tinyDb.getString("timeStr").isEmpty()) {
-            tvDateTimeSelected.setText(tinyDb.getString("timeStr"));
-        }
+			Intent intent = new Intent();
+			intent.setAction(Intent.ACTION_VIEW);
+			intent.addCategory(Intent.CATEGORY_BROWSABLE);
+			intent.setData(Uri.parse(getResources().getString(R.string.crowdInLink)));
+			startActivity(intent);
 
-        if(!tinyDb.getString("codeBlockStr").isEmpty()) {
-            codeBlockSelected.setText(tinyDb.getString("codeBlockStr"));
-        }
+		});
 
-        if(!tinyDb.getString("homeScreenStr").isEmpty()) {
-            homeScreenSelected.setText(tinyDb.getString("homeScreenStr"));
-        }
+		if(!tinyDb.getString("localeStr").isEmpty()) {
+			tvLanguageSelected.setText(tinyDb.getString("localeStr"));
+		}
+
+		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(!tinyDb.getString("themeStr").isEmpty()) {
+			themeSelected.setText(tinyDb.getString("themeStr"));
+		}
 
-        if(langSelectedChoice == 0) {
-            langSelectedChoice = tinyDb.getInt("langId");
-        }
+		if(!tinyDb.getString("fileviewerSourceCodeThemeStr").isEmpty()) {
+			fileveiwerSourceCodeThemesSelected.setText(tinyDb.getString("fileviewerSourceCodeThemeStr"));
+		}
 
-        if(timeSelectedChoice == 0) {
-            timeSelectedChoice = tinyDb.getInt("timeId");
-        }
+		if(langSelectedChoice == 0) {
+			langSelectedChoice = tinyDb.getInt("langId");
+		}
 
-        if(codeBlockSelectedChoice == 0) {
-            codeBlockSelectedChoice = tinyDb.getInt("codeBlockId");
-        }
+		if(timeSelectedChoice == 0) {
+			timeSelectedChoice = tinyDb.getInt("timeId");
+		}
 
-        if(homeScreenSelectedChoice == 0) {
-            homeScreenSelectedChoice = tinyDb.getInt("homeScreenId");
-        }
+		if(codeBlockSelectedChoice == 0) {
+			codeBlockSelectedChoice = tinyDb.getInt("codeBlockId");
+		}
 
-        if(customFontSelectedChoice == 0) {
-            customFontSelectedChoice = tinyDb.getInt("customFontId");
-        }
+		if(homeScreenSelectedChoice == 0) {
+			homeScreenSelectedChoice = tinyDb.getInt("homeScreenId");
+		}
 
-        if(themeSelectedChoice == 0) {
-            themeSelectedChoice = tinyDb.getInt("themeId");
-        }
+		if(customFontSelectedChoice == 0) {
+			customFontSelectedChoice = tinyDb.getInt("customFontId", 1);
+		}
 
-        if(tinyDb.getBoolean("enableCounterIssueBadge")) {
-            issuesSwitch.setChecked(true);
-        }
-        else {
-            issuesSwitch.setChecked(false);
-        }
+		if(themeSelectedChoice == 0) {
+			themeSelectedChoice = tinyDb.getInt("themeId");
+		}
 
-        if(tinyDb.getBoolean("enablePdfMode")) {
-            pdfModeSwitch.setChecked(true);
-        }
-        else {
-            pdfModeSwitch.setChecked(false);
-        }
+		if(fileveiwerSourceCodeThemesSelectedChoice == 0) {
+			fileveiwerSourceCodeThemesSelectedChoice = tinyDb.getInt("fileviewerThemeId");
+		}
 
-        // issues badge switcher
-        issuesSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    tinyDb.putBoolean("enableCounterIssueBadge", true);
-                    tinyDb.putString("enableCounterIssueBadgeInit", "yes");
-                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-                } else {
-                    tinyDb.putBoolean("enableCounterIssueBadge", false);
-                    tinyDb.putString("enableCounterIssueBadgeInit", "yes");
-                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-                }
+		if(tinyDb.getBoolean("enableCounterBadges")) {
+			counterBadgesSwitch.setChecked(true);
+		}
+		else {
+			counterBadgesSwitch.setChecked(false);
+		}
+
+		if(tinyDb.getBoolean("enablePdfMode")) {
+			pdfModeSwitch.setChecked(true);
+		}
+		else {
+			pdfModeSwitch.setChecked(false);
+		}
+
+		if(tinyDb.getBoolean("crashReportingEnabled")) {
+			crashReportsSwitch.setChecked(true);
+		}
+		else {
+			crashReportsSwitch.setChecked(false);
+		}
+
+		// fileviewer srouce code theme selection dialog
+		sourceCodeThemeFrame.setOnClickListener(view -> {
+
+			AlertDialog.Builder fvtsBuilder = new AlertDialog.Builder(ctx);
+
+			fvtsBuilder.setTitle(R.string.fileviewerSourceCodeThemeSelectorDialogTitle);
+			if(fileveiwerSourceCodeThemesSelectedChoice != -1) {
+				fvtsBuilder.setCancelable(true);
+			}
+			else {
+				fvtsBuilder.setCancelable(false);
+			}
+
+			fvtsBuilder.setSingleChoiceItems(fileveiwerSourceCodeThemesList, fileveiwerSourceCodeThemesSelectedChoice, (dialogInterfaceTheme, i) -> {
+
+				fileveiwerSourceCodeThemesSelectedChoice = i;
+				fileveiwerSourceCodeThemesSelected.setText(fileveiwerSourceCodeThemesList[i]);
+				tinyDb.putString("fileviewerSourceCodeThemeStr", fileveiwerSourceCodeThemesList[i]);
+				tinyDb.putInt("fileviewerSourceCodeThemeId", i);
+
+				Objects.requireNonNull(getActivity()).recreate();
+				getActivity().overridePendingTransition(0, 0);
+				dialogInterfaceTheme.dismiss();
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+
+			});
+
+			AlertDialog cfDialog = fvtsBuilder.create();
+			cfDialog.show();
+
+		});
+
+		// certs deletion
+		certsFrame.setOnClickListener(v1 -> {
+
+			AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
+			builder.setTitle(getResources().getString(R.string.settingsCertsPopupTitle));
+			builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage));
+			builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
+
+				ctx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply();
+
+				MainActivity.logout(Objects.requireNonNull(getActivity()), ctx);
+
+			});
+
+			builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
+			builder.create().show();
+
+		});
+
+		// counter badge switcher
+		counterBadgesSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+
+            if (isChecked) {
+                tinyDb.putBoolean("enableCounterBadges", true);
+                Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
             }
-        });
-
-        // pdf night mode switcher
-        pdfModeSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    tinyDb.putBoolean("enablePdfMode", true);
-                    tinyDb.putString("enablePdfModeInit", "yes");
-                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-                } else {
-                    tinyDb.putBoolean("enablePdfMode", false);
-                    tinyDb.putString("enablePdfModeInit", "yes");
-                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-                }
+            else {
+                tinyDb.putBoolean("enableCounterBadges", false);
+                Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
             }
-        });
 
-        // theme selection dialog
-        themeFrame.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
+		});
 
-                AlertDialog.Builder tsBuilder = new AlertDialog.Builder(ctx);
+		// pdf night mode switcher
+		pdfModeSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-                tsBuilder.setTitle(R.string.themeSelectorDialogTitle);
-                if(themeSelectedChoice != -1) {
-                    tsBuilder.setCancelable(true);
-                }
-                else {
-                    tsBuilder.setCancelable(false);
-                }
+			if(isChecked) {
+				tinyDb.putBoolean("enablePdfMode", true);
+				tinyDb.putString("enablePdfModeInit", "yes");
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+			}
+			else {
+				tinyDb.putBoolean("enablePdfMode", false);
+				tinyDb.putString("enablePdfModeInit", "yes");
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+			}
 
-                tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterfaceTheme, int i) {
+		});
 
-                        themeSelectedChoice = i;
-                        themeSelected.setText(themeList[i]);
-                        tinyDb.putString("themeStr", themeList[i]);
-                        tinyDb.putInt("themeId", i);
+		// crash reports switcher
+		crashReportsSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
-                        Objects.requireNonNull(getActivity()).recreate();
-                        getActivity().overridePendingTransition(0, 0);
-                        dialogInterfaceTheme.dismiss();
-                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+			if(isChecked) {
+				tinyDb.putBoolean("crashReportingEnabled", true);
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+			}
+			else {
+				tinyDb.putBoolean("crashReportingEnabled", false);
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+			}
 
-                    }
-                });
+		});
 
-                AlertDialog cfDialog = tsBuilder.create();
-                cfDialog.show();
+		// theme selection dialog
+		themeFrame.setOnClickListener(view -> {
 
-            }
-        });
+			AlertDialog.Builder tsBuilder = new AlertDialog.Builder(ctx);
 
-        // custom font dialog
-        customFontFrame.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
+			tsBuilder.setTitle(R.string.themeSelectorDialogTitle);
+			if(themeSelectedChoice != -1) {
+				tsBuilder.setCancelable(true);
+			}
+			else {
+				tsBuilder.setCancelable(false);
+			}
 
-                AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx);
+			tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {
 
-                cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
-                if(customFontSelectedChoice != -1) {
-                    cfBuilder.setCancelable(true);
-                }
-                else {
-                    cfBuilder.setCancelable(false);
-                }
+				themeSelectedChoice = i;
+				themeSelected.setText(themeList[i]);
+				tinyDb.putString("themeStr", themeList[i]);
+				tinyDb.putInt("themeId", i);
 
-                cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterfaceCustomFont, int i) {
+				Objects.requireNonNull(getActivity()).recreate();
+				getActivity().overridePendingTransition(0, 0);
+				dialogInterfaceTheme.dismiss();
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
 
-                        customFontSelectedChoice = i;
-                        customFontSelected.setText(customFontList[i]);
-                        tinyDb.putString("customFontStr", customFontList[i]);
-                        tinyDb.putInt("customFontId", i);
+			});
 
-                        Objects.requireNonNull(getActivity()).recreate();
-                        getActivity().overridePendingTransition(0, 0);
-                        dialogInterfaceCustomFont.dismiss();
-                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+			AlertDialog cfDialog = tsBuilder.create();
+			cfDialog.show();
 
-                    }
-                });
+		});
 
-                AlertDialog cfDialog = cfBuilder.create();
-                cfDialog.show();
+		// custom font dialog
+		customFontFrame.setOnClickListener(view -> {
 
-            }
-        });
+			AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx);
 
-        // home screen dialog
-        homeScreenFrame.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
+			cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
+			if(customFontSelectedChoice != -1) {
+				cfBuilder.setCancelable(true);
+			}
+			else {
+				cfBuilder.setCancelable(false);
+			}
 
-                AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx);
+			cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {
 
-                hsBuilder.setTitle(R.string.settingshomeScreenSelectorDialogTitle);
-                if(homeScreenSelectedChoice != -1) {
-                    hsBuilder.setCancelable(true);
-                }
-                else {
-                    hsBuilder.setCancelable(false);
-                }
+				customFontSelectedChoice = i;
+				customFontSelected.setText(customFontList[i]);
+				tinyDb.putString("customFontStr", customFontList[i]);
+				tinyDb.putInt("customFontId", i);
 
-                hsBuilder.setSingleChoiceItems(homeScreenList, homeScreenSelectedChoice, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterfaceHomeScreen, int i) {
+				Objects.requireNonNull(getActivity()).recreate();
+				getActivity().overridePendingTransition(0, 0);
+				dialogInterfaceCustomFont.dismiss();
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
 
-                        homeScreenSelectedChoice = i;
-                        homeScreenSelected.setText(homeScreenList[i]);
-                        tinyDb.putString("homeScreenStr", homeScreenList[i]);
-                        tinyDb.putInt("homeScreenId", i);
+			});
 
-                        dialogInterfaceHomeScreen.dismiss();
-                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+			AlertDialog cfDialog = cfBuilder.create();
+			cfDialog.show();
 
-                    }
-                });
+		});
 
-                AlertDialog hsDialog = hsBuilder.create();
-                hsDialog.show();
+		// home screen dialog
+		homeScreenFrame.setOnClickListener(view -> {
 
-            }
-        });
+			AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx);
 
-        // code block dialog
-        codeBlockFrame.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
+			hsBuilder.setTitle(R.string.settingshomeScreenSelectorDialogTitle);
+			if(homeScreenSelectedChoice != -1) {
+				hsBuilder.setCancelable(true);
+			}
+			else {
+				hsBuilder.setCancelable(false);
+			}
 
-                AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx);
+			hsBuilder.setSingleChoiceItems(homeScreenList, homeScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
 
-                cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
-                if(codeBlockSelectedChoice != -1) {
-                    cBuilder.setCancelable(true);
-                }
-                else {
-                    cBuilder.setCancelable(false);
-                }
+				homeScreenSelectedChoice = i;
+				homeScreenSelected.setText(homeScreenList[i]);
+				tinyDb.putString("homeScreenStr", homeScreenList[i]);
+				tinyDb.putInt("homeScreenId", i);
 
-                cBuilder.setSingleChoiceItems(codeBlockList, codeBlockSelectedChoice, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterfaceCodeBlock, int i) {
+				dialogInterfaceHomeScreen.dismiss();
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
 
-                        codeBlockSelectedChoice = i;
-                        codeBlockSelected.setText(codeBlockList[i]);
-                        tinyDb.putString("codeBlockStr", codeBlockList[i]);
-                        tinyDb.putInt("codeBlockId", i);
+			});
 
-                        switch (codeBlockList[i]) {
-                            case "White - Black":
-                                tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.white));
-                                tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-                                break;
-                            case "Grey - Black":
-                                tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorAccent));
-                                tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-                                break;
-                            case "White - Grey":
-                                tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.white));
-                                tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.colorAccent));
-                                break;
-                            case "Dark - White":
-                                tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorPrimary));
-                                tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.white));
-                                break;
-                            default:
-                                tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
-                                tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
-                                break;
-                        }
+			AlertDialog hsDialog = hsBuilder.create();
+			hsDialog.show();
 
-                        dialogInterfaceCodeBlock.dismiss();
-                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+		});
 
-                    }
-                });
+		// code block dialog
+		codeBlockFrame.setOnClickListener(view -> {
 
-                AlertDialog cDialog = cBuilder.create();
-                cDialog.show();
+			AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx);
 
-            }
-        });
+			cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
+			if(codeBlockSelectedChoice != -1) {
+				cBuilder.setCancelable(true);
+			}
+			else {
+				cBuilder.setCancelable(false);
+			}
 
-        // language dialog
-        langFrame.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
+			cBuilder.setSingleChoiceItems(codeBlockList, codeBlockSelectedChoice, (dialogInterfaceCodeBlock, i) -> {
 
-                AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx);
+				codeBlockSelectedChoice = i;
+				codeBlockSelected.setText(codeBlockList[i]);
+				tinyDb.putString("codeBlockStr", codeBlockList[i]);
+				tinyDb.putInt("codeBlockId", i);
 
-                lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
-                if(langSelectedChoice != -1) {
-                    lBuilder.setCancelable(true);
-                }
-                else {
-                    lBuilder.setCancelable(false);
-                }
+				switch(codeBlockList[i]) {
+					case "White - Black":
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.white));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+						break;
+					case "Grey - Black":
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorAccent));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+						break;
+					case "White - Grey":
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.white));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.colorAccent));
+						break;
+					case "Dark - White":
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorPrimary));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.white));
+						break;
+					default:
+						tinyDb.putInt("codeBlockColor", getResources().getColor(R.color.colorLightGreen));
+						tinyDb.putInt("codeBlockBackground", getResources().getColor(R.color.black));
+						break;
+				}
 
-                lBuilder.setSingleChoiceItems(langList, langSelectedChoice, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
+				dialogInterfaceCodeBlock.dismiss();
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
 
-                        langSelectedChoice = i;
-                        tvLanguageSelected.setText(langList[i]);
-                        tinyDb.putString("localeStr", langList[i]);
-                        tinyDb.putInt("langId", i);
+			});
 
-                        switch (langList[i]) {
-                            case "Arabic":
-                                tinyDb.putString("locale", "ar");
-                                break;
-                            case "Chinese":
-                                tinyDb.putString("locale", "zh");
-                                break;
-                            case "Finnish":
-                                tinyDb.putString("locale", "fi");
-                                break;
-                            case "French":
-                                tinyDb.putString("locale", "fr");
-                                break;
-                            case "German":
-                                tinyDb.putString("locale", "de");
-                                break;
-                            case "Italian":
-                                tinyDb.putString("locale", "it");
-                                break;
-                            case "Latvian":
-                                tinyDb.putString("locale", "lv");
-                                break;
-                            case "Persian":
-                                tinyDb.putString("locale", "fa");
-                                break;
-                            case "Portuguese/Brazilian":
-                                tinyDb.putString("locale", "pt");
-                                break;
-                            case "Russian":
-                                tinyDb.putString("locale", "ru");
-                                break;
-                            case "Serbian":
-                                tinyDb.putString("locale", "sr");
-                                break;
-                            case "Turkish":
-                                tinyDb.putString("locale", "tr");
-                                break;
-                            case "Ukrainian":
-                                tinyDb.putString("locale", "uk");
-                                break;
-                            default:
-                                tinyDb.putString("locale", "en");
-                                break;
-                        }
+			AlertDialog cDialog = cBuilder.create();
+			cDialog.show();
 
-                        dialogInterface.dismiss();
-                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-                        Objects.requireNonNull(getActivity()).recreate();
-                        getActivity().overridePendingTransition(0, 0);
+		});
 
-                    }
-                });
-                lBuilder.setNegativeButton(getString(R.string.cancelButton), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
-                    }
-                });
+		// language dialog
+		langFrame.setOnClickListener(view -> {
 
-                AlertDialog lDialog = lBuilder.create();
-                lDialog.show();
+			AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx);
 
-            }
-        });
+			lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
+			if(langSelectedChoice != -1) {
+				lBuilder.setCancelable(true);
+			}
+			else {
+				lBuilder.setCancelable(false);
+			}
 
-        // time n date dialog
-        timeFrame.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
+			lBuilder.setSingleChoiceItems(langList, langSelectedChoice, (dialogInterface, i) -> {
 
-                AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx);
+				langSelectedChoice = i;
+				tvLanguageSelected.setText(langList[i]);
+				tinyDb.putString("localeStr", langList[i]);
+				tinyDb.putInt("langId", i);
 
-                tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
-                if(timeSelectedChoice != -1) {
-                    tBuilder.setCancelable(true);
-                }
-                else {
-                    tBuilder.setCancelable(false);
-                }
+				switch(langList[i]) {
+					case "Arabic":
+						tinyDb.putString("locale", "ar");
+						break;
+					case "Chinese":
+						tinyDb.putString("locale", "zh");
+						break;
+					case "Finnish":
+						tinyDb.putString("locale", "fi");
+						break;
+					case "French":
+						tinyDb.putString("locale", "fr");
+						break;
+					case "German":
+						tinyDb.putString("locale", "de");
+						break;
+					case "Italian":
+						tinyDb.putString("locale", "it");
+						break;
+					case "Latvian":
+						tinyDb.putString("locale", "lv");
+						break;
+					case "Persian":
+						tinyDb.putString("locale", "fa");
+						break;
+					case "Polish":
+						tinyDb.putString("locale", "pl");
+						break;
+					case "Portuguese/Brazilian":
+						tinyDb.putString("locale", "pt");
+						break;
+					case "Russian":
+						tinyDb.putString("locale", "ru");
+						break;
+					case "Serbian":
+						tinyDb.putString("locale", "sr");
+						break;
+					case "Spanish":
+						tinyDb.putString("locale", "es");
+						break;
+					case "Turkish":
+						tinyDb.putString("locale", "tr");
+						break;
+					case "Ukrainian":
+						tinyDb.putString("locale", "uk");
+						break;
+					default:
+						tinyDb.putString("locale", "en");
+						break;
+				}
 
-                tBuilder.setSingleChoiceItems(timeList, timeSelectedChoice, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterfaceTime, int i) {
+				dialogInterface.dismiss();
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+				Objects.requireNonNull(getActivity()).recreate();
+				getActivity().overridePendingTransition(0, 0);
 
-                        timeSelectedChoice = i;
-                        tvDateTimeSelected.setText(timeList[i]);
-                        tinyDb.putString("timeStr", timeList[i]);
-                        tinyDb.putInt("timeId", i);
+			});
 
-                        if ("Normal".equals(timeList[i])) {
-                            tinyDb.putString("dateFormat", "normal");
-                        } else {
-                            tinyDb.putString("dateFormat", "pretty");
-                        }
+			lBuilder.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> dialog.dismiss());
 
-                        dialogInterfaceTime.dismiss();
-                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+			AlertDialog lDialog = lBuilder.create();
+			lDialog.show();
 
-                    }
-                });
+		});
 
-                AlertDialog tDialog = tBuilder.create();
-                tDialog.show();
+		// time n date dialog
+		timeFrame.setOnClickListener(view -> {
 
-            }
-        });
+			AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx);
 
-        return v;
-    }
+			tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
+			if(timeSelectedChoice != -1) {
+				tBuilder.setCancelable(true);
+			}
+			else {
+				tBuilder.setCancelable(false);
+			}
 
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-        ctx = context;
-    }
+			tBuilder.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {
+
+				timeSelectedChoice = i;
+				tvDateTimeSelected.setText(timeList[i]);
+				tinyDb.putString("timeStr", timeList[i]);
+				tinyDb.putInt("timeId", i);
+
+				if("Normal".equals(timeList[i])) {
+					tinyDb.putString("dateFormat", "normal");
+				}
+				else {
+					tinyDb.putString("dateFormat", "pretty");
+				}
+
+				dialogInterfaceTime.dismiss();
+				Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+
+			});
+
+			AlertDialog tDialog = tBuilder.create();
+			tDialog.show();
+
+		});
+
+		return v;
+
+	}
+
+	@Override
+	public void onAttach(@NonNull Context context) {
+
+		super.onAttach(context);
+		ctx = context;
+
+	}
 
 }

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

@@ -24,7 +24,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.NewRepoActivity;
+import org.mian.gitnex.activities.CreateRepoActivity;
 import org.mian.gitnex.adapters.StarredReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.UserRepositories;
@@ -104,7 +104,7 @@ public class StarredRepositoriesFragment extends Fragment {
 
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), NewRepoActivity.class);
+                Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
                 startActivity(intent);
             }
 

app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java

@@ -0,0 +1,103 @@
+package org.mian.gitnex.helpers;
+
+import java.io.IOException;
+import java.util.Objects;
+import org.mian.gitnex.R;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import android.app.Activity;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+import android.text.Html;
+import android.util.Log;
+import androidx.appcompat.app.AlertDialog;
+
+/**
+ * Author M M Arif
+ */
+
+public class ChangeLog {
+
+    static final private String TAG = "ChangeLog";
+    static final private String CHANGELOG_XML_NODE = "changelog";
+	
+    private Activity changelogActivity;
+    
+	public ChangeLog(Activity context) {
+		changelogActivity = context;
+    }
+
+	private String ParseReleaseTag(XmlResourceParser aXml) throws XmlPullParserException, IOException {
+
+		StringBuilder strBuilder = new StringBuilder(aXml.getAttributeValue(null, "version") + "<br>");
+		int eventType = aXml.getEventType();
+
+		while ((eventType != XmlPullParser.END_TAG) || (aXml.getName().equals("change"))) {
+
+			if ((eventType == XmlPullParser.START_TAG) && (aXml.getName().equals("change"))) {
+				eventType = aXml.next();
+				strBuilder.append(aXml.getText()).append("<br>");
+			}
+			eventType = aXml.next();
+
+		}
+		strBuilder.append("<br>");
+
+		return strBuilder.toString();
+
+	}
+
+	private String getChangelog(int resId, Resources res) {
+
+		StringBuilder strBuilder = new StringBuilder();
+		try (XmlResourceParser xml = res.getXml(resId)) {
+
+			int eventType = xml.getEventType();
+			while (eventType != XmlPullParser.END_DOCUMENT) {
+
+				if ((eventType == XmlPullParser.START_TAG) && (xml.getName().equals("release"))) {
+					strBuilder.append(ParseReleaseTag(xml));
+
+				}
+				eventType = xml.next();
+
+			}
+
+		}
+		catch (XmlPullParserException | IOException e) {
+			Log.e(TAG, Objects.requireNonNull(e.getMessage()));
+		}
+
+		return strBuilder.toString();
+
+	}
+
+	public void showDialog() {
+
+		String packageName = changelogActivity.getPackageName();
+		Resources res = null;
+
+		try {
+			res = changelogActivity.getPackageManager().getResourcesForApplication(packageName);
+		}
+		catch (PackageManager.NameNotFoundException e) {
+			Log.e(TAG, Objects.requireNonNull(e.getMessage()));
+		}
+
+		assert res != null;
+		int resId = res.getIdentifier(CHANGELOG_XML_NODE, "xml", packageName);
+
+		String changelogMessage = getChangelog(resId, res);
+
+		androidx.appcompat.app.AlertDialog.Builder builder = new AlertDialog.Builder(changelogActivity);
+		builder.setTitle(R.string.changelogTitle);
+		builder.setMessage(Html.fromHtml("<small>" + changelogMessage + "</small>"));
+		builder.setNegativeButton(R.string.close, (dialog, which) -> dialog.cancel());
+		builder.setCancelable(false);
+		builder.create();
+		builder.show();
+
+	}
+
+}

app/src/main/java/org/mian/gitnex/helpers/LabelWidthCalculator.java

@@ -1,11 +1,28 @@
 package org.mian.gitnex.helpers;
 
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+
 /**
  * Author M M Arif
  */
 
 public class LabelWidthCalculator {
 
+    public static int calculateLabelWidth(String text, Typeface typeface, int textSize, int paddingLeftRight) {
+
+        Paint paint = new Paint();
+        Rect rect = new Rect();
+
+        paint.setTextSize(textSize);
+        paint.setTypeface(typeface);
+        paint.getTextBounds(text, 0, text.length(), rect);
+
+        return rect.width() + (paddingLeftRight * 2);
+
+    }
+
     public static int customWidth(int labelLength) {
 
         int width = 33;

app/src/main/java/org/mian/gitnex/helpers/NetworkObserver.java

@@ -0,0 +1,82 @@
+package org.mian.gitnex.helpers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+
+/**
+ * Author M M Arif
+ */
+
+public class NetworkObserver implements LifecycleObserver {
+
+    private ConnectivityManager mConnectivityMgr;
+    private Context mContext;
+    private NetworkStateReceiver mNetworkStateReceiver;
+
+    public interface ConnectionStateListener {
+        void onAvailable(boolean isAvailable);
+    }
+
+    public NetworkObserver(Context context) {
+        mContext = context;
+        mConnectivityMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        ((AppCompatActivity) mContext).getLifecycle().addObserver(this);
+    }
+
+
+    public void onInternetStateListener(ConnectionStateListener listener) {
+
+        mNetworkStateReceiver = new NetworkStateReceiver(listener);
+        IntentFilter intentFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
+        mContext.registerReceiver(mNetworkStateReceiver, intentFilter);
+
+    }
+
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    public void onDestroy() {
+
+        ((AppCompatActivity) mContext).getLifecycle().removeObserver(this);
+
+        if (mNetworkStateReceiver != null) {
+            mContext.unregisterReceiver(mNetworkStateReceiver);
+        }
+
+    }
+
+
+    public class NetworkStateReceiver extends BroadcastReceiver {
+
+        ConnectionStateListener mListener;
+
+        public NetworkStateReceiver(ConnectionStateListener listener) {
+            mListener = listener;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getExtras() != null) {
+                NetworkInfo activeNetworkInfo = mConnectivityMgr.getActiveNetworkInfo();
+
+                if (activeNetworkInfo != null && activeNetworkInfo.getState() == NetworkInfo.State.CONNECTED) {
+
+                    mListener.onAvailable(true); // connected
+
+                } else if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, Boolean.FALSE)) {
+
+                    mListener.onAvailable(false); // disconnected
+
+                }
+            }
+        }
+    }
+
+}

app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java

@@ -0,0 +1,203 @@
+package org.mian.gitnex.helpers;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.Log;
+import com.squareup.picasso.Cache;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Author anonTree1417
+ */
+
+public class PicassoCache implements Cache {
+
+	private String TAG = "PicassoCache";
+
+	private static final Bitmap.CompressFormat COMPRESS_FORMAT = Bitmap.CompressFormat.PNG;
+	private static final int COMPRESSION_QUALITY = 0; // 0 = high compression (low file size) | 100 = no compression
+
+	private static final String CACHE_MAP_FILE = "cacheMap";
+	private static final int CACHE_SIZE = 25 * 1024 * 1024; // Cache can hold twenty-five megabytes
+
+	private File cachePath;
+	private HashMap<String, String> cacheMap;
+
+	public PicassoCache(File cachePath) throws IOException, ClassNotFoundException {
+
+		this.cachePath = cachePath;
+		cacheMap = new HashMap<>();
+
+		if(cacheMapExists(cachePath)) {
+
+			cacheMap.putAll(loadCacheMap());
+
+		}
+
+	}
+
+	@Override
+	public Bitmap get(String key) {
+
+		try {
+
+			if(cacheMap.containsKey(key)) {
+
+				FileInputStream fileInputStream = new FileInputStream(new File(cachePath, cacheMap.get(key)));
+
+				Bitmap bitmap = BitmapFactory.decodeStream(fileInputStream);
+				fileInputStream.close();
+
+				return bitmap;
+
+			}
+
+		}
+		catch(IOException e) {
+
+			Log.e(TAG, e.toString());
+
+		}
+
+		return null;
+
+	}
+
+	@Override
+	public void set(String key, Bitmap bitmap) {
+
+		try {
+
+			String uuid = generateRandomFilename();
+			File file = new File(cachePath, uuid);
+
+			FileOutputStream fileOutputStream = new FileOutputStream(file, false);
+			bitmap.compress(COMPRESS_FORMAT, COMPRESSION_QUALITY, fileOutputStream);
+
+			fileOutputStream.flush();
+			fileOutputStream.close();
+
+			cacheMap.put(key, uuid);
+			saveCacheMap(cacheMap);
+
+		}
+		catch(IOException e) {
+
+			Log.e(TAG, e.toString());
+
+		}
+
+	}
+
+	@Override
+	public int size() {
+
+		int currentSize = 0;
+
+		for(String key : cacheMap.keySet()) {
+
+			currentSize += new File(cachePath, cacheMap.get(key)).length();
+
+		}
+
+		return currentSize;
+
+	}
+
+	@Override
+	public int maxSize() {
+
+		return CACHE_SIZE;
+
+	}
+
+	@Override
+	public void clear() {
+
+		File[] files = cachePath.listFiles();
+
+		if(files != null) {
+
+			for(File file : files) {
+
+				//noinspection ResultOfMethodCallIgnored
+				file.delete();
+
+			}
+
+		}
+
+	}
+
+	@Override
+	public void clearKeyUri(String keyPrefix) {
+
+		for(String key : cacheMap.keySet()) {
+
+			int len = Math.min(keyPrefix.length(), key.length());
+			boolean match = true;
+
+			for(int i=0; i<len; i++) {
+
+				if(key.charAt(i) != keyPrefix.charAt(i)) {
+
+					match = false;
+					break;
+				}
+
+			}
+
+			if(match) {
+
+				//noinspection ResultOfMethodCallIgnored
+				new File(cachePath, cacheMap.get(key)).delete();
+				cacheMap.remove(key);
+
+			}
+
+		}
+
+	}
+
+	private String generateRandomFilename() {
+
+		return UUID.randomUUID().toString();
+
+	}
+
+	private void saveCacheMap(Map<String, String> cacheMap) throws IOException {
+
+		ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(new File(cachePath, CACHE_MAP_FILE), false));
+
+		objectOutputStream.writeObject(cacheMap);
+		objectOutputStream.flush();
+		objectOutputStream.close();
+
+	}
+
+	private Map<String, String> loadCacheMap() throws IOException, ClassNotFoundException {
+
+		ObjectInputStream objectInputStream = new ObjectInputStream(new FileInputStream(new File(cachePath, CACHE_MAP_FILE)));
+
+		Map<String, String> map = (HashMap<String, String>) objectInputStream.readObject();
+		objectInputStream.close();
+
+		return map;
+
+	}
+
+	private boolean cacheMapExists(File cachePath) {
+
+		return new File(cachePath, CACHE_MAP_FILE).exists();
+
+	}
+
+}

app/src/main/java/org/mian/gitnex/helpers/SnackBar.java

@@ -0,0 +1,63 @@
+package org.mian.gitnex.helpers;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+import com.google.android.material.snackbar.Snackbar;
+import org.mian.gitnex.R;
+
+/**
+ * Author M M Arif
+ */
+
+public class SnackBar {
+
+	public static void info(Context context, View createRepository, String message) {
+
+		Snackbar snackBar = Snackbar.make(createRepository, message, Snackbar.LENGTH_LONG);
+
+		View sbView = snackBar.getView();
+		TextView textView = sbView.findViewById(R.id.snackbar_text);
+		textView.setTextColor(context.getResources().getColor(R.color.lightBlue));
+
+		snackBar.show();
+
+	}
+
+	public static void success(Context context, View createRepository, String message) {
+
+		Snackbar snackBar = Snackbar.make(createRepository, message, Snackbar.LENGTH_LONG);
+
+		View sbView = snackBar.getView();
+		TextView textView = sbView.findViewById(R.id.snackbar_text);
+		textView.setTextColor(context.getResources().getColor(R.color.white));
+
+		snackBar.show();
+
+	}
+
+	public static void warning(Context context, View createRepository, String message) {
+
+		Snackbar snackBar = Snackbar.make(createRepository, message, Snackbar.LENGTH_LONG);
+
+		View sbView = snackBar.getView();
+		TextView textView = sbView.findViewById(R.id.snackbar_text);
+		textView.setTextColor(context.getResources().getColor(R.color.lightYellow));
+
+		snackBar.show();
+
+	}
+
+	public static void error(Context context, View createRepository, String message) {
+
+		Snackbar snackBar = Snackbar.make(createRepository, message, Snackbar.LENGTH_LONG);
+
+		View sbView = snackBar.getView();
+		TextView textView = sbView.findViewById(R.id.snackbar_text);
+		textView.setTextColor(context.getResources().getColor(R.color.darkRed));
+
+		snackBar.show();
+
+	}
+
+}

app/src/main/java/org/mian/gitnex/helpers/StaticGlobalVariables.java

@@ -0,0 +1,18 @@
+package org.mian.gitnex.helpers;
+
+/**
+ * Author M M Arif
+ */
+
+public interface StaticGlobalVariables {
+
+	// issues variables
+	String tagIssuesListOpen = "IssuesListOpenFragment - ";
+	String tagIssuesListClosed = "IssuesListClosedFragment - ";
+	int issuesPageInit = 1;
+	int resultLimitNewGiteaInstances = 25; // Gitea 1.12 and above
+	int resultLimitOldGiteaInstances = 10; // Gitea 1.11 and below
+	String issuesRequestType = "issues";
+	String issueStateClosed = "closed";
+
+}

app/src/main/java/org/mian/gitnex/helpers/TimeHelper.java

@@ -1,35 +1,97 @@
 package org.mian.gitnex.helpers;
 
+import android.content.Context;
+import org.mian.gitnex.R;
+import org.ocpsoft.prettytime.PrettyTime;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
+/**
+ * Author M M Arif
+ */
+
 public class TimeHelper {
 
-    public static String customDateFormatForToast(String customDate) {
+	public static String customDateFormatForToast(String customDate) {
 
-        String[] parts = customDate.split("\\+");
-        String part1 = parts[0] + "Z";
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ENGLISH);
-        Date createdTime = null;
-        try {
-            createdTime = formatter.parse(part1);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
+		String[] parts = customDate.split("\\+");
+		String part1 = parts[0] + "Z";
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ENGLISH);
+		Date createdTime = null;
+		try {
+			createdTime = formatter.parse(part1);
+		}
+		catch(ParseException e) {
+			e.printStackTrace();
+		}
 
-        DateFormat format = DateFormat.getDateTimeInstance();
-        return format.format(createdTime);
+		DateFormat format = DateFormat.getDateTimeInstance();
+		return format.format(createdTime);
 
-    }
+	}
 
-    public static String customDateFormatForToastDateFormat(Date customDate) {
+	public static String formatTime(Date date, Locale locale, String timeFormat, Context context) {
 
-        DateFormat format = DateFormat.getDateTimeInstance();
-        return format.format(customDate);
+		if(date == null) {
+			return "";
+		}
 
-    }
+		switch(timeFormat) {
+
+			case "pretty": {
+				PrettyTime prettyTime = new PrettyTime(Locale.getDefault());
+				return prettyTime.format(date);
+			}
+
+			case "normal": {
+				DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+				return formatter.format(date);
+			}
+
+			case "normal1": {
+				DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+				return formatter.format(date);
+			}
+
+		}
+
+		return "";
+	}
+
+	public static String customDateFormatForToastDateFormat(Date customDate) {
+
+		DateFormat format = DateFormat.getDateTimeInstance();
+		return format.format(customDate);
+
+	}
+
+	public static boolean timeBetweenHours(int fromHour, int toHour) {
+
+		Calendar cal = Calendar.getInstance();
+
+		Calendar from = Calendar.getInstance();
+		from.set(Calendar.HOUR_OF_DAY, fromHour);
+		from.set(Calendar.MINUTE, 0);
+
+		Calendar to = Calendar.getInstance();
+		to.set(Calendar.HOUR_OF_DAY, toHour);
+		to.set(Calendar.MINUTE, 0);
+
+		if(to.before(from)) {
+			if(cal.after(to)) {
+				to.add(Calendar.DATE, 1);
+			}
+			else {
+				from.add(Calendar.DATE, -1);
+			}
+		}
+
+		return cal.after(from) && cal.before(to);
+
+	}
 
 }

app/src/main/java/org/mian/gitnex/helpers/VersionCheck.java

@@ -102,6 +102,22 @@ public enum VersionCheck {
      * 2 = more
      */
     public static int compareVersion(String A, String B) {
+        final Pattern pattern_stable_release = Pattern.compile("^(\\d)\\.(\\d+)\\.(\\d+)");
+        final Pattern pattern_dev_release = Pattern.compile("^(\\d).(\\d+).(\\d+)(\\D)(.+)");
+        Matcher match;
+        match = pattern_dev_release.matcher(A);
+        if (match.find()) {
+            match = pattern_stable_release.matcher(A);
+            match.find();
+            A = match.group();
+        }
+        match = pattern_dev_release.matcher(B);
+        if (match.find()) {
+            match = pattern_stable_release.matcher(B);
+            match.find();
+            B = match.group();
+        }
+
         //throw new IllegalArgumentException
         if((!A.matches("[0-9]+(\\.[0-9]+)*")) || (!B.matches("[0-9]+(\\.[0-9]+)*"))) throw new IllegalArgumentException("Invalid version format");
 

app/src/main/java/org/mian/gitnex/helpers/ssl/MTMDecision.java

@@ -0,0 +1,15 @@
+package org.mian.gitnex.helpers.ssl;
+
+/**
+ * Author Georg Lukas, modified by anonTree1417
+ */
+
+class MTMDecision {
+
+	final static int DECISION_INVALID	= 0;
+	final static int DECISION_ABORT		= 1;
+	final static int DECISION_ALWAYS 	= 2;
+
+	int state = DECISION_INVALID;
+
+}