Merge branch 'release-2.3.2' of gitnex/GitNex into release-2.3

prepare release 2.3.2
Merge branch 'fix-234' of gitnex/GitNex into release-2.3
2019-12-25 19:25:38 +00:00 · 2019-12-26 00:22:22 +05:00 · 2019-12-25 19:11:03 +00:00 · 2019-12-25 18:48:12 +05:00 · 2019-12-25 10:49:20 +00:00 · 2019-12-24 21:22:40 +01:00
370 changed files with 5518 additions and 13662 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -24,32 +24,6 @@ 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
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +0,0 @@
-* text=auto eol=lf
--- a/.gitea/issue_template.md
+++ b/.gitea/issue_template.md
@ -1,31 +0,0 @@
-## # 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.
--- a/.gitea/pull_request_template.md
+++ b/.gitea/pull_request_template.md
@ -1,8 +0,0 @@
-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.**
--- a/.gitignore
+++ b/.gitignore
@ -8,9 +8,6 @@
 *.ap_
 *.aab

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

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

 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -1,159 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JavaCodeStyleSettings>
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="android" withSubpackages="true" static="false" />
-          <package name="androidx" withSubpackages="true" static="false" />
-          <package name="com" withSubpackages="true" static="false" />
-          <package name="junit" withSubpackages="true" static="false" />
-          <package name="net" withSubpackages="true" static="false" />
-          <package name="org" withSubpackages="true" static="false" />
-          <package name="java" withSubpackages="true" static="false" />
-          <package name="javax" withSubpackages="true" static="false" />
-          <package name="" withSubpackages="true" static="false" />
-          <package name="" withSubpackages="true" static="true" />
-        </value>
-      </option>
-    </JavaCodeStyleSettings>
-    <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>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -7,11 +7,6 @@ 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.

--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -18,7 +18,6 @@ This part lists all PUBLIC individuals having contributed content to the transla
 * erardiflorian
 * IndeedNotJames
 * jaqra
- * Lafriks
 * ljoonal
 * Lunny Xiao (xiaolunwen)
 * lxs
--- a/README.md
+++ b/README.md
@ -2,7 +2,6 @@
 [![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)
@ -20,7 +19,7 @@ No trackers are used and source code is available here for anyone to audit.
 [<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitea.com/gitnex/GitNex/releases)

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

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

@ -90,8 +89,5 @@ Open source libraries
 - Apache/commons-io
 - Caverock/androidsvg
 - Droidsonroids.gif/android-gif-drawable
- Barteksc/AndroidPdfViewer
- Mikepenz/fastadapter
- Ge0rg/MemorizingTrustManager

 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)
--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,14 +6,13 @@ android {
        applicationId "org.mian.gitnex"
        minSdkVersion 21
        targetSdkVersion 29
-        versionCode 104
-        versionName "2.5.0-rc4"
+        versionCode 82
+        versionName "2.3.2"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
        release {
            minifyEnabled false
-            shrinkResources false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
@ -21,42 +20,31 @@ 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"
-    def markwon_version = '4.3.1'
-    def fastadapter = "3.3.1"
-    def acra = "5.5.0"
+    def lifecycle_version = "2.2.0-rc02"
+    final def markwon_version = "4.1.1"

    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "com.google.android.material:material:1.2.0-alpha06"
+    implementation "com.google.android.material:material:1.2.0-alpha02"
    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    testImplementation "junit:junit:4.13"
+    testImplementation "junit:junit:4.12"
    androidTestImplementation "androidx.test:runner:1.2.0"
    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
    implementation "com.github.vihtarb:tooltip:0.2.0"
-    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
-    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.squareup.okhttp3:okhttp:3.12.1"
+    implementation "com.google.code.gson:gson:2.8.5"
    implementation "com.squareup.picasso:picasso:2.71828"
    implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
-    implementation 'com.squareup.retrofit2:retrofit:2.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.squareup.retrofit2:retrofit:2.5.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.5.0"
+    implementation "com.squareup.retrofit2:converter-scalars:2.5.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.1"
+    implementation "org.ocpsoft.prettytime:prettytime:4.0.1.Final"
+    implementation "com.vdurmont:emoji-java:4.0.0"
    implementation "com.pes.materialcolorpicker:library:1.2.5"
    implementation "io.noties.markwon:core:$markwon_version"
    implementation "io.noties.markwon:ext-latex:$markwon_version"
@ -78,16 +66,7 @@ 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:20030203.000550"
+    implementation "commons-io:commons-io:2.6"
    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"
-
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
    package="org.mian.gitnex">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <application
        android:allowBackup="true"
@ -14,13 +12,13 @@
        android:networkSecurityConfig="@xml/network_security_config"
        android:roundIcon="@mipmap/app_logo_round"
        android:supportsRtl="true"
-        tools:targetApi="n">
-        <activity android:name=".activities.MergePullRequestActivity" />
+        android:theme="@style/AppTheme">
+        <activity android:name=".activities.MergePullRequestActivity"></activity>
        <activity
            android:name=".activities.FileViewActivity"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
-            android:name=".activities.CreateFileActivity"
+            android:name=".activities.NewFileActivity"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".activities.RepoWatchersActivity"
@ -41,16 +39,16 @@
        <activity android:name=".activities.ProfileEmailActivity" />
        <activity android:name=".activities.AddCollaboratorToRepositoryActivity" />
        <activity android:name=".activities.CreateTeamByOrgActivity" />
-        <activity android:name=".activities.OrganizationTeamMembersActivity" />
+        <activity android:name=".activities.OrgTeamMembersActivity" />
        <activity
-            android:name=".activities.OrganizationDetailActivity"
+            android:name=".activities.OrgDetailActivity"
            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.CreateMilestoneActivity" />
+        <activity android:name=".activities.NewMilestoneActivity" />
        <activity android:name=".activities.ReplyToIssueActivity" />
        <activity
            android:name=".activities.IssueDetailActivity"
@ -59,7 +57,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">
+        <activity android:name=".activities.MainActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@ -68,13 +66,11 @@
        </activity>
        <activity
            android:name=".activities.LoginActivity"
-            android:launchMode="singleTask" android:theme="@android:style/Theme.NoTitleBar"/>
-        <activity android:name=".activities.CreateRepoActivity" />
-        <activity android:name=".activities.CreateOrganizationActivity" />
+            android:launchMode="singleTask" />
+        <activity android:name=".activities.NewRepoActivity" />
+        <activity android:name=".activities.NewOrganizationActivity" />
        <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>
--- a/app/src/main/assets/fonts/manroperegular.ttf
+++ b/app/src/main/assets/fonts/manroperegular.ttf
--- a/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
@ -2,8 +2,6 @@ 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;
@ -24,9 +22,9 @@ import retrofit2.Callback;

 public class IssueActions {

-    public static void editIssueComment(final Context ctx, final int commentId, final String commentBody) {
+    public static void editIssueComment(final Context context, final int commentId, final String commentBody) {

-        final TinyDB tinyDb = new TinyDB(ctx);
+        final TinyDB tinyDb = new TinyDB(context);
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -39,9 +37,9 @@ public class IssueActions {
        Call<IssueComments> call;

        call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, context)
                .getApiInterface()
-                .patchIssueComment(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, commentId, commentBodyJson);
+                .patchIssueComment(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, commentId, commentBodyJson);

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

@ -52,32 +50,32 @@ public class IssueActions {
                    if(response.code() == 200) {

                        tinyDb.putBoolean("commentEdited", true);
-                        Toasty.info(ctx, ctx.getString(R.string.editCommentUpdatedText));
-                        ((ReplyToIssueActivity)ctx).finish();
+                        Toasty.info(context, context.getString(R.string.editCommentUpdatedText));
+                        ((ReplyToIssueActivity)context).finish();

                    }
                }
                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));
+                    AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));

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

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

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

-                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

                }
                else {

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

                }

@ -91,9 +89,9 @@ public class IssueActions {

    }

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

-        final TinyDB tinyDb = new TinyDB(ctx);
+        final TinyDB tinyDb = new TinyDB(context);
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
@ -106,9 +104,9 @@ public class IssueActions {
        Call<JsonElement> call;

        call = RetrofitClient
-                .getInstance(instanceUrl, ctx)
+                .getInstance(instanceUrl, context)
                .getApiInterface()
-                .closeReopenIssue(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);
+                .closeReopenIssue(Authorization.returnAuthentication(context, loginUid, instanceToken), repoOwner, repoName, issueIndex, issueStatJson);

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

@ -121,35 +119,35 @@ public class IssueActions {
                        tinyDb.putBoolean("resumeIssues", true);
                        tinyDb.putBoolean("resumeClosedIssues", true);
                        if(issueState.equals("closed")) {
-                            Toasty.info(ctx, ctx.getString(R.string.issueStateClosed));
+                            Toasty.info(context, context.getString(R.string.issueStateClosed));
                        }
                        else if(issueState.equals("open")) {
-                            Toasty.info(ctx, ctx.getString(R.string.issueStateReopened));
+                            Toasty.info(context, context.getString(R.string.issueStateReopened));
                        }

                    }
                }
                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));
+                    AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));

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

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

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

-                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));
+                    Toasty.info(context, context.getString(R.string.apiNotFound));

                }
                else {

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

                }

@ -163,117 +161,4 @@ 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()) {
-
-                    Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion));
-                    subscribeIssue.setVisibility(View.GONE);
-                    unsubscribeIssue.setVisibility(View.VISIBLE);
-
-                }
-                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()) {
-
-                    Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion));
-                    unsubscribeIssue.setVisibility(View.GONE);
-                    subscribeIssue.setVisibility(View.VISIBLE);
-
-                }
-                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));
-            }
-        });
-    }
-
 }
--- a/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
@ -1,143 +0,0 @@
-package org.mian.gitnex.actions;
-
-import android.content.Context;
-import android.util.Log;
-import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.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());
-
-			}
-
-		});
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -13,7 +14,6 @@ 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;
@ -25,12 +25,13 @@ import org.mian.gitnex.models.UserSearch;
 import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
 import java.util.List;
+import java.util.Objects;

 /**
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;
    final Context ctx = this;
@ -41,15 +42,9 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
    private RecyclerView mRecyclerView;

    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_add_collaborator_to_repository;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        setContentView(R.layout.activity_add_collaborator_to_repository);

        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
@ -64,10 +59,6 @@ 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);

--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
@ -1,11 +1,13 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@ -16,7 +18,7 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.models.MultiSelectModel;
-import org.mian.gitnex.models.UpdateIssueAssignees;
+import org.mian.gitnex.models.UpdateIssueAssignee;
 import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
@ -27,7 +29,7 @@ import retrofit2.Callback;
 * Author M M Arif
 */

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

    private ArrayList<MultiSelectModel> listOfCollaborators = new ArrayList<>();
    private ArrayList<Integer> issueAssigneesIds = new ArrayList<>();
@ -36,15 +38,11 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
    final Context ctx = this;

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

        super.onCreate(savedInstanceState);
-        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.activity_add_remove_assignees);

        getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));

@ -236,14 +234,14 @@ public class AddRemoveAssigneesActivity extends BaseActivity {

    private void updateIssueAssignees(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String loginUid, int issueIndex, List<String> issueAssigneesList) {

-        UpdateIssueAssignees updateAssigneeJson = new UpdateIssueAssignees(issueAssigneesList);
+        UpdateIssueAssignee updateAssigneeJson = new UpdateIssueAssignee(issueAssigneesList);

        Call<JsonElement> call3;

        call3 = RetrofitClient
                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
-                .patchIssueAssignees(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
+                .patchIssueAssignee(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);

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

--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@ -8,6 +9,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@ -25,7 +27,7 @@ import java.util.List;
 * Author M M Arif
 */

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

    private ArrayList<MultiSelectModel> listOfLabels = new ArrayList<>();
    private ArrayList<Integer> issueLabelIds = new ArrayList<>();
@ -34,14 +36,10 @@ public class AddRemoveLabelsActivity extends BaseActivity {
    final Context ctx = this;

    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_add_remove_labels;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.activity_add_remove_labels);

        getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));

--- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
@ -21,7 +22,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.BottomSheetAdminUsersFragment;
+import org.mian.gitnex.fragments.AdminUsersBottomSheetFragment;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.AppUtil;
@ -34,7 +35,7 @@ import java.util.Objects;
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;
    final Context ctx = this;
@ -44,14 +45,10 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
    private Boolean searchFilter = false;

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

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

        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
@ -171,7 +168,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
                finish();
                return true;
            case R.id.genericMenu:
-                BottomSheetAdminUsersFragment bottomSheet = new BottomSheetAdminUsersFragment();
+                AdminUsersBottomSheetFragment bottomSheet = new AdminUsersBottomSheetFragment();
                bottomSheet.show(getSupportFragmentManager(), "usersBottomSheet");
                return true;
            default:
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@ -1,109 +0,0 @@
-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.mipmap.app_logo,
-		resTitle = R.string.crashTitle,
-		resChannelName = R.string.setCrashReports,
-		resText = R.string.crashMessage)
-
-public abstract class BaseActivity extends AppCompatActivity {
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		final TinyDB tinyDb = new TinyDB(getApplicationContext());
-
-		if(tinyDb.getInt("themeId") == 1) {
-			setTheme(R.style.AppThemeLight);
-		}
-		else if(tinyDb.getInt("themeId") == 2) {
-
-			boolean timeSetterFlag = TimeHelper.timeBetweenHours(18, 6); // 6pm to 6am
-
-			if(timeSetterFlag) {
-				setTheme(R.style.AppTheme);
-			}
-			else {
-				setTheme(R.style.AppThemeLight);
-			}
-
-		}
-		else {
-			setTheme(R.style.AppTheme);
-		}
-
-		super.onCreate(savedInstanceState);
-		setContentView(getLayoutResourceId());
-
-		switch(tinyDb.getInt("customFontId", -1)) {
-
-			case 0:
-				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
-				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
-				FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
-				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
-				break;
-
-			case 2:
-				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf");
-				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf");
-				FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf");
-				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf");
-				break;
-
-			default:
-				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf");
-				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf");
-				FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf");
-				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf");
-				break;
-
-		}
-
-		// 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");
-		}
-
-		if (tinyDb.getBoolean("crashReportingEnabled")) {
-
-			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);
-			ACRABuilder.setBuildConfigClass(BuildConfig.class).setReportFormat(StringFormat.KEY_VALUE_LIST);
-			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo(getResources().getString(R.string.appEmail)).setSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(getApplicationContext()))).setEnabled(true);
-			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
-			ACRA.init(getApplication(), ACRABuilder);
-
-		}
-
-	}
-
-	protected abstract int getLayoutResourceId();
-
-}
-
-
--- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
@ -1,325 +0,0 @@
-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();
-        };
-    }
-
-}
-
-
--- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@ -11,7 +12,6 @@ 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;
@ -40,12 +40,13 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
+import java.util.Objects;

 /**
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;
    MultiSelectDialog multiSelectDialog;
@ -68,22 +69,15 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
    private ArrayAdapter<Mention> defaultMentionAdapter;

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

        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");
-        final String loginFullName = tinyDb.getString("userFullname");
        String repoFullName = tinyDb.getString("repoFullName");
        String[] parts = repoFullName.split("/");
        final String repoOwner = parts[0];
@ -99,10 +93,6 @@ 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();

@ -120,7 +110,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
        getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid);

        getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
-        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid, loginFullName);
+        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid);

        disableProcessButton();

@ -387,15 +377,13 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis

    }

-    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, String loginFullName) {
+    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {

        Call<List<Collaborators>> call = RetrofitClient
                .getInstance(instanceUrl, getApplicationContext())
                .getApiInterface()
                .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);

-        listOfAssignees.add(new MultiSelectModel(-1, loginFullName));
-
        call.enqueue(new Callback<List<Collaborators>>() {

            @Override
--- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
@ -2,6 +2,7 @@ package org.mian.gitnex.activities;

 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import retrofit2.Call;
 import retrofit2.Callback;
@ -11,7 +12,6 @@ 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;
@ -34,7 +34,7 @@ import java.util.Objects;
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;
    private TextView colorPicker;
@ -43,15 +43,9 @@ public class CreateLabelActivity extends BaseActivity {
    final Context ctx = this;

    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_create_label;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        setContentView(R.layout.activity_create_label);

        final TinyDB tinyDb = new TinyDB(getApplicationContext());
        String repoFullName = tinyDb.getString("repoFullName");
@ -64,7 +58,7 @@ public class CreateLabelActivity extends BaseActivity {

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

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

@ -77,10 +71,6 @@ 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();
--- a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@ -9,7 +10,6 @@ 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;
@ -26,7 +26,7 @@ import org.mian.gitnex.util.TinyDB;
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;
    private EditText fullName;
@ -37,19 +37,13 @@ public class CreateNewUserActivity extends BaseActivity {
    final Context ctx = this;

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

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

        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);
@ -57,10 +51,6 @@ 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);

--- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@ -9,7 +10,6 @@ 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;
@ -33,7 +33,7 @@ import java.util.List;
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;
    public ImageView closeActivity;
@ -49,19 +49,13 @@ public class CreateReleaseActivity extends BaseActivity {
    List<Branches> branchesList = new ArrayList<>();

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

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

        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");
@ -78,10 +72,6 @@ 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);

--- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
@ -2,6 +2,7 @@ package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@ -9,7 +10,6 @@ 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;
@ -30,7 +30,7 @@ import android.util.Log;
 * Author M M Arif
 */

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

    final Context ctx = CreateTeamByOrgActivity.this;
    private View.OnClickListener onClickListener;
@ -44,11 +44,6 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
    private String[] permissionList = {"Read", "Write", "Admin"};
    public int permissionSelectedChoice = -1;

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

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

        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);
@ -88,10 +82,6 @@ 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);

