3.5.1 release (#872)

3.5.1 release

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/872
Co-Authored-By: M M Arif <mmarif@noreply.codeberg.org>
Co-Committed-By: M M Arif <mmarif@noreply.codeberg.org>

.drone.yml

@@ -15,8 +15,8 @@ steps:
     image: zosiab/eclint:latest
     depends_on: [ clone ]
     commands:
-      - git pull origin main
+      - git pull origin master
-      - eclint check $(git diff --name-only origin/main)
+      - eclint check $(git diff --name-only origin/master)
 
   # This may be used in the future, because it makes of intellij's native code inspection/formatting capabilities.
   # Additional information: https://www.jetbrains.com/help/idea/command-line-formatter.html
@@ -54,7 +54,7 @@ trigger:
   event:
     - push
   branch:
-    - main
+    - master
 
 ---
 kind: pipeline
@@ -101,4 +101,4 @@ trigger:
   event:
     - push
   branch:
-    - main
+    - master

.gitea/issue_template.md

@@ -31,7 +31,7 @@
 <!-- Screenshots and stacktrace's can go here. -->
 <br><br>
 
-- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
+- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/master/CONTRIBUTING.md).
 <br>
 
 #### Thank you for your time.

.gitea/pull_request_template.md

@@ -2,8 +2,8 @@
 <!-- Create a new issue, if it doesn't exist yet -->
 <br><br>
 
-<!-- Make sure you are targeting the "main" branch, pull requests on release branches are only allowed for bug fixes. -->
+<!-- Make sure you are targeting the master branch, pull requests on release branches are only allowed for bug fixes. -->
 
-- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/main/CONTRIBUTING.md).
+- [ ] I carefully read the [contribution guidelines](https://codeberg.org/GitNex/GitNex/src/branch/master/CONTRIBUTING.md).
 - [ ] I'm following the code standards as defined [here](https://codeberg.org/gitnex/GitNex/wiki/Code-Standards).
-- [ ] By submitting this pull request, I permit GitNex to license my work under the [GNU General Public License v3](https://codeberg.org/GitNex/GitNex/src/branch/main/LICENSE).
+- [ ] By submitting this pull request, I permit GitNex to license my work under the [GNU General Public License v3](https://codeberg.org/GitNex/GitNex/src/branch/master/LICENSE).

.gitlab-ci.yml

@@ -4,10 +4,10 @@ stages:
   - publish
 
 on_setup:
-  image: curlimages/curl:7.77.0
+  image: tutum/curl
   stage: .pre
   only:
-    - main
+    - master
     - tags
   variables:
     INSTANCE: "https://codeberg.org"
@@ -20,7 +20,7 @@ build:
   image: nextcloudci/android:android-54
   stage: build
   only:
-    - main
+    - master
     - tags
   script:
     - ./gradlew assembleFreeRelease
@@ -33,7 +33,7 @@ sign:
   image: nextcloudci/android:android-54
   stage: sign
   only:
-    - main
+    - master
     - tags
   variables:
     OUTPUT: "signed.apk"
@@ -47,10 +47,10 @@ sign:
     expire_in: 15 minutes
 
 latest:
-  image: curlimages/curl:7.77.0
+  image: tutum/curl
   stage: publish
   only:
-    - main
+    - master
     - tags
   variables:
     WEBDAV_USERNAME: "GitNexBot"
@@ -60,7 +60,7 @@ latest:
     - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" "$PLUGIN_DESTINATION"
 
 release:
-  image: curlimages/curl:7.77.0
+  image: tutum/curl
   stage: publish
   only:
     - tags
@@ -72,10 +72,10 @@ release:
     - curl -T "$PLUGIN_FILE" -u "$WEBDAV_USERNAME":"$WEBDAV_PASSWORD" 'https://cloud.swatian.com/remote.php/dav/files/GitNexBot/gitnex/releases/'"$CI_COMMIT_REF_NAME"'.apk'
 
 on_success:
-  image: curlimages/curl:7.77.0
+  image: tutum/curl
   stage: .post
   only:
-    - main
+    - master
     - tags
   variables:
     INSTANCE: "https://codeberg.org"
@@ -86,10 +86,10 @@ on_success:
   when: on_success
 
 on_failure:
-  image: curlimages/curl:7.77.0
+  image: tutum/curl
   stage: .post
   only:
-    - main
+    - master
     - tags
   variables:
     INSTANCE: "https://codeberg.org"

CONTRIBUTING.md

@@ -29,7 +29,7 @@ It is documented in the Wiki: [Code-Standards](https://codeberg.org/gitnex/GitNe
 2. Clone the forked repository from your namespace to your local machine.
 3. Create a new branch and work on your feature, enhancement or patch.
 4. Push your commits to your forked version.
-5. You can now create a PR using the web interface against **main** branch.
+5. You can now create a PR using the web interface against **master** branch.
 
 For more information, click [here](http://makeapullrequest.com/).
 

README.md

@@ -1,4 +1,4 @@
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Pipeline status](https://img.shields.io/gitlab/pipeline/opyale/gitnex/main)](https://gitlab.com/opyale/gitnex/-/pipelines) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Pipeline status](https://img.shields.io/gitlab/pipeline/opyale/gitnex/master)](https://gitlab.com/opyale/gitnex/-/pipelines) [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://codeberg.org/api/v1/repos/gitnex/GitNex/releases&query=$[0].tag_name)](https://codeberg.org/gitnex/GitNex/releases) [![Crowdin](https://badges.crowdin.net/gitnex/localized.svg)](https://crowdin.com/project/gitnex) [![Join the Discord chat at https://discord.gg/FbSS4rf](https://img.shields.io/discord/632219664587685908.svg)](https://discord.gg/FbSS4rf)
 
 [<img alt="Become a Patroen" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height="40"/>](https://www.patreon.com/mmarif)
 
@@ -11,7 +11,7 @@ GitNex is licensed under GPLv3 License. See the LICENSE file for the full licens
 ## Downloads
 [<img alt='Get it on F-droid' src='https://gitlab.com/fdroid/artwork/raw/master/badge/get-it-on.png' height="80"/>](https://f-droid.org/en/packages/org.mian.gitnex/)
 [<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.mian.gitnex.pro)
-[<img alt='Download builds and releases' src='https://codeberg.org/gitnex/GitNex/raw/branch/main/assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
+[<img alt='Download builds and releases' src='https://codeberg.org/gitnex/GitNex/raw/branch/master/assets/apk-badge.png' height="82"/>](https://cloud.swatian.com/s/DN7E5xxtaw4fRbE)
 
 ## Note about Gitea version
 Please make sure that you are on latest stable release or later for better app experience.
@@ -37,7 +37,7 @@ Option 2 - Open terminal(Linux) and cd to the project dir. Run `./gradlew assemb
 - [MANY MORE](https://codeberg.org/gitnex/GitNex/wiki/Features)
 
 ## Contributing
-[CONTRIBUTING](https://codeberg.org/gitnex/GitNex/src/branch/main/CONTRIBUTING.md)
+[CONTRIBUTING](https://codeberg.org/gitnex/GitNex/src/branch/master/CONTRIBUTING.md)
 
 ## Translation
 Help us translate GitNex to your native language.
@@ -48,9 +48,9 @@ We use [Crowdin](https://crowdin.com/project/gitnex) for translation. If your la
 
 ## Screenshots:
 
-<img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/001.png" alt="001.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/002.png" alt="002.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/003.png" alt="003.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/004.png" alt="004.png" width="200"/>
+<img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/001.png" alt="001.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/002.png" alt="002.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/003.png" alt="003.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/004.png" alt="004.png" width="200"/>
 ---|---|---|---
-<img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/main/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.png" width="200"/>
+<img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/005.png" alt="005.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/006.png" alt="006.png" width="200"/> | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/007.png" alt="007.png" width="200"/>  | <img src="https://codeberg.org/gitnex/GitNex/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/008.png" alt="008.png" width="200"/>
 
 ## Links
 [Website](https://gitnex.com)
@@ -84,10 +84,10 @@ Thanks to all the open source libraries, contributors and donators.
 - [HamidrezaAmz/BreadcrumbsView](https://github.com/HamidrezaAmz/BreadcrumbsView)
 - [Baseflow/PhotoView](https://github.com/Baseflow/PhotoView)
 - [apache/commons](https://github.com/apache/commons-io)
+- [barteksc/AndroidPdfViewer](https://github.com/barteksc/AndroidPdfViewer)
 - [ge0rg/MemorizingTrustManager](https://github.com/ge0rg/MemorizingTrustManager)
 - [mikaelhg/urlbuilder](https://github.com/mikaelhg/urlbuilder)
 - [ACRA/acra](https://github.com/ACRA/acra)
-- [chrisvest/stormpot](https://github.com/chrisvest/stormpot)
 
 #### Icon sets
 - [feathericons/feather](https://github.com/feathericons/feather)

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 400
+        versionCode 351
-        versionName "4.0.0"
+        versionName "3.5.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -24,7 +24,7 @@ android {
         }
     }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
     }
     buildTypes {
         release {
@@ -54,21 +54,20 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = '2.3.1'
+    def lifecycle_version = '2.3.0'
     def markwon_version = '4.6.2'
-    def work_version = "2.7.0-alpha05"
+    def work_version = "2.5.0"
     def acra = "5.7.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.4.0-alpha03'
+    implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
     implementation "com.google.code.gson:gson:2.8.6"
     implementation "com.squareup.picasso:picasso:2.71828"
@@ -101,17 +100,17 @@ dependencies {
     implementation "commons-io:commons-io:20030203.000550"
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
+    implementation "com.github.barteksc:android-pdf-viewer:3.2.0-beta.1"
     implementation "ch.acra:acra-mail:$acra"
     implementation "ch.acra:acra-limiter:$acra"
     implementation "ch.acra:acra-notification:$acra"
-    implementation 'androidx.room:room-runtime:2.3.0'
+    implementation 'androidx.room:room-runtime:2.2.6'
-    annotationProcessor 'androidx.room:room-compiler:2.3.0'
+    annotationProcessor 'androidx.room:room-compiler:2.2.6'
     implementation "androidx.work:work-runtime:$work_version"
     implementation "io.mikael:urlbuilder:2.0.9"
     implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2"
-    implementation "org.codeberg.gitnex:tea4j:1.0.16"
+    implementation "org.codeberg.gitnex:tea4j:1.0.5"
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
     implementation 'androidx.biometric:biometric:1.1.0'
-    implementation 'com.github.chrisvest:stormpot:2.4.2'
 
 }

app/src/main/AndroidManifest.xml

@@ -51,7 +51,7 @@
             android:name=".activities.CreateNewUserActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
-            android:name=".activities.MyProfileEmailActivity"
+            android:name=".activities.ProfileEmailActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.AddCollaboratorToRepositoryActivity"
@@ -123,7 +123,7 @@
             android:name=".activities.SettingsAppearanceActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
-            android:name=".activities.ProfileActivity"
+            android:name=".activities.SettingsFileViewerActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation" />
         <activity
             android:name=".activities.SettingsSecurityActivity"

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

@@ -1,62 +0,0 @@
-package org.mian.gitnex.actions;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import com.google.gson.JsonElement;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Toasty;
-import retrofit2.Call;
-import retrofit2.Callback;
-
-/**
- * Author qwerty287
- */
-
-public class PullRequestActions {
-
-	public static void deleteHeadBranch(Context context, String repoOwner, String repoName, String headBranch, boolean showToasts) {
-		Call<JsonElement> call = RetrofitClient
-				.getApiInterface(context)
-				.deleteBranch(Authorization.get(context), repoOwner, repoName, headBranch);
-
-		call.enqueue(new Callback<JsonElement>() {
-
-			@Override
-			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
-
-				if(response.code() == 204) {
-
-					if(showToasts) Toasty.success(context, context.getString(R.string.deleteBranchSuccess));
-				}
-				else if(response.code() == 401) {
-
-					AlertDialogs
-						.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle), context.getResources().getString(R.string.alertDialogTokenRevokedMessage), context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-				}
-				else if(response.code() == 403) {
-
-					if(showToasts) Toasty.error(context, context.getString(R.string.authorizeError));
-				}
-				else if(response.code() == 404) {
-
-					if(showToasts) Toasty.warning(context, context.getString(R.string.deleteBranchErrorNotFound));
-				}
-				else {
-
-					if(showToasts) Toasty.error(context, context.getString(R.string.genericError));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
-
-				if(showToasts) Toasty.error(context, context.getString(R.string.deleteBranchError));
-			}
-
-		});
-	}
-
-}

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

@@ -12,7 +12,6 @@ import org.gitnex.tea4j.models.GiteaVersion;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.databinding.ActivityAddNewAccountBinding;
 import org.mian.gitnex.helpers.AppUtil;
@@ -49,7 +48,6 @@ public class AddNewAccountActivity extends BaseActivity {
 
 		initCloseListener();
 		viewBinding.close.setOnClickListener(onClickListener);
-		viewBinding.instanceUrl.setText(getIntent().getStringExtra("instanceUrl"));
 
 		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(ctx, R.layout.list_spinner_items, Protocol.values());
 
@@ -116,7 +114,9 @@ public class AddNewAccountActivity extends BaseActivity {
 	private void versionCheck(final String instanceUrl, final String loginToken) {
 
 		Call<GiteaVersion> callVersion;
-		callVersion = RetrofitClient.getApiInterface(ctx, instanceUrl).getGiteaVersionWithToken("token " + loginToken);
+
+		callVersion = RetrofitClient.getApiInterface(ctx).getGiteaVersionWithToken("token " + loginToken);
+
 		callVersion.enqueue(new Callback<GiteaVersion>() {
 
 			@Override
@@ -205,15 +205,14 @@ public class AddNewAccountActivity extends BaseActivity {
 						assert userDetails != null;
 						// insert new account to db if does not exist
 						String accountName = userDetails.getUsername() + "@" + instanceUrl;
-						UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+						UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
-						boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
+						int checkAccount = userAccountsApi.getCount(accountName);
 
-						if(!userAccountExists) {
+						if(checkAccount == 0) {
 
-							userAccountsApi.createNewAccount(accountName, instanceUrl, userDetails.getUsername(), loginToken, "");
+							userAccountsApi.insertNewAccount(accountName, instanceUrl, userDetails.getUsername(), loginToken, "");
 							Toasty.success(ctx, getResources().getString(R.string.accountAddedMessage));
 							finish();
-
 						}
 						else {
 

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

@@ -2,17 +2,21 @@ package org.mian.gitnex.activities;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.biometric.BiometricPrompt;
+import org.acra.ACRA;
-import androidx.core.content.ContextCompat;
+import org.acra.BuildConfig;
+import org.acra.ReportField;
+import org.acra.annotation.AcraCore;
+import org.acra.annotation.AcraNotification;
+import org.acra.config.CoreConfigurationBuilder;
+import org.acra.config.LimiterConfigurationBuilder;
+import org.acra.config.MailSenderConfigurationBuilder;
+import org.acra.data.StringFormat;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.notifications.Notifications;
-import java.util.Locale;
-import java.util.concurrent.Executor;
 
 /**
  * Author M M Arif
@@ -42,7 +46,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 				break;
 			case 2:
 
-				if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour"), tinyDB.getInt("lightThemeTimeHour"), tinyDB.getInt("darkThemeTimeMinute"), tinyDB.getInt("lightThemeTimeMinute"))) {
+				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
 
 					tinyDB.putString("currentTheme", "dark");
 					setTheme(R.style.AppTheme);
@@ -59,7 +63,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 				setTheme(R.style.AppThemeRetro);
 				break;
 			case 4:
-				if(TimeHelper.timeBetweenHours(tinyDB.getInt("darkThemeTimeHour"), tinyDB.getInt("lightThemeTimeHour"), tinyDB.getInt("darkThemeTimeMinute"), tinyDB.getInt("lightThemeTimeMinute"))) {
+				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
 
 					tinyDB.putString("currentTheme", "dark");
 					setTheme(R.style.AppTheme);
@@ -82,55 +86,11 @@ public abstract class BaseActivity extends AppCompatActivity {
 
 		}
 
-		String locale = tinyDB.getString("locale");
+		AppUtil.setAppLocale(getResources(), tinyDB.getString("locale"));
-		if (locale.isEmpty()) {
-			AppUtil.setAppLocale(getResources(), Locale.getDefault().getLanguage());
-		}
-		else {
-			AppUtil.setAppLocale(getResources(), locale);
-		}
 
 		Notifications.startWorker(appCtx);
 	}
 
-	public void onResume() {
-		super.onResume();
-
-		if(tinyDB.getBoolean("biometricStatus") && !tinyDB.getBoolean("biometricLifeCycle")) {
-
-			Executor executor = ContextCompat.getMainExecutor(this);
-
-			BiometricPrompt biometricPrompt = new BiometricPrompt(this, executor, new BiometricPrompt.AuthenticationCallback() {
-
-				@Override
-				public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
-
-					super.onAuthenticationError(errorCode, errString);
-
-					// Authentication error, close the app
-					if(errorCode == BiometricPrompt.ERROR_USER_CANCELED ||
-						errorCode == BiometricPrompt.ERROR_NEGATIVE_BUTTON) {
-						finish();
-					}
-				}
-
-				// Authentication succeeded, continue to app
-				@Override public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) { super.onAuthenticationSucceeded(result); tinyDB.putBoolean("biometricLifeCycle", true); }
-
-				// Authentication failed, close the app
-				@Override public void onAuthenticationFailed() { super.onAuthenticationFailed(); }
-
-			});
-
-			BiometricPrompt.PromptInfo biometricPromptBuilder = new BiometricPrompt.PromptInfo.Builder()
-				.setTitle(getString(R.string.biometricAuthTitle))
-				.setSubtitle(getString(R.string.biometricAuthSubTitle))
-				.setNegativeButtonText(getString(R.string.cancelButton)).build();
-
-			biometricPrompt.authenticate(biometricPromptBuilder);
-
-		}
-	}
 }
 
 

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

@@ -215,7 +215,7 @@ public class CreateRepoActivity extends BaseActivity {
 
         Call<List<OrgOwner>> call = RetrofitClient
                 .getApiInterface(ctx)
-                .getOrgOwners(instanceToken, 1, 50);
+                .getOrgOwners(instanceToken);
 
         call.enqueue(new Callback<List<OrgOwner>>() {
 

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

@@ -9,31 +9,22 @@ import android.util.Log;
 import android.view.View;
 import androidx.annotation.NonNull;
 import org.apache.commons.lang3.StringUtils;
-import org.gitnex.tea4j.models.Files;
-import org.gitnex.tea4j.models.Organization;
 import org.gitnex.tea4j.models.PullRequests;
-import org.gitnex.tea4j.models.UserInfo;
 import org.gitnex.tea4j.models.UserRepositories;
-import org.jetbrains.annotations.NotNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.database.models.UserAccount;
 import org.mian.gitnex.databinding.ActivityDeeplinksBinding;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.UrlHelper;
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import io.mikael.urlbuilder.UrlBuilder;
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.Response;
 
 /**
  * Author M M Arif
@@ -49,8 +40,6 @@ public class DeepLinksActivity extends BaseActivity {
 	private Intent mainIntent;
 	private Intent issueIntent;
 	private Intent repoIntent;
-	private Intent orgIntent;
-	private Intent userIntent;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -63,8 +52,6 @@ public class DeepLinksActivity extends BaseActivity {
 		mainIntent = new Intent(ctx, MainActivity.class);
 		issueIntent = new Intent(ctx, IssueDetailActivity.class);
 		repoIntent = new Intent(ctx, RepoDetailActivity.class);
-		orgIntent = new Intent(ctx, OrganizationDetailActivity.class);
-		userIntent = new Intent(ctx, ProfileActivity.class);
 
 		Intent intent = getIntent();
 		Uri data = intent.getData();
@@ -72,14 +59,13 @@ public class DeepLinksActivity extends BaseActivity {
 
 		// check for login
 		if(!tinyDB.getBoolean("loggedInMode")) {
-			Intent loginIntent = new Intent(ctx, LoginActivity.class);
+
-			loginIntent.putExtra("instanceUrl", data.getHost());
-			ctx.startActivity(loginIntent);
 			finish();
+			ctx.startActivity(new Intent(ctx, LoginActivity.class));
 		}
 
 		// check for the links(URI) to be in the db
-		UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+		UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
 		List<UserAccount> userAccounts = userAccountsApi.usersAccounts();
 
 		for(UserAccount userAccount : userAccounts) {
@@ -93,94 +79,40 @@ public class DeepLinksActivity extends BaseActivity {
 
 				accountFound = true;
 
-				AppUtil.switchToAccount(ctx, userAccount);
+				tinyDB.putString("loginUid", userAccount.getUserName());
-				break;
+				tinyDB.putString("userLogin", userAccount.getUserName());
+				tinyDB.putString(userAccount.getUserName() + "-token", userAccount.getToken());
+				tinyDB.putString("instanceUrl", userAccount.getInstanceUrl());
+				tinyDB.putInt("currentActiveAccountId", userAccount.getAccountId());
 
+				break;
 			}
 		}
 
 		if(accountFound) {
 
-			// redirect to proper fragment/activity, if no action is there, show options where user to want to go like repos, profile, notifications etc
+			// redirect to proper fragment/activity, If no action is there, show options where user to want to go like repos, profile, notifications etc
-			if(data.getPathSegments().size() == 1) {
+			if(data.getPathSegments().size() > 0) {
-				if(data.getLastPathSegment().equals("notifications")) { // notifications
+
-					mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
+				viewBinding.progressBar.setVisibility(View.GONE);
-					ctx.startActivity(mainIntent);
+				String[] restOfUrl = Objects.requireNonNull(data.getPath()).split("/");
-					finish();
+
-				}
+				if(data.getPathSegments().contains("issues")) { // issue
-				else if(data.getLastPathSegment().equals("explore")) { // explore
-					mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else if(data.getLastPathSegment().equals(tinyDB.getString("userLogin"))) { // your user profile
-					mainIntent.putExtra("launchFragmentByLinkHandler", "profile");
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else if(data.getLastPathSegment().equals("admin")) {
-					mainIntent.putExtra("launchFragmentByLinkHandler", "admin");
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else {
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						getUserOrOrg(currentInstance, instanceToken, data.getLastPathSegment()), 500);
-				}
-			}
-			else if(data.getPathSegments().size() == 2) {
-				if(data.getPathSegments().get(0).equals("explore")) { // specific explore tab
-					if(data.getPathSegments().get(1).equals("organizations")) { // orgs
-						mainIntent.putExtra("exploreOrgs", true);
-					}
-					mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else if(data.getPathSegments().get(0).equals("user") && data.getPathSegments().get(1).equals("login")) { // open login
-					Intent loginIntent = new Intent(ctx, AddNewAccountActivity.class);
-					loginIntent.putExtra("instanceUrl", data.getHost());
-					loginIntent.putExtra("instanceProtocol", data.getScheme());
-					ctx.startActivity(loginIntent);
-					finish();
-				}
-				else if(data.getPathSegments().get(0).equals("admin")) {
-					mainIntent.putExtra("launchFragmentByLinkHandler", "admin");
-					mainIntent.putExtra("giteaAdminAction", data.getLastPathSegment());
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-				else if(!data.getPathSegments().get(0).equals("") & !data.getLastPathSegment().equals("")) { // go to repo
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getLastPathSegment(), "repo"), 500);
-				}
-				else { // no action, show options
-					showNoActionButtons();
-				}
-			}
-			else if(data.getPathSegments().size() >= 3) {
-				if(data.getPathSegments().get(2).equals("issues")) { // issue
 
 					if(!Objects.requireNonNull(data.getLastPathSegment()).contains("issues") & StringUtils.isNumeric(data.getLastPathSegment())) {
 
 						issueIntent.putExtra("issueNumber", data.getLastPathSegment());
-						issueIntent.putExtra("openedFromLink", "true");
-
-						String[] urlSplitted = data.toString().split("#");
-						if (urlSplitted.length == 2) {
-							issueIntent.putExtra("issueComment", urlSplitted[1]);
-						}
 
 						tinyDB.putString("issueNumber", data.getLastPathSegment());
 						tinyDB.putString("issueType", "Issue");
 
-						tinyDB.putString("repoFullName", data.getPathSegments().get(0) + "/" + data.getPathSegments().get(1));
+						tinyDB.putString("repoFullName", restOfUrl[restOfUrl.length - 4] + "/" + restOfUrl[restOfUrl.length - 3]);
 
-						final String repoOwner = data.getPathSegments().get(0);
+						final String repoOwner = restOfUrl[restOfUrl.length - 4];
-						final String repoName = data.getPathSegments().get(1);
+						final String repoName = restOfUrl[restOfUrl.length - 3];
 
 						int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
-						RepositoriesApi repositoryData = BaseApi.getInstance(ctx, RepositoriesApi.class);
+						RepositoriesApi repositoryData = new RepositoriesApi(ctx);
 
 						Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
@@ -199,121 +131,125 @@ public class DeepLinksActivity extends BaseActivity {
 						finish();
 					}
 					else if(Objects.requireNonNull(data.getLastPathSegment()).contains("issues")) {
-						new Handler(Looper.getMainLooper()).postDelayed(() ->
+
-							goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "issue"), 500);
+						new Handler(Looper.getMainLooper()).postDelayed(() -> {
-					}
+
-					else if(data.getLastPathSegment().equals("new")) {
+							goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 3], restOfUrl[restOfUrl.length - 2], "issue");
-						new Handler(Looper.getMainLooper()).postDelayed(() ->
+						}, 500);
-							goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "issueNew"), 500);
 					}
 					else {
+
 						ctx.startActivity(mainIntent);
 						finish();
 					}
 				}
-				else if(data.getPathSegments().get(2).equals("pulls")) { // pr
+				else if(data.getPathSegments().contains("pulls")) { // pr
 
 					if(!Objects.requireNonNull(data.getLastPathSegment()).contains("pulls") & StringUtils.isNumeric(data.getLastPathSegment())) {
 
 						new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
-							String[] urlSplitted = data.toString().split("#");
+							getPullRequest(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 4], restOfUrl[restOfUrl.length - 3], Integer.parseInt(data.getLastPathSegment()));
-							if (urlSplitted.length == 2) {
-								issueIntent.putExtra("issueComment", urlSplitted[1]);
-							}
-
-							getPullRequest(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), Integer.parseInt(data.getLastPathSegment()));
 						}, 500);
 
 					}
 					else if(Objects.requireNonNull(data.getLastPathSegment()).contains("pulls")) {
-						new Handler(Looper.getMainLooper()).postDelayed(() ->
+
-							goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "pull"), 500);
-					}
-					else if(data.getLastPathSegment().equals("files")) { // pr diff
 						new Handler(Looper.getMainLooper()).postDelayed(() -> {
-							issueIntent.putExtra("openPrDiff", "true");
+
-							getPullRequest(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), Integer.parseInt(data.getPathSegments().get(3)));
+							goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 3], restOfUrl[restOfUrl.length - 2], "pull");
 						}, 500);
 					}
 					else {
+
 						ctx.startActivity(mainIntent);
 						finish();
 					}
 				}
+				else if(data.getPathSegments().contains("commit")) { // commits (no API yet to properly implement)
 
-				else if(data.getPathSegments().get(2).equals("compare")) { // new pull request
+					new Handler(Looper.getMainLooper()).postDelayed(() -> {
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
+
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "pullNew"), 500);
+						goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 4], restOfUrl[restOfUrl.length - 3], "pull");
+					}, 500);
 				}
-				else if(data.getPathSegments().get(2).equals("commit")) { // commits (no API yet to properly implement)
+				else if(!restOfUrl[restOfUrl.length - 2].equals("") & !restOfUrl[restOfUrl.length - 1].equals("")) { // go to repo
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
+
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "pull"), 500);
+					new Handler(Looper.getMainLooper()).postDelayed(() -> {
-				}
+
-				else if(data.getPathSegments().get(2).equals("commits")) { // commits list
+						goToRepoSection(currentInstance, instanceToken, restOfUrl[restOfUrl.length - 2], restOfUrl[restOfUrl.length - 1], "repo");
-					String branch = data.getLastPathSegment();
+					}, 500);
-					repoIntent.putExtra("branchName", branch);
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "commitsList"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("milestones") && data.getLastPathSegment().equals("new")) { // new milestone
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "milestonesNew"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("milestones")) { // milestones
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "milestones"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("milestone")) { // milestone
-					repoIntent.putExtra("milestoneId", data.getLastPathSegment());
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "milestones"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("releases") && data.getLastPathSegment().equals("new")) { // new release
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "newRelease"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("releases")) { // releases
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "releases"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("releases") && data.getPathSegments().get(3).equals("tag") && data.getPathSegments().size() == 5) { // release
-					repoIntent.putExtra("releaseTagName", data.getLastPathSegment());
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "releases"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("labels")) { // labels
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "labels"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("settings")) { // repo settings
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "settings"), 500);
-				}
-				else if(data.getLastPathSegment().equals("branches")) { // branches list
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "branchesList"), 500);
-				}
-				else if(data.getPathSegments().size() == 5 && data.getPathSegments().get(2).equals("src") && data.getPathSegments().get(3).equals("branch")) { // branch
-					repoIntent.putExtra("selectedBranch", data.getLastPathSegment());
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						goToRepoSection(currentInstance, instanceToken, data.getPathSegments().get(0), data.getPathSegments().get(1), "branch"), 500);
-				}
-				else if(data.getPathSegments().get(2).equals("src") && data.getPathSegments().get(3).equals("branch")) { // file/dir
-					StringBuilder filePath = new StringBuilder();
-					ArrayList<String> segments = new ArrayList<>(data.getPathSegments());
-					segments.subList(0, 5).clear();
-					for (String item : segments) {
-						filePath.append(item);
-						filePath.append("/");
-					}
-					filePath.deleteCharAt(filePath.toString().length() - 1);
-					new Handler(Looper.getMainLooper()).postDelayed(() ->
-						getFile(currentInstance, instanceToken, data.getPathSegments().get(0),
-							data.getPathSegments().get(1), filePath.toString(), data.getPathSegments().get(4)), 500);
 				}
 				else { // no action, show options
-					showNoActionButtons();
+
+					if(tinyDB.getInt("defaultScreenId") == 1) { // repos
+
+						mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
+						ctx.startActivity(mainIntent);
+						finish();
+					}
+					else if(tinyDB.getInt("defaultScreenId") == 2) { // org
+
+						mainIntent.putExtra("launchFragmentByLinkHandler", "org");
+						ctx.startActivity(mainIntent);
+						finish();
+					}
+					else if(tinyDB.getInt("defaultScreenId") == 3) { // notifications
+
+						mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
+						ctx.startActivity(mainIntent);
+						finish();
+					}
+					else if(tinyDB.getInt("defaultScreenId") == 4) { // explore
+
+						mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
+						ctx.startActivity(mainIntent);
+						finish();
+					}
+					else if(tinyDB.getInt("defaultScreenId") == 0) { // show options
+
+						viewBinding.noActionFrame.setVisibility(View.VISIBLE);
+						viewBinding.addNewAccountFrame.setVisibility(View.GONE);
+
+						viewBinding.repository.setOnClickListener(repository -> {
+
+							tinyDB.putInt("defaultScreenId", 1);
+							mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
+							ctx.startActivity(mainIntent);
+							finish();
+						});
+
+						viewBinding.organization.setOnClickListener(organization -> {
+
+							tinyDB.putInt("defaultScreenId", 2);
+							mainIntent.putExtra("launchFragmentByLinkHandler", "org");
+							ctx.startActivity(mainIntent);
+							finish();
+						});
+
+						viewBinding.notification.setOnClickListener(notification -> {
+
+							tinyDB.putInt("defaultScreenId", 3);
+							mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
+							ctx.startActivity(mainIntent);
+							finish();
+						});
+
+						viewBinding.explore.setOnClickListener(explore -> {
+
+							tinyDB.putInt("defaultScreenId", 4);
+							mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
+							ctx.startActivity(mainIntent);
+							finish();
+						});
+
+						viewBinding.launchApp2.setOnClickListener(launchApp2 -> {
+
+							tinyDB.putInt("defaultScreenId", 0);
+							ctx.startActivity(mainIntent);
+							finish();
+						});
+					}
 				}
 			}
 			else {
@@ -332,7 +268,6 @@ public class DeepLinksActivity extends BaseActivity {
 			viewBinding.addNewAccount.setOnClickListener(addNewAccount -> {
 
 				Intent accountIntent = new Intent(ctx, AddNewAccountActivity.class);
-				accountIntent.putExtra("instanceUrl", data.getHost());
 				startActivity(accountIntent);
 				finish();
 			});
@@ -383,7 +318,6 @@ public class DeepLinksActivity extends BaseActivity {
 
 					issueIntent.putExtra("issueNumber", index);
 					issueIntent.putExtra("prMergeable", prInfo.isMergeable());
-					issueIntent.putExtra("openedFromLink", "true");
 
 					if(prInfo.getHead() != null) {
 
@@ -410,7 +344,7 @@ public class DeepLinksActivity extends BaseActivity {
 					tinyDB.putString("repoFullName", repoOwner + "/" + repoName);
 
 					int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
-					RepositoriesApi repositoryData = BaseApi.getInstance(ctx, RepositoriesApi.class);
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);
 
 					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
@@ -481,7 +415,7 @@ public class DeepLinksActivity extends BaseActivity {
 					tinyDB.putString("repoBranch", repoInfo.getDefault_branch());
 
 					int currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
-					RepositoriesApi repositoryData = BaseApi.getInstance(ctx, RepositoriesApi.class);
+					RepositoriesApi repositoryData = new RepositoriesApi(ctx);
 
 					Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
@@ -518,181 +452,4 @@ public class DeepLinksActivity extends BaseActivity {
 			}
 		});
 	}
-
-	private void getUserOrOrg(String url, String instanceToken, String userOrgName) {
-		Call<Organization> call = RetrofitClient.getApiInterface(ctx, url).getOrganization(instanceToken, userOrgName);
-
-		call.enqueue(new Callback<Organization>() {
-
-			@Override
-			public void onResponse(@NotNull Call<Organization> call, @NotNull Response<Organization> response) {
-				if(response.code() == 404) { // org doesn't exist or it's a user user
-					Log.d("getUserOrOrg-404", String.valueOf(response.code()));
-					getUser(url, instanceToken, userOrgName);
-				}
-				else if(response.code() == 200) { // org
-					assert response.body() != null;
-					orgIntent.putExtra("orgName", response.body().getUsername());
-
-
-					TinyDB tinyDb = TinyDB.getInstance(ctx);
-					tinyDb.putString("orgName", response.body().getUsername());
-					tinyDb.putString("organizationId", String.valueOf(response.body().getId()));
-					tinyDb.putBoolean("organizationAction", true);
-					ctx.startActivity(orgIntent);
-					finish();
-				}
-				else {
-					Log.e("getUserOrOrg-code", String.valueOf(response.code()));
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-			}
-
-			@Override
-			public void onFailure(@NotNull Call<Organization> call, @NotNull Throwable t) {
-				Log.e("onFailure-getUserOrOrg", t.toString());
-			}
-		});
-	}
-
-	private void getUser(String url, String instanceToken, String userName) {
-		Call<UserInfo> call = RetrofitClient.getApiInterface(ctx, url).getUserProfile(instanceToken, userName);
-
-		call.enqueue(new Callback<UserInfo>() {
-
-			@Override
-			public void onResponse(@NotNull Call<UserInfo> call, @NotNull Response<UserInfo> response) {
-				if(response.code() == 200) {
-					assert response.body() != null;
-					userIntent.putExtra("username", response.body().getLogin());
-					ctx.startActivity(userIntent);
-				}
-				else {
-					Log.e("getUser-code", String.valueOf(response.code()));
-					ctx.startActivity(mainIntent);
-				}
-				finish();
-			}
-
-			@Override
-			public void onFailure(@NotNull Call<UserInfo> call, @NotNull Throwable t) {
-				Log.e("onFailure-getUser", t.toString());
-				ctx.startActivity(mainIntent);
-				finish();
-			}
-		});
-	}
-
-	private void getFile(String url, String instanceToken, String owner, String repo, String filePath, String branch) {
-		Call<Files> call = RetrofitClient.getApiInterface(ctx, url).getSingleFileContents(instanceToken, owner, repo, filePath, branch);
-
-		call.enqueue(new Callback<Files>() {
-
-			@Override
-			public void onResponse(@NotNull Call<Files> call, @NotNull Response<Files> response) {
-				if(response.code() == 200) {
-					// check if file and open file/dir
-					Files file = response.body();
-					assert file != null;
-					if(file.getType().equals("file")) {
-						repoIntent.putExtra("file", file);
-						repoIntent.putExtra("branch", branch);
-						goToRepoSection(url, instanceToken, owner, repo, "file");
-					}
-				}
-				else {
-					Log.e("getFile-onFailure", String.valueOf(response.code()));
-					ctx.startActivity(mainIntent);
-					finish();
-				}
-			}
-
-			@Override
-			public void onFailure(@NotNull Call<Files> call, @NotNull Throwable t) {
-				Log.e("getFile-onFailure", t.toString());
-				// maybe it's a directory
-				getDir(url, instanceToken, owner, repo, filePath, branch);
-			}
-		});
-	}
-
-	private void getDir(String url, String instanceToken, String owner, String repo, String filePath, String branch) {
-		repoIntent.putExtra("branch", branch);
-		repoIntent.putExtra("dir", filePath);
-		goToRepoSection(url, instanceToken, owner, repo, "dir");
-	}
-
-	private void showNoActionButtons()  {
-		viewBinding.progressBar.setVisibility(View.GONE);
-
-		if(tinyDB.getInt("defaultScreenId") == 1) { // repos
-
-			mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
-			ctx.startActivity(mainIntent);
-			finish();
-		}
-		else if(tinyDB.getInt("defaultScreenId") == 2) { // org
-
-			mainIntent.putExtra("launchFragmentByLinkHandler", "org");
-			ctx.startActivity(mainIntent);
-			finish();
-		}
-		else if(tinyDB.getInt("defaultScreenId") == 3) { // notifications
-
-			mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
-			ctx.startActivity(mainIntent);
-			finish();
-		}
-		else if(tinyDB.getInt("defaultScreenId") == 4) { // explore
-
-			mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
-			ctx.startActivity(mainIntent);
-			finish();
-		}
-		else if(tinyDB.getInt("defaultScreenId") == 0) { // show options
-
-			viewBinding.noActionFrame.setVisibility(View.VISIBLE);
-			viewBinding.addNewAccountFrame.setVisibility(View.GONE);
-
-			viewBinding.repository.setOnClickListener(repository -> {
-
-				tinyDB.putInt("defaultScreenId", 1);
-				mainIntent.putExtra("launchFragmentByLinkHandler", "repos");
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-
-			viewBinding.organization.setOnClickListener(organization -> {
-
-				tinyDB.putInt("defaultScreenId", 2);
-				mainIntent.putExtra("launchFragmentByLinkHandler", "org");
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-
-			viewBinding.notification.setOnClickListener(notification -> {
-
-				tinyDB.putInt("defaultScreenId", 3);
-				mainIntent.putExtra("launchFragmentByLinkHandler", "notification");
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-
-			viewBinding.explore.setOnClickListener(explore -> {
-
-				tinyDB.putInt("defaultScreenId", 4);
-				mainIntent.putExtra("launchFragmentByLinkHandler", "explore");
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-
-			viewBinding.launchApp2.setOnClickListener(launchApp2 -> {
-
-				tinyDB.putInt("defaultScreenId", 0);
-				ctx.startActivity(mainIntent);
-				finish();
-			});
-		}
-	}
 }

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

@@ -15,6 +15,7 @@ import android.view.View;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.core.app.NotificationCompat;
+import com.github.barteksc.pdfviewer.util.FitPolicy;
 import com.vdurmont.emoji.EmojiParser;
 import org.apache.commons.io.FileUtils;
 import org.gitnex.tea4j.models.Files;
@@ -44,6 +45,8 @@ import retrofit2.Response;
 public class FileViewActivity extends BaseActivity implements BottomSheetFileViewerFragment.BottomSheetListener {
 
 	private ActivityFileViewBinding binding;
+	private Boolean pdfNightMode;
+
 	private Files file;
 
 	@Override
@@ -52,8 +55,8 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		super.onCreate(savedInstanceState);
 
 		binding = ActivityFileViewBinding.inflate(getLayoutInflater());
-
 		setContentView(binding.getRoot());
+
 		setSupportActionBar(binding.toolbar);
 
 		tinyDB.putBoolean("enableMarkdownInFileView", false);
@@ -81,6 +84,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		super.onResume();
 
 		if(tinyDB.getBoolean("fileModified")) {
+
 			String repoFullName = tinyDB.getString("repoFullName");
 			String repoBranch = tinyDB.getString("repoBranch");
 			String[] parts = repoFullName.split("/");
@@ -89,6 +93,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
 			getSingleFileContents(repoOwner, repoName, file.getPath(), repoBranch);
 			tinyDB.putBoolean("fileModified", false);
+
 		}
 	}
 
@@ -111,6 +116,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 					if(responseBody != null) {
 
 						runOnUiThread(() -> binding.progressBar.setVisibility(View.GONE));
+
 						String fileExtension = FileUtils.getExtension(filename);
 
 						boolean processable = false;
@@ -127,11 +133,14 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 									byte[] pictureBytes = responseBody.bytes();
 
 									runOnUiThread(() -> {
+
 										binding.contents.setVisibility(View.GONE);
+										binding.pdfViewFrame.setVisibility(View.GONE);
 										binding.markdownFrame.setVisibility(View.GONE);
 
 										binding.photoView.setVisibility(View.VISIBLE);
 										binding.photoView.setImageBitmap(Images.scaleImage(pictureBytes, 1920));
+
 									});
 								}
 								break;
@@ -144,39 +153,78 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 								}
 
 								processable = true;
+
 								String text = responseBody.string();
 
 								runOnUiThread(() -> {
-									binding.photoView.setVisibility(View.GONE);
 
+									binding.photoView.setVisibility(View.GONE);
+									binding.markdownFrame.setVisibility(View.GONE);
+									binding.pdfViewFrame.setVisibility(View.GONE);
+
+									binding.contents.setVisibility(View.VISIBLE);
 									binding.contents.setContent(text, fileExtension);
 
-									if(tinyDB.getBoolean("enableMarkdownInFileView")) {
-										Markdown.render(ctx, EmojiParser.parseToUnicode(text), binding.markdown);
-
-										binding.contents.setVisibility(View.GONE);
-										binding.markdownFrame.setVisibility(View.VISIBLE);
-									} else {
-										binding.markdownFrame.setVisibility(View.GONE);
-										binding.contents.setVisibility(View.VISIBLE);
-									}
 								});
 								break;
 
+							case DOCUMENT:
+
+								if(fileExtension.equalsIgnoreCase("pdf")) {
+
+									processable = true;
+
+									byte[] documentBytes = responseBody.bytes();
+
+									runOnUiThread(() -> {
+
+										binding.photoView.setVisibility(View.GONE);
+										binding.markdownFrame.setVisibility(View.GONE);
+										binding.contents.setVisibility(View.GONE);
+
+										pdfNightMode = tinyDB.getBoolean("enablePdfMode");
+
+										binding.pdfViewFrame.setVisibility(View.VISIBLE);
+										binding.pdfView.fromBytes(documentBytes)
+											.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();
+
+									});
+								}
+
+								break;
+
 						}
 
 						if(!processable) { // While the file could still be non-binary,
 							// it's better we don't show it (to prevent any crashes and/or unwanted behavior) and let the user download it instead.
+
 							responseBody.close();
 
 							runOnUiThread(() -> {
+
 								binding.photoView.setVisibility(View.GONE);
 								binding.contents.setVisibility(View.GONE);
+								binding.pdfViewFrame.setVisibility(View.GONE);
 
 								binding.markdownFrame.setVisibility(View.VISIBLE);
 								binding.markdown.setText(getString(R.string.excludeFilesInFileViewer));
 								binding.markdown.setGravity(Gravity.CENTER);
 								binding.markdown.setTypeface(null, Typeface.BOLD);
+
 							});
 						}
 					} else {
@@ -185,6 +233,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 							binding.markdown.setText("");
 							binding.progressBar.setVisibility(View.GONE);
 						});
+
 					}
 				} else {
 
@@ -255,22 +304,27 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 		} else if(id == R.id.markdown) {
 
 			if(!tinyDB.getBoolean("enableMarkdownInFileView")) {
-				Markdown.render(ctx, EmojiParser.parseToUnicode(binding.contents.getContent()), binding.markdown);
+
+				new Markdown(ctx, EmojiParser.parseToUnicode(binding.contents.getContent()), binding.markdown);
 
 				binding.contents.setVisibility(View.GONE);
 				binding.markdownFrame.setVisibility(View.VISIBLE);
 
 				tinyDB.putBoolean("enableMarkdownInFileView", true);
+
 			} else {
+
 				binding.markdownFrame.setVisibility(View.GONE);
 				binding.contents.setVisibility(View.VISIBLE);
 
 				tinyDB.putBoolean("enableMarkdownInFileView", false);
+
 			}
 
 			return true;
 
 		} else {
+
 			return super.onOptionsItemSelected(item);
 		}
 	}
@@ -279,16 +333,19 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 	public void onButtonClicked(String text) {
 
 		if("downloadFile".equals(text)) {
+
 			requestFileDownload();
 		}
 
 		if("deleteFile".equals(text)) {
+
 			Intent intent = new Intent(ctx, CreateFileActivity.class);
 			intent.putExtra("fileAction", CreateFileActivity.FILE_ACTION_DELETE);
 			intent.putExtra("filePath", file.getPath());
 			intent.putExtra("fileSha", file.getSha());
 
 			ctx.startActivity(intent);
+
 		}
 
 		if("editFile".equals(text)) {
@@ -306,6 +363,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 				ctx.startActivity(intent);
 
 			} else {
+
 				Toasty.error(ctx, getString(R.string.fileTypeCannotBeEdited));
 			}
 		}

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import android.app.Dialog;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -197,10 +196,6 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 		getSingleIssue(repoOwner, repoName, issueIndex);
 		fetchDataAsync(repoOwner, repoName, issueIndex);
 
-		if(getIntent().getStringExtra("openPrDiff") != null && getIntent().getStringExtra("openPrDiff").equals("true")) {
-			startActivity(new Intent(ctx, FileDiffActivity.class));
-		}
-
 	}
 
 	@Override
@@ -439,11 +434,6 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 		if(id == android.R.id.home) {
 
-			if(getIntent().getStringExtra("openedFromLink") != null && getIntent().getStringExtra("openedFromLink").equals("true")) {
-				Intent intent = new Intent(ctx, RepoDetailActivity.class);
-				intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-				startActivity(intent);
-			}
 			finish();
 			return true;
 		}
@@ -579,7 +569,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 					}
 
 					TinyDB tinyDb = TinyDB.getInstance(appCtx);
-					final Locale locale = getResources().getConfiguration().locale;
+					final String locale = tinyDb.getString("locale");
 					final String timeFormat = tinyDb.getString("dateFormat");
 					tinyDb.putString("issueState", singleIssue.getState());
 					tinyDb.putString("issueTitle", singleIssue.getTitle());
@@ -592,18 +582,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 					viewBinding.issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + EmojiParser.parseToUnicode(singleIssue.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
 					String cleanIssueDescription = singleIssue.getBody().trim();
 
-					viewBinding.assigneeAvatar.setOnClickListener(loginId -> {
+					new Markdown(ctx, EmojiParser.parseToUnicode(cleanIssueDescription), viewBinding.issueDescription);
-						Intent intent = new Intent(ctx, ProfileActivity.class);
-						intent.putExtra("username", singleIssue.getUser().getLogin());
-						ctx.startActivity(intent);
-					});
-
-					viewBinding.assigneeAvatar.setOnLongClickListener(loginId -> {
-						AppUtil.copyToClipboard(ctx, singleIssue.getUser().getLogin(), ctx.getString(R.string.copyLoginIdToClipBoard, singleIssue.getUser().getLogin()));
-						return true;
-					});
-
-					Markdown.render(ctx, EmojiParser.parseToUnicode(cleanIssueDescription), viewBinding.issueDescription);
 
 					RelativeLayout.LayoutParams paramsDesc = (RelativeLayout.LayoutParams) viewBinding.issueDescription.getLayoutParams();
 
@@ -624,20 +603,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 							viewBinding.frameAssignees.addView(assigneesView);
 							assigneesView.setLayoutParams(params1);
-
+							if(!singleIssue.getAssignees().get(i).getFull_name().equals("")) {
-							int finalI = i;
-							assigneesView.setOnClickListener(loginId -> {
-								Intent intent = new Intent(ctx, ProfileActivity.class);
-								intent.putExtra("username", singleIssue.getAssignees().get(finalI).getLogin());
-								ctx.startActivity(intent);
-							});
-
-							assigneesView.setOnLongClickListener(loginId -> {
-								AppUtil.copyToClipboard(ctx, singleIssue.getAssignees().get(finalI).getLogin(), ctx.getString(R.string.copyLoginIdToClipBoard, singleIssue.getAssignees().get(finalI).getLogin()));
-								return true;
-							});
-
-							/*if(!singleIssue.getAssignees().get(i).getFull_name().equals("")) {
 
 								assigneesView.setOnClickListener(
 									new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getFull_name()), ctx));
@@ -646,7 +612,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 								assigneesView.setOnClickListener(
 									new ClickListener(getString(R.string.assignedTo, singleIssue.getAssignees().get(i).getLogin()), ctx));
-							}*/
+							}
 						}
 					}
 					else {
@@ -694,7 +660,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 						if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {
 
-							DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", locale);
+							DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
 							String dueDate = formatter.format(singleIssue.getDue_date());
 							viewBinding.issueDueDate.setText(dueDate);
 							viewBinding.issueDueDate
@@ -702,7 +668,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 						}
 						else if(timeFormat.equals("normal1")) {
 
-							DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", locale);
+							DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", new Locale(locale));
 							String dueDate = formatter.format(singleIssue.getDue_date());
 							viewBinding.issueDueDate.setText(dueDate);
 						}
@@ -748,7 +714,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 						viewBinding.issueDescription.setLayoutParams(paramsDesc);
 					}
 
-					viewBinding.issueCreatedTime.setText(TimeHelper.formatTime(singleIssue.getCreated_at(), locale, timeFormat, ctx));
+					viewBinding.issueCreatedTime.setText(TimeHelper.formatTime(singleIssue.getCreated_at(), new Locale(locale), timeFormat, ctx));
 					viewBinding.issueCreatedTime.setVisibility(View.VISIBLE);
 
 					if(timeFormat.equals("pretty")) {
@@ -784,7 +750,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 						viewBinding.issueMilestone.setVisibility(View.GONE);
 					}
 
-					/*if(!singleIssue.getUser().getFull_name().equals("")) {
+					if(!singleIssue.getUser().getFull_name().equals("")) {
 
 						viewBinding.assigneeAvatar.setOnClickListener(
 							new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getFull_name(), ctx));
@@ -793,7 +759,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
 
 						viewBinding.assigneeAvatar.setOnClickListener(
 							new ClickListener(ctx.getResources().getString(R.string.issueCreator) + singleIssue.getUser().getLogin(), ctx));
-					}*/
+					}
 
 					viewBinding.progressBar.setVisibility(View.GONE);
 				}

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

@@ -17,7 +17,6 @@ import org.gitnex.tea4j.models.UserInfo;
 import org.gitnex.tea4j.models.UserTokens;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
 import org.mian.gitnex.databinding.ActivityLoginBinding;
@@ -77,8 +76,6 @@ public class LoginActivity extends BaseActivity {
 
 		ArrayAdapter<Protocol> adapterProtocols = new ArrayAdapter<>(LoginActivity.this, R.layout.list_spinner_items, Protocol.values());
 
-		instanceUrlET.setText(getIntent().getStringExtra("instanceUrl"));
-
 		protocolSpinner.setAdapter(adapterProtocols);
 		protocolSpinner.setSelection(0);
 		protocolSpinner.setOnItemClickListener((parent, view, position, id) -> {
@@ -361,19 +358,19 @@ public class LoginActivity extends BaseActivity {
 
 						// insert new account to db if does not exist
 						String accountName = userDetails.getUsername() + "@" + TinyDB.getInstance(ctx).getString("instanceUrl");
-						UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+						UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
-						boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
+						int checkAccount = userAccountsApi.getCount(accountName);
 						long accountId;
 
-						if(!userAccountExists) {
+						if(checkAccount == 0) {
 
-							accountId = userAccountsApi.createNewAccount(accountName, TinyDB.getInstance(ctx).getString("instanceUrl"), userDetails.getUsername(), loginToken, "");
+							accountId = userAccountsApi.insertNewAccount(accountName, TinyDB.getInstance(ctx).getString("instanceUrl"), userDetails.getUsername(), loginToken, "");
 							tinyDB.putInt("currentActiveAccountId", (int) accountId);
 						}
 						else {
 
 							userAccountsApi.updateTokenByAccountName(accountName, loginToken);
-							UserAccount data = userAccountsApi.getAccountByName(accountName);
+							UserAccount data = userAccountsApi.getAccountData(accountName);
 							tinyDB.putInt("currentActiveAccountId", data.getAccountId());
 						}
 
@@ -549,20 +546,20 @@ public class LoginActivity extends BaseActivity {
 
 										// insert new account to db if does not exist
 										String accountName = userDetails.getUsername() + "@" + TinyDB.getInstance(ctx).getString("instanceUrl");
-										UserAccountsApi userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+										UserAccountsApi userAccountsApi = new UserAccountsApi(ctx);
-										boolean userAccountExists = userAccountsApi.userAccountExists(accountName);
+										int checkAccount = userAccountsApi.getCount(accountName);
 										long accountId;
 
-										if(!userAccountExists) {
+										if(checkAccount == 0) {
 
 											accountId = userAccountsApi
-												.createNewAccount(accountName, TinyDB.getInstance(ctx).getString("instanceUrl"), userDetails.getUsername(), newToken.getSha1(), "");
+												.insertNewAccount(accountName, TinyDB.getInstance(ctx).getString("instanceUrl"), userDetails.getUsername(), newToken.getSha1(), "");
 											tinyDB.putInt("currentActiveAccountId", (int) accountId);
 										}
 										else {
 
 											userAccountsApi.updateTokenByAccountName(accountName, newToken.getSha1());
-											UserAccount data = userAccountsApi.getAccountByName(accountName);
+											UserAccount data = userAccountsApi.getAccountData(accountName);
 											tinyDB.putInt("currentActiveAccountId", data.getAccountId());
 										}
 

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

@@ -17,7 +17,9 @@ import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.cardview.widget.CardView;
+import androidx.biometric.BiometricPrompt;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
@@ -31,7 +33,6 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.UserAccountsNavAdapter;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
 import org.mian.gitnex.databinding.ActivityMainBinding;
@@ -42,7 +43,7 @@ import org.mian.gitnex.fragments.ExploreFragment;
 import org.mian.gitnex.fragments.MyRepositoriesFragment;
 import org.mian.gitnex.fragments.NotificationsFragment;
 import org.mian.gitnex.fragments.OrganizationsFragment;
-import org.mian.gitnex.fragments.MyProfileFragment;
+import org.mian.gitnex.fragments.ProfileFragment;
 import org.mian.gitnex.fragments.RepositoriesFragment;
 import org.mian.gitnex.fragments.SettingsFragment;
 import org.mian.gitnex.fragments.StarredRepositoriesFragment;
@@ -58,6 +59,7 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Executor;
 import jp.wasabeef.picasso.transformations.BlurTransformation;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -69,6 +71,10 @@ import retrofit2.Callback;
 public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener, BottomSheetDraftsFragment.BottomSheetListener {
 
 	private DrawerLayout drawer;
+	private TextView userFullName;
+	private TextView userEmail;
+	private ImageView userAvatar;
+	private ImageView userAvatarBackground;
 	private TextView toolbarTitle;
 	private Typeface myTypeface;
 
@@ -87,25 +93,38 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		ActivityMainBinding activityMainBinding = ActivityMainBinding.inflate(getLayoutInflater());
 		setContentView(activityMainBinding.getRoot());
 
-		Intent mainIntent = getIntent();
-
-		// DO NOT MOVE
-		if(mainIntent.hasExtra("switchAccountId") &&
-			AppUtil.switchToAccount(ctx, BaseApi.getInstance(ctx, UserAccountsApi.class)
-				.getAccountById(mainIntent.getIntExtra("switchAccountId", 0)))) {
-
-			mainIntent.removeExtra("switchAccountId");
-			recreate();
-			return;
-
-		}
-		// DO NOT MOVE
-
 		tinyDB.putBoolean("noConnection", false);
 
+		String currentVersion = tinyDB.getString("giteaVersion");
+
+		Intent mainIntent = getIntent();
+		String launchFragment = mainIntent.getStringExtra("launchFragment");
+
 		loginUid = tinyDB.getString("loginUid");
 		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
 
+		if(tinyDB.getString("dateFormat").isEmpty()) {
+
+			tinyDB.putString("dateFormat", "pretty");
+		}
+
+		if(tinyDB.getString("codeBlockStr").isEmpty()) {
+
+			tinyDB.putInt("codeBlockColor", ResourcesCompat.getColor(getResources(), R.color.colorLightGreen, null));
+			tinyDB.putInt("codeBlockBackground", ResourcesCompat.getColor(getResources(), R.color.black, null));
+		}
+
+		if(tinyDB.getString("enableCounterIssueBadgeInit").isEmpty()) {
+
+			tinyDB.putBoolean("enableCounterIssueBadge", true);
+		}
+
+		if(tinyDB.getString("homeScreenStr").isEmpty()) {
+
+			tinyDB.putString("homeScreenStr", "yes");
+			tinyDB.putInt("homeScreenId", 0);
+		}
+
 		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
 		if(!tinyDB.getBoolean("loggedInMode")) {
@@ -114,10 +133,9 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			return;
 		}
 
-		if(tinyDB.getInt("currentActiveAccountId", -1) <= 0) {
+		if(tinyDB.getInt("currentActiveAccountId") <= 0) {
-			AlertDialogs.forceLogoutDialog(ctx,
+
-				getResources().getString(R.string.forceLogoutDialogHeader),
+			AlertDialogs.forceLogoutDialog(ctx, getResources().getString(R.string.forceLogoutDialogHeader), getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
-				getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
 		}
 
 		Toolbar toolbar = activityMainBinding.toolbar;
@@ -126,16 +144,53 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		switch(tinyDB.getInt("customFontId", -1)) {
 
 			case 0:
+
 				myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
 				break;
-
 			case 2:
+
 				myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf");
 				break;
-
 			default:
+
 				myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf");
 				break;
+		}
+
+		// biometric auth
+		if(tinyDB.getBoolean("biometricStatus")) {
+
+			Executor executor = ContextCompat.getMainExecutor(this);
+
+			BiometricPrompt biometricPrompt = new BiometricPrompt(this, executor, new BiometricPrompt.AuthenticationCallback() {
+
+				@Override
+				public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
+
+					super.onAuthenticationError(errorCode, errString);
+
+					// Authentication error, close the app
+					if(errorCode == BiometricPrompt.ERROR_USER_CANCELED ||
+						errorCode == BiometricPrompt.ERROR_NEGATIVE_BUTTON) {
+
+						finish();
+					}
+				}
+
+				// Authentication succeeded, continue to app
+				@Override public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) { super.onAuthenticationSucceeded(result); }
+
+				// Authentication failed, close the app
+				@Override public void onAuthenticationFailed() { super.onAuthenticationFailed(); }
+
+			});
+
+			BiometricPrompt.PromptInfo biometricPromptBuilder = new BiometricPrompt.PromptInfo.Builder()
+				.setTitle(getString(R.string.biometricAuthTitle))
+				.setSubtitle(getString(R.string.biometricAuthSubTitle))
+				.setNegativeButtonText(getString(R.string.cancelButton)).build();
+
+			biometricPrompt.authenticate(biometricPromptBuilder);
 
 		}
 
@@ -146,33 +201,43 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		Fragment fragmentById = fm.findFragmentById(R.id.fragment_container);
 
 		if(fragmentById instanceof SettingsFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
 		}
 		else if(fragmentById instanceof MyRepositoriesFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
 		}
 		else if(fragmentById instanceof StarredRepositoriesFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
 		}
 		else if(fragmentById instanceof OrganizationsFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
 		}
 		else if(fragmentById instanceof ExploreFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
 		}
 		else if(fragmentById instanceof NotificationsFragment) {
+
 			toolbarTitle.setText(R.string.pageTitleNotifications);
 		}
-		else if(fragmentById instanceof MyProfileFragment) {
+		else if(fragmentById instanceof ProfileFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
 		}
 		else if(fragmentById instanceof DraftsFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
 		}
 		else if(fragmentById instanceof AdministrationFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleAdministration));
 		}
 		else if(fragmentById instanceof UserAccountsFragment) {
+
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleUserAccounts));
 		}
 
@@ -204,26 +269,27 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				String userFullNameNav = tinyDB.getString("userFullname");
 				String userAvatarNav = tinyDB.getString("userAvatar");
 
-				TextView userEmail = hView.findViewById(R.id.userEmail);
+				userEmail = hView.findViewById(R.id.userEmail);
-				TextView userFullName = hView.findViewById(R.id.userFullname);
+				userFullName = hView.findViewById(R.id.userFullname);
-				ImageView userAvatar = hView.findViewById(R.id.userAvatar);
+				userAvatar = hView.findViewById(R.id.userAvatar);
-				ImageView userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
+				userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
-				CardView navRecyclerViewFrame = hView.findViewById(R.id.userAccountsFrame);
 
-				List<UserAccount> userAccountsList = new ArrayList<>();
+				List<UserAccount> userAccountsList;
+				userAccountsList = new ArrayList<>();
 				UserAccountsApi userAccountsApi;
-				userAccountsApi = BaseApi.getInstance(ctx, UserAccountsApi.class);
+				userAccountsApi = new UserAccountsApi(ctx);
 
-				RecyclerView navRecyclerViewUserAccounts = hView.findViewById(R.id.userAccounts);
+				RecyclerView navRecyclerViewUserAccounts = hView.findViewById(R.id.navRecyclerViewUserAccounts);
 				UserAccountsNavAdapter adapterUserAccounts;
 
 				adapterUserAccounts = new UserAccountsNavAdapter(ctx, userAccountsList, drawer, toolbarTitle);
 
 				userAccountsApi.getAllAccounts().observe((AppCompatActivity) ctx, userAccounts -> {
+
 					if(userAccounts.size() > 0) {
+
 						userAccountsList.addAll(userAccounts);
 						navRecyclerViewUserAccounts.setAdapter(adapterUserAccounts);
-						navRecyclerViewFrame.setVisibility(View.VISIBLE);
 					}
 				});
 
@@ -231,21 +297,21 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				userFullName.setTypeface(myTypeface);
 
 				if(!userEmailNav.equals("")) {
+
 					userEmail.setText(userEmailNav);
 				}
 
 				if(!userFullNameNav.equals("")) {
+
 					userFullName.setText(Html.fromHtml(userFullNameNav));
 				}
 
 				if(!userAvatarNav.equals("")) {
 
-					int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 3);
-
 					PicassoService.getInstance(ctx).get()
 						.load(userAvatarNav)
 						.placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(avatarRadius, 0))
+						.transform(new RoundedTransformation(8, 0))
 						.resize(160, 160)
 						.centerCrop().into(userAvatar);
 
@@ -269,7 +335,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				userAvatar.setOnClickListener(v -> {
 
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_profile);
 					drawer.closeDrawers();
 
@@ -282,8 +348,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
 
 				navigationView.getMenu().findItem(R.id.nav_administration).setVisible(tinyDB.getBoolean("userIsAdmin"));
-				navigationView.getMenu().findItem(R.id.nav_notifications).setVisible(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.3"));
+				navigationView.getMenu().findItem(R.id.nav_notifications).setVisible(new Version(currentVersion).higherOrEqual("1.12.3"));
-
 			}
 
 			@Override
@@ -297,8 +362,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		toggle.syncState();
 		toolbar.setNavigationIcon(R.drawable.ic_menu);
 
-		String launchFragment = mainIntent.getStringExtra("launchFragment");
-
 		if(launchFragment != null) {
 
 			mainIntent.removeExtra("launchFragment");
@@ -306,12 +369,13 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			switch(launchFragment) {
 
 				case "drafts":
+
 					toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new DraftsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_comments_draft);
 					return;
-
 				case "notifications":
+
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleNotifications));
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
@@ -340,31 +404,21 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				case "notification":
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new NotificationsFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_notifications);
-					setActionBarTitle(getResources().getString(R.string.pageTitleNotifications));
 					return;
 
 				case "explore":
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ExploreFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_explore);
 					return;
-
-				case "profile":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_profile);
-					return;
-
-				case "admin":
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new AdministrationFragment()).commit();
-					navigationView.setCheckedItem(R.id.nav_administration);
-					return;
-
 			}
 		}
 
 		if(savedInstanceState == null) {
 
 			if(!new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.3")) {
+
 				if(tinyDB.getInt("homeScreenId") == 7) {
+
 					tinyDB.putInt("homeScreenId", 0);
 				}
 			}
@@ -391,7 +445,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 				case 4:
 					toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_profile);
 					break;
 
@@ -529,7 +583,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		else if(id == R.id.nav_profile) {
 
 			toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
+			getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new ProfileFragment()).commit();
 		}
 		else if(id == R.id.nav_repositories) {
 
@@ -605,22 +659,29 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 	private void giteaVersion() {
 
-		Call<GiteaVersion> callVersion = RetrofitClient.getApiInterface(ctx).getGiteaVersionWithToken(Authorization.get(ctx));
+		final TinyDB tinyDb = TinyDB.getInstance(appCtx);
+
+		final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
+
+		Call<GiteaVersion> callVersion = RetrofitClient.getApiInterface(ctx).getGiteaVersionWithToken(token);
+
 		callVersion.enqueue(new Callback<GiteaVersion>() {
 
 			@Override
 			public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
 
-				if(responseVersion.code() == 200 && responseVersion.body() != null) {
+				if(responseVersion.code() == 200) {
-					String version = responseVersion.body().getVersion();
 
-					tinyDB.putString("giteaVersion", version);
+					GiteaVersion version = responseVersion.body();
-					BaseApi.getInstance(ctx, UserAccountsApi.class).updateServerVersion(version, tinyDB.getInt("currentActiveAccountId"));
+					assert version != null;
+
+					tinyDb.putString("giteaVersion", version.getVersion());
 				}
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
+
 				Log.e("onFailure-version", t.toString());
 			}
 		});

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

@@ -12,7 +12,6 @@ import com.google.gson.JsonElement;
 import org.gitnex.tea4j.models.MergePullRequest;
 import org.gitnex.tea4j.models.MergePullRequestSpinner;
 import org.mian.gitnex.R;
-import org.mian.gitnex.actions.PullRequestActions;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.ActivityMergePullRequestBinding;
 import org.mian.gitnex.helpers.AlertDialogs;
@@ -188,7 +187,7 @@ public class MergePullRequestActivity extends BaseActivity {
 							final String repoOwner = parts[0];
 							final String repoName = parts[1];
 
-							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, tinyDB.getString("prHeadBranch"), false);
+							deleteBranchFunction(repoOwner, repoName);
 
 							Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
 							tinyDB.putBoolean("prMerged", true);
@@ -202,7 +201,7 @@ public class MergePullRequestActivity extends BaseActivity {
 							final String repoOwner = parts[0];
 							final String repoName = parts[1];
 
-							PullRequestActions.deleteHeadBranch(ctx, repoOwner, repoName, tinyDB.getString("prHeadBranch"), false);
+							deleteBranchFunction(repoOwner, repoName);
 
 							Toasty.success(ctx, getString(R.string.mergePRSuccessMsg));
 							tinyDB.putBoolean("prMerged", true);
@@ -254,6 +253,36 @@ public class MergePullRequestActivity extends BaseActivity {
 
 	}
 
+	private void deleteBranchFunction(String repoOwner, String repoName) {
+
+		String branchName = tinyDB.getString("prHeadBranch");
+
+		Call<JsonElement> call = RetrofitClient
+				.getApiInterface(ctx)
+				.deleteBranch(Authorization.get(ctx), repoOwner, repoName, branchName);
+
+		call.enqueue(new Callback<JsonElement>() {
+
+			@Override
+			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
+
+				if(response.code() == 204) {
+
+					Log.i("deleteBranch", "Branch deleted successfully");
+				}
+			}
+
+			@Override
+			public void onFailure(@NonNull Call<JsonElement> call, @NonNull Throwable t) {
+
+				Log.e("onFailure", t.toString());
+				enableProcessButton();
+			}
+
+		});
+
+	}
+
 	private void disableProcessButton() {
 
 		viewBinding.mergeButton.setEnabled(false);

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

@@ -1,143 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.viewpager2.adapter.FragmentStateAdapter;
-import androidx.viewpager2.widget.ViewPager2;
-import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayoutMediator;
-import org.mian.gitnex.R;
-import org.mian.gitnex.fragments.profile.DetailFragment;
-import org.mian.gitnex.fragments.profile.FollowersFragment;
-import org.mian.gitnex.fragments.profile.FollowingFragment;
-import org.mian.gitnex.fragments.profile.OrganizationsFragment;
-import org.mian.gitnex.fragments.profile.RepositoriesFragment;
-import org.mian.gitnex.fragments.profile.StarredRepositoriesFragment;
-import org.mian.gitnex.helpers.Toasty;
-import java.util.Objects;
-
-/**
- * Author M M Arif
- */
-
-public class ProfileActivity extends BaseActivity {
-
-	private String username;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_profile);
-		Intent profileIntent = getIntent();
-		Typeface myTypeface;
-
-		Toolbar toolbar = findViewById(R.id.toolbar);
-		TextView toolbarTitle = findViewById(R.id.toolbarTitle);
-
-		if(profileIntent.getStringExtra("username") != null && !Objects.equals(profileIntent.getStringExtra("username"), "")) {
-			username = profileIntent.getStringExtra("username");
-		}
-		else {
-			Toasty.warning(ctx, ctx.getResources().getString(R.string.userInvalidUserName));
-			finish();
-		}
-
-		setSupportActionBar(toolbar);
-		Objects.requireNonNull(getSupportActionBar()).setTitle(username);
-		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-		ViewPager2 viewPager = findViewById(R.id.profileContainer);
-		viewPager.setOffscreenPageLimit(1);
-		TabLayout tabLayout = findViewById(R.id.tabs);
-
-		switch(tinyDB.getInt("customFontId", -1)) {
-			case 0:
-				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
-				break;
-			case 2:
-				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/sourcecodeproregular.ttf");
-				break;
-			default:
-				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/manroperegular.ttf");
-				break;
-		}
-
-		toolbarTitle.setTypeface(myTypeface);
-		toolbarTitle.setText(username);
-
-		viewPager.setAdapter(new ViewPagerAdapter(this));
-
-		String[] tabTitles = {ctx.getResources().getString(R.string.tabTextInfo), ctx.getResources().getString(R.string.navRepos), ctx.getResources().getString(R.string.navStarredRepos), ctx.getResources().getString(R.string.navOrg), ctx.getResources().getString(R.string.profileTabFollowers), ctx.getResources().getString(R.string.profileTabFollowing)};
-		new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(tabTitles[position])).attach();
-
-		ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
-		int tabsCount = vg.getChildCount();
-
-		for (int j = 0; j < tabsCount; j++) {
-
-			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
-			int tabChildCount = vgTab.getChildCount();
-
-			for (int i = 0; i < tabChildCount; i++) {
-				View tabViewChild = vgTab.getChildAt(i);
-				if (tabViewChild instanceof TextView) {
-					((TextView) tabViewChild).setTypeface(myTypeface);
-				}
-			}
-		}
-	}
-
-	public class ViewPagerAdapter extends FragmentStateAdapter {
-
-		public ViewPagerAdapter(@NonNull FragmentActivity fa) { super(fa); }
-
-		@NonNull
-		@Override
-		public Fragment createFragment(int position) {
-			switch(position) {
-				case 0: // detail
-					return DetailFragment.newInstance(username);
-				case 1: // repos
-					return RepositoriesFragment.newInstance(username);
-				case 2: // starred repos
-					return StarredRepositoriesFragment.newInstance(username);
-				case 3: // organizations
-					return OrganizationsFragment.newInstance(username);
-				case 4: // followers
-					return FollowersFragment.newInstance(username);
-				case 5: // following
-					return FollowingFragment.newInstance(username);
-			}
-			return null;
-		}
-
-		@Override
-		public int getItemCount() {
-			return 6;
-		}
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-
-		int id = item.getItemId();
-
-		if(id == android.R.id.home) {
-			finish();
-			return true;
-		}
-		else {
-			return super.onOptionsItemSelected(item);
-		}
-	}
-}

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

@@ -30,7 +30,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class MyProfileEmailActivity extends BaseActivity {
+public class ProfileEmailActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private EditText userEmail;

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

@@ -17,7 +17,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
@@ -71,6 +70,9 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 	private FragmentRefreshListenerMilestone fragmentRefreshListenerMilestone;
 	private FragmentRefreshListenerFiles fragmentRefreshListenerFiles;
 
+	private String loginUid;
+	private String instanceToken;
+
 	private String repositoryOwner;
 	private String repositoryName;
 
@@ -91,20 +93,15 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		Toolbar toolbar = findViewById(R.id.toolbar);
 
 		TextView toolbarTitle = findViewById(R.id.toolbar_title);
-		ImageView repoTypeToolbar = findViewById(R.id.repoTypeToolbar);
-
-		if(tinyDB.getString("repoType").equalsIgnoreCase("private")) {
-			repoTypeToolbar.setVisibility(View.VISIBLE);
-		}
-		else {
-			repoTypeToolbar.setVisibility(View.GONE);
-		}
 		toolbarTitle.setText(repositoryName);
 
 		setSupportActionBar(toolbar);
 		Objects.requireNonNull(getSupportActionBar()).setTitle(repositoryName);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
+		loginUid = tinyDB.getString("loginUid");
+		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
+
 		tinyDB.putString("repoIssuesState", "open");
 		tinyDB.putString("repoPrState", "open");
 		tinyDB.putString("milestoneState", "open");
@@ -232,84 +229,13 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 			mainIntent.removeExtra("goToSection");
 			mainIntent.removeExtra("goToSectionType");
 
-			switch(goToSectionType) {
+			if(goToSectionType.equals("issue")) {
-				case "branchesList":
+
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
+				RepoDetailActivity.mViewPager.setCurrentItem(2);
-					chooseBranch();
+			}
-					break;
+			else if(goToSectionType.equals("pull")) {
-				case "branch":
+
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
+				RepoDetailActivity.mViewPager.setCurrentItem(3);
-					String selectedBranch = mainIntent.getStringExtra("selectedBranch");
-					tinyDB.putString("repoBranch", selectedBranch);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(selectedBranch);
-					}
-					break;
-				case "file":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String branch1 = mainIntent.getStringExtra("branch");
-					tinyDB.putString("repoBranch", branch1);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(branch1);
-					}
-					Intent intent = new Intent(ctx, FileViewActivity.class);
-					intent.putExtra("file", mainIntent.getSerializableExtra("file"));
-					startActivity(intent);
-					break;
-				case "dir":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String branch2 = mainIntent.getStringExtra("branch");
-					tinyDB.putString("repoBranch", branch2);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(branch2);
-					}
-					//((SectionsPagerAdapter) Objects.requireNonNull(RepoDetailActivity.mViewPager.getAdapter())).getItem(1);
-					break;
-				case "commitsList":
-					RepoDetailActivity.mViewPager.setCurrentItem(1);
-					String branch = mainIntent.getStringExtra("branchName");
-					tinyDB.putString("repoBranch", branch);
-					if(getFragmentRefreshListenerFiles() != null) {
-						getFragmentRefreshListenerFiles().onRefresh(branch);
-					}
-					Intent intent1 = new Intent(ctx, CommitsActivity.class);
-					intent1.putExtra("branchName", branch);
-					ctx.startActivity(intent1);
-					break;
-				case "issue":
-					RepoDetailActivity.mViewPager.setCurrentItem(2);
-					break;
-				case "issueNew":
-					RepoDetailActivity.mViewPager.setCurrentItem(2);
-					startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
-					break;
-				case "pull":
-					RepoDetailActivity.mViewPager.setCurrentItem(3);
-					break;
-				case "pullNew":
-					RepoDetailActivity.mViewPager.setCurrentItem(3);
-					startActivity(new Intent(RepoDetailActivity.this, CreatePullRequestActivity.class));
-					break;
-				case "releases":
-					RepoDetailActivity.mViewPager.setCurrentItem(4);
-					break;
-				case "newRelease":
-					RepoDetailActivity.mViewPager.setCurrentItem(4);
-					startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
-					break;
-				case "milestones":
-					RepoDetailActivity.mViewPager.setCurrentItem(5);
-					break;
-				case "milestonesNew":
-					RepoDetailActivity.mViewPager.setCurrentItem(5);
-					startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
-					break;
-				case "labels":
-					RepoDetailActivity.mViewPager.setCurrentItem(6);
-					break;
-				case "settings":
-					startActivity(new Intent(RepoDetailActivity.this, RepositorySettingsActivity.class));
-					break;
 			}
 		}
 
@@ -341,49 +267,46 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 		int id = item.getItemId();
 
-		if(id == android.R.id.home) {
+		switch(id) {
+
+			case android.R.id.home:
+				finish();
+				return true;
+
+			case R.id.repoMenu:
+				BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
+				bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
+				return true;
+
+			case R.id.filter:
+				BottomSheetIssuesFilterFragment filterBottomSheet = new BottomSheetIssuesFilterFragment();
+				filterBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuBottomSheet");
+				return true;
+
+			case R.id.filterPr:
+				BottomSheetPullRequestFilterFragment filterPrBottomSheet = new BottomSheetPullRequestFilterFragment();
+				filterPrBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuPrBottomSheet");
+				return true;
+
+			case R.id.filterMilestone:
+				BottomSheetMilestonesFilterFragment filterMilestoneBottomSheet = new BottomSheetMilestonesFilterFragment();
+				filterMilestoneBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet");
+				return true;
+
+			case R.id.switchBranches:
+				chooseBranch();
+				return true;
+
+			case R.id.branchCommits:
+				Intent intent = new Intent(ctx, CommitsActivity.class);
+				intent.putExtra("branchName", tinyDB.getString("repoBranch"));
+				ctx.startActivity(intent);
+				return true;
+
+			default:
+				return super.onOptionsItemSelected(item);
 
-			finish();
-			return true;
 		}
-		else if(id == R.id.repoMenu) {
-
-			BottomSheetRepoFragment bottomSheet = new BottomSheetRepoFragment();
-			bottomSheet.show(getSupportFragmentManager(), "repoBottomSheet");
-			return true;
-		}
-		else if(id == R.id.filter) {
-
-			BottomSheetIssuesFilterFragment filterBottomSheet = new BottomSheetIssuesFilterFragment();
-			filterBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuBottomSheet");
-			return true;
-		}
-		else if(id == R.id.filterPr) {
-
-			BottomSheetPullRequestFilterFragment filterPrBottomSheet = new BottomSheetPullRequestFilterFragment();
-			filterPrBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuPrBottomSheet");
-			return true;
-		}
-		else if(id == R.id.filterMilestone) {
-
-			BottomSheetMilestonesFilterFragment filterMilestoneBottomSheet = new BottomSheetMilestonesFilterFragment();
-			filterMilestoneBottomSheet.show(getSupportFragmentManager(), "repoFilterMenuMilestoneBottomSheet");
-			return true;
-		}
-		else if(id == R.id.switchBranches) {
-
-			chooseBranch();
-			return true;
-		}
-		else if(id == R.id.branchCommits) {
-
-			Intent intent = new Intent(ctx, CommitsActivity.class);
-			intent.putExtra("branchName", tinyDB.getString("repoBranch"));
-			ctx.startActivity(intent);
-			return true;
-		}
-
-		return super.onOptionsItemSelected(item);
 
 	}
 
@@ -498,7 +421,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 		Call<List<Branches>> call = RetrofitClient
 			.getApiInterface(ctx)
-			.getBranches(Authorization.get(ctx), repositoryOwner, repositoryName);
+			.getBranches(instanceToken, repositoryOwner, repositoryName);
 
 		call.enqueue(new Callback<List<Branches>>() {
 

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

@@ -45,7 +45,7 @@ public class RepoForksActivity extends BaseActivity {
 	private View.OnClickListener onClickListener;
 	private TextView noData;
 	private ProgressBar progressBar;
-	private final String TAG = "RepositoryForks";
+	private String TAG = "RepositoryForks";
 	private int resultLimit = Constants.resultLimitOldGiteaInstances;
 	private int pageSize = 1;
 

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

@@ -14,7 +14,6 @@ import org.gitnex.tea4j.models.RepositoryTransfer;
 import org.gitnex.tea4j.models.UserRepositories;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.databinding.ActivityRepositorySettingsBinding;
 import org.mian.gitnex.databinding.CustomRepositoryDeleteDialogBinding;
@@ -140,7 +139,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 					Toasty.success(ctx, getString(R.string.repoTransferSuccess));
 
 					finish();
-					BaseApi.getInstance(ctx, RepositoriesApi.class).deleteRepository((int) tinyDB.getLong("repositoryId", 0));
+					RepositoriesApi.deleteRepository((int) tinyDB.getLong("repositoryId", 0));
 					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
 					RepositorySettingsActivity.this.startActivity(intent);
 				}
@@ -221,7 +220,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 					Toasty.success(ctx, getString(R.string.repoDeletionSuccess));
 
 					finish();
-					BaseApi.getInstance(ctx, RepositoriesApi.class).deleteRepository((int) tinyDB.getLong("repositoryId", 0));
+					RepositoriesApi.deleteRepository((int) tinyDB.getLong("repositoryId", 0));
 					Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
 					RepositorySettingsActivity.this.startActivity(intent);
 				}
@@ -384,7 +383,7 @@ public class RepositorySettingsActivity extends BaseActivity {
 					if(!repositoryName.equals(repoName)) {
 
 						finish();
-						BaseApi.getInstance(ctx, RepositoriesApi.class).updateRepositoryOwnerAndName(repositoryOwner, repoName, (int) tinyDB.getLong("repositoryId", 0));
+						RepositoriesApi.updateRepositoryOwnerAndName(repositoryOwner, repoName, (int) tinyDB.getLong("repositoryId", 0));
 						Intent intent = new Intent(RepositorySettingsActivity.this, MainActivity.class);
 						RepositorySettingsActivity.this.startActivity(intent);
 					}

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

@@ -1,20 +1,14 @@
 package org.mian.gitnex.activities;
 
-import android.app.Dialog;
-import android.app.TimePickerDialog;
 import android.os.Bundle;
-import android.text.format.DateFormat;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TimePicker;
+import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
 import com.google.android.material.switchmaterial.SwitchMaterial;
-import org.jetbrains.annotations.NotNull;
 import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.ActivitySettingsAppearanceBinding;
-import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 
 /**
@@ -25,13 +19,13 @@ public class SettingsAppearanceActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
 
-	private static String[] timeList;
+	private static final String[] timeList = {"Pretty", "Normal"};
 	private static int timeSelectedChoice = 0;
 
-	private static String[] customFontList;
+	private static final String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
 	private static int customFontSelectedChoice = 0;
 
-	private static String[] themeList;
+	private static final String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)", "Pitch Black"};
 	private static int themeSelectedChoice = 0;
 
 	@Override
@@ -44,51 +38,48 @@ public class SettingsAppearanceActivity extends BaseActivity {
 
 		ImageView closeActivity = activitySettingsAppearanceBinding.close;
 
+		final TextView tvDateTimeSelected = activitySettingsAppearanceBinding.tvDateTimeSelected; // setter for time
+		final TextView customFontSelected = activitySettingsAppearanceBinding.customFontSelected; // setter for custom font
+		final TextView themeSelected = activitySettingsAppearanceBinding.themeSelected; // setter for theme
+
 		LinearLayout timeFrame = activitySettingsAppearanceBinding.timeFrame;
 		LinearLayout customFontFrame = activitySettingsAppearanceBinding.customFontFrame;
 		LinearLayout themeFrame = activitySettingsAppearanceBinding.themeSelectionFrame;
-		LinearLayout lightTimeFrame = activitySettingsAppearanceBinding.lightThemeTimeSelectionFrame;
-		LinearLayout darkTimeFrame = activitySettingsAppearanceBinding.darkThemeTimeSelectionFrame;
 
 		SwitchMaterial counterBadgesSwitch = activitySettingsAppearanceBinding.switchCounterBadge;
 
-		timeList = getResources().getStringArray(R.array.timeFormats);
-		customFontList = getResources().getStringArray(R.array.fonts);
-		themeList = getResources().getStringArray(R.array.themes);
-
 		initCloseListener();
 		closeActivity.setOnClickListener(onClickListener);
 
-		String lightMinute = String.valueOf(tinyDB.getInt("lightThemeTimeMinute"));
+		if(!tinyDB.getString("timeStr").isEmpty()) {
-		String lightHour = String.valueOf(tinyDB.getInt("lightThemeTimeHour"));
-		if(lightMinute.length() == 1) lightMinute = "0" + lightMinute;
-		if(lightHour.length() == 1) lightHour = "0" + lightHour;
 
-		String darkMinute = String.valueOf(tinyDB.getInt("darkThemeTimeMinute"));
+			tvDateTimeSelected.setText(tinyDB.getString("timeStr"));
-		String darkHour = String.valueOf(tinyDB.getInt("darkThemeTimeHour"));
-		if(darkMinute.length() == 1) darkMinute = "0" + darkMinute;
-		if(darkHour.length() == 1) darkHour = "0" + darkHour;
-
-		activitySettingsAppearanceBinding.lightThemeSelectedTime.setText(ctx.getResources().getString(R.string.settingsThemeTimeSelectedHint, lightHour,
-			lightMinute));
-		activitySettingsAppearanceBinding.darkThemeSelectedTime.setText(ctx.getResources().getString(R.string.settingsThemeTimeSelectedHint, darkHour,
-			darkMinute));
-		activitySettingsAppearanceBinding.tvDateTimeSelected.setText(tinyDB.getString("timeStr"));
-		activitySettingsAppearanceBinding.customFontSelected.setText(tinyDB.getString("customFontStr", "Manrope"));
-		activitySettingsAppearanceBinding.themeSelected.setText(tinyDB.getString("themeStr", "Dark"));
-
-		if(tinyDB.getString("themeStr").startsWith("Auto")) {
-			darkTimeFrame.setVisibility(View.VISIBLE);
-			lightTimeFrame.setVisibility(View.VISIBLE);
-		}
-		else {
-			darkTimeFrame.setVisibility(View.GONE);
-			lightTimeFrame.setVisibility(View.GONE);
 		}
 
-		timeSelectedChoice = tinyDB.getInt("timeId");
+		if(!tinyDB.getString("customFontStr").isEmpty()) {
-		customFontSelectedChoice = tinyDB.getInt("customFontId", 1);
+
-		themeSelectedChoice = tinyDB.getInt("themeId");
+			customFontSelected.setText(tinyDB.getString("customFontStr"));
+		}
+
+		if(!tinyDB.getString("themeStr").isEmpty()) {
+
+			themeSelected.setText(tinyDB.getString("themeStr"));
+		}
+
+		if(timeSelectedChoice == 0) {
+
+			timeSelectedChoice = tinyDB.getInt("timeId");
+		}
+
+		if(customFontSelectedChoice == 0) {
+
+			customFontSelectedChoice = tinyDB.getInt("customFontId", 1);
+		}
+
+		if(themeSelectedChoice == 0) {
+
+			themeSelectedChoice = tinyDB.getInt("themeId");
+		}
 
 		counterBadgesSwitch.setChecked(tinyDB.getBoolean("enableCounterBadges"));
 
@@ -110,7 +101,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {
 
 				themeSelectedChoice = i;
-				activitySettingsAppearanceBinding.themeSelected.setText(themeList[i]);
+				themeSelected.setText(themeList[i]);
 				tinyDB.putString("themeStr", themeList[i]);
 				tinyDB.putInt("themeId", i);
 
@@ -125,16 +116,6 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			cfDialog.show();
 		});
 
-		lightTimeFrame.setOnClickListener(view -> {
-			LightTimePicker timePicker = new LightTimePicker();
-	        timePicker.show(getSupportFragmentManager(), "timePicker");
-		});
-
-		darkTimeFrame.setOnClickListener(view -> {
-			DarkTimePicker timePicker = new DarkTimePicker();
-	        timePicker.show(getSupportFragmentManager(), "timePicker");
-		});
-
 		// custom font dialog
 		customFontFrame.setOnClickListener(view -> {
 
@@ -146,7 +127,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {
 
 				customFontSelectedChoice = i;
-				activitySettingsAppearanceBinding.customFontSelected.setText(customFontList[i]);
+				customFontSelected.setText(customFontList[i]);
 				tinyDB.putString("customFontStr", customFontList[i]);
 				tinyDB.putInt("customFontId", i);
 
@@ -172,17 +153,17 @@ public class SettingsAppearanceActivity extends BaseActivity {
 			tBuilder.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {
 
 				timeSelectedChoice = i;
-				activitySettingsAppearanceBinding.tvDateTimeSelected.setText(timeList[i]);
+				tvDateTimeSelected.setText(timeList[i]);
 				tinyDB.putString("timeStr", timeList[i]);
 				tinyDB.putInt("timeId", i);
 
-				switch(i) {
+				if("Normal".equals(timeList[i])) {
-					case 0:
+
-						tinyDB.putString("dateFormat", "pretty");
+					tinyDB.putString("dateFormat", "normal");
-						break;
+				}
-					case 1:
+				else {
-						tinyDB.putString("dateFormat", "normal");
+
-						break;
+					tinyDB.putString("dateFormat", "pretty");
 				}
 
 				dialogInterfaceTime.dismiss();
@@ -199,54 +180,4 @@ public class SettingsAppearanceActivity extends BaseActivity {
 		onClickListener = view -> finish();
 	}
 
-	public static class LightTimePicker extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
-
-		TinyDB db = TinyDB.getInstance(getContext());
-
-		@NotNull
-		@Override
-		public Dialog onCreateDialog(Bundle savedInstanceState) {
-			int hour = db.getInt("lightThemeTimeHour");
-			int minute = db.getInt("lightThemeTimeMinute");
-
-			return new TimePickerDialog(getActivity(), this, hour, minute, true);
-		}
-
-		@Override
-		public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-			db.putInt("lightThemeTimeHour", hourOfDay);
-			db.putInt("lightThemeTimeMinute", minute);
-			db.putBoolean("refreshParent", true);
-			requireActivity().overridePendingTransition(0, 0);
-			this.dismiss();
-			Toasty.success(requireActivity().getApplicationContext(), requireContext().getResources().getString(R.string.settingsSave));
-			requireActivity().recreate();
-		}
-	}
-
-	public static class DarkTimePicker extends DialogFragment implements TimePickerDialog.OnTimeSetListener {
-
-		TinyDB db = TinyDB.getInstance(getContext());
-
-		@NotNull
-		@Override
-		public Dialog onCreateDialog(Bundle savedInstanceState) {
-			int hour = db.getInt("darkThemeTimeHour");
-			int minute = db.getInt("darkThemeTimeMinute");
-
-			return new TimePickerDialog(getActivity(), this, hour, minute, true);
-		}
-
-		@Override
-		public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-			db.putInt("darkThemeTimeHour", hourOfDay);
-			db.putInt("darkThemeTimeMinute", minute);
-			db.putBoolean("refreshParent", true);
-			requireActivity().overridePendingTransition(0, 0);
-			this.dismiss();
-			Toasty.success(requireActivity().getApplicationContext(), requireContext().getResources().getString(R.string.settingsSave));
-			requireActivity().recreate();
-		}
-	}
-
 }

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

@@ -23,7 +23,7 @@ public class SettingsGeneralActivity extends BaseActivity {
 	private List<String> homeScreenList;
 	private static int homeScreenSelectedChoice = 0;
 
-	private List<String> linkHandlerDefaultScreen;
+	private List<String> defaultScreen;
 	private static int defaultLinkHandlerScreenSelectedChoice = 0;
 
 	@Override
@@ -38,16 +38,20 @@ public class SettingsGeneralActivity extends BaseActivity {
 		viewBinding.close.setOnClickListener(onClickListener);
 
 		// home screen
-		String[] appHomeDefaultScreen = getResources().getStringArray(R.array.appDefaultHomeScreen);
+		String[] homeDefaultScreen_ = {getResources().getString(R.string.pageTitleMyRepos), getResources().getString(R.string.pageTitleStarredRepos), getResources().getString(R.string.pageTitleOrganizations),
+			getResources().getString(R.string.pageTitleRepositories), getResources().getString(R.string.pageTitleProfile), getResources().getString(R.string.pageTitleExplore),
+			getResources().getString(R.string.titleDrafts)};
 
-		String[] appHomeDefaultScreenNew = getResources().getStringArray(R.array.appDefaultHomeScreenNew);
+		String[] homeDefaultScreenNew = {getResources().getString(R.string.pageTitleMyRepos), getResources().getString(R.string.pageTitleStarredRepos), getResources().getString(R.string.pageTitleOrganizations),
+			getResources().getString(R.string.pageTitleRepositories), getResources().getString(R.string.pageTitleProfile), getResources().getString(R.string.pageTitleExplore),
+			getResources().getString(R.string.titleDrafts), getResources().getString(R.string.pageTitleNotifications)};
 
 		if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.3")) {
 
-			appHomeDefaultScreen = appHomeDefaultScreenNew;
+			homeDefaultScreen_ = homeDefaultScreenNew;
 		}
 
-		homeScreenList = new ArrayList<>(Arrays.asList(appHomeDefaultScreen));
+		homeScreenList = new ArrayList<>(Arrays.asList(homeDefaultScreen_));
 		String[] homeScreenArray = new String[homeScreenList.size()];
 		homeScreenList.toArray(homeScreenArray);
 
@@ -109,14 +113,34 @@ public class SettingsGeneralActivity extends BaseActivity {
 		// home screen
 
 		// link handler
-		String[] linkHandlerDefaultScreenList = getResources().getStringArray(R.array.linkHandlerDefaultScreen);
+		String[] defaultScreen_ = {getResources().getString(R.string.generalDeepLinkSelectedText), getResources().getString(R.string.navRepos), getResources().getString(R.string.navOrg), getResources().getString(R.string.pageTitleNotifications), getResources().getString(R.string.navExplore)};
-		linkHandlerDefaultScreen = new ArrayList<>(Arrays.asList(linkHandlerDefaultScreenList));
+		defaultScreen = new ArrayList<>(Arrays.asList(defaultScreen_));
 
-		String[] linksArray = new String[linkHandlerDefaultScreen.size()];
+		String[] linksArray = new String[defaultScreen.size()];
-		linkHandlerDefaultScreen.toArray(linksArray);
+		defaultScreen.toArray(linksArray);
 
-		defaultLinkHandlerScreenSelectedChoice = tinyDB.getInt("defaultScreenId");
+		if(defaultLinkHandlerScreenSelectedChoice == 0) {
-		viewBinding.generalDeepLinkSelected.setText(linksArray[defaultLinkHandlerScreenSelectedChoice]);
+
+			defaultLinkHandlerScreenSelectedChoice = tinyDB.getInt("defaultScreenId");
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.generalDeepLinkSelectedText));
+		}
+
+		if(defaultLinkHandlerScreenSelectedChoice == 1) {
+
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navRepos));
+		}
+		else if(defaultLinkHandlerScreenSelectedChoice == 2) {
+
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navOrg));
+		}
+		else if(defaultLinkHandlerScreenSelectedChoice == 3) {
+
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.pageTitleNotifications));
+		}
+		else if(defaultLinkHandlerScreenSelectedChoice == 4) {
+
+			viewBinding.generalDeepLinkSelected.setText(getResources().getString(R.string.navExplore));
+		}
 
 		viewBinding.setDefaultLinkHandler.setOnClickListener(setDefaultLinkHandler -> {
 

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

@@ -43,13 +43,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
 		viewBinding.enableNotificationsMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
 
 			tinyDB.putBoolean("notificationsEnabled", isChecked);
-
+			if(!isChecked) Notifications.stopWorker(ctx);
-			if(isChecked) {
-				Notifications.startWorker(ctx);
-			} else {
-				Notifications.stopWorker(ctx);
-			}
-
 			Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
 
 		});

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

@@ -31,10 +31,10 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
 
-	private static String[] cacheSizeDataList;
+	private static final String[] cacheSizeDataList = {"50 MB", "100 MB", "250 MB", "500 MB", "1 GB"};
 	private static int cacheSizeDataSelectedChoice = 0;
 
-	private static String[] cacheSizeImagesList;
+	private static final String[] cacheSizeImagesList = {"50 MB", "100 MB", "250 MB", "500 MB", "1 GB"};
 	private static int cacheSizeImagesSelectedChoice = 0;
 
 	@Override
@@ -61,9 +61,6 @@ public class SettingsSecurityActivity extends BaseActivity {
 
 		SwitchMaterial switchBiometric = activitySettingsSecurityBinding.switchBiometric;
 
-		cacheSizeDataList = getResources().getStringArray(R.array.cacheSizeList);
-		cacheSizeImagesList = getResources().getStringArray(R.array.cacheSizeList);
-
 		if(!tinyDB.getString("cacheSizeStr").isEmpty()) {
 
 			cacheSizeDataSelected.setText(tinyDB.getString("cacheSizeStr"));

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

@@ -11,9 +11,6 @@ import androidx.appcompat.app.AlertDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.databinding.ActivitySettingsTranslationBinding;
 import org.mian.gitnex.helpers.Toasty;
-import java.util.LinkedHashMap;
-import java.util.Locale;
-import java.util.TreeMap;
 
 /**
  * Author M M Arif
@@ -23,6 +20,8 @@ public class SettingsTranslationActivity extends BaseActivity {
 
 	private View.OnClickListener onClickListener;
 
+	private static String[] langList = {"English", "Arabic", "Chinese", "Czech", "Finnish", "French", "German", "Italian", "Latvian", "Persian",
+		"Polish", "Portuguese/Brazilian", "Russian", "Serbian", "Spanish", "Turkish", "Ukrainian"};
 	private static int langSelectedChoice = 0;
 
 	@Override
@@ -30,12 +29,6 @@ public class SettingsTranslationActivity extends BaseActivity {
 
 		super.onCreate(savedInstanceState);
 
-		LinkedHashMap<String, String> langs = new LinkedHashMap<>();
-		langs.put("", getString(R.string.settingsLanguageSystem));
-		for(String langCode : getResources().getStringArray(R.array.languages)) {
-			langs.put(langCode, getLanguageDisplayName(langCode));
-		}
-
 		ActivitySettingsTranslationBinding activitySettingsTranslationBinding = ActivitySettingsTranslationBinding.inflate(getLayoutInflater());
 		setContentView(activitySettingsTranslationBinding.getRoot());
 
@@ -59,9 +52,15 @@ public class SettingsTranslationActivity extends BaseActivity {
 
 		});
 
-		tvLanguageSelected.setText(tinyDB.getString("localeStr"));
+		if(!tinyDB.getString("localeStr").isEmpty()) {
 
-		langSelectedChoice = tinyDB.getInt("langId");
+			tvLanguageSelected.setText(tinyDB.getString("localeStr"));
+		}
+
+		if(langSelectedChoice == 0) {
+
+			langSelectedChoice = tinyDB.getInt("langId");
+		}
 
 		// language dialog
 		langFrame.setOnClickListener(view -> {
@@ -71,18 +70,89 @@ public class SettingsTranslationActivity extends BaseActivity {
 			lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
 			lBuilder.setCancelable(langSelectedChoice != -1);
 
-			lBuilder.setSingleChoiceItems(langs.values().toArray(new String[0]), langSelectedChoice, (dialogInterface, i) -> {
+			lBuilder.setSingleChoiceItems(langList, langSelectedChoice, (dialogInterface, i) -> {
 
-				String selectedLanguage = langs.keySet().toArray(new String[0])[i];
+				langSelectedChoice = i;
-				tinyDB.putString("localeStr", langs.get(selectedLanguage));
+				tvLanguageSelected.setText(langList[i]);
+				tinyDB.putString("localeStr", langList[i]);
 				tinyDB.putInt("langId", i);
-				tinyDB.putString("locale", selectedLanguage);
+
+				switch(langList[i]) {
+					case "Arabic":
+
+						tinyDB.putString("locale", "ar");
+						break;
+					case "Chinese":
+
+						tinyDB.putString("locale", "zh");
+						break;
+					case "Czech":
+
+						tinyDB.putString("locale", "cs");
+						break;
+					case "Finnish":
+
+						tinyDB.putString("locale", "fi");
+						break;
+					case "French":
+
+						tinyDB.putString("locale", "fr");
+						break;
+					case "German":
+
+						tinyDB.putString("locale", "de");
+						break;
+					case "Italian":
+
+						tinyDB.putString("locale", "it");
+						break;
+					case "Latvian":
+
+						tinyDB.putString("locale", "lv");
+						break;
+					case "Persian":
+
+						tinyDB.putString("locale", "fa");
+						break;
+					case "Polish":
+
+						tinyDB.putString("locale", "pl");
+						break;
+					case "Portuguese/Brazilian":
+
+						tinyDB.putString("locale", "pt");
+						break;
+					case "Russian":
+
+						tinyDB.putString("locale", "ru");
+						break;
+					case "Serbian":
+
+						tinyDB.putString("locale", "sr");
+						break;
+					case "Spanish":
+
+						tinyDB.putString("locale", "es");
+						break;
+					case "Turkish":
+
+						tinyDB.putString("locale", "tr");
+						break;
+					case "Ukrainian":
+
+						tinyDB.putString("locale", "uk");
+						break;
+					default:
+
+						tinyDB.putString("locale", "en");
+						break;
+				}
 
 				tinyDB.putBoolean("refreshParent", true);
+				this.recreate();
 				this.overridePendingTransition(0, 0);
 				dialogInterface.dismiss();
 				Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
-				this.recreate();
 			});
 
 			lBuilder.setNeutralButton(getString(R.string.cancelButton), null);
@@ -97,10 +167,4 @@ public class SettingsTranslationActivity extends BaseActivity {
 		onClickListener = view -> finish();
 	}
 
-	private static String getLanguageDisplayName(String langCode) {
-		Locale english = new Locale("en");
-		Locale translated = new Locale(langCode);
-		return String.format("%s (%s)", translated.getDisplayName(translated), translated.getDisplayName(english));
-	}
-
 }

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

@@ -31,26 +31,30 @@ import retrofit2.Callback;
 public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAdapter.CronTasksViewHolder> {
 
 	private final List<CronTasks> tasksList;
+	private final Context mCtx;
 	private static TinyDB tinyDb;
 
 	static class CronTasksViewHolder extends RecyclerView.ViewHolder {
 
 		private CronTasks cronTasks;
 
+		private final ImageView runTask;
 		private final TextView taskName;
+		private final LinearLayout cronTasksInfo;
+		private final LinearLayout cronTasksRun;
 
 		private CronTasksViewHolder(View itemView) {
 
 			super(itemView);
 			Context ctx = itemView.getContext();
 
-			final Locale locale = ctx.getResources().getConfiguration().locale;
+			final String locale = tinyDb.getString("locale");
 			final String timeFormat = tinyDb.getString("dateFormat");
 
-			ImageView runTask = itemView.findViewById(R.id.runTask);
+			runTask = itemView.findViewById(R.id.runTask);
 			taskName = itemView.findViewById(R.id.taskName);
-			LinearLayout cronTasksInfo = itemView.findViewById(R.id.cronTasksInfo);
+			cronTasksInfo = itemView.findViewById(R.id.cronTasksInfo);
-			LinearLayout cronTasksRun = itemView.findViewById(R.id.cronTasksRun);
+			cronTasksRun = itemView.findViewById(R.id.cronTasksRun);
 
 			cronTasksInfo.setOnClickListener(taskInfo -> {
 
@@ -58,10 +62,10 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAd
 				String lastRun = "";
 
 				if(cronTasks.getNext() != null) {
-					nextRun = TimeHelper.formatTime(cronTasks.getNext(), locale, timeFormat, ctx);
+					nextRun = TimeHelper.formatTime(cronTasks.getNext(), new Locale(locale), timeFormat, ctx);
 				}
 				if(cronTasks.getPrev() != null) {
-					lastRun = TimeHelper.formatTime(cronTasks.getPrev(), locale, timeFormat, ctx);
+					lastRun = TimeHelper.formatTime(cronTasks.getPrev(), new Locale(locale), timeFormat, ctx);
 				}
 
 				View view = LayoutInflater.from(ctx).inflate(R.layout.layout_cron_task_info, null);
@@ -92,9 +96,10 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAd
 		}
 	}
 
-	public AdminCronTasksAdapter(Context ctx, List<CronTasks> tasksListMain) {
+	public AdminCronTasksAdapter(Context mCtx, List<CronTasks> tasksListMain) {
 
-		tinyDb = TinyDB.getInstance(ctx);
+		tinyDb = TinyDB.getInstance(mCtx);
+		this.mCtx = mCtx;
 		this.tasksList = tasksListMain;
 	}
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.content.Intent;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,7 +15,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -30,10 +28,10 @@ import java.util.List;
 public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdapter.UsersViewHolder> implements Filterable {
 
     private final List<UserInfo> usersList;
-    private final Context context;
+    private final Context mCtx;
     private final List<UserInfo> usersListFull;
 
-    class UsersViewHolder extends RecyclerView.ViewHolder {
+    static class UsersViewHolder extends RecyclerView.ViewHolder {
 
 	    private String userLoginId;
 
@@ -53,22 +51,18 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
             userEmail = itemView.findViewById(R.id.userEmail);
             userRole = itemView.findViewById(R.id.userRole);
 
-	        itemView.setOnClickListener(loginId -> {
+	        userAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
+
-		        intent.putExtra("username", userLoginId);
+		        Context context = loginId.getContext();
-		        context.startActivity(intent);
-	        });
 
-	        userAvatar.setOnLongClickListener(loginId -> {
 		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-		        return true;
 	        });
         }
     }
 
-    public AdminGetUsersAdapter(Context ctx, List<UserInfo> usersListMain) {
+    public AdminGetUsersAdapter(Context mCtx, List<UserInfo> usersListMain) {
 
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.usersList = usersListMain;
         usersListFull = new ArrayList<>(usersList);
     }
@@ -85,18 +79,17 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
     public void onBindViewHolder(@NonNull AdminGetUsersAdapter.UsersViewHolder holder, int position) {
 
         UserInfo currentItem = usersList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
 	    holder.userLoginId = currentItem.getLogin();
 
         if(!currentItem.getFullname().equals("")) {
 
             holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
-            holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
         else {
 
-            holder.userFullName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
             holder.userName.setVisibility(View.GONE);
         }
 
@@ -114,12 +107,12 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
             holder.userRole.setVisibility(View.VISIBLE);
             TextDrawable drawable = TextDrawable.builder()
                     .beginConfig()
-                    .textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null))
+                    .textColor(ResourcesCompat.getColor(mCtx.getResources(), R.color.colorWhite, null))
                     .fontSize(44)
                     .width(180)
                     .height(60)
                     .endConfig()
-                    .buildRoundRect(context.getResources().getString(R.string.userRoleAdmin).toLowerCase(), ResourcesCompat.getColor(context.getResources(), R.color.releasePre, null), 8);
+                    .buildRoundRect(mCtx.getResources().getString(R.string.userRoleAdmin).toLowerCase(), ResourcesCompat.getColor(mCtx.getResources(), R.color.releasePre, null), 8);
             holder.userRole.setImageDrawable(drawable);
         }
         else {
@@ -127,7 +120,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
             holder.userRole.setVisibility(View.GONE);
         }
 
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
     }
 
     @Override

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

@@ -13,7 +13,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.gitnex.tea4j.models.Collaborators;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -25,7 +24,7 @@ import java.util.List;
 
 public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdapter.AssigneesViewHolder> {
 
-	private final Context context;
+	private final Context mCtx;
 	private final List<Collaborators> assigneesList;
 	private List<String> assigneesStrings = new ArrayList<>();
 	private List<String> currentAssignees;
@@ -37,9 +36,9 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 		void assigneesInterface(List<String> data);
 	}
 
-	public AssigneesListAdapter(Context ctx, List<Collaborators> dataMain, AssigneesListAdapterListener assigneesListener, List<String> currentAssignees) {
+	public AssigneesListAdapter(Context mCtx, List<Collaborators> dataMain, AssigneesListAdapterListener assigneesListener, List<String> currentAssignees) {
 
-		this.context = ctx;
+		this.mCtx = mCtx;
 		this.assigneesList = dataMain;
 		this.assigneesListener = assigneesListener;
 		this.currentAssignees = currentAssignees;
@@ -74,7 +73,6 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 	public void onBindViewHolder(@NonNull AssigneesListAdapter.AssigneesViewHolder holder, int position) {
 
 		Collaborators currentItem = assigneesList.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
 		if(currentItem.getFull_name().equals("")) {
 
@@ -85,7 +83,7 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
 			holder.assigneesName.setText(Html.fromHtml(currentItem.getFull_name()));
 		}
 		PicassoService
-			.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(holder.assigneesAvatar);
+			.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(holder.assigneesAvatar);
 
 		for(int i = 0; i < assigneesList.size(); i++) {
 

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,7 +11,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import org.gitnex.tea4j.models.Collaborators;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -25,9 +23,9 @@ import java.util.List;
 public class CollaboratorsAdapter extends BaseAdapter  {
 
     private final List<Collaborators> collaboratorsList;
-    private final Context context;
+    private final Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
 	    private String userLoginId;
 
@@ -40,21 +38,17 @@ public class CollaboratorsAdapter extends BaseAdapter  {
             collaboratorName  = v.findViewById(R.id.collaboratorName);
 
 	        collaboratorAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", userLoginId);
-		        context.startActivity(intent);
-	        });
 
-	        collaboratorAvatar.setOnLongClickListener(loginId -> {
+		        Context context = loginId.getContext();
+
 		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-		        return true;
 	        });
         }
     }
 
-    public CollaboratorsAdapter(Context ctx, List<Collaborators> collaboratorsListMain) {
+    public CollaboratorsAdapter(Context mCtx, List<Collaborators> collaboratorsListMain) {
 
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.collaboratorsList = collaboratorsListMain;
     }
 
@@ -81,7 +75,7 @@ public class CollaboratorsAdapter extends BaseAdapter  {
 
         if (finalView == null) {
 
-            finalView = LayoutInflater.from(context).inflate(R.layout.list_collaborators, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_collaborators, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -96,10 +90,8 @@ public class CollaboratorsAdapter extends BaseAdapter  {
 
     private void initData(ViewHolder viewHolder, int position) {
 
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
         Collaborators currentItem = collaboratorsList.get(position);
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);
+        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);
 
 	    viewHolder.userLoginId = currentItem.getLogin();
 

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

@@ -26,7 +26,7 @@ import java.util.Locale;
 
 public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    private final Context context;
+    private final Context ctx;
     private final int TYPE_LOAD = 0;
     private List<Commits> commitsList;
     private CommitsAdapter.OnLoadMoreListener loadMoreListener;
@@ -35,15 +35,16 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
     public CommitsAdapter(Context ctx, List<Commits> commitsListMain) {
 
-        this.context = ctx;
+        this.ctx = ctx;
         this.commitsList = commitsListMain;
+
     }
 
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-        LayoutInflater inflater = LayoutInflater.from(context);
+        LayoutInflater inflater = LayoutInflater.from(ctx);
 
         if(viewType == TYPE_LOAD) {
             return new CommitsHolder(inflater.inflate(R.layout.list_commits, parent, false));
@@ -51,19 +52,25 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
         else {
             return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
         }
+
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
         if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
+
             isLoading = true;
             loadMoreListener.onLoadMore();
+
         }
 
         if(getItemViewType(position) == TYPE_LOAD) {
+
             ((CommitsHolder) holder).bindData(commitsList.get(position));
+
         }
+
     }
 
     @Override
@@ -75,12 +82,14 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
         else {
             return 1;
         }
+
     }
 
     @Override
     public int getItemCount() {
 
         return commitsList.size();
+
     }
 
     class CommitsHolder extends RecyclerView.ViewHolder {
@@ -98,23 +107,27 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             commitCommitter = itemView.findViewById(R.id.commitCommitterVw);
             commitDate = itemView.findViewById(R.id.commitDateVw);
             commitHtmlUrl = itemView.findViewById(R.id.commitHtmlUrlVw);
+
         }
 
         @SuppressLint("SetTextI18n")
         void bindData(Commits commitsModel) {
 
-            final TinyDB tinyDb = TinyDB.getInstance(context);
+            final TinyDB tinyDb = TinyDB.getInstance(ctx);
-	        Locale locale = context.getResources().getConfiguration().locale;
+            final String locale = tinyDb.getString("locale");
             final String timeFormat = tinyDb.getString("dateFormat");
 
             commitTitle.setText(EmojiParser.parseToUnicode(commitsModel.getCommit().getMessage()));
-            commitCommitter.setText(context.getString(R.string.commitCommittedBy, commitsModel.getCommit().getCommitter().getName()));
+            commitCommitter.setText(ctx.getString(R.string.commitCommittedBy, commitsModel.getCommit().getCommitter().getName()));
-            commitDate.setText(TimeHelper.formatTime(commitsModel.getCommit().getCommitter().getDate(), locale, timeFormat, context));
+
+            commitDate.setText(TimeHelper.formatTime(commitsModel.getCommit().getCommitter().getDate(), new Locale(locale), timeFormat, ctx));
 
             if(timeFormat.equals("pretty")) {
-                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), context));
+                commitDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(commitsModel.getCommit().getCommitter().getDate()), ctx));
             }
-            commitHtmlUrl.setOnClickListener(v -> context.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
+
+            commitHtmlUrl.setOnClickListener(v -> ctx.startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(commitsModel.getHtml_url()))));
+
         }
 
     }
@@ -122,29 +135,41 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     static class LoadHolder extends RecyclerView.ViewHolder {
 
         LoadHolder(View itemView) {
+
             super(itemView);
         }
+
     }
 
     public void setMoreDataAvailable(boolean moreDataAvailable) {
+
         isMoreDataAvailable = moreDataAvailable;
+
     }
 
     public void notifyDataChanged() {
+
         notifyDataSetChanged();
         isLoading = false;
+
     }
 
     public interface OnLoadMoreListener {
+
         void onLoadMore();
+
     }
 
     public void setLoadMoreListener(CommitsAdapter.OnLoadMoreListener loadMoreListener) {
+
         this.loadMoreListener = loadMoreListener;
+
     }
 
     public void updateList(List<Commits> list) {
+
         commitsList = list;
         notifyDataSetChanged();
     }
+
 }

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

@@ -0,0 +1,59 @@
+package org.mian.gitnex.adapters;
+
+import android.text.SpannableStringBuilder;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class CreditsAdapter extends RecyclerView.Adapter<CreditsAdapter.CreditsViewHolder> {
+
+    private List<CharSequence> creditsList;
+
+    static class CreditsViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView creditText;
+
+        private CreditsViewHolder(View itemView) {
+            super(itemView);
+
+            creditText = itemView.findViewById(R.id.creditText);
+
+        }
+    }
+
+    public CreditsAdapter(List<CharSequence> creditsListMain) {
+        this.creditsList = creditsListMain;
+    }
+
+    @NonNull
+    @Override
+    public CreditsAdapter.CreditsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.credits, parent, false);
+        return new CreditsAdapter.CreditsViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull CreditsAdapter.CreditsViewHolder holder, int position) {
+
+        SpannableStringBuilder strBuilder = new SpannableStringBuilder(creditsList.get(position));
+        holder.creditText.setText((strBuilder));
+        holder.creditText.setMovementMethod(LinkMovementMethod.getInstance());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return creditsList.size();
+    }
+
+}

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

@@ -17,7 +17,6 @@ import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.database.models.DraftWithRepository;
 import org.mian.gitnex.fragments.BottomSheetReplyFragment;
@@ -34,7 +33,7 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
     private List<DraftWithRepository> draftsList;
     private final FragmentManager fragmentManager;
-    private final Context context;
+    private final Context mCtx;
 
     class DraftsViewHolder extends RecyclerView.ViewHolder {
 
@@ -57,9 +56,7 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
                 int getDraftId = draftWithRepository.getDraftId();
                 deleteDraft(getAdapterPosition());
-
+	            DraftsApi draftsApi = new DraftsApi(mCtx);
-	            DraftsApi draftsApi = BaseApi.getInstance(context, DraftsApi.class);
-	            assert draftsApi != null;
 	            draftsApi.deleteSingleDraft(getDraftId);
 
             });
@@ -79,23 +76,24 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 	                bundle.putString("commentAction", "edit");
                 }
 
-                TinyDB tinyDb = TinyDB.getInstance(context);
+                TinyDB tinyDb = TinyDB.getInstance(mCtx);
                 tinyDb.putString("issueNumber", String.valueOf(draftWithRepository.getIssueId()));
                 tinyDb.putLong("repositoryId", draftWithRepository.getRepositoryId());
 		        tinyDb.putString("issueType", draftWithRepository.getIssueType());
 		        tinyDb.putString("repoFullName", draftWithRepository.getRepositoryOwner() + "/" + draftWithRepository.getRepositoryName());
 
 		        BottomSheetReplyFragment bottomSheetReplyFragment = BottomSheetReplyFragment.newInstance(bundle);
-		        bottomSheetReplyFragment.setOnInteractedListener(() -> context.startActivity(new Intent(context, IssueDetailActivity.class)));
+		        bottomSheetReplyFragment.setOnInteractedListener(() -> mCtx.startActivity(new Intent(mCtx, IssueDetailActivity.class)));
 		        bottomSheetReplyFragment.show(fragmentManager, "replyBottomSheet");
+
             });
 
         }
 
     }
 
-    public DraftsAdapter(Context ctx, FragmentManager fragmentManager, List<DraftWithRepository> draftsListMain) {
+    public DraftsAdapter(Context mCtx, FragmentManager fragmentManager, List<DraftWithRepository> draftsListMain) {
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.fragmentManager = fragmentManager;
         this.draftsList = draftsListMain;
     }
@@ -105,7 +103,8 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
         draftsList.remove(position);
         notifyItemRemoved(position);
         notifyItemRangeChanged(position, draftsList.size());
-        Toasty.success(context, context.getResources().getString(R.string.draftsSingleDeleteSuccess));
+        Toasty.success(mCtx, mCtx.getResources().getString(R.string.draftsSingleDeleteSuccess));
+
     }
 
     @NonNull
@@ -121,14 +120,14 @@ public class DraftsAdapter extends RecyclerView.Adapter<DraftsAdapter.DraftsView
 
         DraftWithRepository currentItem = draftsList.get(position);
 
-	    String issueNumber = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + context.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
+	    String issueNumber = "<font color='" + ResourcesCompat.getColor(mCtx.getResources(), R.color.lightGray, null) + "'>" + mCtx.getResources().getString(R.string.hash) + currentItem.getIssueId() + "</font>";
 	    Spanned headTitle = HtmlCompat
 		    .fromHtml(issueNumber + " " + currentItem.getRepositoryOwner() + " / " + currentItem.getRepositoryName(), HtmlCompat.FROM_HTML_MODE_LEGACY);
 
 	    holder.repoInfo.setText(headTitle);
 	    holder.draftWithRepository = currentItem;
 
-	    Markdown.render(context, currentItem.getDraftText(), holder.draftText);
+	    new Markdown(mCtx, currentItem.getDraftText(), holder.draftText);
 
 	    if(!currentItem.getCommentId().equalsIgnoreCase("new")) {
 		    holder.editCommentStatus.setVisibility(View.VISIBLE);

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

@@ -1,148 +0,0 @@
-package org.mian.gitnex.adapters;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.Organization;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.OrganizationDetailActivity;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TinyDB;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class ExplorePublicOrganizationsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<Organization> organizationsList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public ExplorePublicOrganizationsAdapter(Context ctx, List<Organization> organizationsListMain) {
-		this.context = ctx;
-		this.organizationsList = organizationsListMain;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(context);
-		if(viewType == TYPE_LOAD) {
-			return new ExplorePublicOrganizationsAdapter.OrganizationsHolder(inflater.inflate(R.layout.list_organizations, parent, false));
-		}
-		else {
-			return new ExplorePublicOrganizationsAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
-			isLoading = true;
-			loadMoreListener.onLoadMore();
-		}
-
-		if(getItemViewType(position) == TYPE_LOAD) {
-			((ExplorePublicOrganizationsAdapter.OrganizationsHolder) holder).bindData(organizationsList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(organizationsList.get(position).getFull_name() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return organizationsList.size();
-	}
-
-	class OrganizationsHolder extends RecyclerView.ViewHolder {
-		private Organization organization;
-		private final ImageView image;
-		private final TextView orgName;
-		private final TextView orgDescription;
-
-		OrganizationsHolder(View itemView) {
-			super(itemView);
-			image = itemView.findViewById(R.id.imageAvatar);
-			orgName = itemView.findViewById(R.id.orgName);
-			orgDescription = itemView.findViewById(R.id.orgDescription);
-
-			itemView.setOnClickListener(v -> {
-				Context context = v.getContext();
-				Intent intent = new Intent(context, OrganizationDetailActivity.class);
-				intent.putExtra("orgName", organization.getUsername());
-
-				TinyDB tinyDb = TinyDB.getInstance(context);
-				tinyDb.putString("orgName", organization.getUsername());
-				tinyDb.putString("organizationId", String.valueOf(organization.getId()));
-				tinyDb.putBoolean("organizationAction", true);
-				context.startActivity(intent);
-			});
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(Organization organization) {
-			this.organization = organization;
-		    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-			orgName.setText(organization.getUsername());
-	        PicassoService.getInstance(context).get()
-		        .load(organization.getAvatar_url())
-		        .placeholder(R.drawable.loader_animated)
-		        .transform(new RoundedTransformation(imgRadius, 0))
-		        .resize(120, 120)
-		        .centerCrop()
-		        .into(image);
-	        if (!organization.getDescription().equals("")) {
-	            orgDescription.setText(organization.getDescription());
-	        }
-		}
-	}
-
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<Organization> list) {
-		organizationsList = list;
-		notifyDataSetChanged();
-	}
-}

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

@@ -1,5 +1,8 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
@@ -8,31 +11,30 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.gitnex.tea4j.models.UserRepositories;
 import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoForksActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.List;
-import java.util.Locale;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -42,78 +44,85 @@ import retrofit2.Callback;
 
 public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepositoriesAdapter.ReposSearchViewHolder> {
 
-	private final List<UserRepositories> reposList;
+	private List<UserRepositories> searchedReposList;
-	private final Context context;
+	private Context mCtx;
 
-	public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context ctx) {
+	public ExploreRepositoriesAdapter(List<UserRepositories> dataList, Context mCtx) {
 
-		this.context = ctx;
+		this.mCtx = mCtx;
-		this.reposList = dataList;
+		this.searchedReposList = dataList;
 	}
 
 	static class ReposSearchViewHolder extends RecyclerView.ViewHolder {
 
-		private UserRepositories userRepositories;
+		private ImageView image;
-
+		private TextView repoName;
-		private final ImageView image;
+		private TextView repoDescription;
-		private final TextView repoName;
+		private TextView fullName;
-		private final TextView orgName;
-		private final TextView repoDescription;
 		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
+		private ImageView repoPrivatePublic;
-		private final TextView repoLastUpdated;
+		private TextView repoStars;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
+		private TextView repoType;
+		private LinearLayout archiveRepo;
+		private TextView repoBranch;
+		private TextView htmlUrl;
 
 		private ReposSearchViewHolder(View itemView) {
 
 			super(itemView);
+
 			repoName = itemView.findViewById(R.id.repoName);
-			orgName = itemView.findViewById(R.id.orgName);
 			repoDescription = itemView.findViewById(R.id.repoDescription);
-			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
 			image = itemView.findViewById(R.id.imageAvatar);
+			fullName = itemView.findViewById(R.id.repoFullName);
+			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
 			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
+			repoForks = itemView.findViewById(R.id.repoForks);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+			repoType = itemView.findViewById(R.id.repoType);
+			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
+			htmlUrl = itemView.findViewById(R.id.htmlUrl);
 
 			itemView.setOnClickListener(v -> {
 
 				Context context = v.getContext();
-				TinyDB tinyDb = TinyDB.getInstance(context);
+				TextView repoFullName = v.findViewById(R.id.repoFullName);
 
 				Intent intent = new Intent(context, RepoDetailActivity.class);
-				intent.putExtra("repoFullName", userRepositories.getFullName());
+				intent.putExtra("repoFullName", repoFullName.getText().toString());
 
-				tinyDb.putString("repoFullName", userRepositories.getFullName());
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
 				tinyDb.putBoolean("resumeIssues", true);
 				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-				tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());
 
-				if(userRepositories.getPrivateFlag()) {
+				String[] parts = fullName.getText().toString().split("/");
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-				}
-				else {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-				}
-
-				String[] parts = userRepositories.getFullName().split("/");
 				final String repoOwner = parts[0];
 				final String repoName = parts[1];
 
 				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
 
 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
 
 					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", id);
+
 				}
 				else {
 
 					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", data.getRepositoryId());
+
 				}
 
 				//store if user is watching this repo
@@ -122,35 +131,117 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 					final String token = "token " + tinyDb.getString(tinyDb.getString("loginUid") + "-token");
 
 					WatchInfo watch = new WatchInfo();
+
 					Call<WatchInfo> call;
+
 					call = RetrofitClient.getApiInterface(context).checkRepoWatchStatus(token, repoOwner, repoName);
 
 					call.enqueue(new Callback<WatchInfo>() {
+
 						@Override
 						public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
 
 							if(response.isSuccessful()) {
+
 								assert response.body() != null;
 								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
-							}
+
-							else {
+							} else {
+
 								tinyDb.putBoolean("repoWatch", false);
+
 								if(response.code() != 404) {
+
 									Toasty.error(context, context.getString(R.string.genericApiStatusError));
+
 								}
+
 							}
+
 						}
 
 						@Override
 						public void onFailure(@NonNull Call<WatchInfo> call, @NonNull Throwable t) {
+
 							tinyDb.putBoolean("repoWatch", false);
 							Toasty.error(context, context.getString(R.string.genericApiStatusError));
+
 						}
 					});
+
 				}
+
 				context.startActivity(intent);
 
 			});
+
+			reposDropdownMenu.setOnClickListener(v -> {
+
+				final Context context = v.getContext();
+
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+				TextView repoForksList = view.findViewById(R.id.repoForksList);
+				TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
+				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+				bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
+
+				repoCopyUrl.setOnClickListener(openInBrowser -> {
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+					ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
+					assert clipboard != null;
+					clipboard.setPrimaryClip(clip);
+
+					Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
+					dialog.dismiss();
+				});
+
+				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+					intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+					context.startActivity(intentOpenInBrowser);
+					dialog.dismiss();
+
+				});
+
+				repoStargazers.setOnClickListener(stargazers -> {
+
+					Intent intent = new Intent(context, RepoStargazersActivity.class);
+					intent.putExtra("repoFullNameForStars", fullName.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
+
+				});
+
+				repoWatchers.setOnClickListener(watchers -> {
+
+					Intent intentW = new Intent(context, RepoWatchersActivity.class);
+					intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+				repoForksList.setOnClickListener(forks -> {
+
+					Intent intentW = new Intent(context, RepoForksActivity.class);
+					intentW.putExtra("repoFullNameForForks", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+			});
+
 		}
 
 	}
@@ -166,26 +257,20 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 	@Override
 	public void onBindViewHolder(@NonNull final ExploreRepositoriesAdapter.ReposSearchViewHolder holder, int position) {
 
-		TinyDB tinyDb = TinyDB.getInstance(context);
+		UserRepositories currentItem = searchedReposList.get(position);
-		UserRepositories currentItem = reposList.get(position);
+		holder.repoDescription.setVisibility(View.GONE);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+		holder.repoBranch.setText(currentItem.getDefault_branch());
-
+		holder.htmlUrl.setText(currentItem.getHtml_url());
-		Locale locale = context.getResources().getConfiguration().locale;
-		String timeFormat = tinyDb.getString("dateFormat");
-		holder.userRepositories = currentItem;
-		holder.orgName.setText(currentItem.getFullName().split("/")[0]);
-		holder.repoName.setText(currentItem.getFullName().split("/")[1]);
-		holder.repoStars.setText(currentItem.getStars_count());
 
 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
-		String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
+		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
 
 		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
 		if(currentItem.getAvatar_url() != null) {
 			if(!currentItem.getAvatar_url().equals("")) {
-				PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
+				PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
 			}
 			else {
 				holder.image.setImageDrawable(drawable);
@@ -195,51 +280,41 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 			holder.image.setImageDrawable(drawable);
 		}
 
-		if(currentItem.getUpdated_at() != null) {
+		holder.repoName.setText(currentItem.getName());
-
-			switch(timeFormat) {
-				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
-					String createdTime = prettyTime.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					holder.repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getUpdated_at()), context));
-					break;
-				}
-				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-					String createdTime = formatter.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					break;
-				}
-				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-					String createdTime = formatter.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					break;
-				}
-			}
-		}
-		else {
-			holder.repoLastUpdated.setVisibility(View.GONE);
-		}
-
 		if(!currentItem.getDescription().equals("")) {
+			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
-		else {
+		holder.fullName.setText(currentItem.getFullName());
-			holder.repoDescription.setText(context.getString(R.string.noDataDescription));
+		if(currentItem.getPrivateFlag()) {
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+			holder.repoType.setText(R.string.strPrivate);
 		}
-
+		else {
+			holder.repoPrivatePublic.setVisibility(View.GONE);
+			holder.repoType.setText(R.string.strPublic);
+		}
+		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoForks.setText(currentItem.getForks_count());
+		holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
 		if(holder.isRepoAdmin == null) {
-			holder.isRepoAdmin = new CheckBox(context);
+			holder.isRepoAdmin = new CheckBox(mCtx);
 		}
 		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
+
+		if(currentItem.isArchived()) {
+			holder.archiveRepo.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.archiveRepo.setVisibility(View.GONE);
+		}
+
 	}
 
 	@Override
 	public int getItemCount() {
 
-		return reposList.size();
+		return searchedReposList.size();
 	}
 
 	public void notifyDataChanged() {

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

@@ -27,7 +27,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 	private final List<Files> originalFiles = new ArrayList<>();
 	private final List<Files> alteredFiles = new ArrayList<>();
 
-    private final Context context;
+    private final Context mCtx;
 
     private final FilesAdapterListener filesListener;
 
@@ -40,7 +40,8 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 
     	private Files file;
 
-		private final ImageView fileTypeIs;
+    	private final LinearLayout fileFrame;
+        private final ImageView fileTypeIs;
         private final TextView fileName;
         private final TextView fileInfo;
 
@@ -48,7 +49,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 
             super(itemView);
 
-	        LinearLayout fileFrame = itemView.findViewById(R.id.fileFrame);
+            fileFrame = itemView.findViewById(R.id.fileFrame);
             fileName = itemView.findViewById(R.id.fileName);
 	        fileTypeIs = itemView.findViewById(R.id.fileTypeIs);
             fileInfo = itemView.findViewById(R.id.fileInfo);
@@ -123,10 +124,11 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         }
     }
 
-    public FilesAdapter(Context ctx, FilesAdapterListener filesListener) {
+    public FilesAdapter(Context mCtx, FilesAdapterListener filesListener) {
 
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.filesListener = filesListener;
+
     }
 
 	public List<Files> getOriginalFiles() {
@@ -139,6 +141,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
 	    alteredFiles.addAll(originalFiles);
 
     	notifyDataSetChanged();
+
     }
 
     @NonNull
@@ -159,28 +162,28 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         switch(currentItem.getType()) {
 
 	        case "file":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_file));
+		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_file));
 		        holder.fileInfo.setVisibility(View.VISIBLE);
 		        holder.fileInfo.setText(FileUtils.byteCountToDisplaySize(currentItem.getSize()));
 	        	break;
 
 	        case "dir":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_directory));
+		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_directory));
 		        holder.fileInfo.setVisibility(View.GONE);
 	        	break;
 
 	        case "submodule":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_submodule));
+		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_submodule));
 		        holder.fileInfo.setVisibility(View.GONE);
 	        	break;
 
 	        case "symlink":
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_symlink));
+		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_symlink));
 		        holder.fileInfo.setVisibility(View.GONE);
 		        break;
 
 	        default:
-		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_question));
+		        holder.fileTypeIs.setImageDrawable(AppCompatResources.getDrawable(mCtx, R.drawable.ic_question));
 
         }
     }

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

@@ -54,6 +54,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 		COLOR_NORMAL = AppUtil.getColorFromAttribute(context, R.attr.primaryBackgroundColor);
 		COLOR_SELECTED = AppUtil.getColorFromAttribute(context, R.attr.diffSelectedColor);
 		COLOR_FONT = AppUtil.getColorFromAttribute(context, R.attr.inputTextColor);
+
 	}
 
 	@Override
@@ -93,6 +94,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 
 			diffStats.setVisibility(View.GONE);
 			diffLines.addView(getMessageView(context.getResources().getString(R.string.binaryFileError)));
+
 		}
 		else {
 
@@ -166,6 +168,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 
 						}
 
+
 						diffTextView.setOnClickListener(v -> {
 
 							if(((DiffTextView) v).getCurrentBackgroundColor() != COLOR_SELECTED) {
@@ -194,6 +197,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 
 									stringBuilder.append(((DiffTextView) view).getText());
 									stringBuilder.append("\n");
+
 								}
 
 								stringBuilder.append("```\n\n");
@@ -205,6 +209,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 								bundle.putBoolean("cursorToEnd", true);
 
 								BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
+
 							}
 
 							return true;
@@ -221,6 +226,7 @@ public class FilesDiffAdapter extends BaseAdapter {
 			else {
 
 				diffLines.addView(getMessageView(context.getResources().getString(R.string.fileTooLarge)));
+
 			}
 
 		}
@@ -242,11 +248,13 @@ public class FilesDiffAdapter extends BaseAdapter {
 		textView.setText(message);
 
 		return textView;
+
 	}
 
 	private String[] getLines(String content) {
 
 		return content.split("\\R");
+
 	}
 
 }

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

@@ -20,7 +20,6 @@ import com.google.gson.JsonElement;
 import com.vdurmont.emoji.EmojiParser;
 import org.gitnex.tea4j.models.IssueComments;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.fragments.BottomSheetReplyFragment;
@@ -45,23 +44,23 @@ import retrofit2.Callback;
 
 public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdapter.IssueCommentViewHolder> {
 
-	private final Context context;
+	private final Context ctx;
 	private final TinyDB tinyDB;
 	private final Bundle bundle;
 	private final List<IssueComments> issuesComments;
 	private final FragmentManager fragmentManager;
 	private final BottomSheetReplyFragment.OnInteractedListener onInteractedListener;
-	private final Locale locale;
 
 	public IssueCommentsAdapter(Context ctx, Bundle bundle, List<IssueComments> issuesCommentsMain, FragmentManager fragmentManager, BottomSheetReplyFragment.OnInteractedListener onInteractedListener) {
 
-		this.context = ctx;
+		this.ctx = ctx;
 		this.bundle = bundle;
 		this.issuesComments = issuesCommentsMain;
 		this.fragmentManager = fragmentManager;
 		this.onInteractedListener = onInteractedListener;
+
 		tinyDB = TinyDB.getInstance(ctx);
-		locale = ctx.getResources().getConfiguration().locale;
+
 	}
 
 	class IssueCommentViewHolder extends RecyclerView.ViewHolder {
@@ -88,9 +87,10 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 			menu.setOnClickListener(v -> {
 
+				final Context ctx = v.getContext();
 				final String loginUid = tinyDB.getString("loginUid");
 
-				@SuppressLint("InflateParams") View vw = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_issue_comments, null);
+				@SuppressLint("InflateParams") View vw = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_issue_comments, null);
 
 				TextView commentMenuEdit = vw.findViewById(R.id.commentMenuEdit);
 				TextView commentShare = vw.findViewById(R.id.issueCommentShare);
@@ -108,7 +108,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 					commentMenuCopy.setVisibility(View.GONE);
 				}
 
-				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
 				dialog.setContentView(vw);
 				dialog.show();
 
@@ -118,17 +118,20 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 				bundle1.putAll(bundle);
 				bundle1.putInt("commentId", issueComment.getId());
 
-				ReactionSpinner reactionSpinner = new ReactionSpinner(context, bundle1);
+				ReactionSpinner reactionSpinner = new ReactionSpinner(ctx, bundle1);
 				reactionSpinner.setOnInteractedListener(() -> {
+
 					tinyDB.putBoolean("commentEdited", true);
 
 					onInteractedListener.onInteracted();
 					dialog.dismiss();
+
 				});
 
 				linearLayout.addView(reactionSpinner);
 
 				commentMenuEdit.setOnClickListener(v1 -> {
+
 					Bundle bundle = new Bundle();
 					bundle.putInt("commentId", issueComment.getId());
 					bundle.putString("commentAction", "edit");
@@ -139,48 +142,56 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 					bottomSheetReplyFragment.show(fragmentManager, "replyBottomSheet");
 
 					dialog.dismiss();
+
 				});
 
 				commentShare.setOnClickListener(v1 -> {
+
 					// get comment Url
 					CharSequence commentUrl = issueComment.getHtml_url();
 
 					// share issue comment
 					Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 					sharingIntent.setType("text/plain");
-					String intentHeader = tinyDB.getString("issueNumber") + context.getResources().getString(R.string.hash) + "issuecomment-" + issueComment.getId() + " " + tinyDB.getString("issueTitle");
+					String intentHeader = tinyDB.getString("issueNumber") + ctx.getResources().getString(R.string.hash) + "issuecomment-" + issueComment.getId() + " " + tinyDB.getString("issueTitle");
 					sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, intentHeader);
 					sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, commentUrl);
-					context.startActivity(Intent.createChooser(sharingIntent, intentHeader));
+					ctx.startActivity(Intent.createChooser(sharingIntent, intentHeader));
 
 					dialog.dismiss();
+
 				});
 
 				issueCommentCopyUrl.setOnClickListener(v1 -> {
+
 					// comment Url
 					CharSequence commentUrl = issueComment.getHtml_url();
 
-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
 					assert clipboard != null;
 
 					ClipData clip = ClipData.newPlainText(commentUrl, commentUrl);
 					clipboard.setPrimaryClip(clip);
 
 					dialog.dismiss();
-					Toasty.success(context, context.getString(R.string.copyIssueUrlToastMsg));
+					Toasty.success(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
+
 				});
 
 				commentMenuQuote.setOnClickListener(v1 -> {
+
 					StringBuilder stringBuilder = new StringBuilder();
 					String commenterName = issueComment.getUser().getUsername();
 
 					if(!commenterName.equals(tinyDB.getString("userLogin"))) {
+
 						stringBuilder.append("@").append(commenterName).append("\n\n");
 					}
 
 					String[] lines = issueComment.getBody().split("\\R");
 
 					for(String line : lines) {
+
 						stringBuilder.append(">").append(line).append("\n");
 					}
 
@@ -192,37 +203,40 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 					dialog.dismiss();
 					BottomSheetReplyFragment.newInstance(bundle).show(fragmentManager, "replyBottomSheet");
+
 				});
 
 				commentMenuCopy.setOnClickListener(v1 -> {
-					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
 					assert clipboard != null;
 
 					ClipData clip = ClipData.newPlainText("Comment on issue #" + tinyDB.getString("issueNumber"), issueComment.getBody());
 					clipboard.setPrimaryClip(clip);
 
 					dialog.dismiss();
-					Toasty.success(context, context.getString(R.string.copyIssueCommentToastMsg));
+					Toasty.success(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
+
 				});
 
 				commentMenuDelete.setOnClickListener(v1 -> {
-					deleteIssueComment(context, issueComment.getId(), getAdapterPosition());
+
+					deleteIssueComment(ctx, issueComment.getId(), getAdapterPosition());
 					dialog.dismiss();
+
 				});
 
 			});
 
 			avatar.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
+
-				intent.putExtra("username", userLoginId);
+				Context context = loginId.getContext();
-				context.startActivity(intent);
+
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
 			});
 
-			avatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-				return true;
-			});
 		}
+
 	}
 
 	private void updateAdapter(int position) {
@@ -230,6 +244,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 		issuesComments.remove(position);
 		notifyItemRemoved(position);
 		notifyItemRangeChanged(position, issuesComments.size());
+
 	}
 
 	private void deleteIssueComment(final Context ctx, final int commentId, int position) {
@@ -296,43 +311,48 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issue_comments, parent, false);
 		return new IssueCommentsAdapter.IssueCommentViewHolder(v);
+
 	}
 	@Override
 	public void onBindViewHolder(@NonNull IssueCommentsAdapter.IssueCommentViewHolder holder, int position) {
 
 		String timeFormat = tinyDB.getString("dateFormat");
 		IssueComments issueComment = issuesComments.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
 		holder.userLoginId = issueComment.getUser().getLogin();
 
 		holder.issueComment = issueComment;
 		holder.author.setText(issueComment.getUser().getUsername());
 
-		PicassoService.getInstance(context).get()
+		PicassoService.getInstance(ctx).get()
 			.load(issueComment.getUser().getAvatar_url())
 			.placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(imgRadius, 0))
+			.transform(new RoundedTransformation(4, 0))
-			.resize(AppUtil.getPixelsFromDensity(context, 35), AppUtil.getPixelsFromDensity(context, 35))
+			.resize(AppUtil.getPixelsFromDensity(ctx, 35), AppUtil.getPixelsFromDensity(ctx, 35))
 			.centerCrop()
 			.into(holder.avatar);
 
-		Markdown.render(context, EmojiParser.parseToUnicode(issueComment.getBody()), holder.comment);
+		new Markdown(ctx, EmojiParser.parseToUnicode(issueComment.getBody()), holder.comment);
 
 		StringBuilder informationBuilder = null;
 		if(issueComment.getCreated_at() != null) {
 
 			if(timeFormat.equals("pretty")) {
-				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), locale, "pretty", context));
+
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "pretty", ctx));
 				holder.information.setOnClickListener(v -> TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreated_at()));
+
 			}
 			else if(timeFormat.equals("normal")) {
-				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), locale, "normal", context));
+
+				informationBuilder = new StringBuilder(TimeHelper.formatTime(issueComment.getCreated_at(), Locale.getDefault(), "normal", ctx));
 			}
 
 			if(!issueComment.getCreated_at().equals(issueComment.getUpdated_at())) {
+
 				if(informationBuilder != null) {
-					informationBuilder.append(context.getString(R.string.colorfulBulletSpan)).append(context.getString(R.string.modifiedText));
+
+					informationBuilder.append(ctx.getString(R.string.colorfulBulletSpan)).append(ctx.getString(R.string.modifiedText));
 				}
 			}
 		}
@@ -343,7 +363,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 		bundle1.putAll(bundle);
 		bundle1.putInt("commentId", issueComment.getId());
 
-		ReactionList reactionList = new ReactionList(context, bundle1);
+		ReactionList reactionList = new ReactionList(ctx, bundle1);
 
 		holder.commentReactionBadges.addView(reactionList);
 		reactionList.setOnReactionAddedListener(() -> {
@@ -357,6 +377,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 	@Override
 	public int getItemCount() {
+
 		return issuesComments.size();
 	}
 

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

@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
@@ -16,7 +17,6 @@ import com.vdurmont.emoji.EmojiParser;
 import org.gitnex.tea4j.models.Issues;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.ClickListener;
@@ -41,10 +41,11 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
-	public IssuesAdapter(Context ctx, List<Issues> issuesListMain) {
+	public IssuesAdapter(Context context, List<Issues> issuesListMain) {
 
-		this.context = ctx;
+		this.context = context;
 		this.issuesList = issuesListMain;
+
 	}
 
 	@NonNull
@@ -59,6 +60,7 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		else {
 			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
 		}
+
 	}
 
 	@Override
@@ -68,12 +70,15 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 			isLoading = true;
 			loadMoreListener.onLoadMore();
+
 		}
 
 		if(getItemViewType(position) == TYPE_LOAD) {
 
 			((IssuesHolder) holder).bindData(issuesList.get(position));
+
 		}
+
 	}
 
 	@Override
@@ -85,12 +90,14 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		else {
 			return 1;
 		}
+
 	}
 
 	@Override
 	public int getItemCount() {
 
 		return issuesList.size();
+
 	}
 
 	class IssuesHolder extends RecyclerView.ViewHolder {
@@ -105,12 +112,17 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 		IssuesHolder(View itemView) {
 
 			super(itemView);
+
 			issueAssigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
 			issueTitle = itemView.findViewById(R.id.issueTitle);
 			issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
+			LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
 			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
 
-			itemView.setOnClickListener(layoutView -> {
+			issueTitle.setOnClickListener(title -> {
+
+				Context context = title.getContext();
+
 				Intent intent = new Intent(context, IssueDetailActivity.class);
 				intent.putExtra("issueNumber", issue.getNumber());
 
@@ -118,33 +130,43 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 				tinyDb.putString("issueNumber", String.valueOf(issue.getNumber()));
 				tinyDb.putString("issueType", "Issue");
 				context.startActivity(intent);
+
+			});
+
+			frameCommentsCount.setOnClickListener(commentsCount -> {
+
+				Context context = commentsCount.getContext();
+
+				Intent intent = new Intent(context, IssueDetailActivity.class);
+				intent.putExtra("issueNumber", issue.getNumber());
+
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("issueNumber", String.valueOf(issue.getNumber()));
+				tinyDb.putString("issueType", "Issue");
+				context.startActivity(intent);
+
 			});
 
 			issueAssigneeAvatar.setOnClickListener(v -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
+				Context context = v.getContext();
-				intent.putExtra("username", issue.getUser().getLogin());
+				String userLoginId = issue.getUser().getLogin();
-				context.startActivity(intent);
+
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
 			});
 
-			issueAssigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, issue.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issue.getUser().getLogin()));
-				return true;
-			});
 		}
 
 		@SuppressLint("SetTextI18n")
 		void bindData(Issues issue) {
 
 			TinyDB tinyDb = TinyDB.getInstance(context);
-			Locale locale = context.getResources().getConfiguration().locale;
+			String locale = tinyDb.getString("locale");
 			String timeFormat = tinyDb.getString("dateFormat");
 
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
 			PicassoService.getInstance(context).get()
 				.load(issue.getUser().getAvatar_url())
 				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0))
+				.transform(new RoundedTransformation(8, 0))
 				.resize(120, 120)
 				.centerCrop()
 				.into(issueAssigneeAvatar);
@@ -157,20 +179,20 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 			switch(timeFormat) {
 				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
+					PrettyTime prettyTime = new PrettyTime(new Locale(locale));
 					String createdTime = prettyTime.format(issue.getCreated_at());
 					this.issueCreatedTime.setText(createdTime);
 					this.issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(issue.getCreated_at()), context));
 					break;
 				}
 				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
 					String createdTime = formatter.format(issue.getCreated_at());
 					this.issueCreatedTime.setText(createdTime);
 					break;
 				}
 				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
 					String createdTime = formatter.format(issue.getCreated_at());
 					this.issueCreatedTime.setText(createdTime);
 					break;
@@ -187,27 +209,32 @@ public class IssuesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
 			super(itemView);
 		}
+
 	}
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 
 		isMoreDataAvailable = moreDataAvailable;
+
 	}
 
 	public void notifyDataChanged() {
 
 		notifyDataSetChanged();
 		isLoading = false;
+
 	}
 
 	public interface OnLoadMoreListener {
 
 		void onLoadMore();
+
 	}
 
 	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 
 		this.loadMoreListener = loadMoreListener;
+
 	}
 
 	public void updateList(List<Issues> list) {

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

@@ -20,6 +20,7 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateLabelActivity;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ColorInverter;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,17 +29,21 @@ import java.util.List;
 
 public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsViewHolder>  {
 
-    private final List<Labels> labelsList;
+    private List<Labels> labelsList;
+    final private Context mCtx;
+    private ArrayList<Integer> labelsArray = new ArrayList<>();
     private static String type;
 	private static String orgName;
 
     static class LabelsViewHolder extends RecyclerView.ViewHolder {
 
-    	private Labels labels;
+        private TextView labelTitle;
+        private TextView labelId;
+        private TextView labelColor;
 
-        private final CardView labelView;
+        private CardView labelView;
-        private final ImageView labelIcon;
+        private ImageView labelIcon;
-        private final TextView labelName;
+        private TextView labelName;
 
         private LabelsViewHolder(View itemView) {
             super(itemView);
@@ -47,6 +52,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
             labelIcon = itemView.findViewById(R.id.labelIcon);
             labelName = itemView.findViewById(R.id.labelName);
             ImageView labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
+            labelTitle = itemView.findViewById(R.id.labelTitle);
+            labelId = itemView.findViewById(R.id.labelId);
+            labelColor = itemView.findViewById(R.id.labelColor);
 
             labelsOptionsMenu.setOnClickListener(v -> {
 
@@ -59,7 +67,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                 TextView labelMenuDelete = view.findViewById(R.id.labelMenuDelete);
                 TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                bottomSheetHeader.setText(labels.getName());
+                bottomSheetHeader.setText(labelTitle.getText());
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();
@@ -67,25 +75,27 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                 labelMenuEdit.setOnClickListener(editLabel -> {
 
                     Intent intent = new Intent(context, CreateLabelActivity.class);
-                    intent.putExtra("labelId", String.valueOf(labels.getId()));
+                    intent.putExtra("labelId", labelId.getText());
-                    intent.putExtra("labelTitle", labels.getName());
+                    intent.putExtra("labelTitle", labelTitle.getText());
-                    intent.putExtra("labelColor", labels.getColor());
+                    intent.putExtra("labelColor", labelColor.getText());
                     intent.putExtra("labelAction", "edit");
 	                intent.putExtra("type", type);
 	                intent.putExtra("orgName", orgName);
                     context.startActivity(intent);
                     dialog.dismiss();
+
                 });
 
                 labelMenuDelete.setOnClickListener(deleteLabel -> {
 
-                    AlertDialogs.labelDeleteDialog(context, labels.getName(), String.valueOf(labels.getId()),
+                    AlertDialogs.labelDeleteDialog(context, labelTitle.getText().toString(), labelId.getText().toString(),
                             context.getResources().getString(R.string.labelDeleteTitle),
                             context.getResources().getString(R.string.labelDeleteMessage),
                             context.getResources().getString(R.string.labelDeleteTitle),
                             context.getResources().getString(R.string.labelDeleteNegativeButton),
 	                        type, orgName);
                     dialog.dismiss();
+
                 });
 
             });
@@ -93,9 +103,10 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         }
     }
 
-    public LabelsAdapter(Context ctx, List<Labels> labelsMain, String type, String orgName) {
+    public LabelsAdapter(Context mCtx, List<Labels> labelsMain, String type, String orgName) {
 
-	    this.labelsList = labelsMain;
+        this.mCtx = mCtx;
+        this.labelsList = labelsMain;
         LabelsAdapter.type = type;
         LabelsAdapter.orgName = orgName;
     }
@@ -111,7 +122,10 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
     public void onBindViewHolder(@NonNull LabelsAdapter.LabelsViewHolder holder, int position) {
 
         Labels currentItem = labelsList.get(position);
-	    holder.labels = currentItem;
+
+        holder.labelTitle.setText(currentItem.getName());
+        holder.labelId.setText(String.valueOf(currentItem.getId()));
+        holder.labelColor.setText(currentItem.getColor());
 
         String labelColor = currentItem.getColor();
         String labelName = currentItem.getName();
@@ -124,6 +138,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         holder.labelName.setTextColor(contrastColor);
         holder.labelName.setText(labelName);
         holder.labelView.setCardBackgroundColor(color);
+
     }
 
     @Override

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

@@ -22,11 +22,11 @@ import java.util.List;
 public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.LabelsViewHolder> {
 
 	private List<Integer> currentLabelsIds;
-	private final List<Labels> labels;
+	private List<Labels> labels;
-	private final List<String> labelsStrings = new ArrayList<>();
+	private List<String> labelsStrings = new ArrayList<>();
 	private List<Integer> labelsIds = new ArrayList<>();
 
-	private final LabelsListAdapterListener labelsListener;
+	private LabelsListAdapterListener labelsListener;
 
 	public interface LabelsListAdapterListener {
 
@@ -43,9 +43,9 @@ public class LabelsListAdapter extends RecyclerView.Adapter<LabelsListAdapter.La
 
 	static class LabelsViewHolder extends RecyclerView.ViewHolder {
 
-		private final CheckBox labelSelection;
+		private CheckBox labelSelection;
-		private final TextView labelText;
+		private TextView labelText;
-		private final ImageView labelColor;
+		private ImageView labelColor;
 
 		private LabelsViewHolder(View itemView) {
 

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,7 +13,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -28,10 +26,10 @@ import java.util.List;
 public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
 
     private final List<UserInfo> membersList;
-    private final Context context;
+    private final Context mCtx;
     private final List<UserInfo> membersListFull;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
 	    private String userLoginId;
 
@@ -44,21 +42,17 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
             memberName  = v.findViewById(R.id.memberName);
 
 	        memberAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", userLoginId);
-		        context.startActivity(intent);
-	        });
 
-	        memberAvatar.setOnLongClickListener(loginId -> {
+		        Context context = loginId.getContext();
+
 		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-		        return true;
 	        });
         }
     }
 
-    public MembersByOrgAdapter(Context ctx, List<UserInfo> membersListMain) {
+    public MembersByOrgAdapter(Context mCtx, List<UserInfo> membersListMain) {
 
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.membersList = membersListMain;
         membersListFull = new ArrayList<>(membersList);
     }
@@ -86,7 +80,7 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
 
         if (finalView == null) {
 
-            finalView = LayoutInflater.from(context).inflate(R.layout.list_members_by_org, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_org, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -102,9 +96,7 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
     private void initData(MembersByOrgAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = membersList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);
-
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);
 
 	    viewHolder.userLoginId = currentItem.getLogin();
 
@@ -116,6 +108,7 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
 
             viewHolder.memberName.setText(currentItem.getLogin());
         }
+
     }
 
     @Override

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

@@ -35,17 +35,19 @@ import java.util.Locale;
 
 public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-	private final Context context;
+	private Context context;
 	private final int TYPE_LOAD = 0;
 	private List<Milestones> dataList;
 	private OnLoadMoreListener loadMoreListener;
 	private boolean isLoading = false;
 	private boolean isMoreDataAvailable = true;
+	private String TAG = Constants.tagMilestonesAdapter;
 
-	public MilestonesAdapter(Context ctx, List<Milestones> dataListMain) {
+	public MilestonesAdapter(Context context, List<Milestones> dataListMain) {
 
-		this.context = ctx;
+		this.context = context;
 		this.dataList = dataListMain;
+
 	}
 
 	@NonNull
@@ -60,6 +62,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		else {
 			return new MilestonesAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
 		}
+
 	}
 
 	@Override
@@ -69,29 +72,33 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 			isLoading = true;
 			loadMoreListener.onLoadMore();
+
 		}
 
 		if(getItemViewType(position) == TYPE_LOAD) {
 
 			((MilestonesAdapter.DataHolder) holder).bindData(dataList.get(position));
+
 		}
+
 	}
 
 	class DataHolder extends RecyclerView.ViewHolder {
 
-		private Milestones milestones;
+		private TextView milestoneId;
-
+		private TextView msTitle;
-		private final TextView msTitle;
+		private TextView msDescription;
-		private final TextView msDescription;
+		private TextView msOpenIssues;
-		private final TextView msOpenIssues;
+		private TextView msClosedIssues;
-		private final TextView msClosedIssues;
+		private TextView msDueDate;
-		private final TextView msDueDate;
+		private ProgressBar msProgress;
-		private final ProgressBar msProgress;
+		private TextView milestoneStatus;
 
 		DataHolder(View itemView) {
 
 			super(itemView);
 
+			milestoneId = itemView.findViewById(R.id.milestoneId);
 			msTitle = itemView.findViewById(R.id.milestoneTitle);
 			msDescription = itemView.findViewById(R.id.milestoneDescription);
 			msOpenIssues = itemView.findViewById(R.id.milestoneIssuesOpen);
@@ -99,11 +106,12 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 			msDueDate = itemView.findViewById(R.id.milestoneDueDate);
 			msProgress = itemView.findViewById(R.id.milestoneProgress);
 			ImageView milestonesMenu = itemView.findViewById(R.id.milestonesMenu);
+			milestoneStatus = itemView.findViewById(R.id.milestoneStatus);
 
 			milestonesMenu.setOnClickListener(v -> {
 
 				Context ctx = v.getContext();
-				int milestoneId_ = Integer.parseInt(String.valueOf(milestones.getId()));
+				int milestoneId_ = Integer.parseInt(milestoneId.getText().toString());
 
 				@SuppressLint("InflateParams") View view = LayoutInflater.from(ctx).inflate(R.layout.bottom_sheet_milestones_in_list, null);
 
@@ -114,15 +122,17 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 				dialog.setContentView(view);
 				dialog.show();
 
-				if(milestones.getState().equals("open")) {
+				if(milestoneStatus.getText().toString().equals("open")) {
 
 					closeMilestone.setVisibility(View.VISIBLE);
 					openMilestone.setVisibility(View.GONE);
+
 				}
 				else {
 
 					closeMilestone.setVisibility(View.GONE);
 					openMilestone.setVisibility(View.VISIBLE);
+
 				}
 
 				closeMilestone.setOnClickListener(v12 -> {
@@ -130,6 +140,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					MilestoneActions.closeMilestone(ctx, milestoneId_);
 					dialog.dismiss();
 					updateAdapter(getAdapterPosition());
+
 				});
 
 				openMilestone.setOnClickListener(v12 -> {
@@ -137,6 +148,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					MilestoneActions.openMilestone(ctx, milestoneId_);
 					dialog.dismiss();
 					updateAdapter(getAdapterPosition());
+
 				});
 
 			});
@@ -146,16 +158,18 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		@SuppressLint("SetTextI18n")
 		void bindData(Milestones dataModel) {
 
-			this.milestones = dataModel;
 			final TinyDB tinyDb = TinyDB.getInstance(context);
-			final String locale = context.getResources().getConfiguration().locale.getLanguage();
+			final String locale = tinyDb.getString("locale");
 			final String timeFormat = tinyDb.getString("dateFormat");
 
-			Markdown.render(context, dataModel.getTitle(), msTitle);
+			milestoneId.setText(String.valueOf(dataModel.getId()));
+			milestoneStatus.setText(dataModel.getState());
+
+			new Markdown(context, dataModel.getTitle(), msTitle);
 
 			if(!dataModel.getDescription().equals("")) {
 
-				Markdown.render(context, EmojiParser.parseToUnicode(dataModel.getDescription()), msDescription);
+				new Markdown(context, EmojiParser.parseToUnicode(dataModel.getDescription()), msDescription);
 			}
 			else {
 
@@ -171,12 +185,14 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 					msProgress.setProgress(100);
 					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 100), context));
+
 				}
 				else {
 
 					int msCompletion = 100 * dataModel.getClosed_issues() / (dataModel.getOpen_issues() + dataModel.getClosed_issues());
 					msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, msCompletion), context));
 					msProgress.setProgress(msCompletion);
+
 				}
 
 			}
@@ -184,11 +200,11 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 				msProgress.setProgress(0);
 				msProgress.setOnClickListener(new ClickListener(context.getResources().getString(R.string.milestoneCompletion, 0), context));
+
 			}
 
 			if(dataModel.getDue_on() != null) {
 
-				String TAG = Constants.tagMilestonesAdapter;
 				if(timeFormat.equals("normal") || timeFormat.equals("pretty")) {
 
 					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd", new Locale(locale));
@@ -210,6 +226,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 					msDueDate.setText(dueDate);
 					msDueDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToast(dataModel.getDue_on()), context));
+
 				}
 				else if(timeFormat.equals("normal1")) {
 
@@ -227,6 +244,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 					assert date1 != null;
 					String dueDate = formatter.format(date1);
 					msDueDate.setText(dueDate);
+
 				}
 
 			}
@@ -244,6 +262,7 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		dataList.remove(position);
 		notifyItemRemoved(position);
 		notifyItemRangeChanged(position, dataList.size());
+
 	}
 
 	@Override
@@ -255,12 +274,14 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 		else {
 			return 1;
 		}
+
 	}
 
 	@Override
 	public int getItemCount() {
 
 		return dataList.size();
+
 	}
 
 	static class LoadHolder extends RecyclerView.ViewHolder {
@@ -269,27 +290,32 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 			super(itemView);
 		}
+
 	}
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 
 		isMoreDataAvailable = moreDataAvailable;
+
 	}
 
 	public void notifyDataChanged() {
 
 		notifyDataSetChanged();
 		isLoading = false;
+
 	}
 
 	public interface OnLoadMoreListener {
 
 		void onLoadMore();
+
 	}
 
 	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
 
 		this.loadMoreListener = loadMoreListener;
+
 	}
 
 	public void updateList(List<Milestones> list) {

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

@@ -1,5 +1,8 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
@@ -10,32 +13,31 @@ import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.gitnex.tea4j.models.UserRepositories;
 import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoForksActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -45,73 +47,79 @@ import retrofit2.Callback;
 
 public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.MyReposViewHolder> implements Filterable {
 
-	private final List<UserRepositories> reposList;
+	private List<UserRepositories> reposList;
-	private final Context context;
+	private Context mCtx;
-	private final List<UserRepositories> reposListFull;
+	private List<UserRepositories> reposListFull;
 
 	static class MyReposViewHolder extends RecyclerView.ViewHolder {
 
-		private UserRepositories userRepositories;
+		private ImageView imageAvatar;
-
+		private TextView repoName;
-		private final ImageView image;
+		private TextView repoDescription;
-		private final TextView repoName;
+		private TextView repoFullName;
-		private final TextView orgName;
+		private ImageView repoPrivatePublic;
-		private final TextView repoDescription;
+		private TextView repoStars;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
+		private TextView repoType;
 		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
+		private LinearLayout archiveRepo;
-		private final TextView repoLastUpdated;
+		private TextView repoBranch;
+		private TextView htmlUrl;
 
 		private MyReposViewHolder(View itemView) {
 
 			super(itemView);
 			repoName = itemView.findViewById(R.id.repoName);
-			orgName = itemView.findViewById(R.id.orgName);
 			repoDescription = itemView.findViewById(R.id.repoDescription);
-			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+			imageAvatar = itemView.findViewById(R.id.imageAvatar);
-			image = itemView.findViewById(R.id.imageAvatar);
+			repoFullName = itemView.findViewById(R.id.repoFullName);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
 			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
+			repoForks = itemView.findViewById(R.id.repoForks);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+			repoType = itemView.findViewById(R.id.repoType);
+			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
+			htmlUrl = itemView.findViewById(R.id.htmlUrl);
 
 			itemView.setOnClickListener(v -> {
 
 				Context context = v.getContext();
-				TinyDB tinyDb = TinyDB.getInstance(context);
 
 				Intent intent = new Intent(context, RepoDetailActivity.class);
-				intent.putExtra("repoFullName", userRepositories.getFullName());
+				intent.putExtra("repoFullName", repoFullName.getText().toString());
 
-				tinyDb.putString("repoFullName", userRepositories.getFullName());
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
+				tinyDb.putString("repoType", repoType.getText().toString());
 				//tinyDb.putBoolean("resumeIssues", true);
 				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-				tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());
 
-				if(userRepositories.getPrivateFlag()) {
+				String[] parts = repoFullName.getText().toString().split("/");
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-				}
-				else {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-				}
-
-				String[] parts = userRepositories.getFullName().split("/");
 				final String repoOwner = parts[0];
 				final String repoName = parts[1];
 
 				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
 
 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
 
 					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", id);
+
 				}
 				else {
 
 					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", data.getRepositoryId());
+
 				}
 
 				//store if user is watching this repo
@@ -164,13 +172,81 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 				context.startActivity(intent);
 
 			});
+
+			reposDropdownMenu.setOnClickListener(v -> {
+
+				final Context context = v.getContext();
+
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+				TextView repoForksList = view.findViewById(R.id.repoForksList);
+				TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
+				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+				bottomSheetHeader.setText(String.format("%s / %s", repoFullName.getText().toString().split("/")[0], repoFullName.getText().toString().split("/")[1]));
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
+
+				repoCopyUrl.setOnClickListener(openInBrowser -> {
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+					ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
+					assert clipboard != null;
+					clipboard.setPrimaryClip(clip);
+
+					Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
+					dialog.dismiss();
+				});
+
+				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+					intentOpenInBrowser.putExtra("repoFullNameBrowser", repoFullName.getText());
+					context.startActivity(intentOpenInBrowser);
+					dialog.dismiss();
+
+				});
+
+				repoStargazers.setOnClickListener(stargazers -> {
+
+					Intent intent = new Intent(context, RepoStargazersActivity.class);
+					intent.putExtra("repoFullNameForStars", repoFullName.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
+
+				});
+
+				repoWatchers.setOnClickListener(watchers -> {
+
+					Intent intentW = new Intent(context, RepoWatchersActivity.class);
+					intentW.putExtra("repoFullNameForWatchers", repoFullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+				repoForksList.setOnClickListener(forks -> {
+
+					Intent intentW = new Intent(context, RepoForksActivity.class);
+					intentW.putExtra("repoFullNameForForks", repoFullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+			});
+
 		}
 
 	}
 
-	public MyReposListAdapter(Context ctx, List<UserRepositories> reposListMain) {
+	public MyReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {
 
-		this.context = ctx;
+		this.mCtx = mCtx;
 		this.reposList = reposListMain;
 		reposListFull = new ArrayList<>(reposList);
 	}
@@ -186,74 +262,59 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 	@Override
 	public void onBindViewHolder(@NonNull MyReposListAdapter.MyReposViewHolder holder, int position) {
 
-		TinyDB tinyDb = TinyDB.getInstance(context);
 		UserRepositories currentItem = reposList.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+		holder.repoDescription.setVisibility(View.GONE);
-
+		holder.repoBranch.setText(currentItem.getDefault_branch());
-		Locale locale = context.getResources().getConfiguration().locale;
+		holder.htmlUrl.setText(currentItem.getHtml_url());
-		String timeFormat = tinyDb.getString("dateFormat");
-		holder.userRepositories = currentItem;
-		holder.orgName.setText(currentItem.getFullName().split("/")[0]);
-		holder.repoName.setText(currentItem.getFullName().split("/")[1]);
-		holder.repoStars.setText(currentItem.getStars_count());
 
 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
-		String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
+		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
 
 		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
 		if(currentItem.getAvatar_url() != null) {
 			if(!currentItem.getAvatar_url().equals("")) {
-				PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
+				PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.imageAvatar);
 			}
 			else {
-				holder.image.setImageDrawable(drawable);
+				holder.imageAvatar.setImageDrawable(drawable);
 			}
 		}
 		else {
-			holder.image.setImageDrawable(drawable);
+			holder.imageAvatar.setImageDrawable(drawable);
-		}
-
-		if(currentItem.getUpdated_at() != null) {
-
-			switch(timeFormat) {
-				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
-					String createdTime = prettyTime.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					holder.repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getUpdated_at()), context));
-					break;
-				}
-				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-					String createdTime = formatter.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					break;
-				}
-				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-					String createdTime = formatter.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					break;
-				}
-			}
-		}
-		else {
-			holder.repoLastUpdated.setVisibility(View.GONE);
 		}
 
+		holder.repoName.setText(currentItem.getName());
 		if(!currentItem.getDescription().equals("")) {
+			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
-		else {
+		holder.repoFullName.setText(currentItem.getFullName());
-			holder.repoDescription.setText(context.getString(R.string.noDataDescription));
+		if(currentItem.getPrivateFlag()) {
+			holder.repoPrivatePublic.setVisibility(View.VISIBLE);
+			holder.repoType.setText(R.string.strPrivate);
 		}
+		else {
+			holder.repoPrivatePublic.setVisibility(View.GONE);
+			holder.repoType.setText(R.string.strPublic);
+		}
+		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoForks.setText(currentItem.getForks_count());
+		holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
 
 		if(holder.isRepoAdmin == null) {
-			holder.isRepoAdmin = new CheckBox(context);
+			holder.isRepoAdmin = new CheckBox(mCtx);
 		}
 		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
+
+		if(currentItem.isArchived()) {
+			holder.archiveRepo.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.archiveRepo.setVisibility(View.GONE);
+		}
+
 	}
 
 	@Override
@@ -268,7 +329,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 		return myReposFilter;
 	}
 
-	private final Filter myReposFilter = new Filter() {
+	private Filter myReposFilter = new Filter() {
 
 		@Override
 		protected FilterResults performFiltering(CharSequence constraint) {

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

@@ -13,7 +13,6 @@ import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import org.gitnex.tea4j.models.NotificationThread;
 import org.mian.gitnex.R;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.TinyDB;
@@ -25,11 +24,11 @@ import java.util.List;
 
 public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdapter.NotificationsViewHolder> {
 
-	private final Context context;
+	private Context context;
-	private final List<NotificationThread> notificationThreads;
+	private List<NotificationThread> notificationThreads;
-	private final OnMoreClickedListener onMoreClickedListener;
+	private OnMoreClickedListener onMoreClickedListener;
-	private final OnNotificationClickedListener onNotificationClickedListener;
+	private OnNotificationClickedListener onNotificationClickedListener;
-	private final TinyDB tinyDb;
+	private TinyDB tinyDb;
 
 	public NotificationsAdapter(Context context, List<NotificationThread> notificationThreads, OnMoreClickedListener onMoreClickedListener, OnNotificationClickedListener onNotificationClickedListener) {
 
@@ -38,18 +37,19 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 		this.notificationThreads = notificationThreads;
 		this.onMoreClickedListener = onMoreClickedListener;
 		this.onNotificationClickedListener = onNotificationClickedListener;
+
 	}
 
 	static class NotificationsViewHolder extends RecyclerView.ViewHolder {
 
-		private final LinearLayout frame;
+		private LinearLayout frame;
-		private final TextView subject;
+		private TextView subject;
-		private final TextView repository;
+		private TextView repository;
-		private final ImageView typePr;
+		private ImageView typePr;
-		private final ImageView typeIssue;
+		private ImageView typeIssue;
-		private final ImageView typeUnknown;
+		private ImageView typeUnknown;
-		private final ImageView pinned;
+		private ImageView pinned;
-		private final ImageView more;
+		private ImageView more;
 
 		public NotificationsViewHolder(@NonNull View itemView) {
 
@@ -63,6 +63,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 			typeUnknown = itemView.findViewById(R.id.typeUnknown);
 			pinned = itemView.findViewById(R.id.pinned);
 			more = itemView.findViewById(R.id.more);
+
 		}
 	}
 
@@ -72,6 +73,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 
 		View v = LayoutInflater.from(context).inflate(R.layout.list_notifications, parent, false);
 		return new NotificationsAdapter.NotificationsViewHolder(v);
+
 	}
 
 	@Override
@@ -88,7 +90,8 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 
 		if(notificationThread.isPinned()) {
 			holder.pinned.setVisibility(View.VISIBLE);
-		} else {
+		}
+		else {
 			holder.pinned.setVisibility(View.GONE);
 		}
 
@@ -123,20 +126,26 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 			final String repoName = parts[1];
 
 			int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-			RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+			RepositoriesApi repositoryData = new RepositoriesApi(context);
 
 			Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 			if(count == 0) {
+
 				long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
 				tinyDb.putLong("repositoryId", id);
-			} else {
+
+			}
+			else {
+
 				Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
 				tinyDb.putLong("repositoryId", data.getRepositoryId());
+
 			}
 		});
 
 		holder.more.setOnClickListener(v -> onMoreClickedListener.onMoreClicked(notificationThread));
+
 	}
 
 	@Override

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

@@ -16,7 +16,6 @@ import org.gitnex.tea4j.models.UserOrganizations;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OrganizationDetailActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import java.util.ArrayList;
@@ -28,42 +27,42 @@ import java.util.List;
 
 public class OrganizationsListAdapter extends RecyclerView.Adapter<OrganizationsListAdapter.OrganizationsViewHolder> implements Filterable {
 
-    private final List<UserOrganizations> orgList;
+    private List<UserOrganizations> orgList;
-    private final Context context;
+    private Context mCtx;
-    private final List<UserOrganizations> orgListFull;
+    private List<UserOrganizations> orgListFull;
 
     static class OrganizationsViewHolder extends RecyclerView.ViewHolder {
 
-    	private UserOrganizations userOrganizations;
+        private ImageView image;
-
+        private TextView mTextView1;
-        private final ImageView image;
+        private TextView mTextView2;
-        private final TextView orgName;
+        private TextView organizationId;
-        private final TextView orgDescription;
 
         private OrganizationsViewHolder(View itemView) {
             super(itemView);
-	        orgName = itemView.findViewById(R.id.orgName);
+            mTextView1 = itemView.findViewById(R.id.orgUsername);
-	        orgDescription = itemView.findViewById(R.id.orgDescription);
+            mTextView2 = itemView.findViewById(R.id.orgDescription);
             image = itemView.findViewById(R.id.imageAvatar);
+            organizationId = itemView.findViewById(R.id.organizationId);
 
             itemView.setOnClickListener(v -> {
 
                 Context context = v.getContext();
                 Intent intent = new Intent(context, OrganizationDetailActivity.class);
-                intent.putExtra("orgName", userOrganizations.getUsername());
+                intent.putExtra("orgName", mTextView1.getText().toString());
 
                 TinyDB tinyDb = TinyDB.getInstance(context);
-                tinyDb.putString("orgName", userOrganizations.getUsername());
+                tinyDb.putString("orgName", mTextView1.getText().toString());
-                tinyDb.putString("organizationId", String.valueOf(userOrganizations.getId()));
+                tinyDb.putString("organizationId", organizationId.getText().toString());
                 tinyDb.putBoolean("organizationAction", true);
                 context.startActivity(intent);
             });
         }
     }
 
-    public OrganizationsListAdapter(Context ctx, List<UserOrganizations> orgsListMain) {
+    public OrganizationsListAdapter(Context mCtx, List<UserOrganizations> orgsListMain) {
 
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.orgList = orgsListMain;
         orgListFull = new ArrayList<>(orgList);
     }
@@ -81,16 +80,16 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
     public void onBindViewHolder(@NonNull OrganizationsViewHolder holder, int position) {
 
         UserOrganizations currentItem = orgList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+        holder.mTextView2.setVisibility(View.GONE);
+        holder.organizationId.setText(Integer.toString(currentItem.getId()));
 
-	    holder.userOrganizations = currentItem;
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
-	    holder.orgName.setText(currentItem.getUsername());
+        holder.mTextView1.setText(currentItem.getUsername());
-
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
 
         if (!currentItem.getDescription().equals("")) {
 
-            holder.orgDescription.setText(currentItem.getDescription());
+            holder.mTextView2.setVisibility(View.VISIBLE);
+            holder.mTextView2.setText(currentItem.getDescription());
         }
     }
 

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

@@ -18,15 +18,15 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmailsAdapter.EmailsViewHolder> {
+public class ProfileEmailsAdapter extends RecyclerView.Adapter<ProfileEmailsAdapter.EmailsViewHolder> {
 
-    private final List<Emails> emailsList;
+    private List<Emails> emailsList;
-    private final Context context;
+    private Context mCtx;
 
     static class EmailsViewHolder extends RecyclerView.ViewHolder {
 
-        private final ImageView emailPrimary;
+        private ImageView emailPrimary;
-        private final TextView userEmail;
+        private TextView userEmail;
 
         private EmailsViewHolder(View itemView) {
             super(itemView);
@@ -37,20 +37,20 @@ public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmails
         }
     }
 
-    public MyProfileEmailsAdapter(Context ctx, List<Emails> emailsListMain) {
+    public ProfileEmailsAdapter(Context mCtx, List<Emails> emailsListMain) {
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.emailsList = emailsListMain;
     }
 
     @NonNull
     @Override
-    public MyProfileEmailsAdapter.EmailsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public ProfileEmailsAdapter.EmailsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_emails, parent, false);
-        return new MyProfileEmailsAdapter.EmailsViewHolder(v);
+        return new ProfileEmailsAdapter.EmailsViewHolder(v);
     }
 
     @Override
-    public void onBindViewHolder(@NonNull MyProfileEmailsAdapter.EmailsViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull ProfileEmailsAdapter.EmailsViewHolder holder, int position) {
 
         Emails currentItem = emailsList.get(position);
 
@@ -59,12 +59,12 @@ public class MyProfileEmailsAdapter extends RecyclerView.Adapter<MyProfileEmails
         if(currentItem.getPrimary()) {
             TextDrawable drawable = TextDrawable.builder()
                     .beginConfig()
-                    .textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null))
+                    .textColor(ResourcesCompat.getColor(mCtx.getResources(), R.color.colorWhite, null))
                     .fontSize(36)
                     .width(220)
                     .height(60)
                     .endConfig()
-                    .buildRoundRect(context.getResources().getString(R.string.emailTypeText), ResourcesCompat.getColor(context.getResources(), R.color.tooltipBackground, null), 8);
+                    .buildRoundRect(mCtx.getResources().getString(R.string.emailTypeText), ResourcesCompat.getColor(mCtx.getResources(), R.color.tooltipBackground, null), 8);
             holder.emailPrimary.setImageDrawable(drawable);
         }
         else {

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.content.Intent;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,7 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -22,12 +20,12 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class MyProfileFollowersAdapter extends RecyclerView.Adapter<MyProfileFollowersAdapter.FollowersViewHolder> {
+public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowersAdapter.FollowersViewHolder> {
 
     private final List<UserInfo> followersList;
-    private final Context context;
+    private final Context mCtx;
 
-    class FollowersViewHolder extends RecyclerView.ViewHolder {
+    static class FollowersViewHolder extends RecyclerView.ViewHolder {
 
 	    private String userLoginId;
 
@@ -43,51 +41,48 @@ public class MyProfileFollowersAdapter extends RecyclerView.Adapter<MyProfileFol
             userFullName = itemView.findViewById(R.id.userFullName);
             userName = itemView.findViewById(R.id.userName);
 
-	        itemView.setOnClickListener(loginId -> {
+	        userAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
+
-		        intent.putExtra("username", userLoginId);
+		        Context context = loginId.getContext();
-		        context.startActivity(intent);
-	        });
 
-	        itemView.setOnLongClickListener(loginId -> {
 		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-		        return true;
 	        });
         }
     }
 
-    public MyProfileFollowersAdapter(Context ctx, List<UserInfo> followersListMain) {
+    public ProfileFollowersAdapter(Context mCtx, List<UserInfo> followersListMain) {
 
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.followersList = followersListMain;
     }
 
     @NonNull
     @Override
-    public MyProfileFollowersAdapter.FollowersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public ProfileFollowersAdapter.FollowersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_followers_following, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_followers, parent, false);
         return new FollowersViewHolder(v);
     }
 
     @Override
-    public void onBindViewHolder(@NonNull MyProfileFollowersAdapter.FollowersViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull ProfileFollowersAdapter.FollowersViewHolder holder, int position) {
 
         UserInfo currentItem = followersList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
 	    holder.userLoginId = currentItem.getLogin();
 
         if(!currentItem.getFullname().equals("")) {
+
             holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
-            holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
         else {
-            holder.userFullName.setText(currentItem.getUsername());
+
+            holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
             holder.userName.setVisibility(View.GONE);
         }
 
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
     }
 
     @Override

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.content.Intent;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,7 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -22,12 +20,12 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class MyProfileFollowingAdapter extends RecyclerView.Adapter<MyProfileFollowingAdapter.FollowingViewHolder> {
+public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowingAdapter.FollowingViewHolder> {
 
     private final List<UserInfo> followingList;
-    private final Context context;
+    private final Context mCtx;
 
-    class FollowingViewHolder extends RecyclerView.ViewHolder {
+    static class FollowingViewHolder extends RecyclerView.ViewHolder {
 
 	    private String userLoginId;
 
@@ -43,51 +41,48 @@ public class MyProfileFollowingAdapter extends RecyclerView.Adapter<MyProfileFol
             userFullName = itemView.findViewById(R.id.userFullName);
             userName = itemView.findViewById(R.id.userName);
 
-	        itemView.setOnClickListener(loginId -> {
+	        userAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
+
-		        intent.putExtra("username", userLoginId);
+		        Context context = loginId.getContext();
-		        context.startActivity(intent);
-	        });
 
-	        itemView.setOnLongClickListener(loginId -> {
 		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-		        return true;
 	        });
         }
     }
 
-    public MyProfileFollowingAdapter(Context ctx, List<UserInfo> followingListMain) {
+    public ProfileFollowingAdapter(Context mCtx, List<UserInfo> followingListMain) {
 
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.followingList = followingListMain;
     }
 
     @NonNull
     @Override
-    public MyProfileFollowingAdapter.FollowingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public ProfileFollowingAdapter.FollowingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_followers_following, parent, false);
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_profile_following, parent, false);
         return new FollowingViewHolder(v);
     }
 
     @Override
-    public void onBindViewHolder(@NonNull MyProfileFollowingAdapter.FollowingViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull ProfileFollowingAdapter.FollowingViewHolder holder, int position) {
 
         UserInfo currentItem = followingList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
 	    holder.userLoginId = currentItem.getLogin();
 
         if(!currentItem.getFullname().equals("")) {
+
             holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
-            holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
         else {
-            holder.userFullName.setText(currentItem.getUsername());
+
+            holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
             holder.userName.setVisibility(View.GONE);
         }
 
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
     }
 
     @Override

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

@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
@@ -16,7 +17,6 @@ import com.vdurmont.emoji.EmojiParser;
 import org.gitnex.tea4j.models.PullRequests;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.ClickListener;
@@ -39,8 +39,10 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 	private boolean isLoading = false, isMoreDataAvailable = true;
 
 	public PullRequestsAdapter(Context context, List<PullRequests> prListMain) {
+
 		this.context = context;
 		this.prList = prListMain;
+
 	}
 
 	@NonNull
@@ -55,6 +57,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		else {
 			return new PullRequestsAdapter.LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
 		}
+
 	}
 
 	@Override
@@ -84,7 +87,9 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 	@Override
 	public int getItemCount() {
+
 		return prList.size();
+
 	}
 
 	class PullRequestsHolder extends RecyclerView.ViewHolder {
@@ -99,12 +104,46 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 		PullRequestsHolder(View itemView) {
 
 			super(itemView);
+
 			assigneeAvatar = itemView.findViewById(R.id.assigneeAvatar);
 			prTitle = itemView.findViewById(R.id.prTitle);
 			prCommentsCount = itemView.findViewById(R.id.prCommentsCount);
+			LinearLayout frameCommentsCount = itemView.findViewById(R.id.frameCommentsCount);
 			prCreatedTime = itemView.findViewById(R.id.prCreatedTime);
 
-			itemView.setOnClickListener(v -> {
+			prTitle.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+
+				Intent intent = new Intent(context, IssueDetailActivity.class);
+				intent.putExtra("issueNumber", pullRequest.getNumber());
+				intent.putExtra("prMergeable", pullRequest.isMergeable());
+				intent.putExtra("prHeadBranch", pullRequest.getHead().getRef());
+
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("issueNumber", String.valueOf(pullRequest.getNumber()));
+				tinyDb.putString("prMergeable", String.valueOf(pullRequest.isMergeable()));
+				tinyDb.putString("prHeadBranch", pullRequest.getHead().getRef());
+
+				if(pullRequest.getHead() != null && pullRequest.getHead().getRepo() != null) {
+					tinyDb.putString("prIsFork", String.valueOf(pullRequest.getHead().getRepo().isFork()));
+					tinyDb.putString("prForkFullName", pullRequest.getHead().getRepo().getFull_name());
+				}
+				else {
+					// pull was done from a deleted fork
+					tinyDb.putString("prIsFork", "true");
+					tinyDb.putString("prForkFullName", context.getString(R.string.prDeletedFork));
+				}
+
+				tinyDb.putString("issueType", "Pull");
+				context.startActivity(intent);
+
+			});
+
+			frameCommentsCount.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+
 				Intent intent = new Intent(context, IssueDetailActivity.class);
 				intent.putExtra("issueNumber", pullRequest.getNumber());
 				intent.putExtra("prMergeable", pullRequest.isMergeable());
@@ -131,29 +170,25 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 			});
 
 			assigneeAvatar.setOnClickListener(v -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
+				Context context = v.getContext();
-				intent.putExtra("username", pullRequest.getUser().getLogin());
+				String userLoginId = pullRequest.getUser().getLogin();
-				context.startActivity(intent);
+
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
 			});
 
-			assigneeAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, pullRequest.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, pullRequest.getUser().getLogin()));
-				return true;
-			});
 		}
 
 		@SuppressLint("SetTextI18n")
 		void bindData(PullRequests pullRequest) {
 
 			TinyDB tinyDb = TinyDB.getInstance(context);
-			Locale locale = context.getResources().getConfiguration().locale;
+			String locale = tinyDb.getString("locale");
 			String timeFormat = tinyDb.getString("dateFormat");
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
 			PicassoService.getInstance(context).get()
 				.load(pullRequest.getUser().getAvatar_url())
 				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0))
+				.transform(new RoundedTransformation(8, 0))
 				.resize(120, 120)
 				.centerCrop()
 				.into(this.assigneeAvatar);
@@ -164,7 +199,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
 			this.prTitle.setText(HtmlCompat.fromHtml(prNumber_ + " " + EmojiParser.parseToUnicode(pullRequest.getTitle()), HtmlCompat.FROM_HTML_MODE_LEGACY));
 			this.prCommentsCount.setText(String.valueOf(pullRequest.getComments()));
-			this.prCreatedTime.setText(TimeHelper.formatTime(pullRequest.getCreated_at(), locale, timeFormat, context));
+			this.prCreatedTime.setText(TimeHelper.formatTime(pullRequest.getCreated_at(), new Locale(locale), timeFormat, context));
 
 			if(timeFormat.equals("pretty")) {
 				this.prCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(pullRequest.getCreated_at()), context));
@@ -175,30 +210,41 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 	static class LoadHolder extends RecyclerView.ViewHolder {
 
 		LoadHolder(View itemView) {
+
 			super(itemView);
 		}
 
 	}
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
+
 		isMoreDataAvailable = moreDataAvailable;
+
 	}
 
 	public void notifyDataChanged() {
+
 		notifyDataSetChanged();
 		isLoading = false;
+
 	}
 
 	public interface OnLoadMoreListener {
+
 		void onLoadMore();
+
 	}
 
 	public void setLoadMoreListener(PullRequestsAdapter.OnLoadMoreListener loadMoreListener) {
+
 		this.loadMoreListener = loadMoreListener;
+
 	}
 
 	public void updateList(List<PullRequests> list) {
+
 		prList = list;
 		notifyDataSetChanged();
 	}
+
 }

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

@@ -1,13 +1,13 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.content.Intent;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.text.HtmlCompat;
@@ -15,9 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import org.gitnex.tea4j.models.Releases;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -32,26 +30,25 @@ import java.util.Locale;
 
 public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.ReleasesViewHolder> {
 
-    private final List<Releases> releasesList;
+    private List<Releases> releasesList;
-    private final Context context;
+    private Context mCtx;
 
 	static class ReleasesViewHolder extends RecyclerView.ViewHolder {
 
-		private Releases releases;
+        private TextView releaseType;
-
+        private TextView releaseName;
-        private final TextView releaseType;
+        private ImageView authorAvatar;
-        private final TextView releaseName;
+        private TextView authorName;
-        private final ImageView authorAvatar;
+        private TextView releaseTag;
-        private final TextView authorName;
+        private TextView releaseCommitSha;
-        private final TextView releaseTag;
+        private TextView releaseDate;
-		private final TextView releaseDate;
+        private TextView releaseBodyContent;
-        private final TextView releaseBodyContent;
+        private LinearLayout downloadFrame;
-        private final LinearLayout downloadFrame;
+        private RelativeLayout downloads;
-        private final LinearLayout downloads;
+        private TextView releaseZipDownload;
-        private final TextView releaseZipDownload;
+	    private TextView releaseTarDownload;
-	    private final TextView releaseTarDownload;
+	    private ImageView downloadDropdownIcon;
-	    private final ImageView downloadDropdownIcon;
+	    private RecyclerView downloadList;
-	    private final RecyclerView downloadList;
 
         private ReleasesViewHolder(View itemView) {
 
@@ -62,7 +59,7 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 	        authorAvatar = itemView.findViewById(R.id.authorAvatar);
 	        authorName = itemView.findViewById(R.id.authorName);
 	        releaseTag = itemView.findViewById(R.id.releaseTag);
-	        TextView releaseCommitSha = itemView.findViewById(R.id.releaseCommitSha);
+	        releaseCommitSha = itemView.findViewById(R.id.releaseCommitSha);
 	        releaseDate = itemView.findViewById(R.id.releaseDate);
 	        releaseBodyContent = itemView.findViewById(R.id.releaseBodyContent);
 	        downloadFrame = itemView.findViewById(R.id.downloadFrame);
@@ -75,18 +72,11 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 	        downloadList.setHasFixedSize(true);
 	        downloadList.setLayoutManager(new LinearLayoutManager(itemView.getContext()));
 
-	        authorAvatar.setOnClickListener(loginId -> {
-		        Context context = loginId.getContext();
-
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", releases.getAuthor().getLogin());
-		        context.startActivity(intent);
-	        });
         }
     }
 
-    public ReleasesAdapter(Context ctx, List<Releases> releasesMain) {
+    public ReleasesAdapter(Context mCtx, List<Releases> releasesMain) {
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.releasesList = releasesMain;
     }
 
@@ -100,13 +90,11 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
     @Override
     public void onBindViewHolder(@NonNull ReleasesAdapter.ReleasesViewHolder holder, int position) {
 
-        final TinyDB tinyDb = TinyDB.getInstance(context);
+        final TinyDB tinyDb = TinyDB.getInstance(mCtx);
-	    final Locale locale = context.getResources().getConfiguration().locale;
+	    final String locale = tinyDb.getString("locale");
 	    final String timeFormat = tinyDb.getString("dateFormat");
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
         Releases currentItem = releasesList.get(position);
-        holder.releases = currentItem;
 
 	    holder.releaseName.setText(currentItem.getName());
 
@@ -123,25 +111,25 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 	    }
 
 	    if(currentItem.getAuthor().getAvatar_url() != null) {
-		    PicassoService.getInstance(context).get().load(currentItem.getAuthor().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.authorAvatar);
+		    PicassoService.getInstance(mCtx).get().load(currentItem.getAuthor().getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.authorAvatar);
 	    }
 
-	    holder.authorName.setText(context.getResources().getString(R.string.releasePublishedBy, currentItem.getAuthor().getUsername()));
+	    holder.authorName.setText(mCtx.getResources().getString(R.string.releasePublishedBy, currentItem.getAuthor().getUsername()));
 
 	    if(currentItem.getTag_name() != null) {
 	    	holder.releaseTag.setText(currentItem.getTag_name());
 	    }
 
 	    if(currentItem.getPublished_at() != null) {
-		    holder.releaseDate.setText(TimeHelper.formatTime(currentItem.getPublished_at(), locale, timeFormat, context));
+		    holder.releaseDate.setText(TimeHelper.formatTime(currentItem.getPublished_at(), new Locale(locale), timeFormat, mCtx));
 	    }
 
 	    if(timeFormat.equals("pretty")) {
-		    holder.releaseDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getPublished_at()), context));
+		    holder.releaseDate.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getPublished_at()), mCtx));
 	    }
 
         if(!currentItem.getBody().equals("")) {
-	        Markdown.render(context, currentItem.getBody(), holder.releaseBodyContent);
+	        new Markdown(mCtx, currentItem.getBody(), holder.releaseBodyContent);
         }
         else {
 	        holder.releaseBodyContent.setText(R.string.noReleaseBodyContent);
@@ -153,25 +141,28 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 
 			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_down);
 			    holder.downloads.setVisibility(View.VISIBLE);
+
 		    }
 		    else {
 
 			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_right);
 			    holder.downloads.setVisibility(View.GONE);
+
 		    }
 
 	    });
 
         holder.releaseZipDownload.setText(
-                HtmlCompat.fromHtml("<a href='" + currentItem.getZipball_url() + "'>" + context.getResources().getString(R.string.zipArchiveDownloadReleasesTab) + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
+                HtmlCompat.fromHtml("<a href='" + currentItem.getZipball_url() + "'>" + mCtx.getResources().getString(R.string.zipArchiveDownloadReleasesTab) + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
         holder.releaseZipDownload.setMovementMethod(LinkMovementMethod.getInstance());
 
         holder.releaseTarDownload.setText(
-                HtmlCompat.fromHtml("<a href='" + currentItem.getTarball_url() + "'>" + context.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
+                HtmlCompat.fromHtml("<a href='" + currentItem.getTarball_url() + "'>" + mCtx.getResources().getString(R.string.tarArchiveDownloadReleasesTab) + "</a> ", HtmlCompat.FROM_HTML_MODE_LEGACY));
         holder.releaseTarDownload.setMovementMethod(LinkMovementMethod.getInstance());
 
 	    ReleasesDownloadsAdapter adapter = new ReleasesDownloadsAdapter(currentItem.getAssets());
 	    holder.downloadList.setAdapter(adapter);
+
     }
 
     @Override

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

@@ -18,16 +18,18 @@ import java.util.List;
 
 public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownloadsAdapter.ReleasesDownloadsViewHolder> {
 
-	private final List<Releases.assetsObject> releasesDownloadsList;
+	private List<Releases.assetsObject> releasesDownloadsList;
 
 	static class ReleasesDownloadsViewHolder extends RecyclerView.ViewHolder {
 
-		private final TextView downloadName;
+		private TextView downloadName;
 
 		private ReleasesDownloadsViewHolder(View itemView) {
 
 			super(itemView);
+
 			downloadName = itemView.findViewById(R.id.downloadName);
+
 		}
 	}
 
@@ -55,6 +57,7 @@ public class ReleasesDownloadsAdapter extends RecyclerView.Adapter<ReleasesDownl
 			holder.downloadName.setMovementMethod(LinkMovementMethod.getInstance());
 
 		}
+
 	}
 
 	@Override

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

@@ -9,31 +9,29 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.gitnex.tea4j.models.UserRepositories;
 import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoForksActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.List;
-import java.util.Locale;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -43,7 +41,7 @@ import retrofit2.Callback;
 
 public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-	private final Context context;
+	private Context ctx;
 	private final int TYPE_LOAD = 0;
 	private List<UserRepositories> forksList;
 	private OnLoadMoreListener loadMoreListener;
@@ -52,15 +50,16 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 	public RepoForksAdapter(Context ctx, List<UserRepositories> forksListMain) {
 
-		this.context = ctx;
+		this.ctx = ctx;
 		this.forksList = forksListMain;
+
 	}
 
 	@NonNull
 	@Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
-		LayoutInflater inflater = LayoutInflater.from(context);
+		LayoutInflater inflater = LayoutInflater.from(ctx);
 
 		if(viewType == TYPE_LOAD) {
 			return new RepoForksAdapter.ForksHolder(inflater.inflate(R.layout.list_repositories, parent, false));
@@ -68,6 +67,7 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		else {
 			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
 		}
+
 	}
 
 	@Override
@@ -77,12 +77,15 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 			isLoading = true;
 			loadMoreListener.onLoadMore();
+
 		}
 
 		if(getItemViewType(position) == TYPE_LOAD) {
 
 			((RepoForksAdapter.ForksHolder) holder).bindData(forksList.get(position));
+
 		}
+
 	}
 
 	@Override
@@ -94,63 +97,69 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		else {
 			return 1;
 		}
+
 	}
 
 	@Override
 	public int getItemCount() {
 
 		return forksList.size();
+
 	}
 
 	class ForksHolder extends RecyclerView.ViewHolder {
 
-		private UserRepositories userRepositories;
+		private ImageView image;
-
+		private TextView repoName;
-		private final ImageView image;
+		private TextView repoDescription;
-		private final TextView repoName;
+		private TextView fullName;
-		private final TextView orgName;
-		private final TextView repoDescription;
 		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
+		private ImageView repoPrivatePublic;
-		private final TextView repoLastUpdated;
+		private TextView repoStars;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
+		private TextView repoType;
+		private LinearLayout archiveRepo;
+		private TextView repoBranch;
+		private ImageView reposDropdownMenu;
 
 		ForksHolder(View itemView) {
 
 			super(itemView);
+
 			repoName = itemView.findViewById(R.id.repoName);
-			orgName = itemView.findViewById(R.id.orgName);
 			repoDescription = itemView.findViewById(R.id.repoDescription);
 			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
 			image = itemView.findViewById(R.id.imageAvatar);
+			fullName = itemView.findViewById(R.id.repoFullName);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
 			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
+			repoForks = itemView.findViewById(R.id.repoForks);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+			repoType = itemView.findViewById(R.id.repoType);
+			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
+
 		}
 
 		@SuppressLint("SetTextI18n")
 		void bindData(UserRepositories forksModel) {
 
-			TinyDB tinyDb = TinyDB.getInstance(context);
+			repoDescription.setVisibility(View.GONE);
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+			repoBranch.setText(forksModel.getDefault_branch());
-
-			Locale locale = context.getResources().getConfiguration().locale;
-			String timeFormat = tinyDb.getString("dateFormat");
-			this.userRepositories = forksModel;
-			orgName.setText(forksModel.getFullName().split("/")[0]);
-			repoName.setText(forksModel.getFullName().split("/")[1]);
-			repoStars.setText(forksModel.getStars_count());
-
 
 			ColorGenerator generator = ColorGenerator.MATERIAL;
 			int color = generator.getColor(forksModel.getName());
-			String firstCharacter = String.valueOf(forksModel.getFullName().charAt(0));
+			String firstCharacter = String.valueOf(forksModel.getName().charAt(0));
 
 			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
 				.endConfig().buildRoundRect(firstCharacter, color, 3);
 
 			if(forksModel.getAvatar_url() != null) {
 				if(!forksModel.getAvatar_url().equals("")) {
-					PicassoService.getInstance(context).get().load(forksModel.getAvatar_url()).placeholder(R.drawable.loader_animated)
+					PicassoService.getInstance(ctx).get().load(forksModel.getAvatar_url()).placeholder(R.drawable.loader_animated)
-						.transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(image);
+						.transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(image);
 				}
 				else {
 					image.setImageDrawable(drawable);
@@ -160,85 +169,76 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 				image.setImageDrawable(drawable);
 			}
 
-			if(forksModel.getUpdated_at() != null) {
+			repoName.setText(forksModel.getName());
-
-				switch(timeFormat) {
-					case "pretty": {
-						PrettyTime prettyTime = new PrettyTime(locale);
-						String createdTime = prettyTime.format(forksModel.getUpdated_at());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(forksModel.getUpdated_at()), context));
-						break;
-					}
-					case "normal": {
-						DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-						String createdTime = formatter.format(forksModel.getUpdated_at());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						break;
-					}
-					case "normal1": {
-						DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-						String createdTime = formatter.format(forksModel.getUpdated_at());
-						repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-						break;
-					}
-				}
-			}
-			else {
-				repoLastUpdated.setVisibility(View.GONE);
-			}
 
 			if(!forksModel.getDescription().equals("")) {
+				repoDescription.setVisibility(View.VISIBLE);
 				repoDescription.setText(forksModel.getDescription());
 			}
+			fullName.setText(forksModel.getFullName());
+
+			if(forksModel.getPrivateFlag()) {
+				repoPrivatePublic.setImageResource(R.drawable.ic_lock);
+				repoType.setText(R.string.strPrivate);
+			}
 			else {
-				repoDescription.setText(context.getString(R.string.noDataDescription));
+				repoPrivatePublic.setVisibility(View.GONE);
+				repoType.setText(R.string.strPublic);
 			}
 
+			repoStars.setText(forksModel.getStars_count());
+			repoForks.setText(forksModel.getForks_count());
+			repoOpenIssuesCount.setText(forksModel.getOpen_issues_count());
+
 			if(isRepoAdmin == null) {
-				isRepoAdmin = new CheckBox(context);
+				isRepoAdmin = new CheckBox(ctx);
 			}
 			isRepoAdmin.setChecked(forksModel.getPermissions().isAdmin());
 
+			if(forksModel.isArchived()) {
+				archiveRepo.setVisibility(View.VISIBLE);
+			}
+			else {
+				archiveRepo.setVisibility(View.GONE);
+			}
+
 			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", userRepositories.getFullName());
+				intent.putExtra("repoFullName", repoFullName.getText().toString());
 
-				tinyDb.putString("repoFullName", userRepositories.getFullName());
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
+				tinyDb.putString("repoType", repoType_.getText().toString());
 				//tinyDb.putBoolean("resumeIssues", true);
 				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-				tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());
 
-				if(userRepositories.getPrivateFlag()) {
+				String[] parts = repoFullName.getText().toString().split("/");
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-				}
-				else {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-				}
-
-				String[] parts = userRepositories.getFullName().split("/");
 				final String repoOwner = parts[0];
 				final String repoName = parts[1];
 
 				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
 
 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
 
 					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", id);
+
 				}
 				else {
 
 					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", data.getRepositoryId());
+
 				}
 
 				//store if user is watching this repo
@@ -291,6 +291,63 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 				context.startActivity(intent);
 
 			});
+
+			reposDropdownMenu.setOnClickListener(v -> {
+
+				final Context context = v.getContext();
+
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+				TextView repoForksList = view.findViewById(R.id.repoForksList);
+				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+				bottomSheetHeader
+					.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
+
+				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+					intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+					context.startActivity(intentOpenInBrowser);
+					dialog.dismiss();
+
+				});
+
+				repoStargazers.setOnClickListener(stargazers -> {
+
+					Intent intent = new Intent(context, RepoStargazersActivity.class);
+					intent.putExtra("repoFullNameForStars", fullName.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
+
+				});
+
+				repoWatchers.setOnClickListener(watchers -> {
+
+					Intent intentW = new Intent(context, RepoWatchersActivity.class);
+					intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+				repoForksList.setOnClickListener(watchers -> {
+
+					Intent intentW = new Intent(context, RepoForksActivity.class);
+					intentW.putExtra("repoFullNameForForks", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+			});
+
 		}
 
 	}
@@ -301,27 +358,32 @@ public class RepoForksAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
 			super(itemView);
 		}
+
 	}
 
 	public void setMoreDataAvailable(boolean moreDataAvailable) {
 
 		isMoreDataAvailable = moreDataAvailable;
+
 	}
 
 	public void notifyDataChanged() {
 
 		notifyDataSetChanged();
 		isLoading = false;
+
 	}
 
 	public interface OnLoadMoreListener {
 
 		void onLoadMore();
+
 	}
 
 	public void setLoadMoreListener(RepoForksAdapter.OnLoadMoreListener loadMoreListener) {
 
 		this.loadMoreListener = loadMoreListener;
+
 	}
 
 	public void updateList(List<UserRepositories> list) {

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

@@ -2,7 +2,6 @@ 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.View;
@@ -12,9 +11,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import java.util.List;
@@ -25,35 +22,22 @@ import java.util.List;
 
 public class RepoStargazersAdapter extends BaseAdapter {
 
-    private final List<UserInfo> stargazersList;
+    private List<UserInfo> stargazersList;
-    private final Context context;
+    private Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
-    	private UserInfo userInfo;
+        private ImageView memberAvatar;
-
+        private TextView memberName;
-        private final ImageView memberAvatar;
-        private final TextView memberName;
 
         ViewHolder(View v) {
             memberAvatar  = v.findViewById(R.id.memberAvatar);
             memberName  = v.findViewById(R.id.memberName);
-
-	        memberAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", userInfo.getLogin());
-		        context.startActivity(intent);
-	        });
-
-	        memberAvatar.setOnLongClickListener(loginId -> {
-		        AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-		        return true;
-	        });
         }
     }
 
-    public RepoStargazersAdapter(Context ctx, List<UserInfo> membersListMain) {
+    public RepoStargazersAdapter(Context mCtx, List<UserInfo> membersListMain) {
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.stargazersList = membersListMain;
     }
 
@@ -79,7 +63,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
         RepoStargazersAdapter.ViewHolder viewHolder;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(context).inflate(R.layout.list_repo_stargazers, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_repo_stargazers, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -95,26 +79,23 @@ public class RepoStargazersAdapter extends BaseAdapter {
     private void initData(RepoStargazersAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = stargazersList.get(position);
-        viewHolder.userInfo = currentItem;
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
+        final TinyDB tinyDb = TinyDB.getInstance(mCtx);
-
-        final TinyDB tinyDb = TinyDB.getInstance(context);
         Typeface myTypeface;
 
         switch(tinyDb.getInt("customFontId", -1)) {
 
             case 0:
-                myTypeface = Typeface.createFromAsset(context.getAssets(), "fonts/roboto.ttf");
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
                 break;
 
             case 2:
-                myTypeface = Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf");
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
                 break;
 
             default:
-                myTypeface = Typeface.createFromAsset(context.getAssets(), "fonts/manroperegular.ttf");
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
                 break;
 
         }

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

@@ -2,7 +2,6 @@ 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.View;
@@ -12,9 +11,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import java.util.List;
@@ -25,35 +22,22 @@ import java.util.List;
 
 public class RepoWatchersAdapter extends BaseAdapter {
 
-    private final List<UserInfo> watchersList;
+    private List<UserInfo> watchersList;
-    private final Context context;
+    private Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
-	    private UserInfo userInfo;
+        private ImageView memberAvatar;
-
+        private TextView memberName;
-        private final ImageView memberAvatar;
-        private final TextView memberName;
 
         ViewHolder(View v) {
             memberAvatar  = v.findViewById(R.id.memberAvatar);
             memberName  = v.findViewById(R.id.memberName);
-
-	        memberAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", userInfo.getLogin());
-		        context.startActivity(intent);
-	        });
-
-	        memberAvatar.setOnLongClickListener(loginId -> {
-		        AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-		        return true;
-	        });
         }
     }
 
-    public RepoWatchersAdapter(Context ctx, List<UserInfo> membersListMain) {
+    public RepoWatchersAdapter(Context mCtx, List<UserInfo> membersListMain) {
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.watchersList = membersListMain;
     }
 
@@ -79,7 +63,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
         RepoWatchersAdapter.ViewHolder viewHolder;
 
         if (finalView == null) {
-            finalView = LayoutInflater.from(context).inflate(R.layout.list_repo_watchers, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_repo_watchers, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -95,26 +79,23 @@ public class RepoWatchersAdapter extends BaseAdapter {
     private void initData(RepoWatchersAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = watchersList.get(position);
-	    viewHolder.userInfo = currentItem;
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
+        final TinyDB tinyDb = TinyDB.getInstance(mCtx);
-
-        final TinyDB tinyDb = TinyDB.getInstance(context);
         Typeface myTypeface;
 
         switch(tinyDb.getInt("customFontId", -1)) {
 
             case 0:
-                myTypeface = Typeface.createFromAsset(context.getAssets(), "fonts/roboto.ttf");
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
                 break;
 
             case 2:
-                myTypeface = Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf");
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
                 break;
 
             default:
-                myTypeface = Typeface.createFromAsset(context.getAssets(), "fonts/manroperegular.ttf");
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
                 break;
 
         }

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

@@ -1,5 +1,8 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
@@ -10,32 +13,31 @@ import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.gitnex.tea4j.models.UserRepositories;
 import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoForksActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -45,73 +47,81 @@ import retrofit2.Callback;
 
 public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.ReposViewHolder> implements Filterable {
 
-	private final List<UserRepositories> reposList;
+	private List<UserRepositories> reposList;
-	private final Context context;
+	private Context mCtx;
-	private final List<UserRepositories> reposListFull;
+	private List<UserRepositories> reposListFull;
 
 	static class ReposViewHolder extends RecyclerView.ViewHolder {
 
-		private UserRepositories userRepositories;
+		private ImageView image;
-
+		private TextView repoName;
-		private final ImageView image;
+		private TextView repoDescription;
-		private final TextView repoName;
+		private TextView fullName;
-		private final TextView orgName;
-		private final TextView repoDescription;
 		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
+		private ImageView repoPrivatePublic;
-		private final TextView repoLastUpdated;
+		private TextView repoStars;
+		private TextView repoForks;
+		private TextView repoOpenIssuesCount;
+		private TextView repoType;
+		private LinearLayout archiveRepo;
+		private TextView repoBranch;
+		private TextView htmlUrl;
 
 		private ReposViewHolder(View itemView) {
 
 			super(itemView);
 			repoName = itemView.findViewById(R.id.repoName);
-			orgName = itemView.findViewById(R.id.orgName);
 			repoDescription = itemView.findViewById(R.id.repoDescription);
 			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
 			image = itemView.findViewById(R.id.imageAvatar);
+			fullName = itemView.findViewById(R.id.repoFullName);
+			repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
 			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
+			repoForks = itemView.findViewById(R.id.repoForks);
+			repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+			ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+			repoType = itemView.findViewById(R.id.repoType);
+			archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+			repoBranch = itemView.findViewById(R.id.repoBranch);
+			htmlUrl = itemView.findViewById(R.id.htmlUrl);
 
 			itemView.setOnClickListener(v -> {
 
 				Context context = v.getContext();
-				TinyDB tinyDb = TinyDB.getInstance(context);
+				TextView repoFullName = v.findViewById(R.id.repoFullName);
+				TextView repoType_ = v.findViewById(R.id.repoType);
 
 				Intent intent = new Intent(context, RepoDetailActivity.class);
-				intent.putExtra("repoFullName", userRepositories.getFullName());
+				intent.putExtra("repoFullName", repoFullName.getText().toString());
 
-				tinyDb.putString("repoFullName", userRepositories.getFullName());
+				TinyDB tinyDb = TinyDB.getInstance(context);
+				tinyDb.putString("repoFullName", repoFullName.getText().toString());
+				tinyDb.putString("repoType", repoType_.getText().toString());
 				//tinyDb.putBoolean("resumeIssues", true);
 				tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-				tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+				tinyDb.putString("repoBranch", repoBranch.getText().toString());
 
-				if(userRepositories.getPrivateFlag()) {
+				String[] parts = repoFullName.getText().toString().split("/");
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-				}
-				else {
-					tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-				}
-
-				String[] parts = userRepositories.getFullName().split("/");
 				final String repoOwner = parts[0];
 				final String repoName = parts[1];
 
 				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
 
 				//RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
 
 					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", id);
+
 				}
 				else {
 
 					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", data.getRepositoryId());
+
 				}
 
 				//store if user is watching this repo
@@ -163,13 +173,81 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 				context.startActivity(intent);
 
 			});
+
+			reposDropdownMenu.setOnClickListener(v -> {
+
+				final Context context = v.getContext();
+
+				@SuppressLint("InflateParams") View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+				TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+				TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+				TextView repoForksList = view.findViewById(R.id.repoForksList);
+				TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
+				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+				bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+				BottomSheetDialog dialog = new BottomSheetDialog(context);
+				dialog.setContentView(view);
+				dialog.show();
+
+				repoCopyUrl.setOnClickListener(openInBrowser -> {
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+					ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
+					assert clipboard != null;
+					clipboard.setPrimaryClip(clip);
+
+					Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
+					dialog.dismiss();
+				});
+
+				repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+					Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+					intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+					context.startActivity(intentOpenInBrowser);
+					dialog.dismiss();
+
+				});
+
+				repoStargazers.setOnClickListener(stargazers -> {
+
+					Intent intent = new Intent(context, RepoStargazersActivity.class);
+					intent.putExtra("repoFullNameForStars", fullName.getText());
+					context.startActivity(intent);
+					dialog.dismiss();
+
+				});
+
+				repoWatchers.setOnClickListener(watchers -> {
+
+					Intent intentW = new Intent(context, RepoWatchersActivity.class);
+					intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+				repoForksList.setOnClickListener(forks -> {
+
+					Intent intentW = new Intent(context, RepoForksActivity.class);
+					intentW.putExtra("repoFullNameForForks", fullName.getText());
+					context.startActivity(intentW);
+					dialog.dismiss();
+
+				});
+
+			});
+
 		}
 
 	}
 
-	public ReposListAdapter(Context ctx, List<UserRepositories> reposListMain) {
+	public ReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {
 
-		this.context = ctx;
+		this.mCtx = mCtx;
 		this.reposList = reposListMain;
 		reposListFull = new ArrayList<>(reposList);
 	}
@@ -185,26 +263,20 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 	@Override
 	public void onBindViewHolder(@NonNull ReposViewHolder holder, int position) {
 
-		TinyDB tinyDb = TinyDB.getInstance(context);
 		UserRepositories currentItem = reposList.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+		holder.repoDescription.setVisibility(View.GONE);
-
+		holder.repoBranch.setText(currentItem.getDefault_branch());
-		Locale locale = context.getResources().getConfiguration().locale;
+		holder.htmlUrl.setText(currentItem.getHtml_url());
-		String timeFormat = tinyDb.getString("dateFormat");
-		holder.userRepositories = currentItem;
-		holder.orgName.setText(currentItem.getFullName().split("/")[0]);
-		holder.repoName.setText(currentItem.getFullName().split("/")[1]);
-		holder.repoStars.setText(currentItem.getStars_count());
 
 		ColorGenerator generator = ColorGenerator.MATERIAL;
 		int color = generator.getColor(currentItem.getName());
-		String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
+		String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
 
 		TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
 
 		if(currentItem.getAvatar_url() != null) {
 			if(!currentItem.getAvatar_url().equals("")) {
-				PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
+				PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
 			}
 			else {
 				holder.image.setImageDrawable(drawable);
@@ -214,45 +286,35 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 			holder.image.setImageDrawable(drawable);
 		}
 
-		if(currentItem.getUpdated_at() != null) {
+		holder.repoName.setText(currentItem.getName());
-
-			switch(timeFormat) {
-				case "pretty": {
-					PrettyTime prettyTime = new PrettyTime(locale);
-					String createdTime = prettyTime.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					holder.repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getUpdated_at()), context));
-					break;
-				}
-				case "normal": {
-					DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-					String createdTime = formatter.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					break;
-				}
-				case "normal1": {
-					DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-					String createdTime = formatter.format(currentItem.getUpdated_at());
-					holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-					break;
-				}
-			}
-		}
-		else {
-			holder.repoLastUpdated.setVisibility(View.GONE);
-		}
-
 		if(!currentItem.getDescription().equals("")) {
+			holder.repoDescription.setVisibility(View.VISIBLE);
 			holder.repoDescription.setText(currentItem.getDescription());
 		}
-		else {
+		holder.fullName.setText(currentItem.getFullName());
-			holder.repoDescription.setText(context.getString(R.string.noDataDescription));
+		if(currentItem.getPrivateFlag()) {
+			holder.repoPrivatePublic.setVisibility(View.VISIBLE);
+			holder.repoType.setText(R.string.strPrivate);
 		}
-
+		else {
+			holder.repoPrivatePublic.setVisibility(View.GONE);
+			holder.repoType.setText(R.string.strPublic);
+		}
+		holder.repoStars.setText(currentItem.getStars_count());
+		holder.repoForks.setText(currentItem.getForks_count());
+		holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
 		if(holder.isRepoAdmin == null) {
-			holder.isRepoAdmin = new CheckBox(context);
+			holder.isRepoAdmin = new CheckBox(mCtx);
 		}
 		holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
+
+		if(currentItem.isArchived()) {
+			holder.archiveRepo.setVisibility(View.VISIBLE);
+		}
+		else {
+			holder.archiveRepo.setVisibility(View.GONE);
+		}
+
 	}
 
 	@Override
@@ -267,7 +329,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		return reposFilter;
 	}
 
-	private final Filter reposFilter = new Filter() {
+	private Filter reposFilter = new Filter() {
 
 		@Override
 		protected FilterResults performFiltering(CharSequence constraint) {

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

@@ -1,5 +1,8 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
@@ -10,32 +13,31 @@ import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.gitnex.tea4j.models.UserRepositories;
 import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoForksActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -45,73 +47,78 @@ import retrofit2.Callback;
 
 public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesByOrgAdapter.OrgReposViewHolder> implements Filterable {
 
-    private final List<UserRepositories> reposList;
+    private List<UserRepositories> reposList;
-    private final Context context;
+    private Context mCtx;
-    private final List<UserRepositories> reposListFull;
+    private List<UserRepositories> reposListFull;
 
     static class OrgReposViewHolder extends RecyclerView.ViewHolder {
 
-	    private UserRepositories userRepositories;
+        private ImageView image;
-
+        private TextView repoName;
-	    private final ImageView image;
+        private TextView repoDescription;
-	    private final TextView repoName;
+        private TextView fullName;
-	    private final TextView orgName;
+        private CheckBox isRepoAdmin;
-	    private final TextView repoDescription;
+        private ImageView repoPrivatePublic;
-	    private CheckBox isRepoAdmin;
+        private TextView repoStars;
-	    private final TextView repoStars;
+        private TextView repoForks;
-	    private final TextView repoLastUpdated;
+        private TextView repoOpenIssuesCount;
+        private TextView repoType;
+	    private LinearLayout archiveRepo;
+	    private TextView repoBranch;
+	    private TextView htmlUrl;
 
         private OrgReposViewHolder(View itemView) {
-
+            super(itemView);
-	        super(itemView);
+            repoName = itemView.findViewById(R.id.repoName);
-	        repoName = itemView.findViewById(R.id.repoName);
+            repoDescription = itemView.findViewById(R.id.repoDescription);
-	        orgName = itemView.findViewById(R.id.orgName);
+            isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
-	        repoDescription = itemView.findViewById(R.id.repoDescription);
+            image = itemView.findViewById(R.id.imageAvatar);
-	        isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+            fullName = itemView.findViewById(R.id.repoFullName);
-	        image = itemView.findViewById(R.id.imageAvatar);
+            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
-	        repoStars = itemView.findViewById(R.id.repoStars);
+            repoStars = itemView.findViewById(R.id.repoStars);
-	        repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
+            repoForks = itemView.findViewById(R.id.repoForks);
+            repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+            repoType = itemView.findViewById(R.id.repoType);
+	        archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+	        repoBranch = itemView.findViewById(R.id.repoBranch);
+	        htmlUrl = itemView.findViewById(R.id.htmlUrl);
 
             itemView.setOnClickListener(v -> {
 
                 Context context = v.getContext();
-	            TinyDB tinyDb = TinyDB.getInstance(context);
 
                 Intent intent = new Intent(context, RepoDetailActivity.class);
-                intent.putExtra("repoFullName", userRepositories.getFullName());
+                intent.putExtra("repoFullName", fullName.getText().toString());
 
-                tinyDb.putString("repoFullName", userRepositories.getFullName());
+                TinyDB tinyDb = TinyDB.getInstance(context);
+                tinyDb.putString("repoFullName", fullName.getText().toString());
+                tinyDb.putString("repoType", repoType.getText().toString());
                 //tinyDb.putBoolean("resumeIssues", true);
                 tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-	            tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+	            tinyDb.putString("repoBranch", repoBranch.getText().toString());
 
-	            if(userRepositories.getPrivateFlag()) {
+                String[] parts = fullName.getText().toString().split("/");
-		            tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-	            }
-	            else {
-		            tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-	            }
-
-                String[] parts = userRepositories.getFullName().split("/");
                 final String repoOwner = parts[0];
                 final String repoName = parts[1];
 
                 int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-                RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+                RepositoriesApi repositoryData = new RepositoriesApi(context);
 
                 //RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-	            assert repositoryData != null;
+                Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
-	            Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
                 if(count == 0) {
 
                     long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
                     tinyDb.putLong("repositoryId", id);
+
                 }
                 else {
 
                     Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
                     tinyDb.putLong("repositoryId", data.getRepositoryId());
+
                 }
 
                 //store if user is watching this repo
@@ -160,13 +167,81 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 
                 context.startActivity(intent);
             });
+
+            reposDropdownMenu.setOnClickListener(v -> {
+
+                final Context context = v.getContext();
+
+                @SuppressLint("InflateParams")
+                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+                TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+                TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+                TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+	            TextView repoForksList = view.findViewById(R.id.repoForksList);
+	            TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+	            bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+                BottomSheetDialog dialog = new BottomSheetDialog(context);
+                dialog.setContentView(view);
+                dialog.show();
+
+	            repoCopyUrl.setOnClickListener(openInBrowser -> {
+
+		            ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+		            ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
+		            assert clipboard != null;
+		            clipboard.setPrimaryClip(clip);
+
+		            Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
+		            dialog.dismiss();
+	            });
+
+                repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+                    context.startActivity(intentOpenInBrowser);
+                    dialog.dismiss();
+
+                });
+
+                repoStargazers.setOnClickListener(stargazers -> {
+
+                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                    context.startActivity(intent);
+                    dialog.dismiss();
+
+                });
+
+                repoWatchers.setOnClickListener(watchers -> {
+
+                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+                    context.startActivity(intentW);
+                    dialog.dismiss();
+
+                });
+
+	            repoForksList.setOnClickListener(forks -> {
+
+		            Intent intentW = new Intent(context, RepoForksActivity.class);
+		            intentW.putExtra("repoFullNameForForks", fullName.getText());
+		            context.startActivity(intentW);
+		            dialog.dismiss();
+
+	            });
+
+            });
+
         }
 
     }
 
-    public RepositoriesByOrgAdapter(Context ctx, List<UserRepositories> reposListMain) {
+    public RepositoriesByOrgAdapter(Context mCtx, List<UserRepositories> reposListMain) {
-
+        this.mCtx = mCtx;
-        this.context = ctx;
         this.reposList = reposListMain;
         reposListFull = new ArrayList<>(reposList);
     }
@@ -174,7 +249,6 @@ 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, parent, false);
         return new RepositoriesByOrgAdapter.OrgReposViewHolder(v);
     }
@@ -182,20 +256,14 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
     @Override
     public void onBindViewHolder(@NonNull RepositoriesByOrgAdapter.OrgReposViewHolder holder, int position) {
 
-	    TinyDB tinyDb = TinyDB.getInstance(context);
+        UserRepositories currentItem = reposList.get(position);
-	    UserRepositories currentItem = reposList.get(position);
+        holder.repoDescription.setVisibility(View.GONE);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+	    holder.repoBranch.setText(currentItem.getDefault_branch());
-
+	    holder.htmlUrl.setText(currentItem.getHtml_url());
-	    Locale locale = context.getResources().getConfiguration().locale;
-	    String timeFormat = tinyDb.getString("dateFormat");
-	    holder.userRepositories = currentItem;
-	    holder.orgName.setText(currentItem.getFullName().split("/")[0]);
-	    holder.repoName.setText(currentItem.getFullName().split("/")[1]);
-	    holder.repoStars.setText(currentItem.getStars_count());
 
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(currentItem.getName());
-        String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
+        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
 
         TextDrawable drawable = TextDrawable.builder()
                 .beginConfig()
@@ -209,7 +277,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 
         if (currentItem.getAvatar_url() != null) {
             if (!currentItem.getAvatar_url().equals("")) {
-                PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
+                PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
             } else {
                 holder.image.setImageDrawable(drawable);
             }
@@ -218,45 +286,36 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
             holder.image.setImageDrawable(drawable);
         }
 
-	    if(currentItem.getUpdated_at() != null) {
+        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.setVisibility(View.VISIBLE);
+            holder.repoType.setText(R.string.strPrivate);
+        }
+        else {
+	        holder.repoPrivatePublic.setVisibility(View.GONE);
+            holder.repoType.setText(R.string.strPublic);
+        }
+        holder.repoStars.setText(currentItem.getStars_count());
+        holder.repoForks.setText(currentItem.getForks_count());
+        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
 
-		    switch(timeFormat) {
+        if (holder.isRepoAdmin == null) {
-			    case "pretty": {
+            holder.isRepoAdmin = new CheckBox(mCtx);
-				    PrettyTime prettyTime = new PrettyTime(locale);
+        }
-				    String createdTime = prettyTime.format(currentItem.getUpdated_at());
+        holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
-				    holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
+
-				    holder.repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getUpdated_at()), context));
+	    if(currentItem.isArchived()) {
-				    break;
+		    holder.archiveRepo.setVisibility(View.VISIBLE);
-			    }
-			    case "normal": {
-				    DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-				    String createdTime = formatter.format(currentItem.getUpdated_at());
-				    holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-				    break;
-			    }
-			    case "normal1": {
-				    DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-				    String createdTime = formatter.format(currentItem.getUpdated_at());
-				    holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-				    break;
-			    }
-		    }
 	    }
 	    else {
-		    holder.repoLastUpdated.setVisibility(View.GONE);
+		    holder.archiveRepo.setVisibility(View.GONE);
 	    }
 
-	    if(!currentItem.getDescription().equals("")) {
-		    holder.repoDescription.setText(currentItem.getDescription());
-	    }
-	    else {
-		    holder.repoDescription.setText(context.getString(R.string.noDataDescription));
-	    }
-
-	    if(holder.isRepoAdmin == null) {
-		    holder.isRepoAdmin = new CheckBox(context);
-	    }
-	    holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
     }
 
     @Override

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

@@ -14,9 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.gitnex.tea4j.models.Issues;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
 import org.mian.gitnex.helpers.AppUtil;
@@ -34,22 +32,23 @@ import java.util.Locale;
  * Author M M Arif
  */
 
-public class ExploreIssuesAdapter extends RecyclerView.Adapter<ExploreIssuesAdapter.SearchViewHolder> {
+public class SearchIssuesAdapter extends RecyclerView.Adapter<SearchIssuesAdapter.SearchViewHolder> {
 
 	private final List<Issues> searchedList;
-	private final Context context;
+	private final Context mCtx;
 	private final TinyDB tinyDb;
 
-	public ExploreIssuesAdapter(List<Issues> dataList, Context ctx) {
+	public SearchIssuesAdapter(List<Issues> dataList, Context mCtx) {
 
-		this.context = ctx;
+		this.mCtx = mCtx;
 		this.searchedList = dataList;
-		this.tinyDb = TinyDB.getInstance(context);
+		this.tinyDb = TinyDB.getInstance(mCtx);
 	}
 
 	class SearchViewHolder extends RecyclerView.ViewHolder {
 
 		private Issues issue;
+
 		private final ImageView issueAssigneeAvatar;
 		private final TextView issueTitle;
 		private final TextView issueCreatedTime;
@@ -64,7 +63,10 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<ExploreIssuesAdap
 			issueCommentsCount = itemView.findViewById(R.id.issueCommentsCount);
 			issueCreatedTime = itemView.findViewById(R.id.issueCreatedTime);
 
-			itemView.setOnClickListener(v -> {
+			issueTitle.setOnClickListener(v -> {
+
+				Context context = v.getContext();
+
 				Intent intent = new Intent(context, IssueDetailActivity.class);
 				intent.putExtra("issueNumber", issue.getNumber());
 
@@ -78,64 +80,60 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<ExploreIssuesAdap
 				final String repoName = parts[1];
 
 				int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-				RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+				RepositoriesApi repositoryData = new RepositoriesApi(context);
 
-				assert repositoryData != null;
 				Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
 				if(count == 0) {
 
 					long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", id);
+
 				}
 				else {
 
 					Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
 					tinyDb.putLong("repositoryId", data.getRepositoryId());
+
 				}
 
 				context.startActivity(intent);
 			});
 
 			issueAssigneeAvatar.setOnClickListener(v -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
+				Context context = v.getContext();
-				intent.putExtra("username", issue.getUser().getLogin());
+				String userLoginId = issue.getUser().getLogin();
-				context.startActivity(intent);
-			});
 
-			issueAssigneeAvatar.setOnLongClickListener(loginId -> {
+				AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-				AppUtil.copyToClipboard(context, issue.getUser().getLogin(), context.getString(R.string.copyLoginIdToClipBoard, issue.getUser().getLogin()));
-				return true;
 			});
 		}
 	}
 
 	@NonNull
 	@Override
-	public ExploreIssuesAdapter.SearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+	public SearchIssuesAdapter.SearchViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
 		View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_issues, parent, false);
-		return new ExploreIssuesAdapter.SearchViewHolder(v);
+		return new SearchIssuesAdapter.SearchViewHolder(v);
 	}
 
 	@Override
-	public void onBindViewHolder(@NonNull final ExploreIssuesAdapter.SearchViewHolder holder, int position) {
+	public void onBindViewHolder(@NonNull final SearchIssuesAdapter.SearchViewHolder holder, int position) {
 
 		Issues currentItem = searchedList.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
-		Locale locale = context.getResources().getConfiguration().locale;
+		String locale = tinyDb.getString("locale");
 		String timeFormat = tinyDb.getString("dateFormat");
 
-		PicassoService.getInstance(context).get()
+		PicassoService.getInstance(mCtx).get()
 			.load(currentItem.getUser().getAvatar_url())
 			.placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(imgRadius, 0))
+			.transform(new RoundedTransformation(8, 0))
 			.resize(120, 120)
 			.centerCrop()
 			.into(holder.issueAssigneeAvatar);
 
-		String issueNumber_ = "<font color='" + ResourcesCompat.getColor(context.getResources(), R.color.lightGray, null) + "'>" + currentItem.getRepository().getFull_name() + context.getResources().getString(R.string.hash) + currentItem.getNumber() + "</font>";
+		String issueNumber_ = "<font color='" + ResourcesCompat.getColor(mCtx.getResources(), R.color.lightGray, null) + "'>" + currentItem.getRepository().getFull_name() + mCtx.getResources().getString(R.string.hash) + currentItem.getNumber() + "</font>";
 
 		holder.issue = currentItem;
 		holder.issueTitle.setText(HtmlCompat.fromHtml(issueNumber_ + " " + currentItem.getTitle(), HtmlCompat.FROM_HTML_MODE_LEGACY));
@@ -143,20 +141,20 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<ExploreIssuesAdap
 
 		switch(timeFormat) {
 			case "pretty": {
-				PrettyTime prettyTime = new PrettyTime(locale);
+				PrettyTime prettyTime = new PrettyTime(new Locale(locale));
 				String createdTime = prettyTime.format(currentItem.getCreated_at());
 				holder.issueCreatedTime.setText(createdTime);
-				holder.issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getCreated_at()), context));
+				holder.issueCreatedTime.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getCreated_at()), mCtx));
 				break;
 			}
 			case "normal": {
-				DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+				DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
 				String createdTime = formatter.format(currentItem.getCreated_at());
 				holder.issueCreatedTime.setText(createdTime);
 				break;
 			}
 			case "normal1": {
-				DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
+				DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + mCtx.getResources().getString(R.string.timeAtText) + "' HH:mm", new Locale(locale));
 				String createdTime = formatter.format(currentItem.getCreated_at());
 				holder.issueCreatedTime.setText(createdTime);
 				break;
@@ -166,10 +164,12 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<ExploreIssuesAdap
 
 	@Override
 	public int getItemCount() {
+
 		return searchedList.size();
 	}
 
 	public void notifyDataChanged() {
+
 		notifyDataSetChanged();
 	}
 }

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

@@ -0,0 +1,59 @@
+package org.mian.gitnex.adapters;
+
+import android.text.SpannableStringBuilder;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import org.mian.gitnex.R;
+import java.util.List;
+
+/**
+ * Author M M Arif
+ */
+
+public class SponsorsAdapter extends RecyclerView.Adapter<SponsorsAdapter.SponsorsViewHolder> {
+
+    private List<CharSequence> sponsorsList;
+
+    static class SponsorsViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView sponsorText;
+
+        private SponsorsViewHolder(View itemView) {
+            super(itemView);
+
+            sponsorText = itemView.findViewById(R.id.sponsorText);
+
+        }
+    }
+
+    public SponsorsAdapter(List<CharSequence> sponsorsListMain) {
+        this.sponsorsList = sponsorsListMain;
+    }
+
+    @NonNull
+    @Override
+    public SponsorsAdapter.SponsorsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.sponsors, parent, false);
+        return new SponsorsAdapter.SponsorsViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull SponsorsAdapter.SponsorsViewHolder holder, int position) {
+
+        SpannableStringBuilder strBuilder = new SpannableStringBuilder(sponsorsList.get(position));
+        holder.sponsorText.setText((strBuilder));
+        holder.sponsorText.setMovementMethod(LinkMovementMethod.getInstance());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return sponsorsList.size();
+    }
+
+}

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

@@ -1,5 +1,8 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
@@ -10,32 +13,31 @@ import android.widget.CheckBox;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.gitnex.tea4j.models.UserRepositories;
 import org.gitnex.tea4j.models.WatchInfo;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;
+import org.mian.gitnex.activities.RepoForksActivity;
+import org.mian.gitnex.activities.RepoStargazersActivity;
+import org.mian.gitnex.activities.RepoWatchersActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.RepositoriesApi;
 import org.mian.gitnex.database.models.Repository;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
 import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.ocpsoft.prettytime.PrettyTime;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -45,73 +47,78 @@ import retrofit2.Callback;
 
 public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposListAdapter.StarredReposViewHolder> implements Filterable {
 
-    private final List<UserRepositories> reposList;
+    private List<UserRepositories> reposList;
-    private final Context context;
+    private Context mCtx;
-    private final List<UserRepositories> reposListFull;
+    private List<UserRepositories> reposListFull;
 
     static class StarredReposViewHolder extends RecyclerView.ViewHolder {
 
-	    private UserRepositories userRepositories;
+        private ImageView image;
-
+        private TextView repoName;
-	    private final ImageView image;
+        private TextView repoDescription;
-	    private final TextView repoName;
+        private TextView fullName;
-	    private final TextView orgName;
+        private CheckBox isRepoAdmin;
-	    private final TextView repoDescription;
+        private ImageView repoPrivatePublic;
-	    private CheckBox isRepoAdmin;
+        private TextView repoStars;
-	    private final TextView repoStars;
+        private TextView repoForks;
-	    private final TextView repoLastUpdated;
+        private TextView repoOpenIssuesCount;
+        private TextView repoType;
+	    private LinearLayout archiveRepo;
+	    private TextView repoBranch;
+	    private TextView htmlUrl;
 
         private StarredReposViewHolder(View itemView) {
-
+            super(itemView);
-	        super(itemView);
+            repoName = itemView.findViewById(R.id.repoName);
-	        repoName = itemView.findViewById(R.id.repoName);
+            repoDescription = itemView.findViewById(R.id.repoDescription);
-	        orgName = itemView.findViewById(R.id.orgName);
+            isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
-	        repoDescription = itemView.findViewById(R.id.repoDescription);
+            image = itemView.findViewById(R.id.imageAvatar);
-	        isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
+            fullName = itemView.findViewById(R.id.repoFullName);
-	        image = itemView.findViewById(R.id.imageAvatar);
+            repoPrivatePublic = itemView.findViewById(R.id.imageRepoType);
-	        repoStars = itemView.findViewById(R.id.repoStars);
+            repoStars = itemView.findViewById(R.id.repoStars);
-	        repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
+            repoForks = itemView.findViewById(R.id.repoForks);
+            repoOpenIssuesCount = itemView.findViewById(R.id.repoOpenIssuesCount);
+            ImageView reposDropdownMenu = itemView.findViewById(R.id.reposDropdownMenu);
+            repoType = itemView.findViewById(R.id.repoType);
+	        archiveRepo = itemView.findViewById(R.id.archiveRepoFrame);
+	        repoBranch = itemView.findViewById(R.id.repoBranch);
+	        htmlUrl = itemView.findViewById(R.id.htmlUrl);
 
             itemView.setOnClickListener(v -> {
 
                 Context context = v.getContext();
-	            TinyDB tinyDb = TinyDB.getInstance(context);
 
                 Intent intent = new Intent(context, RepoDetailActivity.class);
-                intent.putExtra("repoFullName", userRepositories.getFullName());
+                intent.putExtra("repoFullName", fullName.getText().toString());
 
-                tinyDb.putString("repoFullName", userRepositories.getFullName());
+                TinyDB tinyDb = TinyDB.getInstance(context);
+                tinyDb.putString("repoFullName", fullName.getText().toString());
+                tinyDb.putString("repoType", repoType.getText().toString());
                 //tinyDb.putBoolean("resumeIssues", true);
                 tinyDb.putBoolean("isRepoAdmin", isRepoAdmin.isChecked());
-	            tinyDb.putString("repoBranch", userRepositories.getDefault_branch());
+	            tinyDb.putString("repoBranch", repoBranch.getText().toString());
 
-	            if(userRepositories.getPrivateFlag()) {
+                String[] parts = fullName.getText().toString().split("/");
-		            tinyDb.putString("repoType", context.getResources().getString(R.string.strPrivate));
-	            }
-	            else {
-		            tinyDb.putString("repoType", context.getResources().getString(R.string.strPublic));
-	            }
-
-                String[] parts = userRepositories.getFullName().split("/");
                 final String repoOwner = parts[0];
                 final String repoName = parts[1];
 
                 int currentActiveAccountId = tinyDb.getInt("currentActiveAccountId");
-                RepositoriesApi repositoryData = BaseApi.getInstance(context, RepositoriesApi.class);
+                RepositoriesApi repositoryData = new RepositoriesApi(context);
 
                 //RepositoriesRepository.deleteRepositoriesByAccount(currentActiveAccountId);
-	            assert repositoryData != null;
+                Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
-	            Integer count = repositoryData.checkRepository(currentActiveAccountId, repoOwner, repoName);
 
                 if(count == 0) {
 
                     long id = repositoryData.insertRepository(currentActiveAccountId, repoOwner, repoName);
                     tinyDb.putLong("repositoryId", id);
+
                 }
                 else {
 
                     Repository data = repositoryData.getRepository(currentActiveAccountId, repoOwner, repoName);
                     tinyDb.putLong("repositoryId", data.getRepositoryId());
+
                 }
 
                 //store if user is watching this repo
@@ -163,12 +170,81 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 context.startActivity(intent);
 
             });
+
+            reposDropdownMenu.setOnClickListener(v -> {
+
+                final Context context = v.getContext();
+
+                @SuppressLint("InflateParams")
+                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_repository_in_list, null);
+
+                TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
+                TextView repoStargazers = view.findViewById(R.id.repoStargazers);
+                TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+	            TextView repoForksList = view.findViewById(R.id.repoForksList);
+	            TextView repoCopyUrl = view.findViewById(R.id.repoCopyUrl);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
+
+	            bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
+                BottomSheetDialog dialog = new BottomSheetDialog(context);
+                dialog.setContentView(view);
+                dialog.show();
+
+	            repoCopyUrl.setOnClickListener(openInBrowser -> {
+
+		            ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(context).getSystemService(Context.CLIPBOARD_SERVICE);
+		            ClipData clip = ClipData.newPlainText("repoUrl", htmlUrl.getText().toString());
+		            assert clipboard != null;
+		            clipboard.setPrimaryClip(clip);
+
+		            Toasty.info(context, context.getString(R.string.copyIssueUrlToastMsg));
+		            dialog.dismiss();
+	            });
+
+                repoOpenInBrowser.setOnClickListener(openInBrowser -> {
+
+                    Intent intentOpenInBrowser = new Intent(context, OpenRepoInBrowserActivity.class);
+                    intentOpenInBrowser.putExtra("repoFullNameBrowser", fullName.getText());
+                    context.startActivity(intentOpenInBrowser);
+                    dialog.dismiss();
+
+                });
+
+                repoStargazers.setOnClickListener(stargazers -> {
+
+                    Intent intent = new Intent(context, RepoStargazersActivity.class);
+                    intent.putExtra("repoFullNameForStars", fullName.getText());
+                    context.startActivity(intent);
+                    dialog.dismiss();
+
+                });
+
+                repoWatchers.setOnClickListener(watchers -> {
+
+                    Intent intentW = new Intent(context, RepoWatchersActivity.class);
+                    intentW.putExtra("repoFullNameForWatchers", fullName.getText());
+                    context.startActivity(intentW);
+                    dialog.dismiss();
+
+                });
+
+	            repoForksList.setOnClickListener(forks -> {
+
+		            Intent intentW = new Intent(context, RepoForksActivity.class);
+		            intentW.putExtra("repoFullNameForForks", fullName.getText());
+		            context.startActivity(intentW);
+		            dialog.dismiss();
+
+	            });
+
+            });
+
         }
 
     }
 
-    public StarredReposListAdapter(Context ctx, List<UserRepositories> reposListMain) {
+    public StarredReposListAdapter(Context mCtx, List<UserRepositories> reposListMain) {
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.reposList = reposListMain;
         reposListFull = new ArrayList<>(reposList);
     }
@@ -183,20 +259,14 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
     @Override
     public void onBindViewHolder(@NonNull StarredReposListAdapter.StarredReposViewHolder holder, int position) {
 
-	    TinyDB tinyDb = TinyDB.getInstance(context);
+        UserRepositories currentItem = reposList.get(position);
-	    UserRepositories currentItem = reposList.get(position);
+        holder.repoDescription.setVisibility(View.GONE);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+	    holder.repoBranch.setText(currentItem.getDefault_branch());
-
+	    holder.htmlUrl.setText(currentItem.getHtml_url());
-	    Locale locale = context.getResources().getConfiguration().locale;
-	    String timeFormat = tinyDb.getString("dateFormat");
-	    holder.userRepositories = currentItem;
-	    holder.orgName.setText(currentItem.getFullName().split("/")[0]);
-	    holder.repoName.setText(currentItem.getFullName().split("/")[1]);
-	    holder.repoStars.setText(currentItem.getStars_count());
 
         ColorGenerator generator = ColorGenerator.MATERIAL;
         int color = generator.getColor(currentItem.getName());
-        String firstCharacter = String.valueOf(currentItem.getFullName().charAt(0));
+        String firstCharacter = String.valueOf(currentItem.getName().charAt(0));
 
         TextDrawable drawable = TextDrawable.builder()
                 .beginConfig()
@@ -210,7 +280,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 
         if (currentItem.getAvatar_url() != null) {
             if (!currentItem.getAvatar_url().equals("")) {
-                PicassoService.getInstance(context).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.image);
+                PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.image);
             } else {
                 holder.image.setImageDrawable(drawable);
             }
@@ -219,45 +289,35 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
             holder.image.setImageDrawable(drawable);
         }
 
-        if(currentItem.getUpdated_at() != null) {
+        holder.repoName.setText(currentItem.getName());
-
+        if (!currentItem.getDescription().equals("")) {
-	        switch(timeFormat) {
+            holder.repoDescription.setVisibility(View.VISIBLE);
-		        case "pretty": {
+            holder.repoDescription.setText(currentItem.getDescription());
-			        PrettyTime prettyTime = new PrettyTime(locale);
+        }
-			        String createdTime = prettyTime.format(currentItem.getUpdated_at());
+        holder.fullName.setText(currentItem.getFullName());
-			        holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
+        if(currentItem.getPrivateFlag()) {
-			        holder.repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(currentItem.getUpdated_at()), context));
+	        holder.repoPrivatePublic.setVisibility(View.VISIBLE);
-			        break;
+            holder.repoType.setText(R.string.strPrivate);
-		        }
-		        case "normal": {
-			        DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-			        String createdTime = formatter.format(currentItem.getUpdated_at());
-			        holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-			        break;
-		        }
-		        case "normal1": {
-			        DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy '" + context.getResources().getString(R.string.timeAtText) + "' HH:mm", locale);
-			        String createdTime = formatter.format(currentItem.getUpdated_at());
-			        holder.repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, createdTime));
-			        break;
-		        }
-	        }
         }
         else {
-	        holder.repoLastUpdated.setVisibility(View.GONE);
+	        holder.repoPrivatePublic.setVisibility(View.GONE);
+            holder.repoType.setText(R.string.strPublic);
         }
+        holder.repoStars.setText(currentItem.getStars_count());
+        holder.repoForks.setText(currentItem.getForks_count());
+        holder.repoOpenIssuesCount.setText(currentItem.getOpen_issues_count());
+        if (holder.isRepoAdmin == null) {
+            holder.isRepoAdmin = new CheckBox(mCtx);
+        }
+        holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
 
-	    if(!currentItem.getDescription().equals("")) {
+	    if(currentItem.isArchived()) {
-		    holder.repoDescription.setText(currentItem.getDescription());
+		    holder.archiveRepo.setVisibility(View.VISIBLE);
 	    }
 	    else {
-		    holder.repoDescription.setText(context.getString(R.string.noDataDescription));
+		    holder.archiveRepo.setVisibility(View.GONE);
 	    }
 
-	    if(holder.isRepoAdmin == null) {
-		    holder.isRepoAdmin = new CheckBox(context);
-	    }
-	    holder.isRepoAdmin.setChecked(currentItem.getPermissions().isAdmin());
     }
 
     @Override
@@ -270,7 +330,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
         return starredReposFilter;
     }
 
-    private final Filter starredReposFilter = new Filter() {
+    private Filter starredReposFilter = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
             List<UserRepositories> filteredList = new ArrayList<>();

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Typeface;
 import android.text.Html;
 import android.view.LayoutInflater;
@@ -13,7 +12,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
@@ -27,9 +25,9 @@ import java.util.List;
 public class TeamMembersByOrgAdapter extends BaseAdapter {
 
     private final List<UserInfo> teamMembersList;
-    private final Context context;
+    private final Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
 	    private String userLoginId;
 
@@ -42,21 +40,17 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
             memberName  = v.findViewById(R.id.memberName);
 
 	        memberAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", userLoginId);
-		        context.startActivity(intent);
-	        });
 
-	        memberAvatar.setOnLongClickListener(loginId -> {
+		        Context context = loginId.getContext();
+
 		        AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
-		        return true;
 	        });
         }
     }
 
-    public TeamMembersByOrgAdapter(Context ctx, List<UserInfo> membersListMain) {
+    public TeamMembersByOrgAdapter(Context mCtx, List<UserInfo> membersListMain) {
 
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.teamMembersList = membersListMain;
     }
 
@@ -83,7 +77,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
 
         if (finalView == null) {
 
-            finalView = LayoutInflater.from(context).inflate(R.layout.list_members_by_team_by_org, null);
+            finalView = LayoutInflater.from(mCtx).inflate(R.layout.list_members_by_team_by_org, null);
             viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
@@ -99,27 +93,25 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
     private void initData(TeamMembersByOrgAdapter.ViewHolder viewHolder, int position) {
 
         UserInfo currentItem = teamMembersList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+        PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
-
-        PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
 
 	    viewHolder.userLoginId = currentItem.getLogin();
 
-        final TinyDB tinyDb = TinyDB.getInstance(context);
+        final TinyDB tinyDb = TinyDB.getInstance(mCtx);
         Typeface myTypeface;
 
         switch(tinyDb.getInt("customFontId", -1)) {
 
             case 0:
-                myTypeface = Typeface.createFromAsset(context.getAssets(), "fonts/roboto.ttf");
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
                 break;
 
             case 2:
-                myTypeface = Typeface.createFromAsset(context.getAssets(), "fonts/sourcecodeproregular.ttf");
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
                 break;
 
             default:
-                myTypeface = Typeface.createFromAsset(context.getAssets(), "fonts/manroperegular.ttf");
+                myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
                 break;
 
         }

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

@@ -22,41 +22,44 @@ import java.util.List;
 
 public class TeamsByOrgAdapter extends RecyclerView.Adapter<TeamsByOrgAdapter.OrgTeamsViewHolder> implements Filterable {
 
-    private final List<Teams> teamList;
+    private List<Teams> teamList;
-    private final Context context;
+    private Context mCtx;
-    private final List<Teams> teamListFull;
+    private List<Teams> teamListFull;
 
     static class OrgTeamsViewHolder extends RecyclerView.ViewHolder {
 
-    	private Teams teams;
+        private TextView teamTitle;
-
+        private TextView teamId;
-        private final TextView teamTitle;
+        private TextView teamDescription;
-        private final TextView teamDescription;
+        private TextView teamPermission;
-        private final TextView teamPermission;
 
         private OrgTeamsViewHolder(View itemView) {
-
             super(itemView);
             teamTitle = itemView.findViewById(R.id.teamTitle);
+            teamId = itemView.findViewById(R.id.teamId);
             teamDescription = itemView.findViewById(R.id.teamDescription);
             teamPermission = itemView.findViewById(R.id.teamPermission);
 
-            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, OrganizationTeamMembersActivity.class);
+                    Intent intent = new Intent(context, OrganizationTeamMembersActivity.class);
-                intent.putExtra("teamTitle", teams.getName());
+                    intent.putExtra("teamTitle", teamTitle.getText().toString());
-                intent.putExtra("teamId", String.valueOf(teams.getId()));
+                    intent.putExtra("teamId", teamId.getText().toString());
-                context.startActivity(intent);
+                    context.startActivity(intent);
+
+                }
             });
 
         }
 
     }
 
-    public TeamsByOrgAdapter(Context ctx, List<Teams> teamListMain) {
+    public TeamsByOrgAdapter(Context mCtx, List<Teams> teamListMain) {
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.teamList = teamListMain;
         teamListFull = new ArrayList<>(teamList);
     }
@@ -72,10 +75,8 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter<TeamsByOrgAdapter.Or
     public void onBindViewHolder(@NonNull TeamsByOrgAdapter.OrgTeamsViewHolder holder, int position) {
 
         Teams currentItem = teamList.get(position);
-
+        holder.teamId.setText(String.valueOf(currentItem.getId()));
-        holder.teams = currentItem;
         holder.teamTitle.setText(currentItem.getName());
-
         if (!currentItem.getDescription().equals("")) {
             holder.teamDescription.setVisibility(View.VISIBLE);
             holder.teamDescription.setText(currentItem.getDescription());
@@ -84,7 +85,8 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter<TeamsByOrgAdapter.Or
             holder.teamDescription.setVisibility(View.GONE);
             holder.teamDescription.setText("");
         }
-        holder.teamPermission.setText(context.getResources().getString(R.string.teamPermission, currentItem.getPermission()));
+        holder.teamPermission.setText(mCtx.getResources().getString(R.string.teamPermission, currentItem.getPermission()));
+
     }
 
     @Override
@@ -97,7 +99,7 @@ public class TeamsByOrgAdapter extends RecyclerView.Adapter<TeamsByOrgAdapter.Or
         return orgTeamsFilter;
     }
 
-    private final Filter orgTeamsFilter = new Filter() {
+    private Filter orgTeamsFilter = new Filter() {
         @Override
         protected FilterResults performFiltering(CharSequence constraint) {
             List<Teams> filteredList = new ArrayList<>();

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

@@ -14,10 +14,8 @@ import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
@@ -31,7 +29,7 @@ import io.mikael.urlbuilder.UrlBuilder;
 public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapter.UserAccountsViewHolder> {
 
 	private final List<UserAccount> userAccountsList;
-	private final Context context;
+	private final Context mCtx;
 	private TinyDB tinyDB;
 
 	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
@@ -57,45 +55,49 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 
 			deleteAccount.setOnClickListener(itemDelete -> {
 
-				new AlertDialog.Builder(context)
+				new AlertDialog.Builder(mCtx)
-					.setIcon(AppCompatResources.getDrawable(context, R.drawable.ic_delete))
+					.setIcon(AppCompatResources.getDrawable(mCtx, R.drawable.ic_delete))
-					.setTitle(context.getResources().getString(R.string.removeAccountPopupTitle))
+					.setTitle(mCtx.getResources().getString(R.string.removeAccountPopupTitle))
-					.setMessage(context.getResources().getString(R.string.removeAccountPopupMessage))
+					.setMessage(mCtx.getResources().getString(R.string.removeAccountPopupMessage))
-					.setPositiveButton(context.getResources().getString(R.string.removeButton), (dialog, which) -> {
+					.setPositiveButton(mCtx.getResources().getString(R.string.removeButton), (dialog, which) -> {
 
 						updateLayoutByPosition(getAdapterPosition());
-						UserAccountsApi userAccountsApi = BaseApi.getInstance(context, UserAccountsApi.class);
+						UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
-						assert userAccountsApi != null;
 						userAccountsApi.deleteAccount(Integer.parseInt(String.valueOf(accountId)));
-					}).setNeutralButton(context.getResources().getString(R.string.cancelButton), null)
+					}).setNeutralButton(mCtx.getResources().getString(R.string.cancelButton), null)
 					.show();
 			});
 
 			itemView.setOnClickListener(switchAccount -> {
 
-				UserAccountsApi userAccountsApi = BaseApi.getInstance(context, UserAccountsApi.class);
+				UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
-				assert userAccountsApi != null;
+				UserAccount userAccount = userAccountsApi.getAccountData(accountName);
-				UserAccount userAccount = userAccountsApi.getAccountByName(accountName);
 
-				if(AppUtil.switchToAccount(context, userAccount)) {
+				if(tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
 
 					String url = UrlBuilder.fromString(userAccount.getInstanceUrl())
 						.withPath("/")
 						.toString();
 
-					Toasty.success(context,  context.getResources().getString(R.string.switchAccountSuccess, userAccount.getUserName(), url));
+					tinyDB.putString("loginUid", userAccount.getUserName());
-					((Activity) context).recreate();
+					tinyDB.putString("userLogin", userAccount.getUserName());
+					tinyDB.putString(userAccount.getUserName() + "-token", userAccount.getToken());
+					tinyDB.putString("instanceUrl", userAccount.getInstanceUrl());
+					tinyDB.putInt("currentActiveAccountId", userAccount.getAccountId());
 
+					Toasty.success(mCtx,  mCtx.getResources().getString(R.string.switchAccountSuccess, userAccount.getUserName(), url));
+					((Activity) mCtx).recreate();
 				}
+
 			});
 
 		}
 
 	}
 
-	public UserAccountsAdapter(Context ctx, List<UserAccount> userAccountsListMain) {
+	public UserAccountsAdapter(Context mCtx, List<UserAccount> userAccountsListMain) {
 
-		this.context = ctx;
+		this.mCtx = mCtx;
 		this.userAccountsList = userAccountsListMain;
 	}
 
@@ -104,7 +106,7 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 		userAccountsList.remove(position);
 		notifyItemRemoved(position);
 		notifyItemRangeChanged(position, userAccountsList.size());
-		Toasty.success(context, context.getResources().getString(R.string.accountDeletedMessage));
+		Toasty.success(mCtx, mCtx.getResources().getString(R.string.accountDeletedMessage));
 	}
 
 	@NonNull
@@ -120,7 +122,7 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 	public void onBindViewHolder(@NonNull UserAccountsAdapter.UserAccountsViewHolder holder, int position) {
 
 		UserAccount currentItem = userAccountsList.get(position);
-		tinyDB = TinyDB.getInstance(context);
+		tinyDB = TinyDB.getInstance(mCtx);
 
 		String url = UrlBuilder.fromString(currentItem.getInstanceUrl())
 			.withPath("/")
@@ -129,23 +131,17 @@ public class UserAccountsAdapter extends RecyclerView.Adapter<UserAccountsAdapte
 		holder.accountId = currentItem.getAccountId();
 		holder.accountName = currentItem.getAccountName();
 
-		holder.userId.setText(currentItem.getUserName());
+		holder.userId.setText(String.format("@%s", currentItem.getUserName()));
 		holder.accountUrl.setText(url);
 
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+		PicassoService.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.repoAvatar);
-
-		PicassoService.getInstance(context).get()
-			.load(url + "img/favicon.png")
-			.placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(imgRadius, 0))
-			.resize(120, 120)
-			.centerCrop()
-			.into(holder.repoAvatar);
 
 		if(tinyDB.getInt("currentActiveAccountId") == currentItem.getAccountId()) {
+
 			holder.activeAccount.setVisibility(View.VISIBLE);
 		}
 		else {
+
 			holder.deleteAccount.setVisibility(View.VISIBLE);
 		}
 	}

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

@@ -12,7 +12,6 @@ import androidx.annotation.Nullable;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.database.models.UserAccount;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
 import java.util.List;
@@ -24,17 +23,18 @@ import io.mikael.urlbuilder.UrlBuilder;
 
 public class UserAccountsListDialogAdapter extends ArrayAdapter<UserAccount> {
 
-	private final Context context;
+	private final Context mCtx;
 	private final TinyDB tinyDB;
 	private final List<UserAccount> userAccounts;
 
-	public UserAccountsListDialogAdapter(@NonNull Context ctx, int resource, @NonNull List<UserAccount> userAccounts) {
+	public UserAccountsListDialogAdapter(@NonNull Context mCtx, int resource, @NonNull List<UserAccount> userAccounts) {
 
-		super(ctx, resource, userAccounts);
+		super(mCtx, resource, userAccounts);
 
-		tinyDB = TinyDB.getInstance(ctx);
+		tinyDB = TinyDB.getInstance(mCtx);
 		this.userAccounts = userAccounts;
-		this.context = ctx;
+		this.mCtx = mCtx;
+
 	}
 
 	@NonNull
@@ -42,7 +42,7 @@ public class UserAccountsListDialogAdapter extends ArrayAdapter<UserAccount> {
 	public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
 
 		if(convertView == null) {
-			convertView = LayoutInflater.from(context).inflate(R.layout.custom_user_accounts_list, parent, false);
+			convertView = LayoutInflater.from(mCtx).inflate(R.layout.custom_user_accounts_list, parent, false);
 		}
 
 		ImageView profileImage = convertView.findViewById(R.id.profileImage);
@@ -51,7 +51,6 @@ public class UserAccountsListDialogAdapter extends ArrayAdapter<UserAccount> {
 		ImageView activeAccount = convertView.findViewById(R.id.activeAccount);
 
 		UserAccount currentItem = userAccounts.get(position);
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
 
 		String url = UrlBuilder.fromString(currentItem.getInstanceUrl())
 			.withPath("/")
@@ -68,7 +67,7 @@ public class UserAccountsListDialogAdapter extends ArrayAdapter<UserAccount> {
 		}
 
 		PicassoService
-			.getInstance(context).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(profileImage);
+			.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(profileImage);
 
 		return convertView;
 

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

@@ -18,10 +18,11 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
+import org.mian.gitnex.database.api.UserAccountsApi;
 import org.mian.gitnex.database.models.UserAccount;
 import org.mian.gitnex.fragments.UserAccountsFragment;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.RoundedTransformation;
+import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import java.util.List;
 import io.mikael.urlbuilder.UrlBuilder;
@@ -33,13 +34,13 @@ import io.mikael.urlbuilder.UrlBuilder;
 public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNavAdapter.UserAccountsViewHolder> {
 
 	private static DrawerLayout drawer;
-	private final List<UserAccount> userAccountsList;
+	private List<UserAccount> userAccountsList;
-	private final Context context;
+	private Context mCtx;
-	private final TextView toolbarTitle;
+	private TextView toolbarTitle;
 
-	public UserAccountsNavAdapter(Context ctx, List<UserAccount> userAccountsListMain, DrawerLayout drawerLayout, TextView toolbarTitle) {
+	public UserAccountsNavAdapter(Context mCtx, List<UserAccount> userAccountsListMain, DrawerLayout drawerLayout, TextView toolbarTitle) {
 
-		this.context = ctx;
+		this.mCtx = mCtx;
 		this.userAccountsList = userAccountsListMain;
 		drawer = drawerLayout;
 		this.toolbarTitle = toolbarTitle;
@@ -47,7 +48,7 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 
 	class UserAccountsViewHolder extends RecyclerView.ViewHolder {
 
-		private final ImageView userAccountAvatar;
+		private ImageView userAccountAvatar;
 
 		private UserAccountsViewHolder(View itemView) {
 
@@ -56,6 +57,7 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 			userAccountAvatar = itemView.findViewById(R.id.userAccountAvatar);
 
 			itemView.setOnClickListener(item -> {
+
 				customDialogUserAccountsList(userAccountsList);
 				drawer.closeDrawers();
 			});
@@ -82,15 +84,8 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 			.withPath("/")
 			.toString();
 
-		int imageSize = AppUtil.getPixelsFromDensity(context, 35);
+		PicassoService
-
+			.getInstance(mCtx).get().load(url + "img/favicon.png").placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAccountAvatar);
-		PicassoService.getInstance(context).get()
-			.load(url + "img/favicon.png")
-			.placeholder(R.drawable.loader_animated)
-			.transform(new RoundedTransformation(8, 0))
-			.resize(imageSize, imageSize)
-			.centerCrop()
-			.into(holder.userAccountAvatar);
 	}
 
 	@Override
@@ -101,7 +96,8 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 
 	private void customDialogUserAccountsList(List<UserAccount> allAccountsList) {
 
-		Dialog dialog = new Dialog(context, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
+		TinyDB tinyDB = TinyDB.getInstance(mCtx);
+		Dialog dialog = new Dialog(mCtx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
 		dialog.setContentView(R.layout.custom_user_accounts_dialog);
 
 		ListView listView = dialog.findViewById(R.id.accountsList);
@@ -113,33 +109,38 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 
 		manageAccounts.setOnClickListener(item -> {
 
-			toolbarTitle.setText(context.getResources().getString(R.string.pageTitleUserAccounts));
+			toolbarTitle.setText(mCtx.getResources().getString(R.string.pageTitleUserAccounts));
-			AppCompatActivity activity = (AppCompatActivity) context;
+			AppCompatActivity activity = (AppCompatActivity) mCtx;
 			activity.getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new UserAccountsFragment()).commit();
 			dialog.dismiss();
-
 		});
 
-		UserAccountsListDialogAdapter arrayAdapter = new UserAccountsListDialogAdapter(context, R.layout.custom_user_accounts_list, allAccountsList);
+		UserAccountsListDialogAdapter arrayAdapter = new UserAccountsListDialogAdapter(mCtx, R.layout.custom_user_accounts_list, allAccountsList);
 		listView.setAdapter(arrayAdapter);
 
 		listView.setOnItemClickListener((adapterView, view, which, l) -> {
 
-			UserAccount userAccount = allAccountsList.get(which);
+			String accountNameSwitch = allAccountsList.get(which).getAccountName();
+			UserAccountsApi userAccountsApi = new UserAccountsApi(mCtx);
+			UserAccount userAccount = userAccountsApi.getAccountData(accountNameSwitch);
 
-			if(AppUtil.switchToAccount(context, userAccount)) {
+			if(tinyDB.getInt("currentActiveAccountId") != userAccount.getAccountId()) {
 
 				String url = UrlBuilder.fromString(userAccount.getInstanceUrl())
 					.withPath("/")
 					.toString();
 
-				Toasty.success(context,  context.getResources().getString(R.string.switchAccountSuccess, userAccount.getUserName(), url));
+				tinyDB.putString("loginUid", userAccount.getUserName());
-				((Activity) context).recreate();
+				tinyDB.putString("userLogin", userAccount.getUserName());
-				dialog.dismiss();
+				tinyDB.putString(userAccount.getUserName() + "-token", userAccount.getToken());
+				tinyDB.putString("instanceUrl", userAccount.getInstanceUrl());
+				tinyDB.putInt("currentActiveAccountId", userAccount.getAccountId());
 
+				Toasty.success(mCtx,  mCtx.getResources().getString(R.string.switchAccountSuccess, userAccount.getUserName(), url));
+				((Activity) mCtx).recreate();
+				dialog.dismiss();
 			}
 		});
-
 		dialog.show();
 	}
 

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

@@ -1,7 +1,7 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.content.Intent;
+import android.content.DialogInterface;
 import android.text.Html;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -17,11 +17,9 @@ import org.gitnex.tea4j.models.Collaborators;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.CollaboratorActions;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
@@ -36,75 +34,86 @@ import retrofit2.Response;
 
 public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.UserSearchViewHolder> {
 
-    private final List<UserInfo> usersSearchList;
+    private List<UserInfo> usersSearchList;
-    private final Context context;
+    private Context mCtx;
 
-    public UserSearchAdapter(List<UserInfo> dataList, Context ctx) {
+    public UserSearchAdapter(List<UserInfo> dataList, Context mCtx) {
-        this.context = ctx;
+        this.mCtx = mCtx;
         this.usersSearchList = dataList;
     }
 
-    class UserSearchViewHolder extends RecyclerView.ViewHolder {
+    static class UserSearchViewHolder extends RecyclerView.ViewHolder {
 
-	    private UserInfo userInfo;
+        private ImageView userAvatar;
+        private TextView userFullName;
+        private TextView userName;
+        private TextView userNameMain;
+        private ImageView addCollaboratorButtonAdd;
+        private ImageView addCollaboratorButtonRemove;
 
-        private final ImageView userAvatar;
+        private String[] permissionList = {"Read", "Write", "Admin"};
-        private final TextView userFullName;
-        private final TextView userName;
-        private final ImageView addCollaboratorButtonAdd;
-        private final ImageView addCollaboratorButtonRemove;
-
-        private final String[] permissionList = {"Read", "Write", "Admin"};
         final private int permissionSelectedChoice = 0;
 
         private UserSearchViewHolder(View itemView) {
-
             super(itemView);
             userAvatar = itemView.findViewById(R.id.userAvatar);
             userFullName = itemView.findViewById(R.id.userFullName);
             userName = itemView.findViewById(R.id.userName);
+            userNameMain = itemView.findViewById(R.id.userNameMain);
             addCollaboratorButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
             addCollaboratorButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
 
-            addCollaboratorButtonAdd.setOnClickListener(v -> {
+            addCollaboratorButtonAdd.setOnClickListener(new View.OnClickListener() {
-                AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
+                @Override
+                public void onClick(View v) {
 
-                pBuilder.setTitle(R.string.newTeamPermission);
+                    final Context context = v.getContext();
-                pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, (dialogInterface, i) -> {
 
-                })
+                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
-                        .setCancelable(false)
-                        .setNegativeButton(R.string.cancelButton, null)
-                        .setPositiveButton(R.string.addButton, (dialog, which) -> {
 
-                            ListView lw = ((AlertDialog)dialog).getListView();
+                    pBuilder.setTitle(R.string.newTeamPermission);
-                            Object checkedItem = lw.getAdapter().getItem(lw.getCheckedItemPosition());
+                    pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
 
-                            CollaboratorActions.addCollaborator(context,  String.valueOf(checkedItem).toLowerCase(), userInfo.getUsername());
+                            }
-                        });
+                        })
+                            .setCancelable(false)
+                            .setNegativeButton(R.string.cancelButton, null)
+                            .setPositiveButton(R.string.addButton, new DialogInterface.OnClickListener() {
 
-                AlertDialog pDialog = pBuilder.create();
+                                @Override
-                pDialog.show();
+                                public void onClick(DialogInterface dialog, int which) {
+
+                                    ListView lw = ((AlertDialog)dialog).getListView();
+                                    Object checkedItem = lw.getAdapter().getItem(lw.getCheckedItemPosition());
+
+                                    CollaboratorActions.addCollaborator(context,  String.valueOf(checkedItem).toLowerCase(), userNameMain.getText().toString());
+
+                                }
+                            });
+
+                    AlertDialog pDialog = pBuilder.create();
+                    pDialog.show();
+
+                }
             });
 
-            addCollaboratorButtonRemove.setOnClickListener(v -> {
+            addCollaboratorButtonRemove.setOnClickListener(new View.OnClickListener() {
-                AlertDialogs.collaboratorRemoveDialog(context, userInfo.getUsername(),
+                @Override
-                        context.getResources().getString(R.string.removeCollaboratorTitle),
+                public void onClick(View v) {
-                        context.getResources().getString(R.string.removeCollaboratorMessage),
+
-                        context.getResources().getString(R.string.removeButton),
+                    Context context = v.getContext();
-                        context.getResources().getString(R.string.cancelButton), "fa");
+
+                    AlertDialogs.collaboratorRemoveDialog(context, userNameMain.getText().toString(),
+                            context.getResources().getString(R.string.removeCollaboratorTitle),
+                            context.getResources().getString(R.string.removeCollaboratorMessage),
+                            context.getResources().getString(R.string.removeButton),
+                            context.getResources().getString(R.string.cancelButton), "fa");
+
+                }
             });
 
-	        userAvatar.setOnClickListener(loginId -> {
-		        Intent intent = new Intent(context, ProfileActivity.class);
-		        intent.putExtra("username", userInfo.getLogin());
-		        context.startActivity(intent);
-	        });
-
-	        userAvatar.setOnLongClickListener(loginId -> {
-		        AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-		        return true;
-	        });
         }
 
     }
@@ -119,9 +128,9 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
     @Override
     public void onBindViewHolder(@NonNull final UserSearchAdapter.UserSearchViewHolder holder, int position) {
 
-        UserInfo currentItem = usersSearchList.get(position);
+        final UserInfo currentItem = usersSearchList.get(position);
-	    int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+
-	    holder.userInfo = currentItem;
+        holder.userNameMain.setText(currentItem.getUsername());
 
         if (!currentItem.getFullname().equals("")) {
 
@@ -129,18 +138,18 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
         }
         else {
 
-            holder.userFullName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+            holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
         }
 
-	    holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
+	    holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getUsername()));
 
 	    if (!currentItem.getAvatar().equals("")) {
-            PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+            PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
         }
 
         if(getItemCount() > 0) {
 
-            TinyDB tinyDb = TinyDB.getInstance(context);
+            TinyDB tinyDb = TinyDB.getInstance(mCtx);
             final String loginUid = tinyDb.getString("loginUid");
             String repoFullName = tinyDb.getString("repoFullName");
             String[] parts = repoFullName.split("/");
@@ -148,8 +157,8 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
             final String repoName = parts[1];
 
             Call<Collaborators> call = RetrofitClient
-                    .getApiInterface(context)
+                    .getApiInterface(mCtx)
-                    .checkRepoCollaborator(Authorization.get(context), repoOwner, repoName, currentItem.getUsername());
+                    .checkRepoCollaborator(Authorization.get(mCtx), repoOwner, repoName, currentItem.getUsername());
 
             call.enqueue(new Callback<Collaborators>() {
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
-import android.content.Intent;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,11 +11,9 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import org.gitnex.tea4j.models.UserInfo;
 import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.helpers.TinyDB;
@@ -32,25 +29,25 @@ import retrofit2.Response;
 
 public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSearchForTeamMemberAdapter.UserSearchViewHolder> {
 
-	private final List<UserInfo> usersSearchList;
+	private List<UserInfo> usersSearchList;
-	private final Context context;
+	private Context mCtx;
-	private static int teamId;
+	private int teamId;
 
-	public UserSearchForTeamMemberAdapter(List<UserInfo> dataList, Context ctx, int teamId) {
+	public UserSearchForTeamMemberAdapter(List<UserInfo> dataList, Context mCtx, int teamId) {
-		this.context = ctx;
+		this.mCtx = mCtx;
 		this.usersSearchList = dataList;
-		UserSearchForTeamMemberAdapter.teamId = teamId;
+		this.teamId = teamId;
 	}
 
-	class UserSearchViewHolder extends RecyclerView.ViewHolder {
+	static class UserSearchViewHolder extends RecyclerView.ViewHolder {
 
-		private UserInfo userInfo;
+		private ImageView userAvatar;
-
+		private TextView userFullName;
-		private final ImageView userAvatar;
+		private TextView userName;
-		private final TextView userFullName;
+		private TextView userNameMain;
-		private final TextView userName;
+		private ImageView addMemberButtonAdd;
-		private final ImageView addMemberButtonAdd;
+		private ImageView addMemberButtonRemove;
-		private final ImageView addMemberButtonRemove;
+		private TextView teamId_;
 
 		private UserSearchViewHolder(View itemView) {
 
@@ -58,35 +55,35 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 			userAvatar = itemView.findViewById(R.id.userAvatar);
 			userFullName = itemView.findViewById(R.id.userFullName);
 			userName = itemView.findViewById(R.id.userName);
+			userNameMain = itemView.findViewById(R.id.userNameMain);
 			addMemberButtonAdd = itemView.findViewById(R.id.addCollaboratorButtonAdd);
 			addMemberButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
+			teamId_ = itemView.findViewById(R.id.teamId);
 
 			addMemberButtonAdd.setOnClickListener(v -> {
-				AlertDialogs.addMemberDialog(context, userInfo.getLogin(),
+
+				Context context = v.getContext();
+
+				AlertDialogs.addMemberDialog(context, userNameMain.getText().toString(),
 						context.getResources().getString(R.string.addTeamMemberTitle),
 						context.getResources().getString(R.string.addTeamMemberMessage),
 						context.getResources().getString(R.string.addButton),
-						context.getResources().getString(R.string.cancelButton), Integer.parseInt(String.valueOf(teamId)));
+						context.getResources().getString(R.string.cancelButton), Integer.parseInt(teamId_.getText().toString()));
+
 			});
 
 			addMemberButtonRemove.setOnClickListener(v -> {
-				AlertDialogs.removeMemberDialog(context, userInfo.getLogin(),
+
+				Context context = v.getContext();
+
+				AlertDialogs.removeMemberDialog(context, userNameMain.getText().toString(),
 						context.getResources().getString(R.string.removeTeamMemberTitle),
 						context.getResources().getString(R.string.removeTeamMemberMessage),
 						context.getResources().getString(R.string.removeButton),
-						context.getResources().getString(R.string.cancelButton), Integer.parseInt(String.valueOf(teamId)));
+						context.getResources().getString(R.string.cancelButton), Integer.parseInt(teamId_.getText().toString()));
+
 			});
 
-			userAvatar.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userInfo.getLogin());
-				context.startActivity(intent);
-			});
-
-			userAvatar.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-				return true;
-			});
 		}
 
 	}
@@ -101,36 +98,39 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 	@Override
 	public void onBindViewHolder(@NonNull final UserSearchForTeamMemberAdapter.UserSearchViewHolder holder, int position) {
 
-		UserInfo currentItem = usersSearchList.get(position);
+		final UserInfo currentItem = usersSearchList.get(position);
-		holder.userInfo = currentItem;
+
-		int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
+		holder.userNameMain.setText(currentItem.getLogin());
+		holder.teamId_.setText(String.valueOf(teamId));
 
 		if (!currentItem.getFullname().equals("")) {
 
+
 			holder.userFullName.setText(Html.fromHtml(currentItem.getFullname()));
 		}
 		else {
 
-			holder.userFullName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
+			holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
 		}
 
-		holder.userName.setText(context.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
+		holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
 
 		if (!currentItem.getAvatar().equals("")) {
-			PicassoService.getInstance(context).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
+			PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
 		}
 
 		if(getItemCount() > 0) {
 
-			TinyDB tinyDb = TinyDB.getInstance(context);
+			TinyDB tinyDb = TinyDB.getInstance(mCtx);
 			final String loginUid = tinyDb.getString("loginUid");
 			String repoFullName = tinyDb.getString("repoFullName");
 			String[] parts = repoFullName.split("/");
 			final String repoOwner = parts[0];
+			final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
 			Call<UserInfo> call = RetrofitClient
-					.getApiInterface(context)
+					.getApiInterface(mCtx)
-					.checkTeamMember(Authorization.get(context), teamId, currentItem.getLogin());
+					.checkTeamMember(Authorization.get(mCtx), teamId, currentItem.getLogin());
 
 			call.enqueue(new Callback<UserInfo>() {
 
@@ -167,7 +167,8 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 				@Override
 				public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
 
-					Toasty.error(context, context.getResources().getString(R.string.genericServerResponseError));
+					Toasty.error(mCtx, mCtx.getResources().getString(R.string.genericServerResponseError));
+
 				}
 
 			});

app/src/main/java/org/mian/gitnex/adapters/profile/FollowersAdapter.java

@@ -1,166 +0,0 @@
-package org.mian.gitnex.adapters.profile;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.text.Html;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class FollowersAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<UserInfo> usersList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public FollowersAdapter(Context ctx, List<UserInfo> usersListMain) {
-		this.context = ctx;
-		this.usersList = usersListMain;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		LayoutInflater inflater = LayoutInflater.from(context);
-
-		if(viewType == TYPE_LOAD) {
-			return new UsersHolder(inflater.inflate(R.layout.list_profile_followers_following, parent, false));
-		}
-		else {
-			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
-			isLoading = true;
-			loadMoreListener.onLoadMore();
-		}
-
-		if(getItemViewType(position) == TYPE_LOAD) {
-			((UsersHolder) holder).bindData(usersList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(usersList.get(position).getUsername() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return usersList.size();
-	}
-
-	class UsersHolder extends RecyclerView.ViewHolder {
-
-		private UserInfo userInfo;
-
-		private final ImageView userAvatar;
-		private final TextView userFullName;
-		private final TextView userName;
-
-		UsersHolder(View itemView) {
-
-			super(itemView);
-			Context context = itemView.getContext();
-
-			userAvatar = itemView.findViewById(R.id.userAvatar);
-			userFullName = itemView.findViewById(R.id.userFullName);
-			userName = itemView.findViewById(R.id.userName);
-
-			itemView.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userInfo.getLogin());
-				context.startActivity(intent);
-			});
-
-			itemView.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-				return true;
-			});
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(UserInfo userInfo) {
-
-			this.userInfo = userInfo;
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-			//Locale locale = context.getResources().getConfiguration().locale;
-
-			if(!userInfo.getFullname().equals("")) {
-				userFullName.setText(Html.fromHtml(userInfo.getFullname()));
-				userName.setText(context.getResources().getString(R.string.usernameWithAt, userInfo.getUsername()));
-			}
-			else {
-				userFullName.setText(userInfo.getUsername());
-				userName.setVisibility(View.GONE);
-			}
-
-			PicassoService.getInstance(context)
-				.get()
-				.load(userInfo.getAvatar())
-				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0))
-				.resize(120, 120)
-				.centerCrop()
-				.into(userAvatar);
-		}
-	}
-
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<UserInfo> list) {
-		usersList = list;
-		notifyDataSetChanged();
-	}
-
-}

app/src/main/java/org/mian/gitnex/adapters/profile/FollowingAdapter.java

@@ -1,166 +0,0 @@
-package org.mian.gitnex.adapters.profile;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.text.Html;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserInfo;
-import org.mian.gitnex.R;
-import org.mian.gitnex.activities.ProfileActivity;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class FollowingAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<UserInfo> usersList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public FollowingAdapter(Context ctx, List<UserInfo> usersListMain) {
-		this.context = ctx;
-		this.usersList = usersListMain;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		LayoutInflater inflater = LayoutInflater.from(context);
-
-		if(viewType == TYPE_LOAD) {
-			return new UsersHolder(inflater.inflate(R.layout.list_profile_followers_following, parent, false));
-		}
-		else {
-			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
-			isLoading = true;
-			loadMoreListener.onLoadMore();
-		}
-
-		if(getItemViewType(position) == TYPE_LOAD) {
-			((UsersHolder) holder).bindData(usersList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(usersList.get(position).getUsername() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return usersList.size();
-	}
-
-	class UsersHolder extends RecyclerView.ViewHolder {
-
-		private UserInfo userInfo;
-
-		private final ImageView userAvatar;
-		private final TextView userFullName;
-		private final TextView userName;
-
-		UsersHolder(View itemView) {
-
-			super(itemView);
-			Context context = itemView.getContext();
-
-			userAvatar = itemView.findViewById(R.id.userAvatar);
-			userFullName = itemView.findViewById(R.id.userFullName);
-			userName = itemView.findViewById(R.id.userName);
-
-			itemView.setOnClickListener(loginId -> {
-				Intent intent = new Intent(context, ProfileActivity.class);
-				intent.putExtra("username", userInfo.getLogin());
-				context.startActivity(intent);
-			});
-
-			itemView.setOnLongClickListener(loginId -> {
-				AppUtil.copyToClipboard(context, userInfo.getLogin(), context.getString(R.string.copyLoginIdToClipBoard, userInfo.getLogin()));
-				return true;
-			});
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(UserInfo userInfo) {
-
-			this.userInfo = userInfo;
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-			//Locale locale = context.getResources().getConfiguration().locale;
-
-			if(!userInfo.getFullname().equals("")) {
-				userFullName.setText(Html.fromHtml(userInfo.getFullname()));
-				userName.setText(context.getResources().getString(R.string.usernameWithAt, userInfo.getUsername()));
-			}
-			else {
-				userFullName.setText(userInfo.getUsername());
-				userName.setVisibility(View.GONE);
-			}
-
-			PicassoService
-				.getInstance(context)
-				.get()
-				.load(userInfo.getAvatar())
-				.placeholder(R.drawable.loader_animated)
-				.transform(new RoundedTransformation(imgRadius, 0))
-				.resize(120, 120)
-				.centerCrop()
-				.into(userAvatar);
-		}
-	}
-
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<UserInfo> list) {
-		usersList = list;
-		notifyDataSetChanged();
-	}
-}

app/src/main/java/org/mian/gitnex/adapters/profile/OrganizationsAdapter.java

@@ -1,137 +0,0 @@
-package org.mian.gitnex.adapters.profile;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import org.gitnex.tea4j.models.UserOrganizations;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import java.util.List;
-
-/**
- * Author M M Arif
- */
-
-public class OrganizationsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<UserOrganizations> organizationsList;
-	private RepositoriesAdapter.OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public OrganizationsAdapter(Context ctx, List<UserOrganizations> organizationsListMain) {
-		this.context = ctx;
-		this.organizationsList = organizationsListMain;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		LayoutInflater inflater = LayoutInflater.from(context);
-
-		if(viewType == TYPE_LOAD) {
-			return new OrganizationsHolder(inflater.inflate(R.layout.list_organizations, parent, false));
-		}
-		else {
-			return new LoadHolder(inflater.inflate(R.layout.row_load, parent, false));
-		}
-	}
-
-	@Override
-	public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-
-		if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
-			isLoading = true;
-			loadMoreListener.onLoadMore();
-		}
-
-		if(getItemViewType(position) == TYPE_LOAD) {
-			((OrganizationsHolder) holder).bindData(organizationsList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(organizationsList.get(position).getUsername() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return organizationsList.size();
-	}
-
-	class OrganizationsHolder extends RecyclerView.ViewHolder {
-
-		private UserOrganizations userOrganizations;
-
-		private final ImageView image;
-		private final TextView orgName;
-		private final TextView orgDescription;
-
-		OrganizationsHolder(View itemView) {
-
-			super(itemView);
-			orgName = itemView.findViewById(R.id.orgName);
-			orgDescription = itemView.findViewById(R.id.orgDescription);
-			image = itemView.findViewById(R.id.imageAvatar);
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(UserOrganizations userOrganizations) {
-
-			this.userOrganizations = userOrganizations;
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-			orgName.setText(userOrganizations.getUsername());
-
-			PicassoService.getInstance(context).get().load(userOrganizations.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(image);
-
-			if (!userOrganizations.getDescription().equals("")) {
-				orgDescription.setText(userOrganizations.getDescription());
-			}
-		}
-	}
-
-	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(RepositoriesAdapter.OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<UserOrganizations> list) {
-		organizationsList = list;
-		notifyDataSetChanged();
-	}
-}

app/src/main/java/org/mian/gitnex/adapters/profile/RepositoriesAdapter.java

@@ -1,196 +0,0 @@
-package org.mian.gitnex.adapters.profile;
-
-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.CheckBox;
-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 org.gitnex.tea4j.models.UserRepositories;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.TinyDB;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Author M M Arif
- */
-
-public class RepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<UserRepositories> reposList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public RepositoriesAdapter(Context ctx, List<UserRepositories> reposListMain) {
-		this.context = ctx;
-		this.reposList = reposListMain;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		LayoutInflater inflater = LayoutInflater.from(context);
-
-		if(viewType == TYPE_LOAD) {
-			return new RepositoriesAdapter.RepositoriesHolder(inflater.inflate(R.layout.list_repositories, parent, false));
-		}
-		else {
-			return new RepositoriesAdapter.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) {
-			((RepositoriesAdapter.RepositoriesHolder) holder).bindData(reposList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(reposList.get(position).getFullName() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return reposList.size();
-	}
-
-	class RepositoriesHolder extends RecyclerView.ViewHolder {
-
-		private UserRepositories userRepositories;
-
-		private final ImageView avatar;
-		private final TextView repoName;
-		private final TextView orgName;
-		private final TextView repoDescription;
-		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
-		private final TextView repoLastUpdated;
-
-		RepositoriesHolder(View itemView) {
-
-			super(itemView);
-			repoName = itemView.findViewById(R.id.repoName);
-			orgName = itemView.findViewById(R.id.orgName);
-			repoDescription = itemView.findViewById(R.id.repoDescription);
-			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
-			avatar = itemView.findViewById(R.id.imageAvatar);
-			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(UserRepositories userRepositories) {
-
-			this.userRepositories = userRepositories;
-			TinyDB tinyDb = TinyDB.getInstance(context);
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-			Locale locale = context.getResources().getConfiguration().locale;
-			String timeFormat = tinyDb.getString("dateFormat");
-
-			orgName.setText(userRepositories.getFullName().split("/")[0]);
-			repoName.setText(userRepositories.getFullName().split("/")[1]);
-			repoStars.setText(userRepositories.getStars_count());
-
-			ColorGenerator generator = ColorGenerator.MATERIAL;
-			int color = generator.getColor(userRepositories.getName());
-			String firstCharacter = String.valueOf(userRepositories.getFullName().charAt(0));
-
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
-
-			if(userRepositories.getAvatar_url() != null) {
-				if(!userRepositories.getAvatar_url().equals("")) {
-					PicassoService
-						.getInstance(context).get().load(userRepositories.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(avatar);
-				}
-				else {
-					avatar.setImageDrawable(drawable);
-				}
-			}
-			else {
-				avatar.setImageDrawable(drawable);
-			}
-
-			if(userRepositories.getUpdated_at() != null) {
-
-				repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, TimeHelper.formatTime(userRepositories.getUpdated_at(), locale, timeFormat, context)));
-				if(timeFormat.equals("pretty")) {
-					repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdated_at()), context));
-				}
-			}
-			else {
-				repoLastUpdated.setVisibility(View.GONE);
-			}
-
-			if(!userRepositories.getDescription().equals("")) {
-				repoDescription.setText(userRepositories.getDescription());
-			}
-			else {
-				repoDescription.setText(context.getString(R.string.noDataDescription));
-			}
-
-			if(isRepoAdmin == null) {
-				isRepoAdmin = new CheckBox(context);
-			}
-			isRepoAdmin.setChecked(userRepositories.getPermissions().isAdmin());
-
-		}
-	}
-
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<UserRepositories> list) {
-		reposList = list;
-		notifyDataSetChanged();
-	}
-}

app/src/main/java/org/mian/gitnex/adapters/profile/StarredRepositoriesAdapter.java

@@ -1,197 +0,0 @@
-package org.mian.gitnex.adapters.profile;
-
-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.CheckBox;
-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 org.gitnex.tea4j.models.UserRepositories;
-import org.mian.gitnex.R;
-import org.mian.gitnex.clients.PicassoService;
-import org.mian.gitnex.helpers.AppUtil;
-import org.mian.gitnex.helpers.ClickListener;
-import org.mian.gitnex.helpers.RoundedTransformation;
-import org.mian.gitnex.helpers.TimeHelper;
-import org.mian.gitnex.helpers.TinyDB;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Author M M Arif
- */
-
-public class StarredRepositoriesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-	private final Context context;
-	private final int TYPE_LOAD = 0;
-	private List<UserRepositories> reposList;
-	private OnLoadMoreListener loadMoreListener;
-	private boolean isLoading = false, isMoreDataAvailable = true;
-
-	public StarredRepositoriesAdapter(Context ctx, List<UserRepositories> reposListMain) {
-		this.context = ctx;
-		this.reposList = reposListMain;
-	}
-
-	@NonNull
-	@Override
-	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-		LayoutInflater inflater = LayoutInflater.from(context);
-
-		if(viewType == TYPE_LOAD) {
-			return new StarredRepositoriesAdapter.StarredRepositoriesHolder(inflater.inflate(R.layout.list_repositories, parent, false));
-		}
-		else {
-			return new StarredRepositoriesAdapter.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) {
-			((StarredRepositoriesAdapter.StarredRepositoriesHolder) holder).bindData(reposList.get(position));
-		}
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if(reposList.get(position).getFullName() != null) {
-			return TYPE_LOAD;
-		}
-		else {
-			return 1;
-		}
-	}
-
-	@Override
-	public int getItemCount() {
-		return reposList.size();
-	}
-
-	class StarredRepositoriesHolder extends RecyclerView.ViewHolder {
-
-		private UserRepositories userRepositories;
-
-		private final ImageView avatar;
-		private final TextView repoName;
-		private final TextView orgName;
-		private final TextView repoDescription;
-		private CheckBox isRepoAdmin;
-		private final TextView repoStars;
-		private final TextView repoLastUpdated;
-
-		StarredRepositoriesHolder(View itemView) {
-
-			super(itemView);
-			repoName = itemView.findViewById(R.id.repoName);
-			orgName = itemView.findViewById(R.id.orgName);
-			repoDescription = itemView.findViewById(R.id.repoDescription);
-			isRepoAdmin = itemView.findViewById(R.id.repoIsAdmin);
-			avatar = itemView.findViewById(R.id.imageAvatar);
-			repoStars = itemView.findViewById(R.id.repoStars);
-			repoLastUpdated = itemView.findViewById(R.id.repoLastUpdated);
-		}
-
-		@SuppressLint("SetTextI18n")
-		void bindData(UserRepositories userRepositories) {
-
-			this.userRepositories = userRepositories;
-			TinyDB tinyDb = TinyDB.getInstance(context);
-			int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
-
-			Locale locale = context.getResources().getConfiguration().locale;
-			String timeFormat = tinyDb.getString("dateFormat");
-
-			orgName.setText(userRepositories.getFullName().split("/")[0]);
-			repoName.setText(userRepositories.getFullName().split("/")[1]);
-			repoStars.setText(userRepositories.getStars_count());
-
-			ColorGenerator generator = ColorGenerator.MATERIAL;
-			int color = generator.getColor(userRepositories.getName());
-			String firstCharacter = String.valueOf(userRepositories.getFullName().charAt(0));
-
-			TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
-
-			if(userRepositories.getAvatar_url() != null) {
-				if(!userRepositories.getAvatar_url().equals("")) {
-					PicassoService
-						.getInstance(context).get().load(userRepositories.getAvatar_url()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(avatar);
-				}
-				else {
-					avatar.setImageDrawable(drawable);
-				}
-			}
-			else {
-				avatar.setImageDrawable(drawable);
-			}
-
-			if(userRepositories.getUpdated_at() != null) {
-
-				repoLastUpdated.setText(context.getString(R.string.lastUpdatedAt, TimeHelper
-					.formatTime(userRepositories.getUpdated_at(), locale, timeFormat, context)));
-				if(timeFormat.equals("pretty")) {
-					repoLastUpdated.setOnClickListener(new ClickListener(TimeHelper.customDateFormatForToastDateFormat(userRepositories.getUpdated_at()), context));
-				}
-			}
-			else {
-				repoLastUpdated.setVisibility(View.GONE);
-			}
-
-			if(!userRepositories.getDescription().equals("")) {
-				repoDescription.setText(userRepositories.getDescription());
-			}
-			else {
-				repoDescription.setText(context.getString(R.string.noDataDescription));
-			}
-
-			if(isRepoAdmin == null) {
-				isRepoAdmin = new CheckBox(context);
-			}
-			isRepoAdmin.setChecked(userRepositories.getPermissions().isAdmin());
-
-		}
-	}
-
-	static class LoadHolder extends RecyclerView.ViewHolder {
-		LoadHolder(View itemView) {
-			super(itemView);
-		}
-	}
-
-	public void setMoreDataAvailable(boolean moreDataAvailable) {
-		isMoreDataAvailable = moreDataAvailable;
-	}
-
-	public void notifyDataChanged() {
-		notifyDataSetChanged();
-		isLoading = false;
-	}
-
-	public interface OnLoadMoreListener {
-		void onLoadMore();
-	}
-
-	public void setLoadMoreListener(OnLoadMoreListener loadMoreListener) {
-		this.loadMoreListener = loadMoreListener;
-	}
-
-	public void updateList(List<UserRepositories> list) {
-		reposList = list;
-		notifyDataSetChanged();
-	}
-}

app/src/main/java/org/mian/gitnex/core/MainApplication.java

@@ -3,7 +3,6 @@ package org.mian.gitnex.core;
 import android.annotation.SuppressLint;
 import android.app.Application;
 import android.content.Context;
-import androidx.core.content.res.ResourcesCompat;
 import org.acra.ACRA;
 import org.acra.BuildConfig;
 import org.acra.ReportField;
@@ -35,6 +34,7 @@ import org.mian.gitnex.notifications.Notifications;
 
 public class MainApplication extends Application {
 
+	private Context appCtx;
 	private TinyDB tinyDB;
 
 	@Override
@@ -42,11 +42,9 @@ public class MainApplication extends Application {
 
 		super.onCreate();
 
-		Context appCtx = getApplicationContext();
+		appCtx = getApplicationContext();
 		tinyDB = TinyDB.getInstance(appCtx);
 
-		tinyDB.putBoolean("biometricLifeCycle", false);
-
 		setDefaults();
 
 		switch(tinyDB.getInt("customFontId", -1)) {
@@ -76,7 +74,6 @@ public class MainApplication extends Application {
 		Notifications.createChannels(appCtx);
 	}
 
-	@Override
 	protected void attachBaseContext(Context context) {
 
 		super.attachBaseContext(context);
@@ -88,8 +85,8 @@ public class MainApplication extends Application {
 			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
+			ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo(getResources().getString(R.string.appEmail))
-				.getAppBuildNo(context))).setEnabled(true);
+				.setSubject(getResources().getString(R.string.crashReportEmailSubject, AppUtil.getAppBuildNo(context))).setEnabled(true);
 			ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
 
 			ACRA.init(this, ACRABuilder);
@@ -100,74 +97,46 @@ public class MainApplication extends Application {
 
 		// enabling counter badges by default
 		if(tinyDB.getString("enableCounterBadgesInit").isEmpty()) {
+
 			tinyDB.putBoolean("enableCounterBadges", true);
 			tinyDB.putString("enableCounterBadgesInit", "yes");
 		}
 
 		// enable crash reports by default
 		if(tinyDB.getString("crashReportingEnabledInit").isEmpty()) {
+
 			tinyDB.putBoolean("crashReportingEnabled", true);
 			tinyDB.putString("crashReportingEnabledInit", "yes");
 		}
 
 		// default cache setter
 		if(tinyDB.getString("cacheSizeStr").isEmpty()) {
+
 			tinyDB.putString("cacheSizeStr", getResources().getString(R.string.cacheSizeDataSelectionSelectedText));
 		}
 		if(tinyDB.getString("cacheSizeImagesStr").isEmpty()) {
+
 			tinyDB.putString("cacheSizeImagesStr", getResources().getString(R.string.cacheSizeImagesSelectionSelectedText));
 		}
 
 		// enable comment drafts by default
 		if(tinyDB.getString("draftsCommentsDeletionEnabledInit").isEmpty()) {
+
 			tinyDB.putBoolean("draftsCommentsDeletionEnabled", true);
 			tinyDB.putString("draftsCommentsDeletionEnabledInit", "yes");
 		}
 
 		// setting default polling delay
 		if(tinyDB.getInt("pollingDelayMinutes", 0) <= 0) {
+
 			tinyDB.putInt("pollingDelayMinutes", Constants.defaultPollingDelay);
 		}
 
 		// disable biometric by default
 		if(tinyDB.getString("biometricStatusInit").isEmpty()) {
+
 			tinyDB.putBoolean("biometricStatus", false);
 			tinyDB.putString("biometricStatusInit", "yes");
 		}
-
-		// set default date format
-		if(tinyDB.getString("dateFormat").isEmpty()) {
-			tinyDB.putString("dateFormat", "pretty");
-		}
-
-		if(tinyDB.getString("codeBlockStr").isEmpty()) {
-			tinyDB.putInt("codeBlockColor", ResourcesCompat.getColor(getResources(), R.color.colorLightGreen, null));
-			tinyDB.putInt("codeBlockBackground", ResourcesCompat.getColor(getResources(), R.color.black, null));
-		}
-
-		if(tinyDB.getString("enableCounterIssueBadgeInit").isEmpty()) {
-			tinyDB.putBoolean("enableCounterIssueBadge", true);
-		}
-
-		if(tinyDB.getString("homeScreenStr").isEmpty()) {
-			tinyDB.putString("homeScreenStr", "yes");
-			tinyDB.putInt("homeScreenId", 0);
-		}
-
-		if(tinyDB.getString("localeStr").isEmpty()) {
-			tinyDB.putString("localeStr", getString(R.string.settingsLanguageSystem));
-			tinyDB.putInt("langId", 0);
-		}
-
-		if(tinyDB.getInt("darkThemeTimeHour", 100) == 100) {
-			tinyDB.putInt("lightThemeTimeHour", 6);
-			tinyDB.putInt("lightThemeTimeMinute", 0);
-			tinyDB.putInt("darkThemeTimeHour", 18);
-			tinyDB.putInt("darkThemeTimeMinute", 0);
-		}
-
-		if(tinyDB.getString("timeStr").isEmpty()) {
-			tinyDB.putString("timeStr", getString(R.string.settingsDateTimeHeaderDefault));
-		}
 	}
 }

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

@@ -1,57 +0,0 @@
-package org.mian.gitnex.database.api;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import org.mian.gitnex.database.db.GitnexDatabase;
-import org.mian.gitnex.helpers.Constants;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * @author opyale
- */
-
-public abstract class BaseApi {
-
-	private static final Map<Class<? extends BaseApi>, Object> instances = new HashMap<>();
-
-	protected static final ExecutorService executorService = Executors.newCachedThreadPool();
-	protected final GitnexDatabase gitnexDatabase;
-
-	protected BaseApi(Context context) {
-		gitnexDatabase = GitnexDatabase.getDatabaseInstance(context);
-	}
-
-	public static <T extends BaseApi> T getInstance(@NonNull Context context, @NonNull Class<T> clazz) {
-
-		try {
-
-			if(!instances.containsKey(clazz)) {
-				synchronized(BaseApi.class) {
-					if(!instances.containsKey(clazz)) {
-
-						T instance = clazz
-							.getDeclaredConstructor(Context.class)
-							.newInstance(context);
-
-						instances.put(clazz, instance);
-						return instance;
-					}
-				}
-			}
-
-			return (T) instances.get(clazz);
-
-		} catch(NoSuchMethodException | IllegalAccessException |
-			InvocationTargetException | InstantiationException ignored) {}
-
-		return null;
-	}
-
-}

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

@@ -1,23 +1,30 @@
 package org.mian.gitnex.database.api;
 
 import android.content.Context;
+import android.util.Log;
 import androidx.lifecycle.LiveData;
 import org.mian.gitnex.database.dao.DraftsDao;
+import org.mian.gitnex.database.db.GitnexDatabase;
 import org.mian.gitnex.database.models.Draft;
 import org.mian.gitnex.database.models.DraftWithRepository;
+import org.mian.gitnex.helpers.Constants;
 import java.util.List;
 
 /**
  * Author M M Arif
  */
 
-public class DraftsApi extends BaseApi {
+public class DraftsApi {
 
-	private final DraftsDao draftsDao;
+	private static DraftsDao draftsDao;
+	private static long draftId;
+	private static Integer checkDraftFlag;
 
-	DraftsApi(Context context) {
+	public DraftsApi(Context context) {
-		super(context);
+
-		draftsDao = gitnexDatabase.draftsDao();
+		GitnexDatabase db;
+		db = GitnexDatabase.getDatabaseInstance(context);
+		draftsDao = db.draftsDao();
 	}
 
 	public long insertDraft(int repositoryId, int draftAccountId, int issueId, String draftText, String draftType, String commentId, String issueType) {
@@ -34,44 +41,87 @@ public class DraftsApi extends BaseApi {
 		return insertDraftAsyncTask(draft);
 	}
 
-	private long insertDraftAsyncTask(final Draft draft) {
+	private static long insertDraftAsyncTask(final Draft draft) {
-		return draftsDao.insertDraft(draft);
+
+		try {
+
+			Thread thread = new Thread(() -> draftId = draftsDao.insertDraft(draft));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.draftsApi, e.toString());
+		}
+
+		return draftId;
 	}
 
 	public long getDraftIdAsync(int issueId, int draftRepositoryId) {
-		return draftsDao.getDraftId(issueId, draftRepositoryId);
+
+		try {
+
+			Thread thread = new Thread(() -> draftId = draftsDao.getDraftId(issueId, draftRepositoryId));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.draftsApi, e.toString());
+		}
+
+		return draftId;
 	}
 
 	public Integer checkDraft(int issueId, int draftRepositoryId, String commentId) {
-		return draftsDao.checkDraftDao(issueId, draftRepositoryId, commentId);
+
+		try {
+
+			Thread thread = new Thread(() -> checkDraftFlag = draftsDao.checkDraftDao(issueId, draftRepositoryId, commentId));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.draftsApi, e.toString());
+		}
+
+		return checkDraftFlag;
 	}
 
 	public LiveData<List<DraftWithRepository>> getDrafts(int accountId) {
+
 		return draftsDao.fetchAllDrafts(accountId);
 	}
 
 	public LiveData<Draft> getDraftByIssueId(int issueId) {
+
 		return draftsDao.fetchDraftByIssueId(issueId);
 	}
 
 	public void deleteSingleDraft(final int draftId) {
+
 		final LiveData<Draft> draft = draftsDao.fetchDraftById(draftId);
 
 		if(draft != null) {
-			executorService.execute(() -> draftsDao.deleteByDraftId(draftId));
+
+			new Thread(() -> draftsDao.deleteByDraftId(draftId)).start();
 		}
 	}
 
-	public void deleteAllDrafts(final int accountId) {
+	public static void deleteAllDrafts(final int accountId) {
-		executorService.execute(() -> draftsDao.deleteAllDrafts(accountId));
+
+		new Thread(() -> draftsDao.deleteAllDrafts(accountId)).start();
 	}
 
-	public void updateDraft(final String draftText, final int draftId, final String commentId) {
+	public static void updateDraft(final String draftText, final int draftId, final String commentId) {
-		executorService.execute(() -> draftsDao.updateDraft(draftText, draftId, commentId));
+
+		new Thread(() -> draftsDao.updateDraft(draftText, draftId, commentId)).start();
 	}
 
-	public void updateDraftByIssueIdAsyncTask(final String draftText, final int issueId, final int draftRepositoryId, final String commentId) {
+	public static void updateDraftByIssueIdAsyncTask(final String draftText, final int issueId, final int draftRepositoryId, final String commentId) {
-		executorService.execute(() -> draftsDao.updateDraftByIssueId(draftText, issueId, draftRepositoryId, commentId));
+
+		new Thread(() -> draftsDao.updateDraftByIssueId(draftText, issueId, draftRepositoryId, commentId)).start();
 	}
 
 }

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

@@ -1,22 +1,30 @@
 package org.mian.gitnex.database.api;
 
 import android.content.Context;
+import android.util.Log;
 import androidx.lifecycle.LiveData;
 import org.mian.gitnex.database.dao.RepositoriesDao;
+import org.mian.gitnex.database.db.GitnexDatabase;
 import org.mian.gitnex.database.models.Repository;
+import org.mian.gitnex.helpers.Constants;
 import java.util.List;
 
 /**
  * Author M M Arif
  */
 
-public class RepositoriesApi extends BaseApi {
+public class RepositoriesApi {
 
-	private final RepositoriesDao repositoriesDao;
+	private static RepositoriesDao repositoriesDao;
+	private static long repositoryId;
+	private static Repository repository;
+	private static Integer checkRepository;
 
-	RepositoriesApi(Context context) {
+	public RepositoriesApi(Context context) {
-		super(context);
+
-		repositoriesDao = gitnexDatabase.repositoriesDao();
+		GitnexDatabase db;
+		db = GitnexDatabase.getDatabaseInstance(context);
+		repositoriesDao = db.repositoriesDao();
 	}
 
 	public long insertRepository(int repoAccountId, String repositoryOwner, String repositoryName) {
@@ -30,43 +38,108 @@ public class RepositoriesApi extends BaseApi {
 	}
 
 	public long insertRepositoryAsyncTask(Repository repository) {
-		return repositoriesDao.newRepository(repository);
+
+		try {
+
+			Thread thread = new Thread(() -> repositoryId = repositoriesDao.newRepository(repository));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.repositoriesApi, e.toString());
+		}
+
+		return repositoryId;
 	}
 
 	public Repository getRepository(int repoAccountId, String repositoryOwner, String repositoryName) {
-		return repositoriesDao.getSingleRepositoryDao(repoAccountId, repositoryOwner, repositoryName);
+
+		try {
+
+			Thread thread = new Thread(() -> repository = repositoriesDao.getSingleRepositoryDao(repoAccountId, repositoryOwner, repositoryName));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.repositoriesApi, e.toString());
+		}
+
+		return repository;
 	}
 
 	public LiveData<List<Repository>> getAllRepositories() {
+
 		return repositoriesDao.fetchAllRepositories();
 	}
 
 	public LiveData<List<Repository>> getAllRepositoriesByAccount(int repoAccountId) {
+
 		return repositoriesDao.getAllRepositoriesByAccountDao(repoAccountId);
 	}
 
 	public Integer checkRepository(int repoAccountId, String repositoryOwner, String repositoryName) {
-		return repositoriesDao.checkRepositoryDao(repoAccountId, repositoryOwner, repositoryName);
+
+		try {
+
+			Thread thread = new Thread(() -> checkRepository = repositoriesDao.checkRepositoryDao(repoAccountId, repositoryOwner, repositoryName));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.repositoriesApi, e.toString());
+		}
+
+		return checkRepository;
 	}
 
 	public Repository fetchRepositoryById(int repositoryId) {
-		return repositoriesDao.fetchRepositoryByIdDao(repositoryId);
+
+		try {
+
+			Thread thread = new Thread(() -> repository = repositoriesDao.fetchRepositoryByIdDao(repositoryId));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.repositoriesApi, e.toString());
+		}
+
+		return repository;
 	}
 
 	public Repository fetchRepositoryByAccountIdByRepositoryId(int repositoryId, int repoAccountId) {
-		return repositoriesDao.fetchRepositoryByAccountIdByRepositoryIdDao(repositoryId, repoAccountId);
+
+		try {
+
+			Thread thread = new Thread(() -> repository = repositoriesDao.fetchRepositoryByAccountIdByRepositoryIdDao(repositoryId, repoAccountId));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.repositoriesApi, e.toString());
+		}
+
+		return repository;
 	}
 
-	public void updateRepositoryOwnerAndName(String repositoryOwner, String repositoryName, int repositoryId) {
+	public static void updateRepositoryOwnerAndName(String repositoryOwner, String repositoryName, int repositoryId) {
-		executorService.execute(() -> repositoriesDao.updateRepositoryOwnerAndName(repositoryOwner, repositoryName, repositoryId));
+
+		new Thread(() -> repositoriesDao.updateRepositoryOwnerAndName(repositoryOwner, repositoryName, repositoryId)).start();
 	}
 
-	public void deleteRepositoriesByAccount(final int repoAccountId) {
+	public static void deleteRepositoriesByAccount(final int repoAccountId) {
-		executorService.execute(() -> repositoriesDao.deleteRepositoriesByAccount(repoAccountId));
+
+		new Thread(() -> repositoriesDao.deleteRepositoriesByAccount(repoAccountId)).start();
 	}
 
-	public void deleteRepository(final int repositoryId) {
+	public static void deleteRepository(final int repositoryId) {
-		executorService.execute(() -> repositoriesDao.deleteRepository(repositoryId));
+
+		new Thread(() -> repositoriesDao.deleteRepository(repositoryId)).start();
 	}
 
 }

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

@@ -1,25 +1,34 @@
 package org.mian.gitnex.database.api;
 
 import android.content.Context;
+import android.util.Log;
 import androidx.lifecycle.LiveData;
 import org.mian.gitnex.database.dao.UserAccountsDao;
+import org.mian.gitnex.database.db.GitnexDatabase;
 import org.mian.gitnex.database.models.UserAccount;
+import org.mian.gitnex.helpers.Constants;
 import java.util.List;
 
 /**
  * Author M M Arif
  */
 
-public class UserAccountsApi extends BaseApi {
+public class UserAccountsApi {
 
-	private final UserAccountsDao userAccountsDao;
+	private static UserAccountsDao userAccountsDao;
+	private static UserAccount userAccount;
+	private static List<UserAccount> userAccounts;
+	private static Integer checkAccount;
+	private static long accountId;
 
-	UserAccountsApi(Context context) {
+	public UserAccountsApi(Context context) {
-		super(context);
+
-		userAccountsDao = gitnexDatabase.userAccountsDao();
+		GitnexDatabase db;
+		db = GitnexDatabase.getDatabaseInstance(context);
+		userAccountsDao = db.userAccountsDao();
 	}
 
-	public long createNewAccount(String accountName, String instanceUrl, String userName, String token, String serverVersion) {
+	public long insertNewAccount(String accountName, String instanceUrl, String userName, String token, String serverVersion) {
 
 		UserAccount userAccount = new UserAccount();
 		userAccount.setAccountName(accountName);
@@ -28,48 +37,96 @@ public class UserAccountsApi extends BaseApi {
 		userAccount.setToken(token);
 		userAccount.setServerVersion(serverVersion);
 
-		return userAccountsDao.createAccount(userAccount);
+		return insertNewAccountAsync(userAccount);
-
 	}
 
-	public void updateServerVersion(final String serverVersion, final int accountId) {
+	private static long insertNewAccountAsync(final UserAccount userAccount) {
-		executorService.execute(() -> userAccountsDao.updateServerVersion(serverVersion, accountId));
+
+		try {
+
+			Thread thread = new Thread(() -> accountId = userAccountsDao.newAccount(userAccount));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.userAccountsApi, e.toString());
+		}
+
+		return accountId;
+	}
+
+	public static void updateServerVersion(final String serverVersion, final int accountId) {
+
+		new Thread(() -> userAccountsDao.updateServerVersion(serverVersion, accountId)).start();
 	}
 
 	public void updateToken(final int accountId, final String token) {
-		executorService.execute(() -> userAccountsDao.updateAccountToken(accountId, token));
+
+		new Thread(() -> userAccountsDao.updateAccountToken(accountId, token)).start();
 	}
 
 	public void updateTokenByAccountName(final String accountName, final String token) {
-		executorService.execute(() -> userAccountsDao.updateAccountTokenByAccountName(accountName, token));
+
+		new Thread(() -> userAccountsDao.updateAccountTokenByAccountName(accountName, token)).start();
 	}
 
-	public UserAccount getAccountByName(String accountName) {
+	public UserAccount getAccountData(String accountName) {
-		return userAccountsDao.getAccountByName(accountName);
+
+		try {
+
+			Thread thread = new Thread(() -> userAccount = userAccountsDao.fetchRowByAccount_(accountName));
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.userAccountsApi, e.toString());
+		}
+
+		return userAccount;
 	}
 
-	public UserAccount getAccountById(int accountId) {
+	public Integer getCount(String accountName) {
-		return userAccountsDao.getAccountById(accountId);
-	}
 
-	public Integer getCount() {
+		try {
-		return userAccountsDao.getCount();
-	}
 
-	public Boolean userAccountExists(String accountName) {
+			Thread thread = new Thread(() -> checkAccount = userAccountsDao.getCount(accountName));
-		return userAccountsDao.userAccountExists(accountName);
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.userAccountsApi, e.toString());
+		}
+
+		return checkAccount;
 	}
 
 	public LiveData<List<UserAccount>> getAllAccounts() {
-		return userAccountsDao.getAllAccounts();
+
+		return userAccountsDao.fetchAllAccounts();
 	}
 
 	public List<UserAccount> usersAccounts() {
-		return userAccountsDao.userAccounts();
+
+		try {
+
+			Thread thread = new Thread(() -> userAccounts = userAccountsDao.userAccounts());
+			thread.start();
+			thread.join();
+		}
+		catch(InterruptedException e) {
+
+			Log.e(Constants.userAccountsApi, e.toString());
+		}
+
+		return userAccounts;
 	}
 
 	public void deleteAccount(final int accountId) {
-		executorService.execute(() -> userAccountsDao.deleteAccount(accountId));
+
+		new Thread(() -> userAccountsDao.deleteAccount(accountId)).start();
 	}
 
 }

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

@@ -15,25 +15,22 @@ import java.util.List;
 public interface UserAccountsDao {
 
     @Insert
-    long createAccount(UserAccount userAccounts);
+    long newAccount(UserAccount userAccounts);
 
     @Query("SELECT * FROM UserAccounts ORDER BY accountId ASC")
-    LiveData<List<UserAccount>> getAllAccounts();
+    LiveData<List<UserAccount>> fetchAllAccounts();
 
 	@Query("SELECT * FROM UserAccounts ORDER BY accountId ASC")
 	List<UserAccount> userAccounts();
 
-    @Query("SELECT COUNT(accountId) FROM UserAccounts")
+    @Query("SELECT COUNT(accountId) FROM UserAccounts WHERE accountName = :accountName")
-    Integer getCount();
+    Integer getCount(String accountName);
 
-    @Query("SELECT COUNT(accountId) FROM UserAccounts WHERE accountName = :accountName LIMIT 1")
+    @Query("SELECT * FROM UserAccounts WHERE accountName = :accountName")
-    Boolean userAccountExists(String accountName);
+    UserAccount fetchRowByAccount_(String accountName);
 
-    @Query("SELECT * FROM UserAccounts WHERE accountName = :accountName LIMIT 1")
+    @Query("SELECT * FROM UserAccounts WHERE accountId = :accountId")
-    UserAccount getAccountByName(String accountName);
+    UserAccount fetchRowByAccountId(int accountId);
-
-    @Query("SELECT * FROM UserAccounts WHERE accountId = :accountId LIMIT 1")
-    UserAccount getAccountById(int accountId);
 
     @Query("UPDATE UserAccounts SET serverVersion = :serverVersion WHERE accountId = :accountId")
     void updateServerVersion(String serverVersion, int accountId);

app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java

@@ -22,16 +22,32 @@ import org.mian.gitnex.database.models.UserAccount;
         version = 3, exportSchema = false)
 public abstract class GitnexDatabase extends RoomDatabase {
 
-	private static final String DB_NAME = "gitnex";
     private static GitnexDatabase gitnexDatabase;
 
+    public static GitnexDatabase getDatabaseInstance(Context context) {
+
+        if (gitnexDatabase == null) {
+
+            String DB_NAME = "gitnex";
+            gitnexDatabase = Room.databaseBuilder(context, GitnexDatabase.class, DB_NAME)
+                    //.fallbackToDestructiveMigration()
+                    .addMigrations(MIGRATION_1_2, MIGRATION_2_3)
+                    .build();
+        }
+
+        return gitnexDatabase;
+    }
+
     public abstract DraftsDao draftsDao();
+
     public abstract RepositoriesDao repositoriesDao();
+
     public abstract UserAccountsDao userAccountsDao();
 
     private static final Migration MIGRATION_1_2 = new Migration(1, 2) {
         @Override
         public void migrate(@NonNull SupportSQLiteDatabase database) {
+
             //database.execSQL("DROP TABLE Drafts");
 	        database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'commentId' TEXT");
         }
@@ -40,27 +56,8 @@ public abstract class GitnexDatabase extends RoomDatabase {
 	private static final Migration MIGRATION_2_3 = new Migration(2, 3) {
 		@Override
 		public void migrate(@NonNull SupportSQLiteDatabase database) {
+
 			database.execSQL("ALTER TABLE 'Drafts' ADD COLUMN 'issueType' TEXT");
 		}
 	};
-
-	public static GitnexDatabase getDatabaseInstance(Context context) {
-
-		if (gitnexDatabase == null) {
-			synchronized(GitnexDatabase.class) {
-				if(gitnexDatabase == null) {
-
-					gitnexDatabase = Room.databaseBuilder(context, GitnexDatabase.class, DB_NAME)
-						// .fallbackToDestructiveMigration()
-						.allowMainThreadQueries()
-						.addMigrations(MIGRATION_1_2, MIGRATION_2_3)
-						.build();
-
-				}
-			}
-		}
-
-		return gitnexDatabase;
-
-	}
 }

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

@@ -0,0 +1,72 @@
+package org.mian.gitnex.fragments;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
+import org.mian.gitnex.databinding.FragmentAboutBinding;
+import org.mian.gitnex.helpers.AppUtil;
+import org.mian.gitnex.helpers.TinyDB;
+
+/**
+ * Author M M Arif
+ */
+
+public class AboutFragment extends Fragment {
+
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+		FragmentAboutBinding viewBinding = FragmentAboutBinding.inflate(inflater, container, false);
+        TinyDB tinyDb = TinyDB.getInstance(getContext());
+
+	    viewBinding.appVersion.setText(AppUtil.getAppVersion(requireContext()));
+	    viewBinding.userServerVersion.setText(tinyDb.getString("giteaVersion"));
+	    viewBinding.appBuild.setText(String.valueOf(AppUtil.getAppBuildNo(requireContext())));
+
+		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.pageTitleAbout));
+
+		viewBinding.donationLinkPatreon.setOnClickListener(v12 -> {
+
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse(getResources().getString(R.string.supportLinkPatreon)));
+            startActivity(intent);
+        });
+
+		viewBinding.translateLink.setOnClickListener(v13 -> {
+
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse(getResources().getString(R.string.crowdInLink)));
+            startActivity(intent);
+        });
+
+		viewBinding.appWebsite.setOnClickListener(v14 -> {
+
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse(getResources().getString(R.string.appWebsiteLink)));
+            startActivity(intent);
+        });
+
+		if(AppUtil.isPro(requireContext())) {
+
+			viewBinding.supportHeader.setVisibility(View.GONE);
+			viewBinding.dividerSupport.setVisibility(View.GONE);
+			viewBinding.donationLinkPatreon.setVisibility(View.GONE);
+		}
+
+	    return viewBinding.getRoot();
+    }
+
+}

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

@@ -40,16 +40,6 @@ public class AdministrationFragment extends Fragment {
 
 		fragmentAdministrationBinding.adminCron.setOnClickListener(v1 -> startActivity(new Intent(getContext(), AdminCronTasksActivity.class)));
 
-		String action = requireActivity().getIntent().getStringExtra("giteaAdminAction");
-		if(action != null) {
-			if(action.equals("users")) {
-				startActivity(new Intent(getContext(), AdminGetUsersActivity.class));
-			}
-			else if(action.equals("monitor")) {
-				startActivity(new Intent(getContext(), AdminCronTasksActivity.class));
-			}
-		}
-
 		return fragmentAdministrationBinding.getRoot();
 
 	}

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

@@ -8,14 +8,14 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import org.mian.gitnex.activities.MyProfileEmailActivity;
+import org.mian.gitnex.activities.ProfileEmailActivity;
 import org.mian.gitnex.databinding.BottomSheetProfileBinding;
 
 /**
  * Author M M Arif
  */
 
-public class BottomSheetMyProfileFragment extends BottomSheetDialogFragment {
+public class BottomSheetProfileFragment extends BottomSheetDialogFragment {
 
     @Nullable
     @Override
@@ -25,7 +25,7 @@ public class BottomSheetMyProfileFragment extends BottomSheetDialogFragment {
 
 	    bottomSheetProfileBinding.addNewEmailAddress.setOnClickListener(v1 -> {
 
-            startActivity(new Intent(getContext(), MyProfileEmailActivity.class));
+            startActivity(new Intent(getContext(), ProfileEmailActivity.class));
             dismiss();
         });
 

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

@@ -19,12 +19,10 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.ActionResult;
 import org.mian.gitnex.actions.IssueActions;
 import org.mian.gitnex.activities.MainActivity;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.databinding.BottomSheetReplyLayoutBinding;
 import org.mian.gitnex.helpers.Constants;
@@ -58,11 +56,12 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 		super.onAttach(context);
 
 		tinyDB = TinyDB.getInstance(context);
-		draftsApi = BaseApi.getInstance(context, DraftsApi.class);
+		draftsApi = new DraftsApi(context);
 
 		repositoryId = (int) tinyDB.getLong("repositoryId", 0);
 		currentActiveAccountId = tinyDB.getInt("currentActiveAccountId");
 		issueNumber = Integer.parseInt(tinyDB.getString("issueNumber"));
+
 	}
 
 	@SuppressLint("ClickableViewAccessibility")
@@ -88,6 +87,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 
 			send.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_save));
 			mode = Mode.EDIT;
+
 		}
 
 		if(arguments.getString("draftId") != null) {
@@ -97,7 +97,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 
 		if(!tinyDB.getString("issueTitle").isEmpty()) {
 
-			toolbarTitle.setText(EmojiParser.parseToUnicode(tinyDB.getString("issueTitle")));
+			toolbarTitle.setText(tinyDB.getString("issueTitle"));
 		}
 		else if(arguments.getString("draftTitle") != null) {
 
@@ -134,6 +134,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 			}
 
 			return false;
+
 		});
 
 		comment.addTextChangedListener(new TextWatcher() {
@@ -282,7 +283,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
 			}
 			else {
 
-				draftsApi.updateDraft(text, (int) draftId, "TODO");
+				DraftsApi.updateDraft(text, (int) draftId, "TODO");
 			}
 
 			draftsHint.setVisibility(View.VISIBLE);

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

@@ -13,24 +13,17 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.IssueActions;
-import org.mian.gitnex.actions.PullRequestActions;
 import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.FileDiffActivity;
 import org.mian.gitnex.activities.MergePullRequestActivity;
-import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.BottomSheetSingleIssueBinding;
-import org.mian.gitnex.helpers.AlertDialogs;
-import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.views.ReactionSpinner;
 import java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -57,7 +50,6 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 		TextView copyIssueUrl = bottomSheetSingleIssueBinding.copyIssueUrl;
 		TextView openFilesDiff = bottomSheetSingleIssueBinding.openFilesDiff;
 		TextView mergePullRequest = bottomSheetSingleIssueBinding.mergePullRequest;
-		TextView deletePullRequestBranch = bottomSheetSingleIssueBinding.deletePrHeadBranch;
 		TextView shareIssue = bottomSheetSingleIssueBinding.shareIssue;
 		TextView subscribeIssue = bottomSheetSingleIssueBinding.subscribeIssue;
 		TextView unsubscribeIssue = bottomSheetSingleIssueBinding.unsubscribeIssue;
@@ -93,11 +85,9 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
 			if(tinyDB.getBoolean("prMerged") || tinyDB.getString("repoPrState").equals("closed")) {
 				mergePullRequest.setVisibility(View.GONE);
-				deletePullRequestBranch.setVisibility(View.VISIBLE);
 			}
 			else {
 				mergePullRequest.setVisibility(View.VISIBLE);
-				deletePullRequestBranch.setVisibility(View.GONE);
 			}
 
 			if(new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.13.0")) {
@@ -114,7 +104,6 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 		else {
 
 			mergePullRequest.setVisibility(View.GONE);
-			deletePullRequestBranch.setVisibility(View.GONE);
 		}
 
 		mergePullRequest.setOnClickListener(v13 -> {
@@ -123,12 +112,6 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 			dismiss();
 		});
 
-		deletePullRequestBranch.setOnClickListener(v -> {
-
-			PullRequestActions.deleteHeadBranch(ctx, parts[0], parts[1], tinyDB.getString("prHeadBranch"), true);
-			dismiss();
-		});
-
 		openFilesDiff.setOnClickListener(v14 -> {
 
 			startActivity(new Intent(ctx, FileDiffActivity.class));

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

@@ -22,7 +22,6 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.DraftsAdapter;
-import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.DraftsApi;
 import org.mian.gitnex.database.models.DraftWithRepository;
 import org.mian.gitnex.databinding.FragmentDraftsBinding;
@@ -60,7 +59,7 @@ public class DraftsFragment extends Fragment {
         TinyDB tinyDb = TinyDB.getInstance(ctx);
 
 	    draftsList_ = new ArrayList<>();
-        draftsApi = BaseApi.getInstance(ctx, DraftsApi.class);
+        draftsApi = new DraftsApi(ctx);
 
         noData = fragmentDraftsBinding.noData;
         mRecyclerView = fragmentDraftsBinding.recyclerView;
@@ -124,7 +123,7 @@ public class DraftsFragment extends Fragment {
 
     	if(draftsList_.size() > 0) {
 
-		    BaseApi.getInstance(ctx, DraftsApi.class).deleteAllDrafts(accountId);
+		    DraftsApi.deleteAllDrafts(accountId);
 		    draftsList_.clear();
 		    adapter.notifyDataSetChanged();
 		    Toasty.success(ctx, getResources().getString(R.string.draftsDeleteSuccess));

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

@@ -24,6 +24,9 @@ import org.mian.gitnex.helpers.TinyDB;
 
 public class ExploreFragment extends Fragment {
 
+	private Context ctx;
+	private TinyDB tinyDB;
+
 	private int tabsCount;
 	public ViewPager mViewPager;
 
@@ -33,8 +36,8 @@ public class ExploreFragment extends Fragment {
 
 		View view = inflater.inflate(R.layout.fragment_explore, container, false);
 
-		Context ctx = getContext();
+		ctx = getContext();
-		TinyDB tinyDB = TinyDB.getInstance(ctx);
+		tinyDB = TinyDB.getInstance(ctx);
 
 		((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navExplore));
 
@@ -84,10 +87,6 @@ public class ExploreFragment extends Fragment {
 		SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getChildFragmentManager());
 		mViewPager.setAdapter(mSectionsPagerAdapter);
 
-		if(requireActivity().getIntent().getBooleanExtra("exploreOrgs", false)) {
-			mViewPager.setCurrentItem(2);
-		}
-
 		return view;
 
 	}
@@ -112,11 +111,7 @@ public class ExploreFragment extends Fragment {
 					break;
 
 				case 1: // Issues
-					fragment = new ExploreIssuesFragment();
+					fragment = new SearchIssuesFragment();
-					break;
-
-				case 2: // Organizations
-					fragment = new ExplorePublicOrganizationsFragment();
 					break;
 			}
 

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

@@ -1,160 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import org.gitnex.tea4j.models.Organization;
-import org.mian.gitnex.R;
-import org.mian.gitnex.adapters.ExplorePublicOrganizationsAdapter;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.databinding.FragmentOrganizationsBinding;
-import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.SnackBar;
-import org.mian.gitnex.helpers.TinyDB;
-import org.mian.gitnex.helpers.Version;
-import java.util.ArrayList;
-import java.util.List;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-/**
- * Author M M Arif
- */
-
-public class ExplorePublicOrganizationsFragment extends Fragment {
-
-	private FragmentOrganizationsBinding fragmentPublicOrgBinding;
-	private List<Organization> organizationsList;
-	private ExplorePublicOrganizationsAdapter adapter;
-	private Context context;
-	private int pageSize;
-	private final String TAG = Constants.publicOrganizations;
-	private int resultLimit = Constants.resultLimitOldGiteaInstances;
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-		fragmentPublicOrgBinding = FragmentOrganizationsBinding.inflate(inflater, container, false);
-		context = getContext();
-
-		TinyDB tinyDb = TinyDB.getInstance(getContext());
-		final String loginUid = tinyDb.getString("loginUid");
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-		// if gitea is 1.12 or higher use the new limit
-		if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) {
-			resultLimit = Constants.resultLimitNewGiteaInstances;
-		}
-
-		fragmentPublicOrgBinding.addNewOrganization.setVisibility(View.GONE);
-		organizationsList = new ArrayList<>();
-
-		fragmentPublicOrgBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
-			fragmentPublicOrgBinding.pullToRefresh.setRefreshing(false);
-			loadInitial(instanceToken, resultLimit);
-			adapter.notifyDataChanged();
-		}, 200));
-
-		adapter = new ExplorePublicOrganizationsAdapter(getContext(), organizationsList);
-		adapter.setLoadMoreListener(() -> fragmentPublicOrgBinding.recyclerView.post(() -> {
-			if(organizationsList.size() == resultLimit || pageSize == resultLimit) {
-				int page = (organizationsList.size() + resultLimit) / resultLimit;
-				loadMore(Authorization.get(getContext()), page, resultLimit);
-			}
-		}));
-
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(fragmentPublicOrgBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
-		fragmentPublicOrgBinding.recyclerView.setHasFixedSize(true);
-		fragmentPublicOrgBinding.recyclerView.addItemDecoration(dividerItemDecoration);
-		fragmentPublicOrgBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
-		fragmentPublicOrgBinding.recyclerView.setAdapter(adapter);
-
-		loadInitial(Authorization.get(getContext()), resultLimit);
-
-		return fragmentPublicOrgBinding.getRoot();
-	}
-
-	private void loadInitial(String token, int resultLimit) {
-
-		Call<List<Organization>> call = RetrofitClient
-			.getApiInterface(context).getAllOrgs(token, Constants.publicOrganizationsPageInit, resultLimit);
-		call.enqueue(new Callback<List<Organization>>() {
-			@Override
-			public void onResponse(@NonNull Call<List<Organization>> call, @NonNull Response<List<Organization>> response) {
-				if(response.isSuccessful()) {
-					if(response.body() != null && response.body().size() > 0) {
-						organizationsList.clear();
-						organizationsList.addAll(response.body());
-						adapter.notifyDataChanged();
-						fragmentPublicOrgBinding.noDataOrg.setVisibility(View.GONE);
-					}
-					else {
-						organizationsList.clear();
-						adapter.notifyDataChanged();
-						fragmentPublicOrgBinding.noDataOrg.setVisibility(View.VISIBLE);
-					}
-					fragmentPublicOrgBinding.progressBar.setVisibility(View.GONE);
-				}
-				else if(response.code() == 404) {
-					fragmentPublicOrgBinding.noDataOrg.setVisibility(View.VISIBLE);
-					fragmentPublicOrgBinding.progressBar.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-		});
-	}
-
-	private void loadMore(String token, int page, int resultLimit) {
-
-		fragmentPublicOrgBinding.progressLoadMore.setVisibility(View.VISIBLE);
-		Call<List<Organization>> call = RetrofitClient.getApiInterface(context).getAllOrgs(token, page, resultLimit);
-		call.enqueue(new Callback<List<Organization>>() {
-			@Override
-			public void onResponse(@NonNull Call<List<Organization>> call, @NonNull Response<List<Organization>> response) {
-				if(response.isSuccessful()) {
-					List<Organization> result = response.body();
-					if(result != null) {
-						if(result.size() > 0) {
-							pageSize = result.size();
-							organizationsList.addAll(result);
-						}
-						else {
-							SnackBar.info(context, fragmentPublicOrgBinding.getRoot(), getString(R.string.noMoreData));
-							adapter.setMoreDataAvailable(false);
-						}
-					}
-					adapter.notifyDataChanged();
-					fragmentPublicOrgBinding.progressLoadMore.setVisibility(View.GONE);
-				}
-				else {
-					Log.e(TAG, String.valueOf(response.code()));
-				}
-			}
-
-			@Override
-			public void onFailure(@NonNull Call<List<Organization>> call, @NonNull Throwable t) {
-				Log.e(TAG, t.toString());
-			}
-		});
-	}
-}

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

@@ -261,21 +261,54 @@ public class ExploreRepositoriesFragment extends Fragment {
 		dialogFilterOptions.setContentView(view);
 
 		filterBinding.includeTopic.setOnClickListener(includeTopic -> {
-			tinyDb.putBoolean("exploreRepoIncludeTopic", filterBinding.includeTopic.isChecked());
+
+			if(filterBinding.includeTopic.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoIncludeTopic", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoIncludeTopic", false);
+			}
 		});
 
 		filterBinding.includeDesc.setOnClickListener(includeDesc -> {
-			tinyDb.putBoolean("exploreRepoIncludeDescription", filterBinding.includeDesc.isChecked());
+
+			if(filterBinding.includeDesc.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoIncludeDescription", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoIncludeDescription", false);
+			}
 		});
 
 		filterBinding.includeTemplate.setOnClickListener(includeTemplate -> {
-			tinyDb.putBoolean("exploreRepoIncludeTemplate", filterBinding.includeTemplate.isChecked());
+
+			if(filterBinding.includeTemplate.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoIncludeTemplate", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoIncludeTemplate", false);
+			}
 		});
 
 		filterBinding.onlyArchived.setOnClickListener(onlyArchived -> {
-			tinyDb.putBoolean("exploreRepoOnlyArchived", filterBinding.onlyArchived.isChecked());
+
+			if(filterBinding.onlyArchived.isChecked()) {
+
+				tinyDb.putBoolean("exploreRepoOnlyArchived", true);
+			}
+			else {
+
+				tinyDb.putBoolean("exploreRepoOnlyArchived", false);
+			}
 		});
 
+
 		filterBinding.includeTopic.setChecked(tinyDb.getBoolean("exploreRepoIncludeTopic"));
 		filterBinding.includeDesc.setChecked(tinyDb.getBoolean("exploreRepoIncludeDescription"));
 		filterBinding.includeTemplate.setChecked(tinyDb.getBoolean("exploreRepoIncludeTemplate"));

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

@@ -130,17 +130,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
 		});
 
-		String dir = requireActivity().getIntent().getStringExtra("dir");
+		fetchDataAsync(Authorization.get(getContext()), repoOwner, repoName, ref);
-		if(dir != null) {
-			fetchDataAsyncSub(Authorization.get(getContext()), repoOwner, repoName, dir, ref);
-			for(String segment: dir.split("/")) {
-				binding.breadcrumbsView.addItem(new BreadcrumbItem(Collections.singletonList(segment)));
-				path.add(segment);
-			}
-		}
-		else {
-			fetchDataAsync(Authorization.get(getContext()), repoOwner, repoName, ref);
-		}
 
 		return binding.getRoot();
 	}

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

@@ -29,8 +29,8 @@ import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.databinding.FragmentIssuesBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Constants;
-import org.mian.gitnex.helpers.SnackBar;
 import org.mian.gitnex.helpers.TinyDB;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +44,6 @@ import retrofit2.Response;
 
 public class IssuesFragment extends Fragment {
 
-	private FragmentIssuesBinding fragmentIssuesBinding;
 	private Menu menu;
 	private RecyclerView recyclerView;
 	private List<Issues> issuesList;
@@ -52,17 +51,18 @@ public class IssuesFragment extends Fragment {
 	private Context context;
 	private int pageSize = Constants.issuesPageInit;
 	private ProgressBar mProgressBar;
-	private final String TAG = Constants.tagIssuesList;
+	private String TAG = Constants.tagIssuesList;
 	private TextView noDataIssues;
 	private int resultLimit = Constants.resultLimitOldGiteaInstances;
-	private final String requestType = Constants.issuesRequestType;
+	private String requestType = Constants.issuesRequestType;
 	private ProgressBar progressLoadMore;
 
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-		fragmentIssuesBinding = FragmentIssuesBinding.inflate(inflater, container, false);
+		FragmentIssuesBinding fragmentIssuesBinding = FragmentIssuesBinding.inflate(inflater, container, false);
+
 		setHasOptionsMenu(true);
 		context = getContext();
 
@@ -89,17 +89,23 @@ public class IssuesFragment extends Fragment {
 		noDataIssues = fragmentIssuesBinding.noDataIssues;
 
 		swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
+
 			swipeRefresh.setRefreshing(false);
 			loadInitial(instanceToken, repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
 			adapter.notifyDataChanged();
+
 		}, 200));
 
 		adapter = new IssuesAdapter(getContext(), issuesList);
 		adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
+
 			if(issuesList.size() == resultLimit || pageSize == resultLimit) {
+
 				int page = (issuesList.size() + resultLimit) / resultLimit;
 				loadMore(Authorization.get(getContext()), repoOwner, repoName, page, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
+
 			}
+
 		}));
 
 		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL);
@@ -123,9 +129,12 @@ public class IssuesFragment extends Fragment {
 			adapter.setLoadMoreListener(() -> recyclerView.post(() -> {
 
 				if(issuesList.size() == resultLimit || pageSize == resultLimit) {
+
 					int page = (issuesList.size() + resultLimit) / resultLimit;
 					loadMore(Authorization.get(getContext()), repoOwner, repoName, page, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
+
 				}
+
 			}));
 
 			tinyDb.putString("repoIssuesState", issueState);
@@ -135,11 +144,13 @@ public class IssuesFragment extends Fragment {
 
 			loadInitial(Authorization.get(getContext()), repoOwner, repoName, resultLimit, requestType, issueState);
 			recyclerView.setAdapter(adapter);
+
 		});
 
 		loadInitial(Authorization.get(getContext()), repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
 
 		return fragmentIssuesBinding.getRoot();
+
 	}
 
 	@Override
@@ -154,9 +165,12 @@ public class IssuesFragment extends Fragment {
 		final String repoName = parts[1];
 
 		if(tinyDb.getBoolean("resumeIssues")) {
+
 			loadInitial(Authorization.get(getContext()), repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState"));
 			tinyDb.putBoolean("resumeIssues", false);
+
 		}
+
 	}
 
 	private void loadInitial(String token, String repoOwner, String repoName, int resultLimit, String requestType, String issueState) {
@@ -164,38 +178,52 @@ public class IssuesFragment extends Fragment {
 		Call<List<Issues>> call = RetrofitClient.getApiInterface(context).getIssues(token, repoOwner, repoName, 1, resultLimit, requestType, issueState);
 
 		call.enqueue(new Callback<List<Issues>>() {
+
 			@Override
 			public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
 
 				if(response.code() == 200) {
+
 					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 if(response.code() == 404) {
+
 					noDataIssues.setVisibility(View.VISIBLE);
 					mProgressBar.setVisibility(View.GONE);
+
 				}
 				else {
 					Log.e(TAG, String.valueOf(response.code()));
 				}
+
 			}
 
 			@Override
 			public void onFailure(@NonNull Call<List<Issues>> call, @NonNull Throwable t) {
+
 				Log.e(TAG, t.toString());
 			}
+
 		});
+
 	}
 
 	private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String requestType, String issueState) {
@@ -208,29 +236,44 @@ public class IssuesFragment extends Fragment {
 
 			@Override
 			public void onResponse(@NonNull Call<List<Issues>> call, @NonNull Response<List<Issues>> response) {
+
 				if(response.code() == 200) {
+
 					List<Issues> result = response.body();
+
 					assert result != null;
 					if(result.size() > 0) {
+
 						pageSize = result.size();
 						issuesList.addAll(result);
+
 					}
 					else {
-						SnackBar.info(context, fragmentIssuesBinding.getRoot(), getString(R.string.noMoreData));
+
+						Toasty.warning(context, getString(R.string.noMoreData));
 						adapter.setMoreDataAvailable(false);
+
 					}
+
 					adapter.notifyDataChanged();
 					progressLoadMore.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());
+
 			}
+
 		});
 	}
 
@@ -259,15 +302,20 @@ public class IssuesFragment extends Fragment {
 
 			@Override
 			public boolean onQueryTextSubmit(String query) {
+
 				return false;
 			}
 
 			@Override
 			public boolean onQueryTextChange(String newText) {
+
 				filter(newText);
 				return false;
+
 			}
+
 		});
+
 	}
 
 	private void filter(String text) {
@@ -285,4 +333,5 @@ public class IssuesFragment extends Fragment {
 
 		adapter.updateList(arr);
 	}
+
 }

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

@@ -48,8 +48,6 @@ public class MilestonesFragment extends Fragment {
     private String TAG = Constants.tagMilestonesFragment;
     private int resultLimit = Constants.resultLimitOldGiteaInstances;
 
-    private String milestoneId;
-
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
@@ -65,9 +63,6 @@ public class MilestonesFragment extends Fragment {
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        milestoneId = requireActivity().getIntent().getStringExtra("milestoneId");
-        requireActivity().getIntent().removeExtra("milestoneId");
-
         viewBinding.recyclerView.setHasFixedSize(true);
         viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
@@ -193,10 +188,6 @@ public class MilestonesFragment extends Fragment {
                         adapter.notifyDataChanged();
                         viewBinding.noDataMilestone.setVisibility(View.GONE);
 
-                        if(milestoneId != null) {
-                        	viewBinding.recyclerView.scrollToPosition(getMilestoneIndex(Integer.parseInt(milestoneId), response.body()));
-                        }
-
                     }
                     else {
 
@@ -225,15 +216,6 @@ public class MilestonesFragment extends Fragment {
 
     }
 
-	private static int getMilestoneIndex(int milestoneId, List<Milestones> milestones) {
-		for (Milestones milestone : milestones) {
-			if(milestone.getId() == milestoneId) {
-				return milestones.indexOf(milestone);
-			}
-		}
-		return -1;
-	}
-
     private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String milestoneState) {
 
     	viewBinding.progressLoadMore.setVisibility(View.VISIBLE);

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

@@ -16,7 +16,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -96,15 +95,12 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 		notificationsActions = new NotificationsActions(context);
 		notificationsAdapter = new NotificationsAdapter(context, notificationThreads, this, this);
 
-		RecyclerView recyclerView = fragmentNotificationsBinding.notifications;
 		LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL);
+		RecyclerView recyclerView = fragmentNotificationsBinding.notifications;
-
 		recyclerView.setHasFixedSize(true);
 		recyclerView.setLayoutManager(linearLayoutManager);
 		recyclerView.setAdapter(notificationsAdapter);
-		recyclerView.addItemDecoration(dividerItemDecoration);
 		recyclerView.addOnScrollListener(new InfiniteScrollListener(pageResultLimit, linearLayoutManager) {
 
 			@Override
@@ -253,10 +249,6 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
 				if(notificationThreads.isEmpty()) {
 
 					noDataNotifications.setVisibility(View.VISIBLE);
-					markAllAsRead.setVisibility(View.GONE);
-				}
-				else {
-					markAllAsRead.setVisibility(View.VISIBLE);
 				}
 			}
 		});

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

@@ -29,7 +29,7 @@ import retrofit2.Callback;
 
 public class OrganizationInfoFragment extends Fragment {
 
-    private Context ctx;
+    private Context ctx = getContext();
     private ProgressBar mProgressBar;
     private static String orgNameF = "param1";
 
@@ -67,8 +67,6 @@ public class OrganizationInfoFragment extends Fragment {
 
         FragmentOrganizationInfoBinding fragmentOrganizationInfoBinding = FragmentOrganizationInfoBinding.inflate(inflater, container, false);
 
-	    ctx = getContext();
-
         mProgressBar = fragmentOrganizationInfoBinding.progressBar;
         orgAvatar = fragmentOrganizationInfoBinding.orgAvatar;
         TextView orgNameInfo = fragmentOrganizationInfoBinding.orgNameInfo;

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

@@ -18,7 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.gitnex.tea4j.models.Emails;
-import org.mian.gitnex.adapters.MyProfileEmailsAdapter;
+import org.mian.gitnex.adapters.ProfileEmailsAdapter;
 import org.mian.gitnex.databinding.FragmentProfileEmailsBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.viewmodels.ProfileEmailsViewModel;
@@ -28,10 +28,10 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class MyProfileEmailsFragment extends Fragment {
+public class ProfileEmailsFragment extends Fragment {
 
     private ProgressBar mProgressBar;
-    private MyProfileEmailsAdapter adapter;
+    private ProfileEmailsAdapter adapter;
     private RecyclerView mRecyclerView;
     private TextView noDataEmails;
     private static String repoNameF = "param2";
@@ -42,11 +42,11 @@ public class MyProfileEmailsFragment extends Fragment {
 
     private OnFragmentInteractionListener mListener;
 
-    public MyProfileEmailsFragment() {
+    public ProfileEmailsFragment() {
     }
 
-    public static MyProfileEmailsFragment newInstance(String param1, String param2) {
+    public static ProfileEmailsFragment newInstance(String param1, String param2) {
-        MyProfileEmailsFragment fragment = new MyProfileEmailsFragment();
+        ProfileEmailsFragment fragment = new ProfileEmailsFragment();
         Bundle args = new Bundle();
         args.putString(repoOwnerF, param1);
         args.putString(repoNameF, param2);
@@ -74,10 +74,11 @@ public class MyProfileEmailsFragment extends Fragment {
         noDataEmails = fragmentProfileEmailsBinding.noDataEmails;
         mRecyclerView = fragmentProfileEmailsBinding.recyclerView;
 
-	    DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
-
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
+                DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
         mProgressBar = fragmentProfileEmailsBinding.progressBar;
@@ -102,7 +103,7 @@ public class MyProfileEmailsFragment extends Fragment {
         profileEmailModel.getEmailsList(instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<Emails>>() {
             @Override
             public void onChanged(@Nullable List<Emails> emailsListMain) {
-                adapter = new MyProfileEmailsAdapter(getContext(), emailsListMain);
+                adapter = new ProfileEmailsAdapter(getContext(), emailsListMain);
                 if(adapter.getItemCount() > 0) {
                     mRecyclerView.setAdapter(adapter);
                     noDataEmails.setVisibility(View.GONE);

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

@@ -10,25 +10,29 @@ import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import org.mian.gitnex.adapters.MyProfileFollowersAdapter;
+import org.gitnex.tea4j.models.UserInfo;
-import org.mian.gitnex.databinding.FragmentProfileFollowersFollowingBinding;
+import org.mian.gitnex.adapters.ProfileFollowersAdapter;
+import org.mian.gitnex.databinding.FragmentProfileFollowersBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.viewmodels.ProfileFollowersViewModel;
+import java.util.List;
 
 /**
  * Author M M Arif
  */
 
-public class MyProfileFollowersFragment extends Fragment {
+public class ProfileFollowersFragment extends Fragment {
 
     private ProgressBar mProgressBar;
-    private MyProfileFollowersAdapter adapter;
+    private ProfileFollowersAdapter adapter;
     private RecyclerView mRecyclerView;
     private TextView noDataFollowers;
     private static String repoNameF = "param2";
@@ -39,11 +43,11 @@ public class MyProfileFollowersFragment extends Fragment {
 
     private OnFragmentInteractionListener mListener;
 
-    public MyProfileFollowersFragment() {
+    public ProfileFollowersFragment() {
     }
 
-    public static MyProfileFollowersFragment newInstance(String param1, String param2) {
+    public static ProfileFollowersFragment newInstance(String param1, String param2) {
-        MyProfileFollowersFragment fragment = new MyProfileFollowersFragment();
+        ProfileFollowersFragment fragment = new ProfileFollowersFragment();
         Bundle args = new Bundle();
         args.putString(repoOwnerF, param1);
         args.putString(repoNameF, param2);
@@ -64,20 +68,21 @@ public class MyProfileFollowersFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-	    FragmentProfileFollowersFollowingBinding fragmentProfileFollowersFollowingBinding = FragmentProfileFollowersFollowingBinding.inflate(inflater, container, false);
+	    FragmentProfileFollowersBinding fragmentProfileFollowersBinding = FragmentProfileFollowersBinding.inflate(inflater, container, false);
 
-        final SwipeRefreshLayout swipeRefresh = fragmentProfileFollowersFollowingBinding.pullToRefresh;
+        final SwipeRefreshLayout swipeRefresh = fragmentProfileFollowersBinding.pullToRefresh;
 
-        noDataFollowers = fragmentProfileFollowersFollowingBinding.noData;
+        noDataFollowers = fragmentProfileFollowersBinding.noDataFollowers;
-        mRecyclerView = fragmentProfileFollowersFollowingBinding.recyclerView;
+        mRecyclerView = fragmentProfileFollowersBinding.recyclerView;
 
-	    DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-	    mRecyclerView.setHasFixedSize(true);
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-	    mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+                DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-        mProgressBar = fragmentProfileFollowersFollowingBinding.progressBar;
+        mProgressBar = fragmentProfileFollowersBinding.progressBar;
 
         swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
@@ -88,28 +93,28 @@ public class MyProfileFollowersFragment extends Fragment {
 
         fetchDataAsync(Authorization.get(getContext()));
 
-        return fragmentProfileFollowersFollowingBinding.getRoot();
+        return fragmentProfileFollowersBinding.getRoot();
     }
 
     private void fetchDataAsync(String instanceToken) {
 
         ProfileFollowersViewModel pfModel = new ViewModelProvider(this).get(ProfileFollowersViewModel.class);
 
-        pfModel.getFollowersList(instanceToken, getContext()).observe(getViewLifecycleOwner(), pfListMain -> {
+        pfModel.getFollowersList(instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserInfo>>() {
-
+            @Override
-            adapter = new MyProfileFollowersAdapter(getContext(), pfListMain);
+            public void onChanged(@Nullable List<UserInfo> pfListMain) {
-
+                adapter = new ProfileFollowersAdapter(getContext(), pfListMain);
-            if(adapter.getItemCount() > 0) {
+                if(adapter.getItemCount() > 0) {
-                mRecyclerView.setAdapter(adapter);
+                    mRecyclerView.setAdapter(adapter);
-                noDataFollowers.setVisibility(View.GONE);
+                    noDataFollowers.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mRecyclerView.setAdapter(adapter);
+                    noDataFollowers.setVisibility(View.VISIBLE);
+                }
+                mProgressBar.setVisibility(View.GONE);
             }
-            else {
-                adapter.notifyDataSetChanged();
-                mRecyclerView.setAdapter(adapter);
-                noDataFollowers.setVisibility(View.VISIBLE);
-            }
-
-            mProgressBar.setVisibility(View.GONE);
         });
 
     }

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

@@ -10,41 +10,45 @@ import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import org.mian.gitnex.adapters.MyProfileFollowingAdapter;
+import org.gitnex.tea4j.models.UserInfo;
-import org.mian.gitnex.databinding.FragmentProfileFollowersFollowingBinding;
+import org.mian.gitnex.adapters.ProfileFollowingAdapter;
+import org.mian.gitnex.databinding.FragmentProfileFollowingBinding;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.viewmodels.ProfileFollowingViewModel;
+import java.util.List;
 
 /**
  * Author M M Arif
  */
 
-public class MyProfileFollowingFragment extends Fragment {
+public class ProfileFollowingFragment extends Fragment {
 
     private ProgressBar mProgressBar;
-    private MyProfileFollowingAdapter adapter;
+    private ProfileFollowingAdapter adapter;
     private RecyclerView mRecyclerView;
     private TextView noDataFollowing;
-    private static final String repoNameF = "param2";
+    private static String repoNameF = "param2";
-    private static final String repoOwnerF = "param1";
+    private static String repoOwnerF = "param1";
 
     private String repoName;
     private String repoOwner;
 
     private OnFragmentInteractionListener mListener;
 
-    public MyProfileFollowingFragment() {
+    public ProfileFollowingFragment() {
     }
 
-    public static MyProfileFollowingFragment newInstance(String param1, String param2) {
+    public static ProfileFollowingFragment newInstance(String param1, String param2) {
-        MyProfileFollowingFragment fragment = new MyProfileFollowingFragment();
+        ProfileFollowingFragment fragment = new ProfileFollowingFragment();
         Bundle args = new Bundle();
         args.putString(repoOwnerF, param1);
         args.putString(repoNameF, param2);
@@ -65,22 +69,23 @@ public class MyProfileFollowingFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-	    FragmentProfileFollowersFollowingBinding fragmentProfileFollowersFollowingBinding = FragmentProfileFollowersFollowingBinding.inflate(inflater, container, false);
+	    FragmentProfileFollowingBinding fragmentProfileFollowingBinding = FragmentProfileFollowingBinding.inflate(inflater, container, false);
 
         TinyDB tinyDb = TinyDB.getInstance(getContext());
 
-        final SwipeRefreshLayout swipeRefresh = fragmentProfileFollowersFollowingBinding.pullToRefresh;
+        final SwipeRefreshLayout swipeRefresh = fragmentProfileFollowingBinding.pullToRefresh;
 
-        noDataFollowing = fragmentProfileFollowersFollowingBinding.noData;
+        noDataFollowing = fragmentProfileFollowingBinding.noDataFollowing;
-        mRecyclerView = fragmentProfileFollowersFollowingBinding.recyclerView;
+        mRecyclerView = fragmentProfileFollowingBinding.recyclerView;
 
-	    DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
+        mRecyclerView.setHasFixedSize(true);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-	    mRecyclerView.setHasFixedSize(true);
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
-	    mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+                DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-        mProgressBar = fragmentProfileFollowersFollowingBinding.progressBar;
+        mProgressBar = fragmentProfileFollowingBinding.progressBar;
 
         swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
 
@@ -91,28 +96,28 @@ public class MyProfileFollowingFragment extends Fragment {
 
         fetchDataAsync(Authorization.get(getContext()));
 
-        return fragmentProfileFollowersFollowingBinding.getRoot();
+        return fragmentProfileFollowingBinding.getRoot();
     }
 
     private void fetchDataAsync(String instanceToken) {
 
         ProfileFollowingViewModel pfModel = new ViewModelProvider(this).get(ProfileFollowingViewModel.class);
 
-        pfModel.getFollowingList(instanceToken, getContext()).observe(getViewLifecycleOwner(), pfListMain -> {
+        pfModel.getFollowingList(instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserInfo>>() {
-
+            @Override
-            adapter = new MyProfileFollowingAdapter(getContext(), pfListMain);
+            public void onChanged(@Nullable List<UserInfo> pfListMain) {
-
+                adapter = new ProfileFollowingAdapter(getContext(), pfListMain);
-            if(adapter.getItemCount() > 0) {
+                if(adapter.getItemCount() > 0) {
-                mRecyclerView.setAdapter(adapter);
+                    mRecyclerView.setAdapter(adapter);
-                noDataFollowing.setVisibility(View.GONE);
+                    noDataFollowing.setVisibility(View.GONE);
+                }
+                else {
+                    adapter.notifyDataSetChanged();
+                    mRecyclerView.setAdapter(adapter);
+                    noDataFollowing.setVisibility(View.VISIBLE);
+                }
+                mProgressBar.setVisibility(View.GONE);
             }
-            else {
-                adapter.notifyDataSetChanged();
-                mRecyclerView.setAdapter(adapter);
-                noDataFollowing.setVisibility(View.VISIBLE);
-            }
-
-            mProgressBar.setVisibility(View.GONE);
         });
 
     }

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

@@ -36,7 +36,7 @@ import jp.wasabeef.picasso.transformations.BlurTransformation;
  * Author M M Arif
  */
 
-public class MyProfileFragment extends Fragment {
+public class ProfileFragment extends Fragment {
 
     private Context ctx;
 
@@ -61,14 +61,18 @@ public class MyProfileFragment extends Fragment {
         TextView userLanguage = v.findViewById(R.id.userLanguage);
         ImageView userLanguageIcon = v.findViewById(R.id.userLanguageIcon);
 
+	    ViewGroup aboutFrame = v.findViewById(R.id.aboutFrame);
+
 	    String[] userLanguageCodes = tinyDb.getString("userLang").split("-");
 
 	    if(userLanguageCodes.length >= 2) {
+
 		    Locale locale = new Locale(userLanguageCodes[0], userLanguageCodes[1]);
 		    userLanguage.setText(locale.getDisplayLanguage());
 	    }
 	    else {
-	    	userLanguage.setText(getResources().getConfiguration().locale.getDisplayLanguage());
+
+	    	userLanguage.setText(R.string.notSupported);
 	    }
 
 	    userAvatar.setOnClickListener(loginId ->
@@ -79,11 +83,9 @@ public class MyProfileFragment extends Fragment {
 	    userFullName.setText(Html.fromHtml(tinyDb.getString("userFullname")));
 	    userLogin.setText(getString(R.string.usernameWithAt, tinyDb.getString("userLogin")));
 
-	    int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 3);
-
 	    PicassoService.getInstance(ctx).get()
 		    .load(tinyDb.getString("userAvatar"))
-		    .transform(new RoundedTransformation(avatarRadius, 0))
+		    .transform(new RoundedTransformation(8, 0))
 		    .placeholder(R.drawable.loader_animated)
 		    .resize(120, 120)
 		    .centerCrop().into(userAvatar);
@@ -108,7 +110,7 @@ public class MyProfileFragment extends Fragment {
 			    @Override public void onError(Exception e) {}
 		    });
 
-        MyProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getChildFragmentManager());
+        ProfileFragment.SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getChildFragmentManager());
 
         ViewPager mViewPager = v.findViewById(R.id.container);
         mViewPager.setAdapter(mSectionsPagerAdapter);
@@ -155,6 +157,7 @@ public class MyProfileFragment extends Fragment {
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 
         return v;
+
     }
 
     public static class SectionsPagerAdapter extends FragmentStatePagerAdapter {
@@ -170,23 +173,25 @@ public class MyProfileFragment extends Fragment {
             switch (position) {
 
                 case 0: // followers
-                    return MyProfileFollowersFragment.newInstance("repoOwner", "repoName");
+                    return ProfileFollowersFragment.newInstance("repoOwner", "repoName");
 
                 case 1: // following
-                    return MyProfileFollowingFragment.newInstance("repoOwner", "repoName");
+                    return ProfileFollowingFragment.newInstance("repoOwner", "repoName");
 
                 case 2: // emails
-                    return MyProfileEmailsFragment.newInstance("repoOwner", "repoName");
+                    return ProfileEmailsFragment.newInstance("repoOwner", "repoName");
 
             }
 
             return null;
+
         }
 
         @Override
         public int getCount() {
             return 3;
         }
+
     }
 
     @Override
@@ -195,6 +200,7 @@ public class MyProfileFragment extends Fragment {
         menu.clear();
         requireActivity().getMenuInflater().inflate(R.menu.profile_dotted_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
+
     }
 
     @Override
@@ -202,18 +208,21 @@ public class MyProfileFragment extends Fragment {
 
         int id = item.getItemId();
 
-	    if(id == android.R.id.home) {
+        switch (id) {
-		    ((MainActivity)ctx).finish();
+
-		    return true;
+            case android.R.id.home:
-	    }
+                ((MainActivity)ctx).finish();
-	    else if(id == R.id.profileMenu) {
+                return true;
-		    BottomSheetMyProfileFragment bottomSheet = new BottomSheetMyProfileFragment();
+
-		    bottomSheet.show(getChildFragmentManager(), "profileBottomSheet");
+            case R.id.profileMenu:
-		    return true;
+                BottomSheetProfileFragment bottomSheet = new BottomSheetProfileFragment();
-	    }
+                bottomSheet.show(getChildFragmentManager(), "profileBottomSheet");
-	    else {
+                return true;
-		    return super.onOptionsItemSelected(item);
+
-	    }
+            default:
+                return super.onOptionsItemSelected(item);
+
+        }
     }
 
 }

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

@@ -18,7 +18,6 @@ import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import org.gitnex.tea4j.models.IssueComments;
 import org.gitnex.tea4j.models.Releases;
 import org.mian.gitnex.adapters.ReleasesAdapter;
 import org.mian.gitnex.databinding.FragmentReleasesBinding;
@@ -42,7 +41,6 @@ public class ReleasesFragment extends Fragment {
 
     private String repoName;
     private String repoOwner;
-    private String releaseTag;
 
     private OnFragmentInteractionListener mListener;
 
@@ -65,7 +63,6 @@ public class ReleasesFragment extends Fragment {
             repoName = getArguments().getString(repoNameF);
             repoOwner = getArguments().getString(repoOwnerF);
         }
-        releaseTag = requireActivity().getIntent().getStringExtra("releaseTagName");
     }
 
     @Override
@@ -140,13 +137,6 @@ public class ReleasesFragment extends Fragment {
                 adapter = new ReleasesAdapter(getContext(), releasesListMain);
                 if(adapter.getItemCount() > 0) {
                     mRecyclerView.setAdapter(adapter);
-	                if(releasesListMain != null && releaseTag != null) {
-		                int index = getReleaseIndex(releaseTag, releasesListMain);
-		                releaseTag = null;
-		                if(index != -1) {
-			                mRecyclerView.scrollToPosition(index);
-		                }
-	                }
                     noDataReleases.setVisibility(View.GONE);
                 }
                 else {
@@ -160,13 +150,4 @@ public class ReleasesFragment extends Fragment {
 
     }
 
-	private static int getReleaseIndex(String tag, List<Releases> releases) {
-		for (Releases release : releases) {
-			if(release.getTag_name().equals(tag)) {
-				return releases.indexOf(release);
-			}
-		}
-		return -1;
-	}
-
 }