@ -99,7 +89,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
            @Override
            public void onClick(View view) {

-                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);

                pBuilder.setTitle(R.string.newTeamPermission);
                if(permissionSelectedChoice != -1) {
@ -151,7 +141,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                teamAccessControlsArray.setText("");
                pushAccessList = Arrays.asList(accessControlsList);

-                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);

                aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, new DialogInterface.OnMultiChoiceClickListener() {

--- a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;

+import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -17,19 +18,15 @@ import java.util.List;
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;

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

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

        ImageView closeActivity = findViewById(R.id.close);

--- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@ -12,7 +13,6 @@ 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;
@ -45,7 +45,7 @@ import java.util.List;
 * Author M M Arif
 */

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

    final Context ctx = this;
    private View.OnClickListener onClickListener;
@ -62,16 +62,10 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
    private ArrayAdapter<Mention> defaultMentionAdapter;

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

        super.onCreate(savedInstanceState);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        setContentView(R.layout.activity_edit_issue);

        final TinyDB tinyDb = new TinyDB(getApplicationContext());

@ -91,10 +85,6 @@ 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();

--- a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
@ -7,10 +7,11 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.FilesDiffAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
@ -30,7 +31,7 @@ import retrofit2.Callback;
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;
    private TextView toolbar_title;
@ -38,14 +39,10 @@ public class FileDiffActivity extends BaseActivity {
    private ProgressBar mProgressBar;

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

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

@ -72,18 +69,18 @@ public class FileDiffActivity extends BaseActivity {

        mProgressBar.setVisibility(View.VISIBLE);

-        String pullIndex = tinyDb.getString("issueNumber");
+        String fileDiffName = tinyDb.getString("issueNumber")+".diff";

-        getPullDiffContent(tinyDb.getString("instanceUrlWithProtocol"), repoOwner, repoName, pullIndex);
+        getFileContents(tinyDb.getString("instanceUrlWithProtocol"), repoOwner, repoName, fileDiffName);

    }

-    private void getPullDiffContent(String instanceUrl, String owner, String repo, String filename) {
+    private void getFileContents(String instanceUrl, String owner, String repo, String filename) {

        Call<ResponseBody> call = RetrofitClient
                .getInstance(instanceUrl, getApplicationContext())
-                .getWebInterface()
-                .getPullDiffContent(owner, repo, filename);
+                .getApiInterface()
+                .getFileDiffContents(owner, repo, filename);

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

@ -121,7 +118,7 @@ public class FileDiffActivity extends BaseActivity {
                                        }
                                    }

-                                    String fileExtension = FileUtils.getExtension(fileNameFinal);
+                                    String fileExtension = FilenameUtils.getExtension(fileNameFinal);

                                    String fileContentsFinalWithBlankLines = fileContentsFinal.replaceAll( ".*@@.*", "" );
                                    String fileContentsFinalWithoutBlankLines = fileContentsFinal.replaceAll( ".*@@.*(\r?\n|\r)?", "" );
@ -140,13 +137,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 = FileUtils.getExtension(getFileNameFinal);
-
-                                    if(appUtil.imageExtension(FileUtils.getExtension(getFileNameFinal))) {
-
-                                        fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension), "", binaryFileFinal));
-                                    }
+                                    String fileExtension = FilenameUtils.getExtension(getFileNameFinal);

+                                    fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension),"", binaryFileFinal));
                                }

                            }
--- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
@ -1,50 +1,33 @@
 package org.mian.gitnex.activities;

 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
-import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Base64;
 import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import com.github.barteksc.pdfviewer.PDFView;
-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.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.fragments.BottomSheetFileViewerFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Files;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;

@ -52,345 +35,171 @@ import retrofit2.Callback;
 * Author M M Arif
 */

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

-	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 HighlightJsView singleCodeContents;
+    private PhotoView imageView;
+    final Context ctx = this;
+    private ProgressBar mProgressBar;
+    private byte[] imageData;

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

-		return R.layout.activity_file_view;
-	}
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_file_view);
+        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);
+        singleFileContents.setVisibility(View.GONE);
+        mProgressBar = findViewById(R.id.progress_bar);

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

-		TextView toolbar_title = findViewById(R.id.toolbar_title);
-		toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+        try {

-		initCloseListener();
-		closeActivity.setOnClickListener(onClickListener);
+            singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
+            singleFileName = singleFileName.replaceAll("//", "/");
+            singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;

-		tinyDb.putString("downloadFileContents", "");
+        }
+        catch (UnsupportedEncodingException e) {

-		try {
+            assert singleFileName != null;
+            Log.i("singleFileName", singleFileName);

-			singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
-			singleFileName = singleFileName.replaceAll("//", "/");
-			singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
+        }

-		}
-		catch(UnsupportedEncodingException e) {
+        toolbar_title.setText(singleFileName);

-			assert singleFileName != null;
-			Log.i("singleFileName", singleFileName);
+        getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);

-		}
+    }

-		toolbar_title.setText(singleFileName);
+    private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {

-		getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);
+        Call<Files> call = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getSingleFileContents(token, owner, repo, filename);

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

-	private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {
+            @Override
+            public void onResponse(@NonNull Call<Files> call, @NonNull retrofit2.Response<Files> response) {

-		final TinyDB tinyDb = new TinyDB(getApplicationContext());
+                if (response.code() == 200) {

-		Call<Files> call = RetrofitClient.getInstance(instanceUrl, getApplicationContext()).getApiInterface().getSingleFileContents(token, owner, repo, filename);
+                    AppUtil appUtil = new AppUtil();
+                    assert response.body() != null;

-		call.enqueue(new Callback<Files>() {
+                    if(!response.body().getContent().equals("")) {

-			@Override
-			public void onResponse(@NonNull Call<Files> call, @NonNull retrofit2.Response<Files> response) {
+                        String fileExtension = FilenameUtils.getExtension(filename);
+                        mProgressBar.setVisibility(View.GONE);

-				if(response.code() == 200) {
+                        if(appUtil.imageExtension(fileExtension)) { // file is image

-					AppUtil appUtil = new AppUtil();
-					assert response.body() != null;
+                            singleFileContents.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.GONE);
+                            imageView.setVisibility(View.VISIBLE);

-					if(!response.body().getContent().equals("")) {
+                            imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
+                            Drawable imageDrawable = new BitmapDrawable(getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
+                            imageView.setImageDrawable(imageDrawable);

-						String fileExtension = FileUtils.getExtension(filename);
-						mProgressBar.setVisibility(View.GONE);
+                        }
+                        else if (appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode

-						// download file meta
-						tinyDb.putString("downloadFileName", filename);
-						tinyDb.putString("downloadFileContents", response.body().getContent());
+                            imageView.setVisibility(View.GONE);
+                            singleFileContents.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.VISIBLE);

-						if(appUtil.imageExtension(fileExtension)) { // file is image
+                            singleCodeContents.setTheme(Theme.GRUVBOX_DARK);
+                            singleCodeContents.setShowLineNumbers(true);
+                            singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));

-							singleFileContentsFrame.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
-							pdfViewFrame.setVisibility(View.GONE);
-							imageView.setVisibility(View.VISIBLE);
+                        }
+                        else { // file type not known - plain text view

-							imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
-							Drawable imageDrawable = new BitmapDrawable(getResources(), BitmapFactory.decodeByteArray(imageData, 0, imageData.length));
-							imageView.setImageDrawable(imageDrawable);
+                            imageView.setVisibility(View.GONE);
+                            singleCodeContents.setVisibility(View.GONE);
+                            singleFileContents.setVisibility(View.VISIBLE);

-						}
-						else if(appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
+                            singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));

-							imageView.setVisibility(View.GONE);
-							singleFileContentsFrame.setVisibility(View.GONE);
-							pdfViewFrame.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.VISIBLE);
+                        }

-							switch(tinyDb.getInt("fileviewerSourceCodeThemeId")) {
-								case 1:
-									singleCodeContents.setTheme(Theme.ARDUINO_LIGHT);
-									break;
-								case 2:
-									singleCodeContents.setTheme(Theme.GITHUB);
-									break;
-								case 3:
-									singleCodeContents.setTheme(Theme.FAR);
-									break;
-								case 4:
-									singleCodeContents.setTheme(Theme.IR_BLACK);
-									break;
-								case 5:
-									singleCodeContents.setTheme(Theme.ANDROID_STUDIO);
-									break;
-								default:
-									singleCodeContents.setTheme(Theme.MONOKAI_SUBLIME);
-							}
+                    }
+                    else {
+                        singleFileContents.setText("");
+                        mProgressBar.setVisibility(View.GONE);
+                    }

-							singleCodeContents.setShowLineNumbers(true);
-							singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
+                }
+                else if(response.code() == 401) {

-						}
-						else if(appUtil.pdfExtension(fileExtension)) { // file is pdf
+                    AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
+                            getResources().getString(R.string.alertDialogTokenRevokedMessage),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
+                            getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));

-							imageView.setVisibility(View.GONE);
-							singleFileContentsFrame.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
-							pdfViewFrame.setVisibility(View.VISIBLE);
+                }
+                else if(response.code() == 403) {

-							pdfNightMode = tinyDb.getBoolean("enablePdfMode");
+                    Toasty.info(ctx, ctx.getString(R.string.authorizeError));

-							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(response.code() == 404) {

-						}
-						else if(appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded
+                    Toasty.info(ctx, ctx.getString(R.string.apiNotFound));

-							imageView.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
-							pdfViewFrame.setVisibility(View.GONE);
-							singleFileContentsFrame.setVisibility(View.VISIBLE);
+                }
+                else {

-							singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
-							singleFileContents.setGravity(Gravity.CENTER);
-							singleFileContents.setTypeface(null, Typeface.BOLD);
+                    Toasty.info(getApplicationContext(), getString(R.string.labelGeneralError));

-						}
-						else { // file type not known - plain text view
+                }

-							imageView.setVisibility(View.GONE);
-							singleCodeContents.setVisibility(View.GONE);
-							pdfViewFrame.setVisibility(View.GONE);
-							singleFileContentsFrame.setVisibility(View.VISIBLE);
+            }

-							singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
+            @Override
+            public void onFailure(@NonNull Call<Files> call, @NonNull Throwable t) {
+                Log.e("onFailure", t.toString());
+            }
+        });

-						}
+    }

-					}
-					else {
-						singleFileContents.setText("");
-						mProgressBar.setVisibility(View.GONE);
-					}
+    private void initCloseListener() {
+        onClickListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getIntent().removeExtra("singleFileName");
+                finish();
+            }
+        };
+    }

-				}
-				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();
-			}
-		};
-	}
-
-}
+}
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@ -2,9 +2,10 @@ package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -17,6 +18,7 @@ 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;
@ -28,15 +30,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;
 import android.text.Spanned;
 import android.util.Log;
 import android.view.Gravity;
@ -51,15 +50,14 @@ 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.BottomSheetSingleIssueFragment;
+import org.mian.gitnex.fragments.SingleIssueBottomSheetFragment;
 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;
@ -69,6 +67,7 @@ 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;
@ -81,7 +80,7 @@ import java.util.Objects;
 * Author M M Arif
 */

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

    public ImageView closeActivity;
    private IssueCommentsAdapter adapter;
@ -96,20 +95,15 @@ 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;

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

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

        final TinyDB tinyDb = new TinyDB(getApplicationContext());

@ -134,13 +128,10 @@ 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);

        Toolbar toolbar = findViewById(R.id.toolbar);
-        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
        setSupportActionBar(toolbar);
        Objects.requireNonNull(getSupportActionBar()).setTitle(repoName);
        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@ -150,61 +141,22 @@ 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);

-        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;
-
-        switch(tinyDb.getInt("customFontId", -1)) {
-
-            case 1:
-                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
-                break;
-
-            case 2:
-                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-                break;
-
-            default:
-                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
-                break;
-
-        }
-
-        toolbarTitle.setTypeface(myTypeface);
-        toolbarTitle.setText(repoName);
+        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);
+            }
+        });

        getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
        fetchDataAsync(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
@ -228,7 +180,7 @@ public class IssueDetailActivity extends BaseActivity {
                finish();
                return true;
            case R.id.genericMenu:
-                BottomSheetSingleIssueFragment bottomSheet = new BottomSheetSingleIssueFragment();
+                SingleIssueBottomSheetFragment bottomSheet = new SingleIssueBottomSheetFragment();
                bottomSheet.show(getSupportFragmentManager(), "singleIssueBottomSheet");
                return true;
            default:
@ -310,7 +262,7 @@ public class IssueDetailActivity extends BaseActivity {

    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, String repo, int index, String loginUid) {

-        IssueCommentsViewModel issueCommentsModel = new ViewModelProvider(this).get(IssueCommentsViewModel.class);
+        IssueCommentsViewModel issueCommentsModel = ViewModelProviders.of(this).get(IssueCommentsViewModel.class);

        issueCommentsModel.getIssueCommentList(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), owner, repo, index, getApplicationContext()).observe(this, new Observer<List<IssueComments>>() {
            @Override
@ -343,35 +295,44 @@ public class IssueDetailActivity extends BaseActivity {

                        final Markwon markwon = Markwon.builder(Objects.requireNonNull(getApplicationContext()))
                                .usePlugin(CorePlugin.create())
-                                .usePlugin(ImagesPlugin.create(plugin -> {
-                                    plugin.addSchemeHandler(new SchemeHandler() {
-                                        @NonNull
-                                        @Override
-                                        public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+                                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
+                                    @Override
+                                    public void configureImages(@NonNull ImagesPlugin plugin) {
+                                        plugin.addSchemeHandler(new SchemeHandler() {
+                                            @NonNull
+                                            @Override
+                                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {

-                                            final int resourceId = 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(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());
+                                            @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());
+                                    }

                                }))
                                .usePlugin(new AbstractMarkwonPlugin() {
@ -396,9 +357,8 @@ public class IssueDetailActivity extends BaseActivity {
                        tinyDb.putString("issueState", singleIssue.getState());
                        tinyDb.putString("issueTitle", singleIssue.getTitle());

-                        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()));
+                        Picasso.get().load(singleIssue.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+                        issueTitle.setText(getString(R.string.issueTitleWithId, singleIssue.getNumber(), singleIssue.getTitle()));
                        String cleanIssueDescription = singleIssue.getBody().trim();
                        Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
                        markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(getApplicationContext(), bodyWithMD, cleanIssueDescription));
@ -414,7 +374,7 @@ public class IssueDetailActivity extends BaseActivity {

                                ImageView assigneesView = new ImageView(getApplicationContext());

-                                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);
+                                Picasso.get().load(singleIssue.getAssignees().get(i).getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop().into(assigneesView);

                                assigneesLayout.addView(assigneesView);
                                assigneesView.setLayoutParams(params1);
@ -435,7 +395,7 @@ public class IssueDetailActivity extends BaseActivity {

                        if(singleIssue.getLabels() != null) {
                            labelsScrollView.setVisibility(View.VISIBLE);
-                            int width = 25;
+                            int width = 33;
                            for (int i = 0; i < singleIssue.getLabels().size(); i++) {

                                String labelColor = singleIssue.getLabels().get(i).getColor();
@ -451,11 +411,11 @@ public class IssueDetailActivity extends BaseActivity {
                                        .beginConfig()
                                        .useFont(Typeface.DEFAULT)
                                        .textColor(new ColorInverter().getContrastColor(color))
-                                        .fontSize(30)
-                                        .width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, 30, 15))
-                                        .height(50)
+                                        .fontSize(36)
+                                        .width((width * labelName.length()) - ((width / 4) * labelName.length()))
+                                        .height(60)
                                        .endConfig()
-                                        .buildRoundRect(labelName, color, 10);
+                                        .buildRoundRect(labelName, color, 8);
                                labelsView.setImageDrawable(drawable);

                                labelsLayout.addView(labelsView);
@ -514,11 +474,29 @@ public class IssueDetailActivity extends BaseActivity {
                            issueDescription.setLayoutParams(paramsDesc);
                        }

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

                        if(singleIssue.getMilestone() != null) {
@ -557,7 +535,12 @@ public class IssueDetailActivity extends BaseActivity {
    }

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
@ -2,6 +2,7 @@ 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;
@ -15,16 +16,15 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.RadioGroup;
-import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import com.tooltip.Tooltip;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.NetworkObserver;
-import org.mian.gitnex.helpers.SnackBar;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.models.GiteaVersion;
 import org.mian.gitnex.models.UserInfo;
@ -33,7 +33,6 @@ 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;
@ -45,7 +44,7 @@ import retrofit2.Callback;
 * Author M M Arif
 */

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

    private Button loginButton;
    private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode;
@ -54,20 +53,15 @@ 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(){
-        return R.layout.activity_login;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {

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

        TinyDB tinyDb = new TinyDB(getApplicationContext());
-        NetworkObserver networkMonitor = new NetworkObserver(this);
+        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

        loginButton = findViewById(R.id.login_button);
        instanceUrlET = findViewById(R.id.instance_url);
@ -80,7 +74,6 @@ 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()));

@ -94,80 +87,44 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
        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")) {
-                    SnackBar.warning(getApplicationContext(), layoutView,getResources().getString(R.string.protocolError));
+                    Toasty.info(getApplicationContext(), getResources().getString(R.string.protocolError));
                }

            }
-
            public void onNothingSelected(AdapterView<?> parent) {
            }
-
        });

        info_button.setOnClickListener(infoListener);

-        if(tinyDb.getString("loginType").equals("basic")) { // username/password
+        if(!connToInternet) {

-            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);
+            Toasty.info(getApplicationContext(), getResources().getString(R.string.checkNetConnection));
+            return;

        }

-        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);
-
+        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);
+                }
            }
-            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);
@ -216,16 +173,20 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
        }
    };

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

    @SuppressLint("ResourceAsColor")
    private void login() {
@ -244,8 +205,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener

        if(loginMethodType == R.id.loginUsernamePassword) {

-            tinyDb.putString("loginType", "basic");
-
            if(instanceUrl.contains("@")) {

                String[] urlForHttpAuth = instanceUrl.split("@");
@ -282,7 +241,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
            }
            else {
                instanceUrl = "http://" + instanceHost + "/api/v1/";
-                instanceUrlWithProtocol = "http://" + instanceHost;
+                instanceUrlWithProtocol = "https://" + instanceHost;
            }

            tinyDb.putString("instanceUrlRaw", instanceHost);
@ -294,7 +253,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener

                if(instanceUrlET.getText().toString().equals("")) {

-                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldURL));
+                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldURL));
                    enableProcessButton();
                    loginButton.setText(R.string.btnLogin);
                    return;
@ -302,7 +261,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                }
                if(loginUid.equals("")) {

-                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldUsername));
+                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldUsername));
                    enableProcessButton();
                    loginButton.setText(R.string.btnLogin);
                    return;
@ -310,7 +269,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                }
                if(loginPassword.getText().toString().equals("")) {

-                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldPassword));
+                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldPassword));
                    enableProcessButton();
                    loginButton.setText(R.string.btnLogin);
                    return;
@ -322,11 +281,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener

                    if(appUtil.checkIntegers(loginOTP_)) {

-                        loginOTP = Integer.parseInt(loginOTP_);
+                        loginOTP = Integer.valueOf(loginOTP_);
                    }
                    else {

-                        SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.loginOTPTypeError));
+                        Toasty.info(getApplicationContext(), getString(R.string.loginOTPTypeError));
                        enableProcessButton();
                        loginButton.setText(R.string.btnLogin);
                        return;
@ -340,15 +299,13 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
            }
            else {

-                SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.checkNetConnection));
+                Toasty.info(getApplicationContext(), getString(R.string.checkNetConnection));

            }

        }
        else {

-            tinyDb.putString("loginType", "token");
-
            String instanceHost;
            if(AppUtil.httpCheck(instanceUrl)) {

@ -373,10 +330,11 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
            }
            else {
                instanceUrl = "http://" + instanceHost + "/api/v1/";
-                instanceUrlWithProtocol = "http://" + instanceHost;
+                instanceUrlWithProtocol = "https://" + instanceHost;
            }

            tinyDb.putString("instanceUrlRaw", instanceHost);
+            //tinyDb.putString("loginUid", loginUid);
            tinyDb.putString("instanceUrl", instanceUrl);
            tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol);

@ -384,7 +342,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener

                if (instanceUrlET.getText().toString().equals("")) {

-                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.emptyFieldURL));
+                    Toasty.info(getApplicationContext(), getString(R.string.emptyFieldURL));
                    enableProcessButton();
                    loginButton.setText(R.string.btnLogin);
                    return;
@ -392,7 +350,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                }
                if (loginToken_.equals("")) {

-                    SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.loginTokenError));
+                    Toasty.info(getApplicationContext(), getString(R.string.loginTokenError));
                    enableProcessButton();
                    loginButton.setText(R.string.btnLogin);
                    return;
@ -403,7 +361,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
            }
            else {

-                SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.checkNetConnection));
+                Toasty.info(getApplicationContext(), getString(R.string.checkNetConnection));

            }

@ -413,28 +371,12 @@ 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) {

-        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);
-            }
-        }
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        Call<GiteaVersion> callVersion = RetrofitClient
+                .getInstance(instanceUrl, getApplicationContext())
+                .getApiInterface()
+                .getGiteaVersion();

        callVersion.enqueue(new Callback<GiteaVersion>() {

@ -450,7 +392,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener

                    switch (vt) {
                        case UNSUPPORTED_NEW:
-                            //SnackBar.warning(getApplicationContext(), layoutView, getResources().getString(R.string.versionUnsupportedNew));
+                            //Toasty.info(getApplicationContext(), getString(R.string.versionUnsupportedNew));
                        case SUPPORTED_LATEST:
                        case SUPPORTED_OLD:
                        case DEVELOPMENT:
@ -458,24 +400,28 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                            return;
                        case UNSUPPORTED_OLD:

-                            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx);
+                            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);

                            alertDialogBuilder
                                    .setTitle(getString(R.string.versionAlertDialogHeader))
                                    .setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
                                    .setCancelable(true)
                                    .setIcon(R.drawable.ic_warning)
-                                    .setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {
-
-                                        dialog.dismiss();
-                                        enableProcessButton();
-
+                                    .setNegativeButton(getString(R.string.cancelButton), new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            dialog.dismiss();
+                                            enableProcessButton();
+                                        }
                                    })
-                                    .setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
+                                    .setPositiveButton(getString(R.string.textContinue), new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {

-                                        dialog.dismiss();
-                                        login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
+                                            dialog.dismiss();
+                                            login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);

+                                        }
                                    });

                            AlertDialog alertDialog = alertDialogBuilder.create();
@ -483,37 +429,30 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                            alertDialog.show();
                            return;
                        default: // UNKNOWN
-                            SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.versionUnknow));
+                            Toasty.info(getApplicationContext(), 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);

            }

@ -540,12 +479,11 @@ 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);
@ -557,14 +495,18 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                }
                else if(response.code() == 401) {

-                    SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.unauthorizedApiError));
+                    String toastError = getResources().getString(R.string.unauthorizedApiError);
+                    Toasty.info(getApplicationContext(), toastError);
+
                    enableProcessButton();
                    loginButton.setText(R.string.btnLogin);

                }
                else {

-                    SnackBar.error(getApplicationContext(), layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
+                    String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
+                    Toasty.info(getApplicationContext(), toastError);
+
                    enableProcessButton();
                    loginButton.setText(R.string.btnLogin);

@ -574,12 +516,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener

            @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));
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.genericError));
                enableProcessButton();
                loginButton.setText(R.string.btnLogin);
-
            }
        });

@ -587,24 +527,20 @@ 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, StandardCharsets.UTF_8);
+        final String credential = Credentials.basic(loginUid, loginPass);

        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>>() {
@ -657,20 +593,16 @@ 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>() {
@ -688,62 +620,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener

                                            if (!newToken.getSha1().equals("")) {

-                                                Call<UserInfo> call = RetrofitClient
-                                                        .getInstance(instanceUrl, getApplicationContext())
-                                                        .getApiInterface()
-                                                        .getUserInfo("token " + newToken.getSha1());
+                                                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.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);
-
-                                                    }
-                                                });
+                                                startActivity(new Intent(LoginActivity.this, MainActivity.class));
+                                                finish();

                                            }

@ -752,7 +636,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                                    }
                                    else if(responseCreate.code() == 500) {

-                                        SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.genericApiStatusError) + responseCreate.code());
+                                        String toastError = getResources().getString(R.string.genericApiStatusError) + responseCreate.code();
+                                        Toasty.info(getApplicationContext(), toastError);
                                        enableProcessButton();
                                        loginButton.setText(R.string.btnLogin);

@ -761,9 +646,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                                }

                                @Override
-                                public void onFailure(@NonNull Call<UserTokens> createUserToken, @NonNull Throwable t) {
-
-                                    Log.e("onFailure-token", t.toString());
+                                public void onFailure(@NonNull Call<UserTokens> createUserToken, Throwable t) {

                                }

@ -771,61 +654,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                        }
                        else {

-                            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);
-
-                                }
-                            });
+                            //Log.i("Current Token", tinyDb.getString(loginUid + "-token"));
+                            tinyDb.putBoolean("loggedInMode", true);
+                            startActivity(new Intent(LoginActivity.this, MainActivity.class));
+                            finish();

                        }

@ -834,14 +666,18 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                }
                else if(response.code() == 500) {

-                    SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.genericApiStatusError) + response.code());
+                    String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
+                    Toasty.info(getApplicationContext(), toastError);
                    enableProcessButton();
                    loginButton.setText(R.string.btnLogin);

                }
                else {

-                    SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.genericApiStatusError) + response.code());
+                    String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
+                    //Log.i("error message else4", String.valueOf(response.code()));
+
+                    Toasty.info(getApplicationContext(), toastError);
                    enableProcessButton();
                    loginButton.setText(R.string.btnLogin);

@ -851,12 +687,10 @@ 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());
-                SnackBar.error(getApplicationContext(), layoutView,getResources().getString(R.string.malformedJson));
+                Toasty.info(getApplicationContext(), getResources().getString(R.string.malformedJson));
                enableProcessButton();
                loginButton.setText(R.string.btnLogin);
-
            }
        });

--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@ -1,20 +1,14 @@
 package org.mian.gitnex.activities;

-import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import androidx.annotation.NonNull;
 import com.google.android.material.navigation.NavigationView;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
 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 androidx.appcompat.app.AppCompatActivity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
@ -23,19 +17,18 @@ 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.BottomSheetNavSubMenuFragment;
+import org.mian.gitnex.fragments.NavSubMenuBottomSheetFragment;
 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;
@ -52,25 +45,17 @@ import retrofit2.Callback;
 * Author M M Arif
 */

-public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener {
+public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {

    private DrawerLayout drawer;
    private TextView userFullName;
    private TextView userEmail;
    private ImageView userAvatar;
-    private TextView toolbarTitle;
    final Context ctx = this;
-    private Typeface myTypeface;

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

-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
        final TinyDB tinyDb = new TinyDB(getApplicationContext());
        tinyDb.putBoolean("noConnection", false);
        //userAvatar = findViewById(R.id.userAvatar);
@ -101,73 +86,33 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig

        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
        if(!tinyDb.getBoolean("loggedInMode")) {
-            logout(this, ctx);
+            logout();
            return;
        }

-        Toolbar toolbar = findViewById(R.id.toolbar);
-        toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
-        switch(tinyDb.getInt("customFontId", -1)) {
-
-            case 0:
-                myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
-                break;
-
-            case 2:
-                myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf");
-                break;
-
-            default:
-                myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf");
-                break;
-
-        }
-
-        toolbarTitle.setTypeface(myTypeface);
+        androidx.appcompat.widget.Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);

-        FragmentManager fm = getSupportFragmentManager();
-        Fragment fragmentById = fm.findFragmentById(R.id.fragment_container);
-        if (fragmentById instanceof SettingsFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
-        }
-        else if (fragmentById instanceof MyRepositoriesFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
-        }
-        else if (fragmentById instanceof StarredRepositoriesFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
-        }
-        else if (fragmentById instanceof OrganizationsFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
-        }
-        else if (fragmentById instanceof ExploreRepositoriesFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-        }
-        else if (fragmentById instanceof ProfileFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-        }
-        else if (fragmentById instanceof AboutFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
-        }
-
        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) {
-                BottomSheetNavSubMenuFragment bottomSheet = new BottomSheetNavSubMenuFragment();
+                NavSubMenuBottomSheetFragment bottomSheet = new NavSubMenuBottomSheetFragment();
                bottomSheet.show(getSupportFragmentManager(), "adminMenuBottomSheet");
            }
        });

        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
                R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.darkGreen));
+        toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.white));
        drawer.addDrawerListener(toggle);

        drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
@ -185,6 +130,8 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
                    tinyDb.putBoolean("noConnection", false);
                }

+                //tinyDb.putBoolean("noConnection", true);
+
                String userEmailNav = tinyDb.getString("userEmail");
                String userFullNameNav = tinyDb.getString("userFullname");
                String userAvatarNav = tinyDb.getString("userAvatar");
@ -192,18 +139,16 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
                userEmail = hView.findViewById(R.id.userEmail);
                if (!userEmailNav.equals("")) {
                    userEmail.setText(userEmailNav);
-                    userEmail.setTypeface(myTypeface);
                }

                userFullName = hView.findViewById(R.id.userFullname);
                if (!userFullNameNav.equals("")) {
                    userFullName.setText(userFullNameNav);
-                    userFullName.setTypeface(myTypeface);
                }

                userAvatar = hView.findViewById(R.id.userAvatar);
                if (!userAvatarNav.equals("")) {
-                    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);
+                    Picasso.get().load(userAvatarNav).networkPolicy(NetworkPolicy.OFFLINE).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
                }

                userAvatar.setOnClickListener(new View.OnClickListener() {
@ -231,37 +176,31 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig

        if(savedInstanceState == null) {
            if(tinyDb.getInt("homeScreenId") == 0) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new MyRepositoriesFragment()).commit();
                navigationView.setCheckedItem(R.id.nav_home);
            }
            else if(tinyDb.getInt("homeScreenId") == 1) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new StarredRepositoriesFragment()).commit();
                navigationView.setCheckedItem(R.id.nav_starred_repos);
            }
            else if(tinyDb.getInt("homeScreenId") == 2) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new OrganizationsFragment()).commit();
                navigationView.setCheckedItem(R.id.nav_organizations);
            }
            else if(tinyDb.getInt("homeScreenId") == 3) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new RepositoriesFragment()).commit();
                navigationView.setCheckedItem(R.id.nav_repositories);
            }
            else if(tinyDb.getInt("homeScreenId") == 4) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new ProfileFragment()).commit();
                navigationView.setCheckedItem(R.id.nav_profile);
            }
            else {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new MyRepositoriesFragment()).commit();
                navigationView.setCheckedItem(R.id.nav_home);
@ -284,23 +223,6 @@ 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) {
@ -324,37 +246,30 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig

        switch (menuItem.getItemId()) {
            case R.id.nav_home:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new MyRepositoriesFragment()).commit();
                break;
            case R.id.nav_organizations:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new OrganizationsFragment()).commit();
                break;
            case R.id.nav_profile:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new ProfileFragment()).commit();
                break;
            case R.id.nav_repositories:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new RepositoriesFragment()).commit();
-
                break;
            case R.id.nav_settings:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new SettingsFragment()).commit();
                break;
            case R.id.nav_logout:
-                logout(this, ctx);
+                logout();
                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
                break;
            case R.id.nav_about:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new AboutFragment()).commit();
                break;
@ -362,12 +277,10 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
                rateThisApp();
                break;
            case R.id.nav_starred_repos:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new StarredRepositoriesFragment()).commit();
                break;
            case R.id.nav_explore:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                        new ExploreRepositoriesFragment()).commit();
                break;
@ -388,15 +301,15 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
        }
    }

-    public static void logout(Activity activity, Context ctx) {
+    public void logout() {

-        TinyDB tinyDb = new TinyDB(ctx.getApplicationContext());
+        TinyDB tinyDb = new TinyDB(getApplicationContext());
        tinyDb.putBoolean("loggedInMode", false);
        tinyDb.remove("basicAuthPassword");
        tinyDb.putBoolean("basicAuthFlag", false);
        //tinyDb.clear();
-        activity.finish();
-        ctx.startActivity(new Intent(ctx, LoginActivity.class));
+        finish();
+        startActivity(new Intent(MainActivity.this, LoginActivity.class));

    }

@ -404,12 +317,10 @@ 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()
-                .getGiteaVersionWithToken(token);
+                .getGiteaVersion();

        callVersion.enqueue(new Callback<GiteaVersion>() {

@ -428,7 +339,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
            }

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

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

@ -486,7 +397,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig

                        userAvatar = hView.findViewById(R.id.userAvatar);
                        if (!Objects.requireNonNull(userDetails).getAvatar().equals("")) {
-                            PicassoService.getInstance(ctx).get().load(userDetails.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
+                            Picasso.get().load(userDetails.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(160, 160).centerCrop().into(userAvatar);
                        } else {
                            userAvatar.setImageResource(R.mipmap.app_logo_round);
                        }
--- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
@ -1,20 +1,16 @@
 package org.mian.gitnex.activities;

-import android.annotation.SuppressLint;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 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;
@ -23,13 +19,10 @@ 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;
@ -40,269 +33,226 @@ import retrofit2.Response;
 * Author M M Arif
 */

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

-	public ImageView closeActivity;
-	private View.OnClickListener onClickListener;
+    public ImageView closeActivity;
+    private View.OnClickListener onClickListener;

-	final Context ctx = this;
+    final Context ctx = this;

-	private SocialAutoCompleteTextView mergeDescription;
-	private EditText mergeTitle;
-	private Spinner mergeModeSpinner;
-	private ArrayAdapter<Mention> defaultMentionAdapter;
-	private Button mergeButton;
-	private String Do;
+    private SocialAutoCompleteTextView mergePR;
+    private ArrayAdapter<Mention> defaultMentionAdapter;
+    private Button mergeButton;

-	@Override
-	protected int getLayoutResourceId() {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_merge_pull_request);

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

 }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
@ -6,7 +6,6 @@ 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;
@ -14,6 +13,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@ -33,7 +33,7 @@ import retrofit2.Callback;
 * Author M M Arif
 */

-public class CreateFileActivity extends BaseActivity {
+public class NewFileActivity extends AppCompatActivity {

    public ImageView closeActivity;
    private View.OnClickListener onClickListener;
@ -49,19 +49,13 @@ public class CreateFileActivity extends BaseActivity {
    List<Branches> branchesList = new ArrayList<>();

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

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

        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");
@ -77,10 +71,6 @@ public class CreateFileActivity 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);

--- a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.app.DatePickerDialog;
@ -9,7 +10,6 @@ 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;
@ -18,7 +18,6 @@ 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.VersionCheck;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Milestones;
 import org.mian.gitnex.util.AppUtil;
@ -29,7 +28,7 @@ import java.util.Calendar;
 * Author M M Arif
 */

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

    private EditText milestoneDueDate;
    private View.OnClickListener onClickListener;
@ -39,28 +38,18 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
    final Context ctx = this;

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

        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);
@ -128,16 +117,15 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
            }
        }

-        String finalMilestoneDueDate = null;
-        if(!newMilestoneDueDate.isEmpty()) {
-            finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
-        } else if (VersionCheck.compareVersion("1.10.0", tinyDb.getString("giteaVersion")) > 1) {
-            // if Gitea version is less than 1.10.0 DueDate is required
+        if(newMilestoneDueDate.equals("")) {
+
            Toasty.info(getApplicationContext(), getString(R.string.milestoneDateEmpty));
            return;
+
        }

        disableProcessButton();
+        String finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
        createNewMilestone(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);

    }
--- a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
@ -4,9 +4,9 @@ import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@ -25,7 +25,7 @@ import retrofit2.Callback;
 * Author M M Arif
 */

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

    public ImageView closeActivity;
    private View.OnClickListener onClickListener;
@ -36,26 +36,16 @@ public class CreateOrganizationActivity extends BaseActivity {
    final Context ctx = this;

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

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

--- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
@ -5,9 +5,9 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@ -25,9 +25,7 @@ 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;

@ -35,7 +33,7 @@ import retrofit2.Callback;
 * Author M M Arif
 */

-public class CreateRepoActivity extends BaseActivity {
+public class NewRepoActivity extends AppCompatActivity {

    public ImageView closeActivity;
    private View.OnClickListener onClickListener;
@ -46,20 +44,12 @@ public class CreateRepoActivity extends BaseActivity {
    private CheckBox repoAccess;
    final Context ctx = this;

-    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)$");
+    List<OrgOwner> orgsList = new ArrayList<>();

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

        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());

@ -69,23 +59,17 @@ public class CreateRepoActivity 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);
-        getOrganizations(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), userLogin);
+        getOrgs(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), userLogin);
        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
            @Override
            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
@ -111,6 +95,7 @@ public class CreateRepoActivity extends BaseActivity {
            createRepo.setOnClickListener(createRepoListener);

        }
+
    }

    private View.OnClickListener createRepoListener = new View.OnClickListener() {
@ -158,23 +143,15 @@ public class CreateRepoActivity 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) {
@ -242,11 +219,10 @@ public class CreateRepoActivity extends BaseActivity {
                enableProcessButton();
            }
        });
+
    }

-    private void getOrganizations(String instanceUrl, String instanceToken, final String userLogin) {
-
-        TinyDB tinyDb = new TinyDB(getApplicationContext());
+    private void getOrgs(String instanceUrl, String instanceToken, final String userLogin) {

        Call<List<OrgOwner>> call = RetrofitClient
                .getInstance(instanceUrl, getApplicationContext())
@ -261,39 +237,26 @@ public class CreateRepoActivity extends BaseActivity {
                if(response.isSuccessful()) {
                    if(response.code() == 200) {

-                        int organizationId = 0;
+                        List<OrgOwner> orgsList_ = response.body();

-                        List<OrgOwner> organizationsList_ = response.body();
+                        orgsList.add(new OrgOwner(userLogin));
+                        assert orgsList_ != null;
+                        if(orgsList_.size() > 0) {
+                            for (int i = 0; i < orgsList_.size(); i++) {

-                        organizationsList.add(new OrgOwner(userLogin));
-                        assert organizationsList_ != null;
-                        if(organizationsList_.size() > 0) {
-                            for (int i = 0; i < organizationsList_.size(); i++) {
-
-                                if(!tinyDb.getString("organizationId").isEmpty()) {
-                                    if (Integer.parseInt(tinyDb.getString("organizationId")) == organizationsList_.get(i).getId()) {
-                                        organizationId = i + 1;
-                                    }
-                                }
                                OrgOwner data = new OrgOwner(
-                                        organizationsList_.get(i).getUsername()
+                                        orgsList_.get(i).getUsername()
                                );
-                                organizationsList.add(data);
+                                orgsList.add(data);

                            }
                        }

                        ArrayAdapter<OrgOwner> adapter = new ArrayAdapter<>(getApplicationContext(),
-                                R.layout.spinner_item, organizationsList);
+                                R.layout.spinner_item, orgsList);

                        adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
                        spinner.setAdapter(adapter);
-
-                        if (tinyDb.getBoolean("organizationAction") & organizationId != 0) {
-                            spinner.setSelection(organizationId);
-                            tinyDb.putBoolean("organizationAction", false);
-                        }
-
                        enableProcessButton();

                    }
@ -316,6 +279,7 @@ public class CreateRepoActivity extends BaseActivity {
                enableProcessButton();
            }
        });
+
    }

    private void initCloseListener() {
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationDetailActivity.java
@ -2,23 +2,20 @@ package org.mian.gitnex.activities;

 import com.google.android.material.tabs.TabLayout;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import android.content.Intent;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.fragments.MembersByOrgFragment;
-import org.mian.gitnex.fragments.BottomSheetOrganizationFragment;
+import org.mian.gitnex.fragments.OrgBottomSheetFragment;
 import org.mian.gitnex.fragments.OrganizationInfoFragment;
 import org.mian.gitnex.fragments.RepositoriesByOrgFragment;
 import org.mian.gitnex.fragments.TeamsByOrgFragment;
@ -29,68 +26,28 @@ import java.util.Objects;
 * Author M M Arif
 */

-public class OrganizationDetailActivity extends BaseActivity implements BottomSheetOrganizationFragment.BottomSheetListener {
+public class OrgDetailActivity extends AppCompatActivity implements OrgBottomSheetFragment.BottomSheetListener {

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

        TinyDB tinyDb = new TinyDB(getApplicationContext());
        String orgName = tinyDb.getString("orgName");

        Toolbar toolbar = findViewById(R.id.toolbar);
-        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
        setSupportActionBar(toolbar);
        Objects.requireNonNull(getSupportActionBar()).setTitle(orgName);
        getSupportActionBar().setDisplayHomeAsUpEnabled(true);

-        OrganizationDetailActivity.SectionsPagerAdapter mSectionsPagerAdapter = new OrganizationDetailActivity.SectionsPagerAdapter(getSupportFragmentManager());
+        OrgDetailActivity.SectionsPagerAdapter mSectionsPagerAdapter = new OrgDetailActivity.SectionsPagerAdapter(getSupportFragmentManager());

        ViewPager mViewPager = findViewById(R.id.container);
        mViewPager.setAdapter(mSectionsPagerAdapter);

        TabLayout tabLayout = findViewById(R.id.tabs);

-        Typeface myTypeface;
-
-        switch(tinyDb.getInt("customFontId", -1)) {
-
-            case 0:
-                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf");
-                break;
-
-            case 2:
-                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf");
-                break;
-
-            default:
-                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf");
-                break;
-
-        }
-
-        toolbarTitle.setTypeface(myTypeface);
-        toolbarTitle.setText(orgName);
-
-        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
-        int tabsCount = vg.getChildCount();
-        for (int j = 0; j < tabsCount; j++) {
-            ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
-            int tabChildCount = vgTab.getChildCount();
-            for (int i = 0; i < tabChildCount; i++) {
-                View tabViewChild = vgTab.getChildAt(i);
-                if (tabViewChild instanceof TextView) {
-                    ((TextView) tabViewChild).setTypeface(myTypeface);
-                }
-            }
-        }
-
        mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
        tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));

@ -114,7 +71,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
                finish();
                return true;
            case R.id.repoMenu:
-                BottomSheetOrganizationFragment bottomSheet = new BottomSheetOrganizationFragment();
+                OrgBottomSheetFragment bottomSheet = new OrgBottomSheetFragment();
                bottomSheet.show(getSupportFragmentManager(), "orgBottomSheet");
                return true;
            default:
@ -126,15 +83,9 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
    @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(OrganizationDetailActivity.this, CreateTeamByOrgActivity.class));
+                startActivity(new Intent(OrgDetailActivity.this, CreateTeamByOrgActivity.class));
                break;
        }
        //Log.i("clicked", text);
@ -144,7 +95,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh
    public class SectionsPagerAdapter extends FragmentPagerAdapter {

        SectionsPagerAdapter(FragmentManager fm) {
-            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+            super(fm);
        }

        @NonNull
@ -153,7 +104,7 @@ public class OrganizationDetailActivity extends BaseActivity implements BottomSh

            TinyDB tinyDb = new TinyDB(getApplicationContext());
            String orgName;
-            if(getIntent().getStringExtra("orgName") != null || !Objects.equals(getIntent().getStringExtra("orgName"), "")) {
+            if(getIntent().getStringExtra("orgName") != null || !getIntent().getStringExtra("orgName").equals("")) {
                orgName = getIntent().getStringExtra("orgName");
            }
            else {
--- a/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrganizationTeamMembersActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.os.Bundle;
@ -15,13 +16,12 @@ import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.TeamMembersByOrgViewModel;
 import java.util.List;
-import java.util.Objects;

 /**
 * Author M M Arif
 */

-public class OrganizationTeamMembersActivity extends BaseActivity {
+public class OrgTeamMembersActivity extends AppCompatActivity {

    private TextView noDataMembers;
    private View.OnClickListener onClickListener;
@ -29,13 +29,9 @@ public class OrganizationTeamMembersActivity extends BaseActivity {
    private GridView mGridView;

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

        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
@ -50,7 +46,7 @@ public class OrganizationTeamMembersActivity extends BaseActivity {
        initCloseListener();
        closeActivity.setOnClickListener(onClickListener);

-        if(getIntent().getStringExtra("teamTitle") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamTitle")).equals("")) {
+        if(getIntent().getStringExtra("teamTitle") != null && !getIntent().getStringExtra("teamTitle").equals("")) {
            toolbarTitle.setText(getIntent().getStringExtra("teamTitle"));
        }
        else {
@ -58,7 +54,7 @@ public class OrganizationTeamMembersActivity extends BaseActivity {
        }

        String teamId;
-        if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){
+        if(getIntent().getStringExtra("teamId") != null && !getIntent().getStringExtra("teamId").equals("")){
            teamId = getIntent().getStringExtra("teamId");
        }
        else {
@ -68,7 +64,6 @@ public class OrganizationTeamMembersActivity extends BaseActivity {
        getIntent().getStringExtra("teamId");
        //Log.i("teamId", getIntent().getStringExtra("teamId"));

-        assert teamId != null;
        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId));

    }
--- a/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@ -9,7 +10,6 @@ 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;
@ -30,7 +30,7 @@ import java.util.List;
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;
    private EditText userEmail;
@ -38,26 +38,16 @@ public class ProfileEmailActivity extends BaseActivity {
    private Button addEmailButton;

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

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

--- a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@ -9,7 +10,6 @@ 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;
@ -33,7 +33,7 @@ import java.util.List;
 * Author M M Arif
 */

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

    public ImageView closeActivity;
    private View.OnClickListener onClickListener;
@ -45,16 +45,10 @@ public class ReplyToIssueActivity extends BaseActivity {
    private Button replyButton;

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

        super.onCreate(savedInstanceState);
-
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        setContentView(R.layout.activity_reply_to_issue);

        boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
        TinyDB tinyDb = new TinyDB(getApplicationContext());
@ -70,10 +64,6 @@ 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"));
        }
--- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
@ -3,6 +3,7 @@ package org.mian.gitnex.activities;
 import com.google.android.material.tabs.TabLayout;
 import com.google.gson.JsonElement;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@ -13,7 +14,6 @@ import retrofit2.Callback;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.res.ColorStateList;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@ -21,22 +21,21 @@ 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 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.IssuesMainFragment;
+import org.mian.gitnex.fragments.IssuesFragment;
 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,20 +47,14 @@ import android.net.Uri;
 * Author M M Arif
 */

-public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoFragment.BottomSheetListener {
+public class RepoDetailActivity extends AppCompatActivity implements RepoBottomSheetFragment.BottomSheetListener {

-    private TextView textViewBadgeIssue;
-    private TextView textViewBadgePull;
-    private TextView textViewBadgeRelease;
+    private TextView textViewBadge;

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

        TinyDB tinyDb = new TinyDB(getApplicationContext());
        String repoFullName = tinyDb.getString("repoFullName");
@ -77,8 +70,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
        AppUtil.setAppLocale(getResources(), appLocale);

        Toolbar toolbar = findViewById(R.id.toolbar);
-        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
        setSupportActionBar(toolbar);
        Objects.requireNonNull(getSupportActionBar()).setTitle(repoName1);
        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@ -90,103 +81,28 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF

        TabLayout tabLayout = findViewById(R.id.tabs);

-        Typeface myTypeface;
-
-        switch(tinyDb.getInt("customFontId", -1)) {
-
-            case 0:
-                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/roboto.ttf");
-                break;
-
-            case 2:
-                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/sourcecodeproregular.ttf");
-                break;
-
-            default:
-                myTypeface = Typeface.createFromAsset(getApplicationContext().getAssets(), "fonts/manroperegular.ttf");
-                break;
-
-        }
-
-        toolbarTitle.setTypeface(myTypeface);
-        toolbarTitle.setText(repoName1);
-
-        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);
-                }
-            }
-        }
-
-        // 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("enableCounterBadges")) {
+        if(tinyDb.getBoolean("enableCounterIssueBadge")) {

-            @SuppressLint("InflateParams") View tabHeader2 = LayoutInflater.from(this).inflate(R.layout.badge_issue, null);
-            textViewBadgeIssue = tabHeader2.findViewById(R.id.counterBadgeIssue);
+            @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 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);
+            TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(2);
            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(3)).setCustomView(tabHeader4);
-                TabLayout.Tab tabOpenPulls = tabLayout.getTabAt(3);
-                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
@ -205,16 +121,13 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
        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
@ -227,7 +140,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
                finish();
                return true;
            case R.id.repoMenu:
-                BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
+                RepoBottomSheetFragment bottomSheet = new RepoBottomSheetFragment();
                bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
                return true;
            default:
@ -239,14 +152,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
    @Override
    public void onButtonClicked(String text) {

-        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);
-
        switch (text) {
            case "label":
                startActivity(new Intent(RepoDetailActivity.this, CreateLabelActivity.class));
@ -255,7 +160,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
                startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
                break;
            case "newMilestone":
-                startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
+                startActivity(new Intent(RepoDetailActivity.this, NewMilestoneActivity.class));
                break;
            case "addCollaborator":
                startActivity(new Intent(RepoDetailActivity.this, AddCollaboratorToRepositoryActivity.class));
@ -264,18 +169,18 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
                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);
                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, url);
-                sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, url);
-                startActivity(Intent.createChooser(sharingIntent, url.toString()));
-                break;
            case "newFile":
-                startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
+                startActivity(new Intent(RepoDetailActivity.this, NewFileActivity.class));
                break;
        }

@ -304,37 +209,37 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
                case 1: // files
                    return FilesFragment.newInstance(repoOwner, repoName);
                case 2: // issues
-                    fragment = new IssuesMainFragment();
+                    fragment = new IssuesFragment();
                    break;
-                case 3: // pull requests
+                case 3: // closed issues
+                    fragment = new ClosedIssuesFragment();
+                    break;
+                case 4: // pull requests
                    fragment = new PullRequestsFragment();
                    break;
-                case 4: // branches
-                    return BranchesFragment.newInstance(repoOwner, repoName);
-                case 5: // releases
-                    return ReleasesFragment.newInstance(repoOwner, repoName);
-                case 6: // milestones
+                case 5: // milestones
                    return MilestonesFragment.newInstance(repoOwner, repoName);
-                case 7: // labels
+                case 6: // labels
                    return LabelsFragment.newInstance(repoOwner, repoName);
-                case 8: // collaborators
+                case 7: // branches
+                    return BranchesFragment.newInstance(repoOwner, repoName);
+                case 8: // releases
+                    return ReleasesFragment.newInstance(repoOwner, repoName);
+                case 9: // collaborators
                    return CollaboratorsFragment.newInstance(repoOwner, repoName);
            }
-            assert fragment != null;
            return fragment;
        }

        @Override
        public int getCount() {
-            return 9;
+            return 10;
        }

    }

    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()
@ -351,24 +256,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF

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

-                        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());
-                            }
-                        }
+                        assert repoInfo != null;
+                        textViewBadge.setText(repoInfo.getOpen_issues_count());

                    }

@ -383,7 +272,6 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
            public void onFailure(@NonNull Call<UserRepositories> call, @NonNull Throwable t) {
                Log.e("onFailure", t.toString());
            }
-
        });

    }
--- a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
@ -2,6 +2,7 @@ package org.mian.gitnex.activities;

 import android.os.Bundle;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
@ -21,7 +22,7 @@ import java.util.List;
 * Author M M Arif
 */

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

    private TextView noDataStargazers;
    private View.OnClickListener onClickListener;
@ -30,13 +31,9 @@ public class RepoStargazersActivity extends BaseActivity {
    private ProgressBar mProgressBar;

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

        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
--- a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
@ -2,6 +2,7 @@ package org.mian.gitnex.activities;

 import android.os.Bundle;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
@ -21,7 +22,7 @@ import java.util.List;
 * Author M M Arif
 */

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

    private TextView noDataWatchers;
    private View.OnClickListener onClickListener;
@ -30,13 +31,9 @@ public class RepoWatchersActivity extends BaseActivity {
    private ProgressBar mProgressBar;

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

        TinyDB tinyDb = new TinyDB(getApplicationContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
--- a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;

+import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@ -17,18 +18,14 @@ import java.util.List;
 * Author M M Arif
 */

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

    private View.OnClickListener onClickListener;

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

        ImageView closeActivity = findViewById(R.id.close);

--- a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
+++ b/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.list_admin_users, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.admin_users_list, parent, false);
        return new AdminGetUsersAdapter.UsersViewHolder(v);
    }

@ -98,7 +98,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
            holder.userRole.setVisibility(View.GONE);
        }

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

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/BranchesAdapter.java
@ -1,17 +1,16 @@
 package org.mian.gitnex.adapters;

 import android.content.Context;
-import android.content.Intent;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.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;

@ -28,23 +27,14 @@ 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);
-            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);
-
-                }
-            });
+            branchCommitHash = itemView.findViewById(R.id.branchCommitHash);

        }
    }
@ -57,7 +47,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.list_branches, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.branches_list, parent, false);
        return new BranchesAdapter.BranchesViewHolder(v);
    }

@ -77,6 +67,10 @@ 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
--- a/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java
@ -0,0 +1,291 @@
+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();
+        }
+    };
+
+}
--- a/app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
+++ b/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.list_collaborators, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.collaborators_list, 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);
-        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);
+        Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);

        if(!currentItem.getFull_name().equals("")) {
            viewHolder.collaboratorName.setText(currentItem.getFull_name());
--- a/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
@ -1,161 +0,0 @@
-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);
-
-        }
-
-    }
-
-}
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@ -1,35 +1,31 @@
 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.google.android.material.bottomsheet.BottomSheetDialog;
+import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.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 retrofit2.Call;
-import retrofit2.Callback;

 /**
 * Author M M Arif
@ -38,216 +34,183 @@ import retrofit2.Callback;
 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) {
+    public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context mCtx) {
+        this.mCtx = mCtx;
+        this.searchedReposList = dataList;
+    }

-		this.mCtx = mCtx;
-		this.searchedReposList = dataList;
-	}
+    static class ReposSearchViewHolder extends RecyclerView.ViewHolder {

-	static class ReposSearchViewHolder 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 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 ReposSearchViewHolder(View itemView) {
+            super(itemView);

-		private ReposSearchViewHolder(View 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);

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

-			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);
+                    Context context = v.getContext();
+                    TextView repoFullName = v.findViewById(R.id.repoFullName);

-			itemView.setOnClickListener(v -> {
+                    Intent intent = new Intent(context, RepoDetailActivity.class);
+                    intent.putExtra("repoFullName", repoFullName.getText().toString());

-				Context context = v.getContext();
-				TextView repoFullName = v.findViewById(R.id.repoFullName);
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("repoFullName", repoFullName.getText().toString());
+                    tinyDb.putBoolean("resumeIssues", true);
+                    context.startActivity(intent);

-				Intent intent = new Intent(context, RepoDetailActivity.class);
-				intent.putExtra("repoFullName", repoFullName.getText().toString());
+                }
+            });

-				TinyDB tinyDb = new TinyDB(context);
-				tinyDb.putString("repoFullName", repoFullName.getText().toString());
-				tinyDb.putBoolean("resumeIssues", true);
-				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
+            reposDropdownMenu.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {

-				//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");
+                    final Context context = v.getContext();
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);

-					WatchRepository watch = new WatchRepository();
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    popupMenu.inflate(R.menu.repo_dotted_list_menu);

-					Call<WatchRepository> call;
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {

-					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
+                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                        fMenuHelper.setAccessible(true);
+                        menuHelper = fMenuHelper.get(popupMenu);
+                        argTypes = new Class[] { boolean.class };
+                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
+                                argTypes).invoke(menuHelper, true);

-					call.enqueue(new Callback<WatchRepository>() {
+                    } catch (Exception e) {

-						@Override
-						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
+                        popupMenu.show();
+                        return;

-							if(response.isSuccessful()) {
+                    }

-								assert response.body() != null;
-								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.repoStargazers:

-							} else {
+                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                                    context.startActivity(intent);
+                                    break;

-								tinyDb.putBoolean("repoWatch", false);
+                                case R.id.repoWatchers:

-								if(response.code() != 404) {
+                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+                                    context.startActivity(intentW);
+                                    break;

-									Toasty.info(context, context.getString(R.string.genericApiStatusError));
+                                case R.id.repoOpenInBrowser:

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

-						}
-					});
-				}
+    }

-				context.startActivity(intent);
+    @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);
+    }

-			});
+    @Override
+    public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int 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);
+        final UserRepositories currentItem = searchedReposList.get(position);


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

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

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

+    @Override
+    public int getItemCount() {
+        return searchedReposList.size();
+    }
 }
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
@ -13,7 +13,6 @@ 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;

@ -39,7 +38,6 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
        private ImageView fileTypeImage;
        private TextView fileName;
        private TextView fileType;
-        private TextView fileInfo;

        private FilesViewHolder(View itemView) {

@ -47,7 +45,6 @@ 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);

@ -147,7 +144,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.list_files, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.files_list, parent, false);
        return new FilesAdapter.FilesViewHolder(v);
    }

@ -161,8 +158,6 @@ 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));
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesDiffAdapter.java
@ -53,7 +53,7 @@ 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.list_files_diffs, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.files_diffs_list, parent, false);
        return new FilesDiffAdapter.FilesDiffViewHolder(v);
    }

--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/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.google.android.material.bottomsheet.BottomSheetDialog;
+import com.squareup.picasso.Picasso;
 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.sql.Time;
+import java.lang.reflect.Field;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
@ -33,6 +33,8 @@ 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;
@ -57,223 +59,232 @@ import io.noties.markwon.linkify.LinkifyPlugin;

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

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

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java
@ -1,245 +1,291 @@
 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 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 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;
+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.Date;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;

 /**
 * Author M M Arif
 */

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

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

-	private boolean isSelectable = true;
+    public IssuesAdapter(Context context, List<Issues> issuesListMain) {

-	public IssuesAdapter(Context ctx) {
-		this.ctx = ctx;
-	}
+        this.context = context;
+        this.issuesList = issuesListMain;
+        issuesListFull = new ArrayList<>(issuesList);

-	public IssuesAdapter withNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
+    }

-		this.setNewItems(issueTitle, issueNumber, issueAssigneeAvatar, issueCreatedTime, issueCommentsCount, userFullname, userLogin);
-		return this;
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

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

-	private void setNewItems(String issueTitle, int issueNumber, String issueAssigneeAvatar, Date issueCreatedTime, int issueCommentsCount, String userFullname, String userLogin) {
+        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));
+        }

-		this.issueTitle = issueTitle;
-		this.issueNumber = issueNumber;
-		this.issueAssigneeAvatar = issueAssigneeAvatar;
-		this.issueCreatedTime = issueCreatedTime;
-		this.issueCommentsCount = issueCommentsCount;
-		this.userFullname = userFullname;
-		this.userLogin = userLogin;
+    }

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

-	private int getIssueNumber() {
-		return issueNumber;
-	}
+        if(position >= getItemCount()-1 && isMoreDataAvailable && !isLoading && loadMoreListener!=null) {

-	public String getIssueTitle() {
-		return issueTitle;
-	}
+            isLoading = true;
+            loadMoreListener.onLoadMore();

-	private String getIssueAssigneeAvatar() {
-		return issueAssigneeAvatar;
-	}
+        }

-	private Date getIssueCreatedTime() {
-		return issueCreatedTime;
-	}
+        if(getItemViewType(position) == TYPE_LOAD) {

-	private int getIssueCommentsCount() {
-		return issueCommentsCount;
-	}
+            ((IssuesHolder)holder).bindData(issuesList.get(position));

-	private String getUserFullname() {
-		return userFullname;
-	}
+        }

-	private String getUserLogin() {
-		return userLogin;
-	}
+    }

-	@Override
-	public boolean isEnabled() {
-		return true;
-	}
+    @Override
+    public int getItemViewType(int position) {

-	@Override
-	public IssuesAdapter withEnabled(boolean enabled) {
-		return null;
-	}
+        if(issuesList.get(position).getTitle() != null) {
+            return TYPE_LOAD;
+        }
+        else {
+            return 1;
+        }

-	@Override
-	public boolean isSelectable() {
-		return isSelectable;
-	}
+    }

-	@Override
-	public IssuesAdapter withSelectable(boolean selectable) {
-		this.isSelectable = selectable;
-		return this;
-	}
+    @Override
+    public int getItemCount() {

-	@Override
-	public int getType() {
-		return R.id.relativeLayoutFrameIssuesList;
-	}
+        return issuesList.size();

-	@Override
-	public int getLayoutRes() {
-		return R.layout.list_issues;
-	}
+    }

-	@NonNull
-	@Override
-	public IssuesAdapter.ViewHolder getViewHolder(@NonNull View v) {
-		return new IssuesAdapter.ViewHolder(v);
-	}
+    class IssuesHolder extends RecyclerView.ViewHolder {

-	public class ViewHolder extends FastAdapter.ViewHolder<IssuesAdapter> {
+        private TextView issueNumber;
+        private ImageView issueAssigneeAvatar;
+        private TextView issueTitle;
+        private TextView issueCreatedTime;
+        private TextView issueCommentsCount;
+        private RelativeLayout relativeLayoutFrame;

-		final TinyDB tinyDb = new TinyDB(ctx);
-		final String locale = tinyDb.getString("locale");
-		final String timeFormat = tinyDb.getString("dateFormat");
+        IssuesHolder(View itemView) {

-		private TextView issueNumber;
-		private ImageView issueAssigneeAvatar;
-		private TextView issueTitle;
-		private TextView issueCreatedTime;
-		private TextView issueCommentsCount;
+            super(itemView);

-		public ViewHolder(View 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);

-			super(itemView);
+            issueTitle.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {

-			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);
+                    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 bindView(@NonNull IssuesAdapter item, @NonNull List<Object> payloads) {
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    tinyDb.putString("issueType", "issue");
+                    context.startActivity(intent);

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

-			PicassoService.getInstance(ctx).get().load(item.getIssueAssigneeAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(issueAssigneeAvatar);
+                    Context context = v.getContext();
+                    //Log.i("issueNumber", issueNumber.getText().toString());

-			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()));
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", issueNumber.getText());

-			issueNumber.setText(String.valueOf(item.getIssueNumber()));
-			issueCommentsCount.setText(String.valueOf(item.getIssueCommentsCount()));
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    tinyDb.putString("issueType", "issue");
+                    context.startActivity(intent);

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

-			}
+        @SuppressLint("SetTextI18n")
+        void bindData(Issues issuesModel){

-		}
+            final TinyDB tinyDb = new TinyDB(context);
+            final String locale = tinyDb.getString("locale");
+            final String timeFormat = tinyDb.getString("dateFormat");

-		@Override
-		public void unbindView(@NonNull IssuesAdapter item) {
+            /*if(issuesModel.getPull_request() != null) {
+                if (!issuesModel.getPull_request().isMerged()) {
+                    relativeLayoutFrame.setVisibility(View.GONE);
+                    relativeLayoutFrame.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
+                }
+            }*/

-			issueTitle.setText(null);
-			issueCommentsCount.setText(null);
-			issueCreatedTime.setText(null);
+            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()));

-	public static class IssueTitleClickEvent extends ClickEventHook<IssuesAdapter> {
+            issueNumber.setText(String.valueOf(issuesModel.getNumber()));
+            issueCommentsCount.setText(String.valueOf(issuesModel.getComments()));

-		@Nullable
-		@Override
-		public List<View> onBindMany(@NonNull RecyclerView.ViewHolder viewHolder) {
+            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;
+                }
+            }

-			if (viewHolder instanceof IssuesAdapter.ViewHolder) {
-				return EventHookUtil.toList(((ViewHolder) viewHolder).issueTitle);
-			}
+        }

-			return super.onBindMany(viewHolder);
+    }

-		}
+    static class LoadHolder extends RecyclerView.ViewHolder {

-		@Override
-		public void onClick(View v, int position, @NonNull FastAdapter<IssuesAdapter> fastAdapter, IssuesAdapter item) {
+        LoadHolder(View itemView) {
+            super(itemView);
+        }

-			Context context = v.getContext();
+    }

-			Intent intent = new Intent(context, IssueDetailActivity.class);
-			intent.putExtra("issueNumber", item.getIssueNumber());
+    public void setMoreDataAvailable(boolean moreDataAvailable) {

-			TinyDB tinyDb = new TinyDB(context);
-			tinyDb.putString("issueNumber", String.valueOf(item.getIssueNumber()));
-			tinyDb.putString("issueType", "issue");
-			context.startActivity(intent);
+        isMoreDataAvailable = moreDataAvailable;

-		}
+    }

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

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@ -1,27 +1,28 @@
 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;

 /**
@ -50,45 +51,65 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
            labelId = itemView.findViewById(R.id.labelId);
            labelColor = itemView.findViewById(R.id.labelColor);

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

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

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

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

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

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

-                    Intent intent = new Intent(context, CreateLabelActivity.class);
-                    intent.putExtra("labelId", labelId.getText());
-                    intent.putExtra("labelTitle", labelTitle.getText());
-                    intent.putExtra("labelColor", labelColor.getText());
-                    intent.putExtra("labelAction", "edit");
-                    context.startActivity(intent);
-                    dialog.dismiss();
+                        popupMenu.show();
+                        return;

-                });
+                    }

-                labelMenuDelete.setOnClickListener(deleteLabel -> {
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.labelMenuEdit:

-                    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();
+                                    Intent intent = new Intent(context, CreateLabelActivity.class);
+                                    intent.putExtra("labelId", labelId.getText());
+                                    intent.putExtra("labelTitle", labelTitle.getText());
+                                    intent.putExtra("labelColor", labelColor.getText());
+                                    intent.putExtra("labelAction", "edit");
+                                    context.startActivity(intent);
+                                    break;

-                });
+                                case R.id.labelMenuDelete:

+                                    AlertDialogs.labelDeleteDialog(context, labelTitle.getText().toString(), labelId.getText().toString(),
+                                            context.getResources().getString(R.string.labelDeleteTitle),
+                                            context.getResources().getString(R.string.labelDeleteMessage),
+                                            context.getResources().getString(R.string.labelDeletePositiveButton),
+                                            context.getResources().getString(R.string.labelDeleteNegativeButton));
+                                    break;
+
+                            }
+                            return false;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
            });

        }
@ -102,7 +123,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.list_labels, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.labels_list, parent, false);
        return new LabelsAdapter.LabelsViewHolder(v);
    }

@ -110,6 +131,7 @@ 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()));
@ -117,24 +139,35 @@ 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(35)
-                .width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, 40, 20))
-                .height(55)
+                .fontSize(36)
+                .width(LabelWidthCalculator.customWidth(getMaxLabelLength()))
+                .height(60)
                .endConfig()
-                .buildRoundRect(labelName, color, 10);
-
+                .buildRoundRect(labelName, color, 8);
        holder.labelsView.setImageDrawable(drawable);

    }

+    private int getMaxLabelLength() {
+
+        for(int i = 0; i < labelsList.size(); i++) {
+
+            Labels labelItem = labelsList.get(i);
+            labelsArray.add(labelItem.getName().length());
+
+        }
+
+        return Collections.max(labelsArray);
+
+    }
+
    @Override
    public int getItemCount() {
        return labelsList.size();
--- a/app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
+++ b/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.list_members_by_org, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_org_list, 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);
-        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);

        if(!currentItem.getFullname().equals("")) {
            viewHolder.memberName.setText(currentItem.getFullname());
--- a/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
@ -15,10 +15,8 @@ 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;
@ -34,6 +32,7 @@ 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;
@ -43,6 +42,7 @@ 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,7 +63,6 @@ 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;
@ -71,12 +70,10 @@ 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);
@ -84,52 +81,23 @@ 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);

-            milestonesMenu.setOnClickListener(v -> {
+            /*msTitle.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {

-                Context ctx = v.getContext();
-                int milestoneId_ = Integer.parseInt(milestoneId.getText().toString());
+                    Context context = v.getContext();
+                    Log.i("issueNumber", issueNumber.getText().toString());

-                @SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_milestones_in_list, null);
+                    Intent intent = new Intent(context, IssueDetailActivity.class);
+                    intent.putExtra("issueNumber", issueNumber.getText());

-	            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();
-
-	            });
-
-            });
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("issueNumber", issueNumber.getText().toString());
+                    context.startActivity(intent);

+                }
+            });*/
        }
    }

@ -142,7 +110,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.list_milestones, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.milestones_list, parent, false);
        return new MilestonesAdapter.MilestonesViewHolder(v);
    }

@ -155,40 +123,46 @@ 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(plugin -> {
-                    plugin.addSchemeHandler(new SchemeHandler() {
-                        @NonNull
-                        @Override
-                        public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {
+                .usePlugin(ImagesPlugin.create(new ImagesPlugin.ImagesConfigure() {
+                    @Override
+                    public void configureImages(@NonNull ImagesPlugin plugin) {
+                        plugin.addSchemeHandler(new SchemeHandler() {
+                            @NonNull
+                            @Override
+                            public ImageItem handle(@NonNull String raw, @NonNull Uri uri) {

-                            final int resourceId = mCtx.getResources().getIdentifier(
-                                    raw.substring("drawable://".length()),
-                                    "drawable",
-                                    mCtx.getPackageName());
+                                final 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(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());
+                            @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
@ -208,6 +182,7 @@ 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")) {

@ -249,7 +224,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
            holder.msDescription.setText(bodyWithMD);
        }
        else {
-            holder.msDescription.setText("");
+            holder.msDescription.setVisibility(View.GONE);
        }

        holder.msOpenIssues.setText(String.valueOf(currentItem.getOpen_issues()));
@ -286,14 +261,13 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
                } catch (ParseException e) {
                    e.printStackTrace();
                }
-                assert date != null;
                String dueDate = formatter.format(date);
-
+                assert date != null;
                if(date.before(new Date())) {
                    holder.msDueDate.setTextColor(mCtx.getResources().getColor(R.color.darkRed));
                }

-                holder.msDueDate.setText(mCtx.getResources().getString(R.string.dueDate, dueDate));
+                holder.msDueDate.setText(dueDate);
                holder.msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToast(currentItem.getDue_on()), mCtx));

            } else if (timeFormat.equals("normal1")) {
@ -304,14 +278,13 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
                } catch (ParseException e) {
                    e.printStackTrace();
                }
-                assert date1 != null;
                String dueDate = formatter.format(date1);
-                holder.msDueDate.setText(mCtx.getResources().getString(R.string.dueDate, dueDate));
+                holder.msDueDate.setText(dueDate);
            }

        }
        else {
-            holder.msDueDate.setText("");
+            holder.msDueDate.setVisibility(View.GONE);
        }

    }
@ -327,7 +300,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
    }

    private Filter milestoneFilter = new Filter() {
-
        @Override
        protected FilterResults performFiltering(CharSequence constraint) {
            List<Milestones> filteredList = new ArrayList<>();
@ -356,7 +328,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<MilestonesAdapter.Mi
            milestonesList.addAll((List) results.values);
            notifyDataSetChanged();
        }
-
    };

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/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,25 +13,22 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.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
@ -68,114 +65,85 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
            repoType = itemView.findViewById(R.id.repoType);

-            itemView.setOnClickListener(v -> {
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View 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);
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("repoFullName", fullNameMy.getText().toString());
+                    tinyDb.putString("repoType", repoType.getText().toString());
+                    tinyDb.putBoolean("resumeIssues", true);
+                    context.startActivity(intent);

-                //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");
-
-                    WatchRepository watch = new WatchRepository();
-
-                    Call<WatchRepository> call;
-
-                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
-
-                    call.enqueue(new Callback<WatchRepository>() {
-
-                        @Override
-                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
-
-                            if(response.isSuccessful()) {
-
-                                assert response.body() != null;
-                                tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
-
-                            } else {
-
-                                tinyDb.putBoolean("repoWatch", false);
-
-                                if(response.code() != 404) {
-
-                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
-
-                                }
-
-                            }
-
-                        }
-
-                        @Override
-                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
-
-                            tinyDb.putBoolean("repoWatch", false);
-                            Toasty.info(context, context.getString(R.string.genericApiStatusError));
-
-                        }
-                    });
                }
-
-                context.startActivity(intent);
-
            });

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

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

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

-                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);
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {

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

-                repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+                    } catch (Exception e) {

-                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullNameMy.getText());
-                    context.startActivity(intentOpenInBrowser);
-                    dialog.dismiss();
+                        popupMenu.show();
+                        return;

-                });
+                    }

-                repoStargazers.setOnClickListener(stargazers -> {
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.repoStargazers:

-                    Intent intent = new Intent(context, RepoStargazersActivity.class);
-                    intent.putExtra("repoFullNameForStars", fullNameMy.getText());
-                    context.startActivity(intent);
-                    dialog.dismiss();
+                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                                    intent.putExtra("repoFullNameForStars", fullNameMy.getText());
+                                    context.startActivity(intent);
+                                    break;

-                });
+                                case R.id.repoWatchers:

-                repoWatchers.setOnClickListener(watchers -> {
+                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                                    intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText());
+                                    context.startActivity(intentW);
+                                    break;

-                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                    intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText());
-                    context.startActivity(intentW);
-                    dialog.dismiss();
+                                case R.id.repoOpenInBrowser:

-                });
+                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullNameMy.getText());
+                                    context.startActivity(intentOpenInBrowser);
+                                    break;

+                            }
+                            return false;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
            });

        }
@ -190,7 +158,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.list_my_repos, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.my_repos_list, parent, false);
        return new MyReposListAdapter.MyReposViewHolder(v);
    }

@ -216,7 +184,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.

        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.imageMy);
+                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.imageMy);
            } else {
                holder.imageMy.setImageDrawable(drawable);
            }
--- a/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
@ -2,7 +2,6 @@ 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;
@ -12,9 +11,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.OrganizationDetailActivity;
-import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.activities.OrgDetailActivity;
 import org.mian.gitnex.models.UserOrganizations;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.util.TinyDB;
@ -36,27 +35,23 @@ 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, OrganizationDetailActivity.class);
+                    Intent intent = new Intent(context, OrgDetailActivity.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);

                }
@ -74,19 +69,17 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
    @NonNull
    @Override
    public OrganizationsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_organizations, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.organizations_list, 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()));

-        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);
+        Picasso.get().load(currentItem.getAvatar_url()).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);
--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileEmailsAdapter.java
+++ b/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.list_profile_emails, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.profile_emails_list, parent, false);
        return new ProfileEmailsAdapter.EmailsViewHolder(v);
    }

--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
+++ b/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.list_profile_followers, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.profile_followers_list, parent, false);
        return new ProfileFollowersAdapter.FollowersViewHolder(v);
    }

@ -65,7 +65,7 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowe
            holder.userName.setVisibility(View.GONE);
        }

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

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
+++ b/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.list_profile_following, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.profile_following_list, parent, false);
        return new ProfileFollowingAdapter.FollowingViewHolder(v);
    }

@ -65,7 +65,7 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowi
            holder.userName.setVisibility(View.GONE);
        }

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

    @Override
--- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
+++ b/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.list_pr, parent,false));
+            return new PullRequestsAdapter.PullRequestsHolder(inflater.inflate(R.layout.repo_pr_list, 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) {
-                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);
+                Picasso.get().load(prModel.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
            } else {
-                PicassoService.getInstance(context).get().load(prModel.getUser().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
+                Picasso.get().load(prModel.getUser().getAvatar_url()).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,10 +181,26 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
            prNumber.setText(String.valueOf(prModel.getNumber()));
            prCommentsCount.setText(String.valueOf(prModel.getComments()));

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

        }
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
+++ b/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.list_releases, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.releases_list, parent, false);
        return new ReleasesAdapter.ReleasesViewHolder(v);
    }

--- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
@ -2,18 +2,16 @@ package org.mian.gitnex.adapters;

 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+import 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;
 import java.util.List;

 /**
@ -25,7 +23,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
    private List<UserInfo> stargazersList;
    private Context mCtx;

-    private static class ViewHolder {
+    private class ViewHolder {

        private ImageView memberAvatar;
        private TextView memberName;
@ -63,8 +61,8 @@ public class RepoStargazersAdapter extends BaseAdapter {
        RepoStargazersAdapter.ViewHolder viewHolder;

        if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_repo_stargazers, null);
-            viewHolder = new ViewHolder(finalView);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_stargazers_list, null);
+            viewHolder = new RepoStargazersAdapter.ViewHolder(finalView);
            finalView.setTag(viewHolder);
        }
        else {
@ -79,41 +77,13 @@ public class RepoStargazersAdapter extends BaseAdapter {
    private void initData(RepoStargazersAdapter.ViewHolder viewHolder, int position) {

        UserInfo currentItem = stargazersList.get(position);
-        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;
-
-        switch(tinyDb.getInt("customFontId", -1)) {
-
-            case 0:
-                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
-                break;
-
-            case 2:
-                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
-                break;
-
-            default:
-                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
-                break;
-
-        }
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);

        if(!currentItem.getFullname().equals("")) {
            viewHolder.memberName.setText(currentItem.getFullname());
-            viewHolder.memberName.setTypeface(myTypeface);
        }
        else {
            viewHolder.memberName.setText(currentItem.getLogin());
-            viewHolder.memberName.setTypeface(myTypeface);
-        }
-
-        if(tinyDb.getInt("themeId") == 1) { //light
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
-        }
-        else { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
        }

    }
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
@ -2,18 +2,16 @@ package org.mian.gitnex.adapters;

 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+import 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;
 import java.util.List;

 /**
@ -25,7 +23,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
    private List<UserInfo> watchersList;
    private Context mCtx;

-    private static class ViewHolder {
+    private class ViewHolder {

        private ImageView memberAvatar;
        private TextView memberName;
@ -63,8 +61,8 @@ public class RepoWatchersAdapter extends BaseAdapter {
        RepoWatchersAdapter.ViewHolder viewHolder;

        if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_repo_watchers, null);
-            viewHolder = new ViewHolder(finalView);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_watchers_list, null);
+            viewHolder = new RepoWatchersAdapter.ViewHolder(finalView);
            finalView.setTag(viewHolder);
        }
        else {
@ -79,41 +77,13 @@ public class RepoWatchersAdapter extends BaseAdapter {
    private void initData(RepoWatchersAdapter.ViewHolder viewHolder, int position) {

        UserInfo currentItem = watchersList.get(position);
-        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;
-
-        switch(tinyDb.getInt("customFontId", -1)) {
-
-            case 0:
-                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
-                break;
-
-            case 2:
-                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
-                break;
-
-            default:
-                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
-                break;
-
-        }
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);

        if(!currentItem.getFullname().equals("")) {
            viewHolder.memberName.setText(currentItem.getFullname());
-            viewHolder.memberName.setTypeface(myTypeface);
        }
        else {
            viewHolder.memberName.setText(currentItem.getLogin());
-            viewHolder.memberName.setTypeface(myTypeface);
-        }
-
-        if(tinyDb.getInt("themeId") == 1) { //light
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
-        }
-        else { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
        }

    }
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@ -1,38 +1,34 @@
 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.google.android.material.bottomsheet.BottomSheetDialog;
+import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.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
@ -40,262 +36,225 @@ import retrofit2.Callback;

 public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.ReposViewHolder> implements Filterable {

-	private List<UserRepositories> reposList;
-	private Context mCtx;
-	private List<UserRepositories> reposListFull;
-
-	static class ReposViewHolder extends RecyclerView.ViewHolder {
-
-		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) {
-
-			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(v -> {
-
-				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());
-
-				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");
-
-					WatchRepository watch = new WatchRepository();
-
-					Call<WatchRepository> call;
-
-					call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
-
-					call.enqueue(new Callback<WatchRepository>() {
-
-						@Override
-						public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
-
-							if(response.isSuccessful()) {
-
-								assert response.body() != null;
-								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
-
-							} else {
-
-								tinyDb.putBoolean("repoWatch", false);
-
-								if(response.code() != 404) {
-
-									Toasty.info(context, context.getString(R.string.genericApiStatusError));
-
-								}
-
-							}
-
-						}
-
-						@Override
-						public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
-
-							tinyDb.putBoolean("repoWatch", false);
-							Toasty.info(context, context.getString(R.string.genericApiStatusError));
-
-						}
-					});
-				}
-
-				context.startActivity(intent);
-
-			});
-
-			reposDropdownMenu.setOnClickListener(v -> {
-
-				final Context context = v.getContext();
-
-				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
-
-				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
-				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
-				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
-				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
-
-				bottomSheetHeader.setText(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();
-
-				});
-
-			});
-
-		}
-
-	}
-
-	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();
-		}
-	};
+    private List<UserRepositories> reposList;
+    private Context mCtx;
+    private List<UserRepositories> reposListFull;
+
+    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 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);
+
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    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());
+
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("repoFullName", repoFullName.getText().toString());
+                    tinyDb.putString("repoType", repoType_.getText().toString());
+                    tinyDb.putBoolean("resumeIssues", true);
+                    context.startActivity(intent);
+
+                }
+            });
+
+            reposDropdownMenu.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    final Context context = v.getContext();
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    popupMenu.inflate(R.menu.repo_dotted_list_menu);
+
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {
+
+                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                        fMenuHelper.setAccessible(true);
+                        menuHelper = fMenuHelper.get(popupMenu);
+                        argTypes = new Class[] { boolean.class };
+                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
+                                argTypes).invoke(menuHelper, true);
+
+                    } catch (Exception e) {
+
+                        popupMenu.show();
+                        return;
+
+                    }
+
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.repoStargazers:
+
+                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                                    context.startActivity(intent);
+                                    break;
+
+                                case R.id.repoWatchers:
+
+                                    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;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
+            });
+
+        }
+    }
+
+    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);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ReposViewHolder holder, int position) {
+
+        UserRepositories currentItem = reposList.get(position);
+        holder.mTextView2.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("")) {
+                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);
+        }
+
+        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());
+
+    }
+
+    @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();
+        }
+    };

 }
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@ -1,38 +1,34 @@
 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.google.android.material.bottomsheet.BottomSheetDialog;
+import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.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
@ -47,10 +43,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
    static class OrgReposViewHolder extends RecyclerView.ViewHolder {

        private ImageView image;
-        private TextView repoName;
-        private TextView repoDescription;
+        private TextView mTextView1;
+        private TextView mTextView2;
        private TextView fullName;
-        private CheckBox isRepoAdmin;
        private ImageView repoPrivatePublic;
        private TextView repoStars;
        private TextView repoForks;
@ -59,9 +54,8 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB

        private OrgReposViewHolder(View itemView) {
            super(itemView);
-            repoName = itemView.findViewById(R.id.repoName);
-            repoDescription = itemView.findViewById(R.id.repoDescription);
-            isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+            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);
@ -71,114 +65,85 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
            repoType = itemView.findViewById(R.id.repoType);

-            itemView.setOnClickListener(v -> {
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View 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);
-                tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("repoFullName", fullName.getText().toString());
+                    tinyDb.putString("repoType", repoType.getText().toString());
+                    tinyDb.putBoolean("resumeIssues", true);
+                    context.startActivity(intent);

-                //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");
-
-                    WatchRepository watch = new WatchRepository();
-
-                    Call<WatchRepository> call;
-
-                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
-
-                    call.enqueue(new Callback<WatchRepository>() {
-
-                        @Override
-                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
-
-                            if(response.isSuccessful()) {
-
-                                assert response.body() != null;
-                                tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
-
-                            } else {
-
-                                tinyDb.putBoolean("repoWatch", false);
-
-                                if(response.code() != 404) {
-
-                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
-
-                                }
-
-                            }
-
-                        }
-
-                        @Override
-                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
-
-                            tinyDb.putBoolean("repoWatch", false);
-                            Toasty.info(context, context.getString(R.string.genericApiStatusError));
-
-                        }
-                    });
                }
-
-                context.startActivity(intent);
            });

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

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

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

-                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);
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {

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

-                repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+                    } catch (Exception e) {

-                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
-                    context.startActivity(intentOpenInBrowser);
-                    dialog.dismiss();
+                        popupMenu.show();
+                        return;

-                });
+                    }

-                repoStargazers.setOnClickListener(openInBrowser -> {
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.repoStargazers:

-                    Intent intent = new Intent(context, RepoStargazersActivity.class);
-                    intent.putExtra("repoFullNameForStars", fullName.getText());
-                    context.startActivity(intent);
-                    dialog.dismiss();
+                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                                    context.startActivity(intent);
+                                    break;

-                });
+                                case R.id.repoWatchers:

-                repoWatchers.setOnClickListener(openInBrowser -> {
+                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+                                    context.startActivity(intentW);
+                                    break;

-                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
-                    context.startActivity(intentW);
-                    dialog.dismiss();
+                                case R.id.repoOpenInBrowser:

-                });
+                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+                                    context.startActivity(intentOpenInBrowser);
+                                    break;

+                            }
+                            return false;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
            });

        }
@ -194,7 +159,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.list_repositories_by_org, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.repositories_by_org_list, parent, false);
        return new RepositoriesByOrgAdapter.OrgReposViewHolder(v);
    }

@ -202,7 +167,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
    public void onBindViewHolder(@NonNull RepositoriesByOrgAdapter.OrgReposViewHolder holder, int position) {

        UserRepositories currentItem = reposList.get(position);
-        holder.repoDescription.setVisibility(View.GONE);
+        holder.mTextView2.setVisibility(View.GONE);

        ColorGenerator generator = ColorGenerator.MATERIAL;
        int color = generator.getColor(currentItem.getName());
@ -220,7 +185,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB

        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);
+                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
            } else {
                holder.image.setImageDrawable(drawable);
            }
@ -229,10 +194,10 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
            holder.image.setImageDrawable(drawable);
        }

-        holder.repoName.setText(currentItem.getName());
+        holder.mTextView1.setText(currentItem.getName());
        if (!currentItem.getDescription().equals("")) {
-            holder.repoDescription.setVisibility(View.VISIBLE);
-            holder.repoDescription.setText(currentItem.getDescription());
+            holder.mTextView2.setVisibility(View.VISIBLE);
+            holder.mTextView2.setText(currentItem.getDescription());
        }
        holder.fullName.setText(currentItem.getFullname());
        if(currentItem.getPrivateFlag()) {
@ -247,11 +212,6 @@ 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
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@ -1,38 +1,34 @@
 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.google.android.material.bottomsheet.BottomSheetDialog;
+import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
 import org.mian.gitnex.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
@ -47,10 +43,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
    static class StarredReposViewHolder extends RecyclerView.ViewHolder {

        private ImageView image;
-        private TextView repoName;
-        private TextView repoDescription;
+        private TextView mTextView1;
+        private TextView mTextView2;
        private TextView fullName;
-        private CheckBox isRepoAdmin;
        private ImageView repoPrivatePublic;
        private TextView repoStars;
        private TextView repoForks;
@ -59,9 +54,8 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi

        private StarredReposViewHolder(View itemView) {
            super(itemView);
-            repoName = itemView.findViewById(R.id.repoName);
-            repoDescription = itemView.findViewById(R.id.repoDescription);
-            isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+            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);
@ -71,115 +65,85 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
            repoType = itemView.findViewById(R.id.repoType);

-            itemView.setOnClickListener(v -> {
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View 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);
-                tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
+                    TinyDB tinyDb = new TinyDB(context);
+                    tinyDb.putString("repoFullName", fullName.getText().toString());
+                    tinyDb.putString("repoType", repoType.getText().toString());
+                    tinyDb.putBoolean("resumeIssues", true);
+                    context.startActivity(intent);

-                //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");
-
-                    WatchRepository watch = new WatchRepository();
-
-                    Call<WatchRepository> call;
-
-                    call = RetrofitClient.getInstance(instanceUrl, context).getApiInterface().checkRepoWatchStatus(token, repoOwner, repoName);
-
-                    call.enqueue(new Callback<WatchRepository>() {
-
-                        @Override
-                        public void onResponse(@NonNull Call<WatchRepository> call, @NonNull retrofit2.Response<WatchRepository> response) {
-
-                            if(response.isSuccessful()) {
-
-                                assert response.body() != null;
-                                tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
-
-                            } else {
-
-                                tinyDb.putBoolean("repoWatch", false);
-
-                                if(response.code() != 404) {
-
-                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
-
-                                }
-
-                            }
-
-                        }
-
-                        @Override
-                        public void onFailure(@NonNull Call<WatchRepository> call, @NonNull Throwable t) {
-
-                            tinyDb.putBoolean("repoWatch", false);
-                            Toasty.info(context, context.getString(R.string.genericApiStatusError));
-
-                        }
-                    });
                }
-
-                context.startActivity(intent);
-
            });

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

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

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

-                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);
+                    Object menuHelper;
+                    Class[] argTypes;
+                    try {

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

-                repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+                    } catch (Exception e) {

-                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
-                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
-                    context.startActivity(intentOpenInBrowser);
-                    dialog.dismiss();
+                        popupMenu.show();
+                        return;

-                });
+                    }

-                repoStargazers.setOnClickListener(stargazers -> {
+                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        @Override
+                        public boolean onMenuItemClick(MenuItem item) {
+                            switch (item.getItemId()) {
+                                case R.id.repoStargazers:

-                    Intent intent = new Intent(context, RepoStargazersActivity.class);
-                    intent.putExtra("repoFullNameForStars", fullName.getText());
-                    context.startActivity(intent);
-                    dialog.dismiss();
+                                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                                    context.startActivity(intent);
+                                    break;

-                });
+                                case R.id.repoWatchers:

-                repoWatchers.setOnClickListener(watchers -> {
+                                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+                                    context.startActivity(intentW);
+                                    break;

-                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
-                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
-                    context.startActivity(intentW);
-                    dialog.dismiss();
+                                case R.id.repoOpenInBrowser:

-                });
+                                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+                                    context.startActivity(intentOpenInBrowser);
+                                    break;

+                            }
+                            return false;
+                        }
+                    });
+
+                    popupMenu.show();
+
+                }
            });

        }
@ -195,7 +159,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.list_starred_repos, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.starred_repos_list, parent, false);
        return new StarredReposListAdapter.StarredReposViewHolder(v);
    }

@ -203,7 +167,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
    public void onBindViewHolder(@NonNull StarredReposListAdapter.StarredReposViewHolder holder, int position) {

        UserRepositories currentItem = reposList.get(position);
-        holder.repoDescription.setVisibility(View.GONE);
+        holder.mTextView2.setVisibility(View.GONE);

        ColorGenerator generator = ColorGenerator.MATERIAL;
        int color = generator.getColor(currentItem.getName());
@ -221,7 +185,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi

        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);
+                Picasso.get().load(currentItem.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
            } else {
                holder.image.setImageDrawable(drawable);
            }
@ -230,10 +194,10 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
            holder.image.setImageDrawable(drawable);
        }

-        holder.repoName.setText(currentItem.getName());
+        holder.mTextView1.setText(currentItem.getName());
        if (!currentItem.getDescription().equals("")) {
-            holder.repoDescription.setVisibility(View.VISIBLE);
-            holder.repoDescription.setText(currentItem.getDescription());
+            holder.mTextView2.setVisibility(View.VISIBLE);
+            holder.mTextView2.setText(currentItem.getDescription());
        }
        holder.fullName.setText(currentItem.getFullname());
        if(currentItem.getPrivateFlag()) {
@ -247,10 +211,6 @@ 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());

    }

--- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
@ -2,19 +2,16 @@ package org.mian.gitnex.adapters;

 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+import 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;
 import java.util.List;

 /**
@ -26,7 +23,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
    private List<UserInfo> teamMembersList;
    private Context mCtx;

-    private static class ViewHolder {
+    private class ViewHolder {

        private ImageView memberAvatar;
        private TextView memberName;
@ -65,8 +62,8 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
        TeamMembersByOrgAdapter.ViewHolder viewHolder = null;

        if (finalView == null) {
-            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_team_by_org, null);
-            viewHolder = new ViewHolder(finalView);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_team_by_org_list, null);
+            viewHolder = new TeamMembersByOrgAdapter.ViewHolder(finalView);
            finalView.setTag(viewHolder);
        }
        else {
@ -81,41 +78,13 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
    private void initData(TeamMembersByOrgAdapter.ViewHolder viewHolder, int position) {

        UserInfo currentItem = teamMembersList.get(position);
-        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;
-
-        switch(tinyDb.getInt("customFontId", -1)) {
-
-            case 0:
-                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
-                break;
-
-            case 2:
-                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
-                break;
-
-            default:
-                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
-                break;
-
-        }
+        Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);

        if(!currentItem.getFullname().equals("")) {
            viewHolder.memberName.setText(currentItem.getFullname());
-            viewHolder.memberName.setTypeface(myTypeface);
        }
        else {
            viewHolder.memberName.setText(currentItem.getLogin());
-            viewHolder.memberName.setTypeface(myTypeface);
-        }
-
-        if(tinyDb.getInt("themeId") == 1) { //light
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
-        }
-        else { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
        }

    }
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamsByOrgAdapter.java
+++ b/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.OrganizationTeamMembersActivity;
+import org.mian.gitnex.activities.OrgTeamMembersActivity;
 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, OrganizationTeamMembersActivity.class);
+                    Intent intent = new Intent(context, OrgTeamMembersActivity.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.list_teams_by_org, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.teams_by_org_list, parent, false);
        return new TeamsByOrgAdapter.OrgTeamsViewHolder(v);
    }

--- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
+++ b/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;
@ -68,7 +68,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us

                    final Context context = v.getContext();

-                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
+                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);

                    pBuilder.setTitle(R.string.newTeamPermission);
                    pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, new DialogInterface.OnClickListener() {
@ -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.list_collaborators_search, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.collaborators_list_search, parent, false);
        return new UserSearchAdapter.UserSearchViewHolder(v);
    }

@ -141,7 +141,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
        }

        if (!currentItem.getAvatar().equals("")) {
-            PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+            Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
        }

        if(getItemCount() > 0) {
--- a/app/src/main/java/org/mian/gitnex/clients/IssuesService.java
+++ b/app/src/main/java/org/mian/gitnex/clients/IssuesService.java
@ -1,16 +1,10 @@
 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;
@ -26,59 +20,42 @@ 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);

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

-			SSLContext sslContext = SSLContext.getInstance("TLS");
+        Retrofit.Builder builder = new Retrofit.Builder()
+                .baseUrl(instanceURL)
+                .client(okHttpClient)
+                .addConverterFactory(GsonConverterFactory.create());

-			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
-			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
+        Retrofit retrofit = builder.build();

-			OkHttpClient okHttpClient = new OkHttpClient.Builder()
-					.cache(cache)
-					//.addInterceptor(logging)
-					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
-					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
-					.addInterceptor(new Interceptor() {
+        return retrofit.create(serviceClass);

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

 }
--- a/app/src/main/java/org/mian/gitnex/clients/PicassoService.java
+++ b/app/src/main/java/org/mian/gitnex/clients/PicassoService.java
@ -1,76 +0,0 @@
-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;
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java
+++ b/app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java
@ -1,16 +1,10 @@
 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;
@ -26,58 +20,42 @@ 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);

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

-			SSLContext sslContext = SSLContext.getInstance("TLS");
+        Retrofit.Builder builder = new Retrofit.Builder()
+                .baseUrl(instanceURL)
+                .client(okHttpClient)
+                .addConverterFactory(GsonConverterFactory.create());

-			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
-			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
+        Retrofit retrofit = builder.build();

-			OkHttpClient okHttpClient = new OkHttpClient.Builder()
-					.cache(cache)
-					//.addInterceptor(logging)
-					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
-					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
-					.addInterceptor(new Interceptor() {
+        return retrofit.create(serviceClass);

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

 }
--- a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
+++ b/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
@ -1,19 +1,16 @@
 package org.mian.gitnex.clients;

 import android.content.Context;
-import android.util.Log;
+import androidx.annotation.NonNull;
 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.security.SecureRandom;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
 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;
@ -25,67 +22,51 @@ 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);

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

-			SSLContext sslContext = SSLContext.getInstance("TLS");
+        Retrofit.Builder builder = new Retrofit.Builder()
+                .baseUrl(instanceUrl)
+                .client(okHttpClient)
+                .addConverterFactory(ScalarsConverterFactory.create())
+                .addConverterFactory(GsonConverterFactory.create());

-			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
-			sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom());
+        retrofit = builder.build();

-			OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder()
-					.cache(cache)
-					//.addInterceptor(logging)
-					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
-					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
-					.addInterceptor(chain -> {
+    }

-						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 static synchronized RetrofitClient getInstance(String instanceUrl, Context ctx) {
+        return new RetrofitClient(instanceUrl, ctx);
+    }

-			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);
+    public ApiInterface getApiInterface() {
+        return retrofit.create(ApiInterface.class);
    }

 }
--- a/app/src/main/java/org/mian/gitnex/fragments/AboutFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/AboutFragment.java
@ -27,6 +27,7 @@ public class AboutFragment extends Fragment {
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {

        View v = inflater.inflate(R.layout.fragment_about, container, false);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleAbout));

        TinyDB tinyDb = new TinyDB(getContext());

--- a/app/src/main/java/org/mian/gitnex/fragments/AdminUsersBottomSheetFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/AdminUsersBottomSheetFragment.java
@ -15,14 +15,14 @@ import org.mian.gitnex.R;
 * Author M M Arif
 */

-public class BottomSheetAdminUsersFragment extends BottomSheetDialogFragment {
+public class AdminUsersBottomSheetFragment extends BottomSheetDialogFragment {

-    private BottomSheetAdminUsersFragment.BottomSheetListener bmListener;
+    private AdminUsersBottomSheetFragment.BottomSheetListener bmListener;

    @Nullable
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.bottom_sheet_admin_users_layout, container, false);
+        View v = inflater.inflate(R.layout.admin_users_bottom_sheet_layout, container, false);

        TextView createNewUser = v.findViewById(R.id.createNewUser);

@ -46,7 +46,7 @@ public class BottomSheetAdminUsersFragment extends BottomSheetDialogFragment {
        super.onAttach(context);

        try {
-            bmListener = (BottomSheetAdminUsersFragment.BottomSheetListener) context;
+            bmListener = (AdminUsersBottomSheetFragment.BottomSheetListener) context;
        } catch (ClassCastException e) {
            throw new ClassCastException(context.toString()
                    + " must implement BottomSheetListener");
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java
@ -1,65 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import org.mian.gitnex.R;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * Author M M Arif
- */
-
-public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
-
-    private BottomSheetOrganizationFragment.BottomSheetListener bmListener;
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        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
-            public void onClick(View v) {
-                bmListener.onButtonClicked("team");
-                dismiss();
-            }
-        });
-
-        createRepository.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                bmListener.onButtonClicked("repository");
-                dismiss();
-            }
-        });
-
-        return v;
-    }
-
-    public interface BottomSheetListener {
-        void onButtonClicked(String text);
-    }
-
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-
-        try {
-            bmListener = (BottomSheetOrganizationFragment.BottomSheetListener) context;
-        } catch (ClassCastException e) {
-            throw new ClassCastException(context.toString()
-                    + " must implement BottomSheetListener");
-        }
-    }
-
-}
--- a/app/src/main/java/org/mian/gitnex/fragments/ClosedIssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ClosedIssuesFragment.java
@ -0,0 +1,287 @@
+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";
+
+    @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);
+                        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);
+
+                        }
+                        /*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);
+
+        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);
+            tinyDb.putBoolean("resumeClosedIssues", false);
+
+        }
+
+    }
+
+    private void loadInitial(String token, String repoOwner, String repoName, String issueState) {
+
+        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName,  1, issueState);
+
+        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){
+
+        //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);
+
+        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;
+
+            }
+
+        });
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
@ -17,11 +17,13 @@ import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.ExploreRepositoriesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.ExploreRepositories;
 import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 import java.util.Objects;
@ -30,194 +32,155 @@ 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;
+    }

-	public static ExploreRepositoriesFragment newInstance(String param1, String param2) {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            String repoName = getArguments().getString(repoNameF);
+            String repoOwner = getArguments().getString(repoOwnerF);
+        }
+    }

-		ExploreRepositoriesFragment fragment = new ExploreRepositoriesFragment();
-		Bundle args = new Bundle();
-		args.putString(repoOwnerF, param1);
-		args.putString(repoNameF, param2);
-		fragment.setArguments(args);
-		return fragment;
-	}
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {

-	@Override
-	public void onCreate(Bundle savedInstanceState) {
+        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));

-		super.onCreate(savedInstanceState);
-		if(getArguments() != null) {
-			String repoName = getArguments().getString(repoNameF);
-			String repoOwner = getArguments().getString(repoOwnerF);
-		}
-	}
+        final View v = inflater.inflate(R.layout.fragment_explore_repo, container, false);
+        //setHasOptionsMenu(true);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleExplore));

-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, 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");

-		final View v = inflater.inflate(R.layout.fragment_explore_repo, container, false);
-		//setHasOptionsMenu(true);
+        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);

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

-		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 loadSearchReposList(String instanceUrl, String instanceToken, String loginUid, String searchKeyword, 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), searchKeyword, 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 getReposList(List<UserRepositories> dataList, Context context) {

-				if(response.isSuccessful()) {
-					assert response.body() != null;
-					getReposList(response.body().getSearchedData(), context);
-				}
-				else {
-					Log.i("onResponse", String.valueOf(response.code()));
-				}
+        ExploreRepositoriesAdapter adapter = new ExploreRepositoriesAdapter(dataList, context);

-			}
+        mRecyclerView.setVisibility(View.VISIBLE);

-			@Override
-			public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
+                DividerItemDecoration.VERTICAL);
+        mRecyclerView.addItemDecoration(dividerItemDecoration);

-				Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
-			}
+        if(adapter.getItemCount() > 0) {

-		});
+            mRecyclerView.setAdapter(adapter);
+            noData.setVisibility(View.GONE);
+            mProgressBar.setVisibility(View.GONE);

-	}
+        }
+        else {

-	private void loadSearchReposList(String instanceUrl, String instanceToken, String loginUid, String searchKeyword, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
+            noData.setVisibility(View.VISIBLE);
+            mProgressBar.setVisibility(View.GONE);

-		Call<ExploreRepositories> call = RetrofitClient.getInstance(instanceUrl, getContext()).getApiInterface().queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), searchKeyword, repoTypeInclude, sort, order, limit);
+        }

-		call.enqueue(new Callback<ExploreRepositories>() {
+    }

-			@Override
-			public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
+    public void onButtonPressed(Uri uri) {
+        if (mListener != null) {
+            mListener.onFragmentInteraction(uri);
+        }
+    }

-				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 getReposList(List<UserRepositories> dataList, Context context) {
-
-		ExploreRepositoriesAdapter adapter = new ExploreRepositoriesAdapter(dataList, context);
-
-		mRecyclerView.setVisibility(View.VISIBLE);
-
-		mRecyclerView.setHasFixedSize(true);
-		mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
-		mRecyclerView.addItemDecoration(dividerItemDecoration);
-
-		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);
-
-	}
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }

+    public interface OnFragmentInteractionListener {
+        void onFragmentInteraction(Uri uri);
+    }
 }
--- a/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/FilesFragment.java
@ -1,6 +1,5 @@
 package org.mian.gitnex.fragments;

-import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@ -146,9 +145,7 @@ 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) {

@ -161,10 +158,7 @@ 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());
-
-                String currentIndex = (result + item.getSelectedItem()).substring(1);
-
-                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, currentIndex);
+                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);

            }

--- a/app/src/main/java/org/mian/gitnex/fragments/IssuesClosedFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesClosedFragment.java
@ -1,311 +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.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));
-        Handler handler = new Handler();
-
-        handler.postDelayed(() -> {
-
-            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());
-                }
-
-            });
-
-        }, 1000);
-
-        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();
-    }
-
-}
--- a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
@ -0,0 +1,286 @@
+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;
+
+    @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);
+                        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);
+
+                        }
+                        /*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);
+
+        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);
+            tinyDb.putBoolean("resumeIssues", false);
+
+        }
+
+    }
+
+    private void loadInitial(String token, String repoOwner, String repoName) {
+
+        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName,  1);
+
+        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){
+
+        //add loading progress view
+        issuesList.add(new Issues("load"));
+        adapter.notifyItemInserted((issuesList.size() - 1));
+
+        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, page);
+
+        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;
+
+            }
+
+        });
+
+    }
+
+}
--- a/app/src/main/java/org/mian/gitnex/fragments/IssuesMainFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesMainFragment.java
@ -1,155 +0,0 @@
-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);
-		}
-
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/fragments/IssuesOpenFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesOpenFragment.java
@ -1,308 +0,0 @@
-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.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 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));
-		Handler handler = new Handler();
-
-		handler.postDelayed(() -> {
-
-			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());
-				}
-
-			});
-
-		}, 1000);
-
-		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();
-	}
-
-}
--- a/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
@ -24,7 +24,8 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.CreateRepoActivity;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.activities.NewRepoActivity;
 import org.mian.gitnex.adapters.MyReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.UserRepositories;
@ -48,9 +49,6 @@ public class MyRepositoriesFragment extends Fragment {
    private ImageView createNewRepo;
    private TextView noDataMyRepo;

-    private int pageSize = 1;
-    private int resultLimit = 50;
-
    private String mParam1;
    private String mParam2;

@ -85,13 +83,13 @@ public class MyRepositoriesFragment extends Fragment {

        final View v = inflater.inflate(R.layout.fragment_my_repositories, container, false);
        setHasOptionsMenu(true);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleMyRepos));

        TinyDB tinyDb = new TinyDB(getContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
        final String userLogin =  tinyDb.getString("userLogin");
-        tinyDb.putBoolean("isRepoAdmin", true);

        final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh);

@ -101,18 +99,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(), CreateRepoActivity.class);
+                Intent intent = new Intent(view.getContext(), NewRepoActivity.class);
                startActivity(intent);
-
            }

        });
@ -120,13 +118,12 @@ 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
@ -142,13 +139,13 @@ public class MyRepositoriesFragment extends Fragment {
                    @Override
                    public void run() {
                        swipeRefresh.setRefreshing(false);
-                        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
+                        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext());
                    }
                }, 50);
            }
        });

-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, pageSize, resultLimit);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin);

        return v;

@ -163,18 +160,15 @@ public class MyRepositoriesFragment extends Fragment {
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
        final String userLogin =  tinyDb.getString("userLogin");

-        if(tinyDb.getBoolean("repoCreated")) {
-            MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
-            tinyDb.putBoolean("repoCreated", false);
-        }
+        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext());

    }

-    private void fetchDataAsync(String instanceUrl, String instanceToken, String userLogin, int  pageSize, int resultLimit) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String userLogin) {

        MyRepositoriesViewModel myRepoModel = new ViewModelProvider(this).get(MyRepositoriesViewModel.class);

-        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
+        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
            @Override
            public void onChanged(@Nullable List<UserRepositories> myReposListMain) {
                adapter = new MyReposListAdapter(getContext(), myReposListMain);
--- a/app/src/main/java/org/mian/gitnex/fragments/NavSubMenuBottomSheetFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/NavSubMenuBottomSheetFragment.java
@ -16,12 +16,12 @@ import androidx.annotation.Nullable;
 * Author M M Arif
 */

-public class BottomSheetNavSubMenuFragment extends BottomSheetDialogFragment {
+public class NavSubMenuBottomSheetFragment extends BottomSheetDialogFragment {

    @Nullable
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.bottom_sheet_nav_sub_menu_layout, container, false);
+        View v = inflater.inflate(R.layout.nav_sub_menu_bottom_sheet_layout, container, false);

        TextView adminUsers = v.findViewById(R.id.adminUsers);

--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetFileViewerFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetFileViewerFragment.java
@ -2,35 +2,34 @@ package org.mian.gitnex.fragments;

 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import org.mian.gitnex.R;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 /**
 * Author M M Arif
 */

-public class BottomSheetFileViewerFragment extends BottomSheetDialogFragment {
+public class OrgBottomSheetFragment extends BottomSheetDialogFragment {

-    private BottomSheetFileViewerFragment.BottomSheetListener bmListener;
+    private OrgBottomSheetFragment.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_file_viewer, container, false);
+        TextView createTeam = v.findViewById(R.id.createTeam);

-        TextView downloadFile = v.findViewById(R.id.downloadFile);
-
-        downloadFile.setOnClickListener(new View.OnClickListener() {
+        createTeam.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-                bmListener.onButtonClicked("downloadFile");
+                bmListener.onButtonClicked("team");
                dismiss();
            }
        });
@ -47,7 +46,7 @@ public class BottomSheetFileViewerFragment extends BottomSheetDialogFragment {
        super.onAttach(context);

        try {
-            bmListener = (BottomSheetFileViewerFragment.BottomSheetListener) context;
+            bmListener = (OrgBottomSheetFragment.BottomSheetListener) context;
        } catch (ClassCastException e) {
            throw new ClassCastException(context.toString()
                    + " must implement BottomSheetListener");
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
+++ b/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;
-                        PicassoService.getInstance(ctx).get().load(orgInfo.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
+                        Picasso.get().load(orgInfo.getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(orgAvatar);
                        orgDescInfo.setText(orgInfo.getDescription());
                        orgWebsiteInfo.setText(orgInfo.getWebsite());
                        orgLocationInfo.setText(orgInfo.getLocation());
--- a/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
@ -23,7 +23,8 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.CreateOrganizationActivity;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.activities.NewOrganizationActivity;
 import org.mian.gitnex.adapters.OrganizationsListAdapter;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.util.AppUtil;
@ -49,6 +50,7 @@ public class OrganizationsFragment extends Fragment {
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {

+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleOrganizations));
        final View v = inflater.inflate(R.layout.fragment_organizations, container, false);
        setHasOptionsMenu(true);

@ -77,7 +79,7 @@ public class OrganizationsFragment extends Fragment {

            @Override
            public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), CreateOrganizationActivity.class);
+                Intent intent = new Intent(view.getContext(), NewOrganizationActivity.class);
                startActivity(intent);
            }

--- a/app/src/main/java/org/mian/gitnex/fragments/ProfileBottomSheetFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileBottomSheetFragment.java
@ -16,12 +16,12 @@ import androidx.annotation.Nullable;
 * Author M M Arif
 */

-public class BottomSheetProfileFragment extends BottomSheetDialogFragment {
+public class ProfileBottomSheetFragment extends BottomSheetDialogFragment {

    @Nullable
    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.bottom_sheet_profile_layout, container, false);
+        View v = inflater.inflate(R.layout.profile_bottom_sheet_layout, container, false);

        TextView addNewEmailAddress = v.findViewById(R.id.addNewEmailAddress);

--- a/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java
@ -1,7 +1,6 @@
 package org.mian.gitnex.fragments;

 import android.content.Context;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@ -18,9 +17,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;
@ -38,6 +37,7 @@ public class ProfileFragment extends Fragment {
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {

        View v = inflater.inflate(R.layout.fragment_profile, container, false);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleProfile));
        setHasOptionsMenu(true);

        TinyDB tinyDb = new TinyDB(getContext());
@ -48,48 +48,17 @@ public class ProfileFragment extends Fragment {
        TextView userEmail = v.findViewById(R.id.userEmail);

        userFullName.setText(tinyDb.getString("userFullname"));
-        PicassoService.getInstance(ctx).get().load(tinyDb.getString("userAvatar")).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(userAvatar);
+        Picasso.get().load(tinyDb.getString("userAvatar")).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 SectionsPagerAdapter(getChildFragmentManager());
+        ProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter = new ProfileFragment.SectionsPagerAdapter(getFragmentManager());

        ViewPager mViewPager = v.findViewById(R.id.container);
        mViewPager.setAdapter(mSectionsPagerAdapter);

-        Typeface myTypeface;
-
-        switch(tinyDb.getInt("customFontId", -1)) {
-
-            case 0:
-                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
-                break;
-
-            case 2:
-                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-                break;
-
-            default:
-                myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf");
-                break;
-
-        }
-
        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));

@ -97,10 +66,10 @@ public class ProfileFragment extends Fragment {

    }

-    public static class SectionsPagerAdapter extends FragmentStatePagerAdapter {
+    public class SectionsPagerAdapter extends FragmentStatePagerAdapter {

        SectionsPagerAdapter(FragmentManager fm) {
-            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+            super(fm);
        }

        @NonNull
@ -143,8 +112,9 @@ public class ProfileFragment extends Fragment {
                ((MainActivity)ctx).finish();
                return true;
            case R.id.profileMenu:
-                BottomSheetProfileFragment bottomSheet = new BottomSheetProfileFragment();
-                bottomSheet.show(getChildFragmentManager(), "profileBottomSheet");
+                ProfileBottomSheetFragment bottomSheet = new ProfileBottomSheetFragment();
+                assert getFragmentManager() != null;
+                bottomSheet.show(getFragmentManager(), "profileBottomSheet");
                return true;
            default:
                return super.onOptionsItemSelected(item);
--- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java
@ -52,7 +52,6 @@ public class PullRequestsFragment extends Fragment {
    private int pageSize = 1;
    private TextView noData;
    private String prState = "open";
-    private int resultLimit = 50;

    @Nullable
    @Override
@ -88,7 +87,7 @@ public class PullRequestsFragment extends Fragment {
                    public void run() {

                        swipeRefresh.setRefreshing(false);
-                        loadInitial(instanceToken, repoOwner, repoName, pageSize, prState, resultLimit);
+                        loadInitial(instanceToken, repoOwner, repoName, pageSize, prState);
                        adapter.notifyDataChanged();

                    }
@ -107,7 +106,7 @@ public class PullRequestsFragment extends Fragment {
                        if(prList.size() == 10 || pageSize == 10) {

                            int page = (prList.size() + 10) / 10;
-                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, prState, resultLimit);
+                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, prState);

                        }
                        /*else {
@ -129,7 +128,7 @@ public class PullRequestsFragment extends Fragment {
        recyclerView.setAdapter(adapter);

        apiPR = PullRequestsService.createService(ApiInterface.class, instanceUrl, getContext());
-        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
+        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState);

        return v;

@ -149,17 +148,16 @@ public class PullRequestsFragment extends Fragment {

        if(tinyDb.getBoolean("resumePullRequests")) {

-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
+            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState);
            tinyDb.putBoolean("resumePullRequests", false);
-            tinyDb.putBoolean("prMerged", false);

        }

    }

-    private void loadInitial(String token, String repoOwner, String repoName, int page, String prState, int resultLimit) {
+    private void loadInitial(String token, String repoOwner, String repoName, int page, String prState) {

-        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
+        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState);

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

@ -201,13 +199,13 @@ public class PullRequestsFragment extends Fragment {

    }

-    private void loadMore(String token, String repoOwner, String repoName, int page, String prState, int resultLimit){
+    private void loadMore(String token, String repoOwner, String repoName, int page, String prState){

        //add loading progress view
        prList.add(new PullRequests("load"));
        adapter.notifyItemInserted((prList.size() - 1));

-        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
+        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState);

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

--- a/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoBottomSheetFragment.java
@ -17,14 +17,14 @@ import androidx.annotation.Nullable;
 * Author M M Arif
 */

-public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
+public class RepoBottomSheetFragment 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.bottom_sheet_repo_layout, container, false);
+        View v = inflater.inflate(R.layout.repo_bottom_sheet_layout, container, false);

        final TinyDB tinyDb = new TinyDB(getContext());

@ -39,7 +39,6 @@ public class BottomSheetRepoFragment 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
@ -87,14 +86,6 @@ public class BottomSheetRepoFragment 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) {
--- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
@ -6,7 +6,6 @@ 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;
@ -31,7 +30,6 @@ 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;
@ -46,6 +44,9 @@ 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;
@ -57,7 +58,7 @@ import java.util.Objects;

 public class RepoInfoFragment extends Fragment {

-    private Context ctx;
+    private Context ctx = getContext();
    private ProgressBar mProgressBar;
    private LinearLayout pageContent;
    private static String repoNameF = "param2";
@ -65,17 +66,17 @@ public class RepoInfoFragment extends Fragment {

    private String repoName;
    private String repoOwner;
-    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 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 repoFileContents;
    private LinearLayout repoMetaFrame;
    private ImageView repoMetaDataExpandCollapse;
@ -119,26 +120,25 @@ 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);
-        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);
+        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);
        repoFileContents = v.findViewById(R.id.repoFileContents);
+        TextView repoFilename = v.findViewById(R.id.repoFilename);
        repoMetaFrame = v.findViewById(R.id.repoMetaFrame);
-        LinearLayout repoMetaFrameHeader = v.findViewById(R.id.repoMetaFrameHeader);
+        TextView repoMetaData = v.findViewById(R.id.repoMetaData);
        repoMetaDataExpandCollapse = v.findViewById(R.id.repoMetaDataExpandCollapse);
        repoFilenameExpandCollapse = v.findViewById(R.id.repoFilenameExpandCollapse);
        fileContentsFrameHeader = v.findViewById(R.id.fileContentsFrameHeader);
@ -149,23 +149,15 @@ 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));

-        if(isExpandViewVisible()) {
-        	toggleExpandView();
-        }
-
-        if(!isExpandViewMetaVisible()) {
-        	toggleExpandViewMeta();
-        }
-
-        fileContentsFrameHeader.setOnClickListener(new View.OnClickListener() {
+        repoFilename.setOnClickListener(new View.OnClickListener() {
            public void onClick(View v) {
-                toggleExpandView();
+                collapseExpandView();
            }
        });

-        repoMetaFrameHeader.setOnClickListener(new View.OnClickListener() {
+        repoMetaData.setOnClickListener(new View.OnClickListener() {
            public void onClick(View v) {
-                toggleExpandViewMeta();
+                collapseExpandViewMeta();
            }
        });

@ -188,7 +180,7 @@ public class RepoInfoFragment extends Fragment {
        void onFragmentInteraction(Uri uri);
    }

-    private void toggleExpandView() {
+    private void collapseExpandView() {

        if (repoFileContents.getVisibility() == View.GONE) {
            repoFilenameExpandCollapse.setImageResource(R.drawable.ic_arrow_up);
@ -202,14 +194,10 @@ public class RepoInfoFragment extends Fragment {
            //Animation slide_up = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
            //fileContentsFrame.startAnimation(slide_up);
        }
+
    }

-    private boolean isExpandViewVisible() {
-    	return repoFileContents.getVisibility() == View.VISIBLE;
-    }
-
-    private void toggleExpandViewMeta() {
-
+    private void collapseExpandViewMeta() {
        if (repoMetaFrame.getVisibility() == View.GONE) {
            repoMetaDataExpandCollapse.setImageResource(R.drawable.ic_arrow_up);
            repoMetaFrame.setVisibility(View.VISIBLE);
@ -222,11 +210,8 @@ 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) {

@ -251,64 +236,16 @@ public class RepoInfoFragment extends Fragment {
                        if (response.code() == 200) {

                            assert repoInfo != null;
-                            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();
-
-                            });
+                            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());

                            if(repoInfo.getHas_issues() != null) {
                                tinyDb.putBoolean("hasIssues", repoInfo.getHas_issues());
@ -317,6 +254,28 @@ 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;
+                                }
+                            }
+
                            mProgressBar.setVisibility(View.GONE);
                            pageContent.setVisibility(View.VISIBLE);

@ -415,14 +374,13 @@ 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),
--- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
@ -45,8 +45,6 @@ public class RepositoriesByOrgFragment extends Fragment {
    private TextView noData;
    private static String orgNameF = "param2";
    private String orgName;
-    private int pageSize = 1;
-    private int resultLimit = 50;

    public RepositoriesByOrgFragment() {
    }
@ -99,13 +97,13 @@ public class RepositoriesByOrgFragment extends Fragment {
                    @Override
                    public void run() {
                        swipeRefresh.setRefreshing(false);
-                        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
+                        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext());
                    }
                }, 200);
            }
        });

-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, pageSize, resultLimit);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName);

        return v;
    }
@ -119,18 +117,15 @@ public class RepositoriesByOrgFragment extends Fragment {
        final String loginUid = tinyDb.getString("loginUid");
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

-        if(tinyDb.getBoolean("repoCreated")) {
-            RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
-            tinyDb.putBoolean("repoCreated", false);
-        }
+        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext());

    }

-    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, int pageSize, int resultLimit) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner) {

        RepositoriesByOrgViewModel orgRepoModel = new ViewModelProvider(this).get(RepositoriesByOrgViewModel.class);

-        orgRepoModel.getRepositoriesByOrg(instanceUrl, instanceToken, owner, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
+        orgRepoModel.getRepositoriesByOrg(instanceUrl, instanceToken, owner, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
            @Override
            public void onChanged(@Nullable List<UserRepositories> orgReposListMain) {
                adapter = new RepositoriesByOrgAdapter(getContext(), orgReposListMain);
--- a/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
@ -22,7 +22,8 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.CreateRepoActivity;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.activities.NewRepoActivity;
 import org.mian.gitnex.adapters.ReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.UserRepositories;
@ -44,8 +45,6 @@ public class RepositoriesFragment extends Fragment {
    private ReposListAdapter adapter;
    private ImageView createNewRepo;
    private TextView noDataRepo;
-    private int pageSize = 1;
-    private int resultLimit = 50;

    @Nullable
    @Override
@ -55,6 +54,7 @@ public class RepositoriesFragment extends Fragment {

        final View v = inflater.inflate(R.layout.fragment_repositories, container, false);
        setHasOptionsMenu(true);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleRepositories));

        TinyDB tinyDb = new TinyDB(getContext());
        final String instanceUrl = tinyDb.getString("instanceUrl");
@ -79,7 +79,7 @@ public class RepositoriesFragment extends Fragment {

            @Override
            public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), CreateRepoActivity.class);
+                Intent intent = new Intent(view.getContext(), NewRepoActivity.class);
                startActivity(intent);
            }

@ -109,13 +109,13 @@ public class RepositoriesFragment extends Fragment {
                    @Override
                    public void run() {
                        swipeRefresh.setRefreshing(false);
-                        RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+                        RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
                    }
                }, 50);
            }
        });

-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), pageSize, resultLimit);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));

        return v;

@ -130,16 +130,16 @@ public class RepositoriesFragment extends Fragment {
        final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");

        if(tinyDb.getBoolean("repoCreated")) {
-            RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+            RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
            tinyDb.putBoolean("repoCreated", false);
        }
    }

-    private void fetchDataAsync(String instanceUrl, String instanceToken, int pageSize, int resultLimit) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken) {

        RepositoriesListViewModel repoModel = new ViewModelProvider(this).get(RepositoriesListViewModel.class);

-        repoModel.getUserRepositories(instanceUrl, instanceToken, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
+        repoModel.getUserRepositories(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
            @Override
            public void onChanged(@Nullable List<UserRepositories> reposListMain) {
                adapter = new ReposListAdapter(getContext(), reposListMain);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
M M Arif	1e7572d0ea	Merge branch 'release-2.3.2' of gitnex/GitNex into release-2.3	2019-12-25 19:25:38 +00:00
M M Arif	2e6d07860f	prepare release 2.3.2	2019-12-26 00:22:22 +05:00
M M Arif	01498d6b0d	Merge branch 'fix-234' of gitnex/GitNex into release-2.3	2019-12-25 19:11:03 +00:00
M M Arif	3e016dc90f	fix double slash in url	2019-12-25 18:48:12 +05:00
M M Arif	52b65f8bed	Merge branch 'backport-241' of gitnex/GitNex into release-2.3	2019-12-25 10:49:20 +00:00
6543	e2b607d013	fix	2019-12-24 21:22:40 +01:00
M M Arif	82977c7a53	Merge branch 'releae-2.3.1' of gitnex/GitNex into release-2.3	2019-12-13 13:31:14 +00:00
M M Arif	9729ebdc99	prepare release 2.3.1	2019-12-13 18:13:19 +05:00
M M Arif	3ed5ddc6e8	Merge branch 'fix-file-decode-issue' of gitnex/GitNex into release-2.3	2019-12-13 13:07:25 +00:00
M M Arif	7019268512	fix decode filename	2019-12-13 13:52:18 +05:00
M M Arif	22b88bc4f4	Merge branch '231-revert-showing-only-issues' of gitnex/GitNex into release-2.3	2019-12-04 17:43:08 +00:00
M M Arif	b2565c7c62	show all in issues list, bump version	2019-12-04 21:16:41 +05:00
M M Arif	7d4ffe43dc	Merge branch '223-copy-text-support-files' of gitnex/GitNex into release-2.3	2019-12-02 14:56:28 +00:00
M M Arif	3c12c9261d	Merge branch '222-fix-alignments' of gitnex/GitNex into release-2.3	2019-12-02 14:45:17 +00:00
M M Arif	308bc033fa	fix alignments	2019-12-02 13:08:01 +05:00
M M Arif	4fae271b09	allow copy, support more files	2019-12-01 23:57:46 +05:00