Release 3.0.0 rc3 (#570)

Release 3.0.0 rc3

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

.editorconfig

@@ -20,3 +20,7 @@ indent_size = 2
 
 [{*.yml,*.yaml}]
 indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+insert_final_newline = false

.idea/codeStyles/Project.xml

@@ -36,6 +36,7 @@
       <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
       <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
       <option name="IF_BRACE_FORCE" value="3" />
       <option name="WRAP_ON_TYPING" value="1" />
       <indentOptions>
@@ -156,4 +157,4 @@
       </arrangement>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>

CONTRIBUTORS.md

@@ -3,6 +3,7 @@ This part lists all PUBLIC individuals having contributed content to the code.
 
  * M M Arif (mmarif)
  * 6543
+ * opyale
  * Unpublished
 
 # Translators

README.md

@@ -66,7 +66,7 @@ We use [Crowdin](https://crowdin.com/project/gitnex) for translation. If your la
 ## Thanks
 Thanks to all the open source libraries, contributors and donators.
 
-Open source libraries
+#### Open source libraries
 - Retrofit
 - Gson
 - Okhttp
@@ -88,5 +88,6 @@ Open source libraries
 - Barteksc/AndroidPdfViewer
 - Ge0rg/MemorizingTrustManager
 - Dimezis/BlurView
+- mikaelhg/urlbuilder
 
 [Follow me on Fediverse - mastodon.social/@mmarif](https://mastodon.social/@mmarif)

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 296
+        versionCode 297
-        versionName "3.0.0-rc2"
+        versionName "3.0.0-rc3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     viewBinding {
@@ -36,8 +36,8 @@ configurations {
 }
 
 dependencies {
-    def lifecycle_version = "2.2.0"
+    def lifecycle_version = "2.3.0-alpha05"
-    def markwon_version = '4.3.1'
+    def markwon_version = '4.4.0'
     def acra = "5.5.0"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
@@ -45,18 +45,19 @@ dependencies {
     implementation "com.google.android.material:material:1.3.0-alpha01"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     testImplementation "junit:junit:4.13"
     androidTestImplementation "androidx.test:runner:1.2.0"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
     implementation "com.github.vihtarb:tooltip:0.2.0"
-    implementation 'com.squareup.okhttp3:okhttp:4.7.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.7.2'
     implementation "com.google.code.gson:gson:2.8.6"
     implementation "com.squareup.picasso:picasso:2.71828"
     implementation "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1"
-    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-scalars:2.8.1'
+    implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.7.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.7.2'
     implementation 'org.ocpsoft.prettytime:prettytime:4.0.5.Final'
     implementation "com.vdurmont:emoji-java:5.1.1"
     implementation "com.pes.materialcolorpicker:library:1.2.5"
@@ -77,8 +78,6 @@ dependencies {
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.19"
     implementation "com.hendraanggrian.appcompat:socialview:0.2"
     implementation "com.hendraanggrian.appcompat:socialview-commons:0.2"
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     implementation "com.github.HamidrezaAmz:BreadcrumbsView:0.2.9"
     implementation "commons-io:commons-io:20030203.000550"
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
@@ -86,6 +85,7 @@ dependencies {
     implementation "ch.acra:acra-mail:$acra"
     implementation "ch.acra:acra-limiter:$acra"
     implementation "ch.acra:acra-notification:$acra"
-    implementation 'com.eightbitlab:blurview:1.6.3'
+    implementation "com.eightbitlab:blurview:1.6.3"
+    implementation "io.mikael:urlbuilder:2.0.9"
 
 }

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

@@ -96,7 +96,7 @@ public class AddNewTeamMemberActivity extends BaseActivity {
 			@Override
 			public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-				if(!addNewTeamMember.getText().toString().equals("")) {
+				if(!addNewTeamMember.getText().toString().equals("") && addNewTeamMember.getText().toString().length() > 1) {
 
 					adapter = new UserSearchForTeamMemberAdapter(dataList, ctx, Integer.parseInt(teamId));
 					loadUserSearchList(instanceUrl, instanceToken, addNewTeamMember.getText().toString(), loginUid, teamId);

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

@@ -1,13 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -19,16 +11,20 @@ import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.AdminGetUsersAdapter;
 import org.mian.gitnex.fragments.BottomSheetAdminUsersFragment;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.AdminGetUsersViewModel;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -79,18 +75,12 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
                 DividerItemDecoration.VERTICAL);
         mRecyclerView.addItemDecoration(dividerItemDecoration);
 
-        swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+        swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
-            @Override
+
-            public void onRefresh() {
+            swipeRefresh.setRefreshing(false);
-                new Handler().postDelayed(new Runnable() {
+            AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
-                    @Override
+
-                    public void run() {
+        }, 500));
-                        swipeRefresh.setRefreshing(false);
-                        AdminGetUsersViewModel.loadUsersList(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
-                    }
-                }, 500);
-            }
-        });
 
         fetchDataAsync(ctx, instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken));
 
@@ -98,25 +88,24 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
 
     private void fetchDataAsync(Context ctx, String instanceUrl, String instanceToken) {
 
-        AdminGetUsersViewModel usersModel = ViewModelProviders.of(this).get(AdminGetUsersViewModel.class);
+        AdminGetUsersViewModel usersModel = new ViewModelProvider(this).get(AdminGetUsersViewModel.class);
 
-        usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, new Observer<List<UserInfo>>() {
+        usersModel.getUsersList(ctx, instanceUrl, instanceToken).observe(this, usersListMain -> {
-            @Override
+
-            public void onChanged(@Nullable List<UserInfo> usersListMain) {
+            adapter = new AdminGetUsersAdapter(ctx, usersListMain);
-                adapter = new AdminGetUsersAdapter(ctx, usersListMain);
+            if(adapter.getItemCount() > 0) {
-                if(adapter.getItemCount() > 0) {
+                mRecyclerView.setVisibility(View.VISIBLE);
-                    mRecyclerView.setVisibility(View.VISIBLE);
+                mRecyclerView.setAdapter(adapter);
-                    mRecyclerView.setAdapter(adapter);
+                noDataUsers.setVisibility(View.GONE);
-                    noDataUsers.setVisibility(View.GONE);
+                searchFilter = true;
-                    searchFilter = true;
-                }
-                else {
-                    //adapter.notifyDataSetChanged();
-                    //mRecyclerView.setAdapter(adapter);
-                    mRecyclerView.setVisibility(View.GONE);
-                    noDataUsers.setVisibility(View.VISIBLE);
-                }
             }
+            else {
+                //adapter.notifyDataSetChanged();
+                //mRecyclerView.setAdapter(adapter);
+                mRecyclerView.setVisibility(View.GONE);
+                noDataUsers.setVisibility(View.VISIBLE);
+            }
+
         });
 
     }
@@ -127,37 +116,36 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
         final MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
 
-        new Handler().postDelayed(new Runnable() {
+        new Handler().postDelayed(() -> {
-            @Override
-            public void run() {
-                if(searchFilter) {
 
-                    boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+            if(searchFilter) {
 
-                    inflater.inflate(R.menu.search_menu, menu);
+                boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
-                    MenuItem searchItem = menu.findItem(R.id.action_search);
+                inflater.inflate(R.menu.search_menu, menu);
-                    androidx.appcompat.widget.SearchView searchView = (androidx.appcompat.widget.SearchView) searchItem.getActionView();
-                    searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
 
-                    if(!connToInternet) {
+                MenuItem searchItem = menu.findItem(R.id.action_search);
-                        return;
+                SearchView searchView = (SearchView) searchItem.getActionView();
+                searchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
+                if(!connToInternet) {
+                    return;
+                }
+
+                searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+
+                    @Override
+                    public boolean onQueryTextSubmit(String query) { return true; }
+
+                    @Override
+                    public boolean onQueryTextChange(String newText) {
+                        adapter.getFilter().filter(newText);
+                        return false;
                     }
 
-                    searchView.setOnQueryTextListener(new androidx.appcompat.widget.SearchView.OnQueryTextListener() {
+                });
-                        @Override
-                        public boolean onQueryTextSubmit(String query) {
-                            return true;
-                        }
-
-                        @Override
-                        public boolean onQueryTextChange(String newText) {
-                            adapter.getFilter().filter(newText);
-                            return false;
-                        }
-                    });
-                }
             }
+
         }, 500);
 
         return true;
@@ -194,12 +182,7 @@ public class AdminGetUsersActivity extends BaseActivity implements BottomSheetAd
     }
 
     private void initCloseListener() {
-        onClickListener = new View.OnClickListener() {
+        onClickListener = view -> finish();
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        };
     }
 
 }

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

@@ -103,6 +103,11 @@ public abstract class BaseActivity extends AppCompatActivity {
 			tinyDb.putString("cacheSizeImagesStr", getResources().getString(R.string.cacheSizeImagesSelectionSelectedText));
 		}
 
+		if(!tinyDb.getString("instanceUrlWithProtocol").endsWith("/")) {
+
+			tinyDb.putString("instanceUrlWithProtocol", tinyDb.getString("instanceUrlWithProtocol") + "/");
+		}
+
 		if (tinyDb.getBoolean("crashReportingEnabled")) {
 
 			CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);

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

@@ -61,7 +61,7 @@ public class CreateFileActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -146,7 +146,7 @@ public class CreateFileActivity extends BaseActivity {
 
     private void processNewFile() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
         TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -82,7 +82,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -153,7 +153,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     private void processNewIssue() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");

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

@@ -73,7 +73,7 @@ public class CreateLabelActivity extends BaseActivity {
 
         }
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         ImageView closeActivity = findViewById(R.id.close);
         colorPicker = findViewById(R.id.colorPicker);
@@ -154,7 +154,7 @@ public class CreateLabelActivity extends BaseActivity {
     private void processUpdateLabel() {
 
         final TinyDB tinyDb = new TinyDB(appCtx);
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
@@ -202,7 +202,7 @@ public class CreateLabelActivity extends BaseActivity {
 
     private void processCreateLabel() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
         TinyDB tinyDb = new TinyDB(appCtx);
         String repoFullName = tinyDb.getString("repoFullName");
@@ -446,4 +446,4 @@ public class CreateLabelActivity extends BaseActivity {
 
     }
 
-}
+}

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

@@ -50,7 +50,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -92,7 +92,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
 
     private void processNewMilestone() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
         TinyDB tinyDb = new TinyDB(appCtx);
         String repoFullName = tinyDb.getString("repoFullName");

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

@@ -48,7 +48,7 @@ public class CreateNewUserActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -80,7 +80,7 @@ public class CreateNewUserActivity extends BaseActivity {
 
     private void processCreateNewUser() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
         TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -47,7 +47,7 @@ public class CreateOrganizationActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -97,7 +97,7 @@ public class CreateOrganizationActivity extends BaseActivity {
 
     private void processNewOrganization() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
         TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -60,7 +60,7 @@ public class CreateReleaseActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -125,7 +125,7 @@ public class CreateReleaseActivity extends BaseActivity {
 
     private void processNewRelease() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -64,7 +64,7 @@ public class CreateRepoActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 
         TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -124,7 +124,7 @@ public class CreateRepoActivity extends BaseActivity {
 
     private void processNewRepo() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         AppUtil appUtil = new AppUtil();
         TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -78,7 +78,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -256,7 +256,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         final String orgName = tinyDb.getString("orgName");;
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         String newTeamName = teamName.getText().toString();
         String newTeamDesc = teamDesc.getText().toString();
         String newTeamPermission = teamPermission.getText().toString().toLowerCase();

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

@@ -196,7 +196,7 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
 
     private void processEditIssue() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");

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

@@ -106,7 +106,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 			tinyDb.putInt("homeScreenId", 0);
 		}
 
-		boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
 		if(!tinyDb.getBoolean("loggedInMode")) {
 			logout(this, ctx);
@@ -243,6 +243,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 ProfileFragment()).commit();
 					drawer.closeDrawers();
 				});
@@ -514,7 +515,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 							tinyDb.putString("userLang", userDetails.getLang());
 						}
 						else {
-							tinyDb.putString("userLang", "...");
+							tinyDb.putString("userLang", "");
 						}
 					}
 				}
@@ -525,7 +526,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 				}
 				else {
 
-					String toastError = getResources().getString(R.string.genericApiStatusError) + String.valueOf(response.code());
+					String toastError = getResources().getString(R.string.genericApiStatusError) + response.code();
 					Toasty.info(ctx, toastError);
 
 				}

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

@@ -62,7 +62,7 @@ public class MergePullRequestActivity extends BaseActivity {
 		View view = viewBinding.getRoot();
 		setContentView(view);
 
-		boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 		TinyDB tinyDb = new TinyDB(appCtx);
 
 		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -217,7 +217,7 @@ public class MergePullRequestActivity extends BaseActivity {
 		String mergePRTitle = viewBinding.mergeTitle.getText().toString();
 		boolean deleteBranch = viewBinding.deleteBranch.isChecked();
 
-		boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+		boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
 		if(!connToInternet) {
 

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

@@ -5,7 +5,13 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
+import org.mian.gitnex.R;
+import org.mian.gitnex.helpers.PathsHelper;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.util.TinyDB;
+import java.net.URI;
+import java.net.URISyntaxException;
+import io.mikael.urlbuilder.UrlBuilder;
 
 /**
  * Author M M Arif
@@ -18,20 +24,28 @@ public class OpenRepoInBrowserActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        super.onCreate(savedInstanceState);
+	    super.onCreate(savedInstanceState);
-        appCtx = getApplicationContext();
+	    appCtx = getApplicationContext();
+	    TinyDB tinyDb = new TinyDB(appCtx);
 
-        TinyDB tinyDb = new TinyDB(appCtx);
+	    try {
-        String instanceUrlWithProtocol = "https://" + tinyDb.getString("instanceUrlRaw");
-        if (!tinyDb.getString("instanceUrlWithProtocol").isEmpty()) {
-            instanceUrlWithProtocol = tinyDb.getString("instanceUrlWithProtocol");
-        }
 
-        String repoFullNameBrowser = getIntent().getStringExtra("repoFullNameBrowser");
+		    URI instanceUrl = new URI(tinyDb.getString("instanceUrlWithProtocol"));
-        Uri url = Uri.parse(instanceUrlWithProtocol + "/" + repoFullNameBrowser);
+
-        Intent i = new Intent(Intent.ACTION_VIEW, url);
+		    String browserPath = PathsHelper.join(instanceUrl.getPath(), getIntent().getStringExtra("repoFullNameBrowser"));
-        startActivity(i);
+
-        finish();
+		    String browserUrl = UrlBuilder.fromUri(instanceUrl)
+			    .withPath(browserPath)
+			    .toString();
+
+		    Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(browserUrl));
+		    startActivity(i);
+		    finish();
+
+	    }
+	    catch(URISyntaxException e) {
+		    Toasty.error(appCtx, getString(R.string.genericError));
+	    }
 
     }
 

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

@@ -49,7 +49,7 @@ public class ProfileEmailActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         appCtx = getApplicationContext();
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -84,7 +84,7 @@ public class ProfileEmailActivity extends BaseActivity {
 
     private void processAddNewEmail() {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         TinyDB tinyDb = new TinyDB(appCtx);
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");

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

@@ -58,13 +58,13 @@ public class ReplyToIssueActivity extends BaseActivity {
 
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
         TinyDB tinyDb = new TinyDB(appCtx);
 
         addComment = findViewById(R.id.addComment);
         addComment.setShowSoftInputOnFocus(true);
 
-        defaultMentionAdapter = new MentionArrayAdapter<>(this);
+        defaultMentionAdapter = new MentionArrayAdapter<>(ctx);
         loadCollaboratorsList();
 
         addComment.setMentionAdapter(defaultMentionAdapter);
@@ -191,7 +191,7 @@ public class ReplyToIssueActivity extends BaseActivity {
     private void processNewCommentReply() {
 
         String newReplyDT = addComment.getText().toString();
-        boolean connToInternet = AppUtil.haveNetworkConnection(appCtx);
+        boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
 
         if(!connToInternet) {
 

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

@@ -42,7 +42,6 @@ import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.models.WatchInfo;
-import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.util.Objects;
 import retrofit2.Call;
@@ -63,59 +62,19 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 	private FragmentRefreshListenerPr fragmentRefreshListenerPr;
 	private FragmentRefreshListenerMilestone fragmentRefreshListenerMilestone;
 
-	final Context ctx = this;
+	private final Context ctx = this;
 	private Context appCtx;
 
-	// issues interface
+	private TinyDB tinyDB;
-	public FragmentRefreshListener getFragmentRefreshListener() {
 
-		return fragmentRefreshListener;
+	private String instanceUrl;
-	}
+	private String loginUid;
+	private String instanceToken;
 
-	public void setFragmentRefreshListener(FragmentRefreshListener fragmentRefreshListener) {
+	private String repositoryOwner;
+	private String repositoryName;
 
-		this.fragmentRefreshListener = fragmentRefreshListener;
+	private int tabsCount;
-	}
-
-	public interface FragmentRefreshListener {
-
-		void onRefresh(String text);
-
-	}
-
-	// pr interface
-	public FragmentRefreshListenerPr getFragmentRefreshListenerPr() {
-
-		return fragmentRefreshListenerPr;
-	}
-
-	public void setFragmentRefreshListenerPr(FragmentRefreshListenerPr fragmentRefreshListenerPr) {
-
-		this.fragmentRefreshListenerPr = fragmentRefreshListenerPr;
-	}
-
-	public interface FragmentRefreshListenerPr {
-
-		void onRefresh(String text);
-
-	}
-
-	// milestones interface
-	public FragmentRefreshListenerMilestone getFragmentRefreshListenerMilestone() {
-
-		return fragmentRefreshListenerMilestone;
-	}
-
-	public void setFragmentRefreshListenerMilestone(FragmentRefreshListenerMilestone fragmentRefreshListenerMilestone) {
-
-		this.fragmentRefreshListenerMilestone = fragmentRefreshListenerMilestone;
-	}
-
-	public interface FragmentRefreshListenerMilestone {
-
-		void onRefresh(String text);
-
-	}
 
 	@Override
 	protected int getLayoutResourceId() {
@@ -129,40 +88,32 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		super.onCreate(savedInstanceState);
 		appCtx = getApplicationContext();
 
-		TinyDB tinyDb = new TinyDB(appCtx);
+		tinyDB = new TinyDB(appCtx);
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		String repoName1 = parts[1];
 
-		final String instanceUrl = tinyDb.getString("instanceUrl");
+		String[] repoNameParts = tinyDB.getString("repoFullName").split("/");
-		final String repoOwner = parts[0];
+		repositoryOwner = repoNameParts[0];
-		final String loginUid = tinyDb.getString("loginUid");
+		repositoryName = repoNameParts[1];
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
-
-		tinyDb.putString("repoIssuesState", "open");
-		tinyDb.putString("repoPrState", "open");
-		tinyDb.putString("milestoneState", "open");
-
-		String appLocale = tinyDb.getString("locale");
-		AppUtil.setAppLocale(getResources(), appLocale);
 
 		Toolbar toolbar = findViewById(R.id.toolbar);
+
 		TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
+		toolbarTitle.setText(repositoryName);
 
 		setSupportActionBar(toolbar);
-		Objects.requireNonNull(getSupportActionBar()).setTitle(repoName1);
+		Objects.requireNonNull(getSupportActionBar()).setTitle(repositoryName);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-		SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+		instanceUrl = tinyDB.getString("instanceUrl");
+		loginUid = tinyDB.getString("loginUid");
+		instanceToken = "token " + tinyDB.getString(loginUid + "-token");
 
-		ViewPager mViewPager = findViewById(R.id.container);
+		tinyDB.putString("repoIssuesState", "open");
-		mViewPager.setAdapter(mSectionsPagerAdapter);
+		tinyDB.putString("repoPrState", "open");
-
+		tinyDB.putString("milestoneState", "open");
-		TabLayout tabLayout = findViewById(R.id.tabs);
 
 		Typeface myTypeface;
 
-		switch(tinyDb.getInt("customFontId", -1)) {
+		switch(tinyDB.getInt("customFontId", -1)) {
 
 			case 0:
 				myTypeface = Typeface.createFromAsset(ctx.getAssets(), "fonts/roboto.ttf");
@@ -179,34 +130,50 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		}
 
 		toolbarTitle.setTypeface(myTypeface);
-		toolbarTitle.setText(repoName1);
 
-		ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
+		TabLayout tabLayout = findViewById(R.id.tabs);
-		int tabsCount = vg.getChildCount();
+
+		ViewGroup viewGroup = (ViewGroup) tabLayout.getChildAt(0);
+		tabsCount = viewGroup.getChildCount();
+
 		for(int j = 0; j < tabsCount; j++) {
-			ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
+
+			ViewGroup vgTab = (ViewGroup) viewGroup.getChildAt(j);
 			int tabChildCount = vgTab.getChildCount();
+
 			for(int i = 0; i < tabChildCount; i++) {
+
 				View tabViewChild = vgTab.getChildAt(i);
+
 				if(tabViewChild instanceof TextView) {
 					((TextView) tabViewChild).setTypeface(myTypeface);
 				}
 			}
 		}
 
-		// only show Collaborators if you have permission to
+		// Only show collaborators tab, if you have permission to
-		final View collaboratorTab = vg.getChildAt(8);
+		View collaboratorTab = viewGroup.getChildAt(8);
-		if(tinyDb.getBoolean("isRepoAdmin")) {
+
+		if(tinyDB.getBoolean("isRepoAdmin") || new Version(tinyDB.getString("giteaVersion")).higherOrEqual("1.12.0")) {
+
 			collaboratorTab.setVisibility(View.VISIBLE);
 		}
 		else {
+
+			tabsCount--;
 			collaboratorTab.setVisibility(View.GONE);
+
 		}
 
+		ViewPager mViewPager = findViewById(R.id.container);
+
 		mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
 		tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 
-		if(tinyDb.getBoolean("enableCounterBadges")) {
+		SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+		mViewPager.setAdapter(mSectionsPagerAdapter);
+
+		if(tinyDB.getBoolean("enableCounterBadges")) {
 
 			@SuppressLint("InflateParams") View tabHeader2 = LayoutInflater.from(this).inflate(R.layout.badge_issue, null);
 			textViewBadgeIssue = tabHeader2.findViewById(R.id.counterBadgeIssue);
@@ -221,41 +188,48 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 			textViewBadgePull.setVisibility(View.GONE);
 			textViewBadgeRelease.setVisibility(View.GONE);
 
-			getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName1);
+			getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
 			ColorStateList textColor = tabLayout.getTabTextColors();
 
-			// issue count
+			// Issue count
 			if(textViewBadgeIssue.getText() != "") {
+
 				TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(2);
 				Objects.requireNonNull(tabLayout.getTabAt(2)).setCustomView(tabHeader2);
-				assert tabOpenIssues != null;
+				assert tabOpenIssues != null; // FIXME This should be cleaned up
 				TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeIssueText);
 				openIssueTabView.setTextColor(textColor);
+
 			}
 
-			// pull count
+			// Pull request count
 			if(textViewBadgePull.getText() != "") { // only show if API returned a number
+
 				Objects.requireNonNull(tabLayout.getTabAt(3)).setCustomView(tabHeader4);
 				TabLayout.Tab tabOpenPulls = tabLayout.getTabAt(3);
-				assert tabOpenPulls != null;
+				assert tabOpenPulls != null; // FIXME This should be cleaned up
 				TextView openPullTabView = Objects.requireNonNull(tabOpenPulls.getCustomView()).findViewById(R.id.counterBadgePullText);
 				openPullTabView.setTextColor(textColor);
+
 			}
 
-			// release count
+			// Release count
-			if(new Version("1.11.4").less(tinyDb.getString("giteaVersion"))) {
+			if(new Version("1.11.4").less(tinyDB.getString("giteaVersion"))) {
+
 				if(textViewBadgeRelease.getText() != "") { // only show if API returned a number
+
 					Objects.requireNonNull(tabLayout.getTabAt(5)).setCustomView(tabHeader6);
 					TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(5);
-					assert tabOpenRelease != null;
+					assert tabOpenRelease != null; // FIXME This should be cleaned up
 					TextView openReleaseTabView = Objects.requireNonNull(tabOpenRelease.getCustomView()).findViewById(R.id.counterBadgeReleaseText);
 					openReleaseTabView.setTextColor(textColor);
+
 				}
 			}
 		}
 
-		checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName1);
+		checkRepositoryStarStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
-		checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName1);
+		checkRepositoryWatchStatus(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
 
 	}
 
@@ -263,17 +237,10 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 	public void onResume() {
 
 		super.onResume();
-		TinyDB tinyDb = new TinyDB(appCtx);
-		final String instanceUrl = tinyDb.getString("instanceUrl");
-		final String loginUid = tinyDb.getString("loginUid");
-		String repoFullName = tinyDb.getString("repoFullName");
-		String[] parts = repoFullName.split("/");
-		final String repoOwner = parts[0];
-		final String repoName = parts[1];
-		final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-		if(tinyDb.getBoolean("enableCounterIssueBadge")) {
+		if(tinyDB.getBoolean("enableCounterIssueBadge")) {
-			getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
+
+			getRepoInfo(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repositoryOwner, repositoryName);
 		}
 
 	}
@@ -293,27 +260,34 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		int id = item.getItemId();
 
 		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;
+
 			default:
 				return super.onOptionsItemSelected(item);
+
 		}
 
 	}
@@ -321,68 +295,81 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 	@Override
 	public void onButtonClicked(String text) {
 
-		TinyDB tinyDb = new TinyDB(appCtx);
-
 		switch(text) {
+
 			case "label":
 				startActivity(new Intent(RepoDetailActivity.this, CreateLabelActivity.class));
 				break;
+
 			case "newIssue":
 				startActivity(new Intent(RepoDetailActivity.this, CreateIssueActivity.class));
 				break;
+
 			case "newMilestone":
 				startActivity(new Intent(RepoDetailActivity.this, CreateMilestoneActivity.class));
 				break;
+
 			case "addCollaborator":
 				startActivity(new Intent(RepoDetailActivity.this, AddCollaboratorToRepositoryActivity.class));
 				break;
+
 			case "createRelease":
 				startActivity(new Intent(RepoDetailActivity.this, CreateReleaseActivity.class));
 				break;
+
 			case "openWebRepo":
-				Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(tinyDb.getString("repoHtmlUrl")));
+				Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(tinyDB.getString("repoHtmlUrl")));
 				startActivity(i);
 				break;
+
 			case "shareRepo":
 				Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
 				sharingIntent.setType("text/plain");
-				sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, tinyDb.getString("repoHtmlUrl"));
+				sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, tinyDB.getString("repoHtmlUrl"));
-				sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, tinyDb.getString("repoHtmlUrl"));
+				sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, tinyDB.getString("repoHtmlUrl"));
-				startActivity(Intent.createChooser(sharingIntent, tinyDb.getString("repoHtmlUrl")));
+				startActivity(Intent.createChooser(sharingIntent, tinyDB.getString("repoHtmlUrl")));
 				break;
+
 			case "newFile":
 				startActivity(new Intent(RepoDetailActivity.this, CreateFileActivity.class));
 				break;
+
 			case "openIssues":
 				if(getFragmentRefreshListener() != null) {
 					getFragmentRefreshListener().onRefresh("open");
 				}
 				break;
+
 			case "closedIssues":
 				if(getFragmentRefreshListener() != null) {
 					getFragmentRefreshListener().onRefresh("closed");
 				}
 				break;
+
 			case "openPr":
 				if(getFragmentRefreshListenerPr() != null) {
 					getFragmentRefreshListenerPr().onRefresh("open");
 				}
 				break;
+
 			case "closedPr":
 				if(getFragmentRefreshListenerPr() != null) {
 					getFragmentRefreshListenerPr().onRefresh("closed");
 				}
 				break;
+
 			case "openMilestone":
 				if(getFragmentRefreshListenerMilestone() != null) {
 					getFragmentRefreshListenerMilestone().onRefresh("open");
 				}
 				break;
+
 			case "closedMilestone":
 				if(getFragmentRefreshListenerMilestone() != null) {
 					getFragmentRefreshListenerMilestone().onRefresh("closed");
 				}
 				break;
+
 		}
 
 	}
@@ -398,54 +385,58 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		@Override
 		public Fragment getItem(int position) {
 
-			TinyDB tinyDb = new TinyDB(appCtx);
-			String repoFullName = tinyDb.getString("repoFullName");
-			String[] parts = repoFullName.split("/");
-			String repoOwner = parts[0];
-			String repoName = parts[1];
-
 			Fragment fragment = null;
+
 			switch(position) {
-				case 0: // information
+
-					return RepoInfoFragment.newInstance(repoOwner, repoName);
+				case 0: // Repository details
-				case 1: // files
+					return RepoInfoFragment.newInstance(repositoryOwner, repositoryName);
-					return FilesFragment.newInstance(repoOwner, repoName);
+
-				case 2: // issues
+				case 1: // Files
+					return FilesFragment.newInstance(repositoryOwner, repositoryName);
+
+				case 2: // Issues
 					fragment = new IssuesFragment();
 					break;
-				case 3: // pull requests
+
+				case 3: // Pull requests
 					fragment = new PullRequestsFragment();
 					break;
-				case 4: // branches
+
-					return BranchesFragment.newInstance(repoOwner, repoName);
+				case 4: // Branches
-				case 5: // releases
+					return BranchesFragment.newInstance(repositoryOwner, repositoryName);
-					return ReleasesFragment.newInstance(repoOwner, repoName);
+
-				case 6: // milestones
+				case 5: // Releases
+					return ReleasesFragment.newInstance(repositoryOwner, repositoryName);
+
+				case 6: // Milestones
 					fragment = new MilestonesFragment();
 					break;
-				case 7: // labels
+
-					return LabelsFragment.newInstance(repoOwner, repoName);
+				case 7: // Labels
-				case 8: // collaborators
+					return LabelsFragment.newInstance(repositoryOwner, repositoryName);
-					return CollaboratorsFragment.newInstance(repoOwner, repoName);
+
+				case 8: // Collaborators
+					return CollaboratorsFragment.newInstance(repositoryOwner, repositoryName);
+
 			}
+
 			assert fragment != null;
 			return fragment;
+
 		}
 
 		@Override
 		public int getCount() {
 
-			return 9;
+			return tabsCount;
 		}
 
 	}
 
 	private void getRepoInfo(String instanceUrl, String token, final String owner, String repo) {
 
-		TinyDB tinyDb = new TinyDB(appCtx);
-
 		Call<UserRepositories> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserRepository(token, owner, repo);
-
 		call.enqueue(new Callback<UserRepositories>() {
 
 			@Override
@@ -457,20 +448,23 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 					if(response.code() == 200) {
 
-						if(tinyDb.getBoolean("enableCounterBadges")) {
+						if(tinyDB.getBoolean("enableCounterBadges")) {
 							assert repoInfo != null;
 
 							if(repoInfo.getOpen_issues_count() != null) {
+
 								textViewBadgeIssue.setVisibility(View.VISIBLE);
 								textViewBadgeIssue.setText(repoInfo.getOpen_issues_count());
 							}
 
 							if(repoInfo.getOpen_pull_count() != null) {
+
 								textViewBadgePull.setVisibility(View.VISIBLE);
 								textViewBadgePull.setText(repoInfo.getOpen_pull_count());
 							}
 
 							if(repoInfo.getRelease_count() != null) {
+
 								textViewBadgeRelease.setVisibility(View.VISIBLE);
 								textViewBadgeRelease.setText(repoInfo.getRelease_count());
 							}
@@ -480,6 +474,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 				}
 				else {
+
 					Log.e("onFailure", String.valueOf(response.code()));
 				}
 
@@ -497,17 +492,13 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 	private void checkRepositoryStarStatus(String instanceUrl, String instanceToken, final String owner, String repo) {
 
-		Call<JsonElement> call;
+		Call<JsonElement> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkRepoStarStatus(instanceToken, owner, repo);
-
-		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkRepoStarStatus(instanceToken, owner, repo);
-
 		call.enqueue(new Callback<JsonElement>() {
 
 			@Override
 			public void onResponse(@NonNull Call<JsonElement> call, @NonNull retrofit2.Response<JsonElement> response) {
 
-				TinyDB tinyDb = new TinyDB(appCtx);
+				tinyDB.putInt("repositoryStarStatus", response.code());
-				tinyDb.putInt("repositoryStarStatus", response.code());
 
 			}
 
@@ -525,22 +516,23 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 		Call<WatchInfo> call;
 
 		call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().checkRepoWatchStatus(instanceToken, owner, repo);
-
 		call.enqueue(new Callback<WatchInfo>() {
 
 			@Override
 			public void onResponse(@NonNull Call<WatchInfo> call, @NonNull retrofit2.Response<WatchInfo> response) {
 
-				TinyDB tinyDb = new TinyDB(appCtx);
-
 				if(response.code() == 200) {
+
 					assert response.body() != null;
+
 					if(response.body().getSubscribed()) {
-						tinyDb.putBoolean("repositoryWatchStatus", true);
+						tinyDB.putBoolean("repositoryWatchStatus", true);
 					}
+
 				}
 				else {
-					tinyDb.putBoolean("repositoryWatchStatus", false);
+
+					tinyDB.putBoolean("repositoryWatchStatus", false);
 				}
 
 			}
@@ -554,4 +546,25 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
 	}
 
+	// Issues interface
+	public FragmentRefreshListener getFragmentRefreshListener() { return fragmentRefreshListener; }
+
+	public void setFragmentRefreshListener(FragmentRefreshListener fragmentRefreshListener) { this.fragmentRefreshListener = fragmentRefreshListener; }
+
+	public interface FragmentRefreshListener { void onRefresh(String text); }
+
+	// Pull request interface
+	public FragmentRefreshListenerPr getFragmentRefreshListenerPr() { return fragmentRefreshListenerPr; }
+
+	public void setFragmentRefreshListenerPr(FragmentRefreshListenerPr fragmentRefreshListenerPr) { this.fragmentRefreshListenerPr = fragmentRefreshListenerPr; }
+
+	public interface FragmentRefreshListenerPr { void onRefresh(String text); }
+
+	// Milestones interface
+	public FragmentRefreshListenerMilestone getFragmentRefreshListenerMilestone() { return fragmentRefreshListenerMilestone; }
+
+	public void setFragmentRefreshListenerMilestone(FragmentRefreshListenerMilestone fragmentRefreshListenerMilestone) { this.fragmentRefreshListenerMilestone = fragmentRefreshListenerMilestone; }
+
+	public interface FragmentRefreshListenerMilestone { void onRefresh(String text); }
+
 }

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

@@ -59,6 +59,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		private TextView repoStars;
 		private TextView repoForks;
 		private TextView repoOpenIssuesCount;
+		private TextView repoType;
 		private LinearLayout archiveRepo;
 
 		private ReposSearchViewHolder(View itemView) {
@@ -75,6 +76,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 			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);
 
 			itemView.setOnClickListener(v -> {
@@ -153,7 +155,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
 				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-				bottomSheetHeader.setText(fullName.getText());
+				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();
@@ -233,9 +235,11 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		holder.fullName.setText(currentItem.getFullname());
 		if(currentItem.getPrivateFlag()) {
 			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
 			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+			holder.repoType.setText(R.string.strPublic);
 		}
 		holder.repoStars.setText(currentItem.getStars_count());
 		holder.repoForks.setText(currentItem.getForks_count());

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

@@ -1,6 +1,8 @@
 package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -104,6 +106,8 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 				TextView commentMenuEdit = view.findViewById(R.id.commentMenuEdit);
 				TextView commentShare = view.findViewById(R.id.issueCommentShare);
+				TextView commentMenuQuote = view.findViewById(R.id.commentMenuQuote);
+				TextView commentMenuCopy = view.findViewById(R.id.commentMenuCopy);
 				TextView commentMenuDelete = view.findViewById(R.id.commentMenuDelete);
 
 				if(!loginUid.contentEquals(commenterUsername.getText())) {
@@ -111,6 +115,10 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 					commentMenuDelete.setVisibility(View.GONE);
 				}
 
+				if(issueComment.getText().toString().isEmpty()) {
+					commentMenuCopy.setVisibility(View.GONE);
+				}
+
 				BottomSheetDialog dialog = new BottomSheetDialog(ctx);
 				dialog.setContentView(view);
 				dialog.show();
@@ -143,6 +151,48 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
 
 				});
 
+				commentMenuQuote.setOnClickListener(v1 -> {
+
+					StringBuilder stringBuilder = new StringBuilder();
+					String commenterName = commenterUsername.getText().toString();
+
+					if(!commenterName.equals(tinyDb.getString("userLogin"))) {
+
+						stringBuilder.append("@").append(commenterName).append("\n\n");
+					}
+
+					String[] lines = commendBodyRaw.getText().toString().split("\\R");
+
+					for(String line : lines) {
+
+						stringBuilder.append(">").append(line).append("\n");
+					}
+
+					stringBuilder.append("\n");
+
+					Intent intent = new Intent(ctx, ReplyToIssueActivity.class);
+					intent.putExtra("commentBody", stringBuilder.toString());
+					intent.putExtra("cursorToEnd", true);
+					intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+					dialog.dismiss();
+					ctx.startActivity(intent);
+
+				});
+
+				commentMenuCopy.setOnClickListener(view1 -> {
+
+					ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
+					assert clipboard != null;
+
+					ClipData clip = ClipData.newPlainText("Comment on issue #" + issueNumber.getText().toString(), issueComment.getText().toString());
+					clipboard.setPrimaryClip(clip);
+
+					dialog.dismiss();
+					Toasty.info(ctx, ctx.getString(R.string.copyIssueCommentToastMsg));
+
+				});
+
 				commentMenuDelete.setOnClickListener(deleteComment -> {
 
 					deleteIssueComment(ctx, Integer.parseInt(commendId.getText().toString()), getAdapterPosition());

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

@@ -3,26 +3,25 @@ package org.mian.gitnex.adapters;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.amulyakhare.textdrawable.TextDrawable;
+import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
+import androidx.core.widget.ImageViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateLabelActivity;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ColorInverter;
-import org.mian.gitnex.helpers.LabelWidthCalculator;
 import org.mian.gitnex.models.Labels;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Author M M Arif
@@ -39,12 +38,17 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         private TextView labelTitle;
         private TextView labelId;
         private TextView labelColor;
-        private ImageView labelsView;
+
+        private CardView labelView;
+        private ImageView labelIcon;
+        private TextView labelName;
 
         private LabelsViewHolder(View itemView) {
             super(itemView);
 
-            labelsView = itemView.findViewById(R.id.labelsView);
+            labelView = itemView.findViewById(R.id.labelView);
+            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);
@@ -119,19 +123,13 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         String labelName = currentItem.getName();
 
         int color = Color.parseColor("#" + labelColor);
+        int contrastColor = new ColorInverter().getContrastColor(color);
 
-        TextDrawable drawable = TextDrawable.builder()
+	    ImageViewCompat.setImageTintList(holder.labelIcon, ColorStateList.valueOf(contrastColor));
-                .beginConfig()
-                .useFont(Typeface.DEFAULT)
-                .bold()
-                .textColor(new ColorInverter().getContrastColor(color))
-                .fontSize(35)
-                .width(LabelWidthCalculator.calculateLabelWidth(labelName, Typeface.DEFAULT, 40, 20))
-                .height(55)
-                .endConfig()
-                .buildRoundRect(labelName, color, 10);
 
-        holder.labelsView.setImageDrawable(drawable);
+        holder.labelName.setTextColor(contrastColor);
+        holder.labelName.setText(labelName);
+        holder.labelView.setCardBackgroundColor(color);
 
     }
 
@@ -140,4 +138,4 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
         return labelsList.size();
     }
 
-}
+}

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

@@ -151,7 +151,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
                 TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                bottomSheetHeader.setText(repoFullName.getText());
+                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();

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

@@ -190,8 +190,15 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 			prMergeable.setText(String.valueOf(prModel.isMergeable()));
 			if(prModel.getHead() != null) {
 				prHeadBranch.setText(prModel.getHead().getRef());
-				prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
+				if(prModel.getHead().getRepo() != null) {
-				prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
+					prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
+					prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
+				}
+				else {
+					// pull was done from a deleted fork
+					prIsFork.setText("true");
+					prForkFullName.setText(context.getString(R.string.prDeletedFrok));
+				}
 			}
 			prCommentsCount.setText(String.valueOf(prModel.getComments()));
 

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

@@ -203,7 +203,7 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
             markwon.setParsedMarkdown(holder.releaseBodyContent, bodyWithMD);
         }
         else {
-            holder.releaseBodyContent.setVisibility(View.GONE);
+	        holder.releaseBodyContent.setText(R.string.noReleaseBodyContent);
         }
 
 	    holder.downloadFrame.setOnClickListener(v -> {

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

@@ -153,7 +153,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 				TextView repoWatchers = view.findViewById(R.id.repoWatchers);
 				TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-				bottomSheetHeader.setText(fullName.getText());
+				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();

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

@@ -150,7 +150,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
                 TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                bottomSheetHeader.setText(fullName.getText());
+	            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();

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

@@ -151,7 +151,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
                 TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                bottomSheetHeader.setText(fullName.getText());
+	            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();

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

@@ -104,12 +104,11 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 
 		if (!currentItem.getFullname().equals("")) {
 			holder.userFullName.setText(currentItem.getFullname());
-			holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
 		}
 		else {
 			holder.userFullName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
-			holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
 		}
+		holder.userName.setText(mCtx.getResources().getString(R.string.usernameWithAt, currentItem.getLogin()));
 
 		if (!currentItem.getAvatar().equals("")) {
 			PicassoService.getInstance(mCtx).get().load(currentItem.getAvatar()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(holder.userAvatar);
@@ -123,7 +122,6 @@ public class UserSearchForTeamMemberAdapter extends RecyclerView.Adapter<UserSea
 			String repoFullName = tinyDb.getString("repoFullName");
 			String[] parts = repoFullName.split("/");
 			final String repoOwner = parts[0];
-			final String repoName = parts[1];
 			final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
 			Call<UserInfo> call = RetrofitClient

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

@@ -27,7 +27,7 @@ public class AppApiService {
 	public static <S> S createService(Class<S> serviceClass, String instanceURL, Context ctx) {
 
 		TinyDB tinyDb = new TinyDB(ctx);
-		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+		final boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
 		int cacheSize = FilesData.returnOnlyNumber(tinyDb.getString("cacheSizeStr")) * 1024 * 1024;
 		Cache cache = new Cache(httpCacheDirectory, cacheSize);

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

@@ -32,7 +32,7 @@ public class RetrofitClient {
 	private RetrofitClient(String instanceUrl, Context ctx) {
 
 		TinyDB tinyDb = new TinyDB(ctx);
-		final boolean connToInternet = AppUtil.haveNetworkConnection(ctx);
+		final boolean connToInternet = AppUtil.hasNetworkConnection(ctx);
 		int cacheSize = FilesData.returnOnlyNumber(tinyDb.getString("cacheSizeStr")) * 1024 * 1024;
 		File httpCacheDirectory = new File(ctx.getCacheDir(), "responses");
 		Cache cache = new Cache(httpCacheDirectory, cacheSize);

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

@@ -71,13 +71,14 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
             }
         });
 
-        addCollaborator.setOnClickListener(new View.OnClickListener() {
+		if (tinyDb.getBoolean("isRepoAdmin")) {
-            @Override
+			addCollaborator.setOnClickListener(v1 -> {
-            public void onClick(View v) {
+				bmListener.onButtonClicked("addCollaborator");
-                bmListener.onButtonClicked("addCollaborator");
+				dismiss();
-                dismiss();
+			});
-            }
+		} else {
-        });
+			addCollaborator.setVisibility(View.GONE);
+		}
 
         createRelease.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -19,10 +19,14 @@ import org.mian.gitnex.activities.AddRemoveLabelsActivity;
 import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.FileDiffActivity;
 import org.mian.gitnex.activities.MergePullRequestActivity;
+import org.mian.gitnex.helpers.PathsHelper;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.util.TinyDB;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Objects;
+import io.mikael.urlbuilder.UrlBuilder;
 
 /**
  * Author M M Arif
@@ -138,53 +142,61 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
 		shareIssue.setOnClickListener(v1 -> {
 
-			// get url of repo
+			try {
-			String repoFullName = tinyDB.getString("repoFullName");
+
-			String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
+				URI instanceUrl = new URI(tinyDB.getString("instanceUrlWithProtocol"));
-			if(!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
+
-				instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
+				String issuePath = PathsHelper.join(instanceUrl.getPath(), tinyDB.getString("repoFullName"), "/issues/", tinyDB.getString("issueNumber"));
+
+				String issueUrl = UrlBuilder.fromUri(instanceUrl)
+					.withPath(issuePath)
+					.toString();
+
+				// share issue
+				Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+				sharingIntent.setType("text/plain");
+				sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle"));
+				sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, issueUrl);
+				startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")));
+
+			}
+			catch(URISyntaxException e) {
+				Toasty.error(ctx, getString(R.string.genericError));
+			}
+			finally {
+				dismiss();
 			}
-
-			// get issue Url
-			String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
-
-			// share issue
-			Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
-			sharingIntent.setType("text/plain");
-			sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle"));
-			sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, issueUrl);
-			startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.hash) + tinyDB.getString("issueNumber") + " " + tinyDB.getString("issueTitle")));
-
-			dismiss();
 
 		});
 
-		copyIssueUrl.setOnClickListener(new View.OnClickListener() {
+		copyIssueUrl.setOnClickListener(v12 -> {
 
-			@Override
+			try {
-			public void onClick(View v) {
 
-				// get url of repo
+				URI instanceUrl = new URI(tinyDB.getString("instanceUrlWithProtocol"));
-				String repoFullName = tinyDB.getString("repoFullName");
-				String instanceUrlWithProtocol = "https://" + tinyDB.getString("instanceUrlRaw");
-				if(!tinyDB.getString("instanceUrlWithProtocol").isEmpty()) {
-					instanceUrlWithProtocol = tinyDB.getString("instanceUrlWithProtocol");
-				}
 
-				// get issue Url
+				String issuePath = PathsHelper.join(instanceUrl.getPath(), tinyDB.getString("repoFullName"), "/issues/", tinyDB.getString("issueNumber"));
-				String issueUrl = instanceUrlWithProtocol + "/" + repoFullName + "/issues/" + tinyDB.getString("issueNumber");
+
+				String issueUrl = UrlBuilder.fromUri(instanceUrl)
+					.withPath(issuePath)
+					.toString();
 
 				// copy to clipboard
-				ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(android.content.Context.CLIPBOARD_SERVICE);
+				ClipboardManager clipboard = (ClipboardManager) Objects.requireNonNull(ctx).getSystemService(Context.CLIPBOARD_SERVICE);
 				ClipData clip = ClipData.newPlainText("issueUrl", issueUrl);
 				assert clipboard != null;
 				clipboard.setPrimaryClip(clip);
 
-				dismiss();
-
 				Toasty.info(ctx, ctx.getString(R.string.copyIssueUrlToastMsg));
 
 			}
+			catch(URISyntaxException e) {
+				Toasty.error(ctx, getString(R.string.genericError));
+			}
+			finally {
+				dismiss();
+			}
+
 		});
 
 		if(tinyDB.getString("issueType").equals("issue")) {

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

@@ -325,6 +325,9 @@ public class IssuesFragment extends Fragment {
 		List<Issues> arr = new ArrayList<>();
 
 		for(Issues d : issuesList) {
+			if(d == null || d.getTitle() == null || d.getBody() == null) {
+				continue;
+			}
 			if(d.getTitle().toLowerCase().contains(text) || d.getBody().toLowerCase().contains(text)) {
 				arr.add(d);
 			}

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

@@ -104,7 +104,7 @@ public class MembersByOrgFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -318,6 +318,9 @@ public class MilestonesFragment extends Fragment {
         List<Milestones> arr = new ArrayList<>();
 
         for(Milestones d : dataList) {
+	        if(d == null || d.getTitle() == null || d.getDescription() == null) {
+		        continue;
+	        }
             if(d.getTitle().toLowerCase().contains(text) || d.getDescription().toLowerCase().contains(text)) {
                 arr.add(d);
             }

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

@@ -81,7 +81,7 @@ public class MyRepositoriesFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         final View v = inflater.inflate(R.layout.fragment_my_repositories, container, false);
         setHasOptionsMenu(true);
@@ -196,7 +196,7 @@ public class MyRepositoriesFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -52,7 +52,7 @@ public class OrganizationsFragment extends Fragment {
         final View v = inflater.inflate(R.layout.fragment_organizations, container, false);
         setHasOptionsMenu(true);
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         TinyDB tinyDb = new TinyDB(getContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -158,7 +158,7 @@ public class OrganizationsFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.fragments;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -13,6 +14,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.widget.ImageViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
@@ -54,16 +56,26 @@ public class ProfileFragment extends Fragment {
 	    ImageView userAvatarBackground = v.findViewById(R.id.userAvatarBackground);
         ImageView userAvatar = v.findViewById(R.id.userAvatar);
         TextView userLogin = v.findViewById(R.id.userLogin);
+        View divider = v.findViewById(R.id.divider);
         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("-");
-	    Locale locale = new Locale(userLanguageCodes[0], userLanguageCodes[1]);
+
+	    if(userLanguageCodes.length >= 2) {
+
+		    Locale locale = new Locale(userLanguageCodes[0], userLanguageCodes[1]);
+		    userLanguage.setText(locale.getDisplayCountry());
+	    }
+	    else {
+
+	    	userLanguage.setText(R.string.notSupported);
+	    }
 
 	    userFullName.setText(tinyDb.getString("userFullname"));
 	    userLogin.setText(getString(R.string.usernameWithAt, tinyDb.getString("userLogin")));
-	    userLanguage.setText(locale.getDisplayCountry());
 
 	    PicassoService.getInstance(ctx).get()
 		    .load(tinyDb.getString("userAvatar"))
@@ -79,11 +91,14 @@ public class ProfileFragment extends Fragment {
 			    @Override
 			    public void onSuccess() {
 
-				    int textColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
+				    int invertedColor = new ColorInverter().getImageViewContrastColor(userAvatarBackground);
 
-				    userFullName.setTextColor(textColor);
+				    userFullName.setTextColor(invertedColor);
-				    userLogin.setTextColor(textColor);
+				    divider.setBackgroundColor(invertedColor);
-				    userLanguage.setTextColor(textColor);
+				    userLogin.setTextColor(invertedColor);
+				    userLanguage.setTextColor(invertedColor);
+
+				    ImageViewCompat.setImageTintList(userLanguageIcon, ColorStateList.valueOf(invertedColor));
 
 				    blurView.setupWith(aboutFrame)
 					    .setBlurAlgorithm(new RenderScriptBlur(ctx))

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

@@ -332,6 +332,9 @@ public class PullRequestsFragment extends Fragment {
 		List<PullRequests> arr = new ArrayList<>();
 
 		for(PullRequests d : prList) {
+			if(d == null || d.getTitle() == null || d.getBody() == null) {
+				continue;
+			}
 			if(d.getTitle().toLowerCase().contains(text) || d.getBody().toLowerCase().contains(text)) {
 				arr.add(d);
 			}

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

@@ -152,7 +152,7 @@ public class RepositoriesByOrgFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -51,7 +51,7 @@ public class RepositoriesFragment extends Fragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         final View v = inflater.inflate(R.layout.fragment_repositories, container, false);
         setHasOptionsMenu(true);
@@ -161,7 +161,7 @@ public class RepositoriesFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -78,7 +78,7 @@ public class StarredRepositoriesFragment extends Fragment {
                              Bundle savedInstanceState) {
 
         View v = inflater.inflate(R.layout.fragment_starred_repositories, container, false);
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
         setHasOptionsMenu(true);
 
         TinyDB tinyDb = new TinyDB(getContext());
@@ -186,7 +186,7 @@ public class StarredRepositoriesFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -148,7 +148,7 @@ public class TeamsByOrgFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
 
-        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+        boolean connToInternet = AppUtil.hasNetworkConnection(Objects.requireNonNull(getContext()));
 
         inflater.inflate(R.menu.search_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);

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

@@ -19,28 +19,26 @@ public class AlertDialogs {
 
     public static void authorizationTokenRevokedDialog(final Context context, String title, String message, String copyNegativeButton, String copyPositiveButton) {
 
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context)
+	        .setTitle(title)
+            .setMessage(message)
+            .setCancelable(true)
+            .setIcon(R.drawable.ic_warning)
+            .setNegativeButton(copyNegativeButton, (dialog, which) -> dialog.dismiss())
+            .setPositiveButton(copyPositiveButton, (dialog, which) -> {
 
-        alertDialogBuilder
+                final TinyDB tinyDb = new TinyDB(context);
-                .setTitle(title)
+                tinyDb.putBoolean("loggedInMode", false);
-                .setMessage(message)
+                tinyDb.remove("basicAuthPassword");
-                .setCancelable(true)
+                tinyDb.putBoolean("basicAuthFlag", false);
-                .setIcon(R.drawable.ic_warning)
+                Intent intent = new Intent(context, LoginActivity.class);
-                .setNegativeButton(copyNegativeButton, (dialog, which) -> dialog.dismiss())
+                context.startActivity(intent);
-                .setPositiveButton(copyPositiveButton, (dialog, which) -> {
+                dialog.dismiss();
 
-                    final TinyDB tinyDb = new TinyDB(context);
+            });
-                    tinyDb.putBoolean("loggedInMode", false);
-                    tinyDb.remove("basicAuthPassword");
-                    tinyDb.putBoolean("basicAuthFlag", false);
-                    Intent intent = new Intent(context, LoginActivity.class);
-                    context.startActivity(intent);
-                    dialog.dismiss();
 
-                });
+        alertDialogBuilder.create().show();
-        AlertDialog alertDialog = alertDialogBuilder.create();
 
-        alertDialog.show();
     }
 
     public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String title, String message, String positiveButton, String negativeButton) {

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

@@ -33,7 +33,22 @@ public class ColorInverter {
     	if(imageView != null) {
 
 		    Bitmap bitmap = ((BitmapDrawable) imageView.getDrawable()).getBitmap();
-		    return getContrastColor(bitmap.getPixel(bitmap.getWidth() / 2, bitmap.getHeight() / 2));
+
+		    int colorSum = 0;
+		    int divisionValue = 0;
+
+		    for(int height=0; height<bitmap.getHeight(); height += 10) {
+
+		    	for(int width=0; width<bitmap.getWidth(); width += 10) {
+
+		    		colorSum += bitmap.getPixel(width, height);
+		    		divisionValue++;
+
+			    }
+		    }
+
+		    // Calculate average color
+		    return getContrastColor(colorSum / divisionValue);
 
 	    }
     	else {

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

@@ -23,73 +23,4 @@ public class LabelWidthCalculator {
 
     }
 
-    public static int customWidth(int labelLength) {
-
-        int width = 33;
-
-        if(labelLength == 20) {
-            width = ((width * labelLength) - 150);
-        }
-        else if(labelLength == 19) {
-            width = ((width * labelLength) - 140);
-        }
-        else if(labelLength == 18) {
-            width = ((width * labelLength) - 130);
-        }
-        else if(labelLength == 17) {
-            width = ((width * labelLength) - 120);
-        }
-        else if(labelLength == 16) {
-            width = ((width * labelLength) - 110);
-        }
-        else if(labelLength == 15) {
-            width = ((width * labelLength) - 100);
-        }
-        else if(labelLength == 14) {
-            width = ((width * labelLength) - 90);
-        }
-        else if(labelLength == 13) {
-            width = ((width * labelLength) - 80);
-        }
-        else if(labelLength == 12) {
-            width = ((width * labelLength) - 70);
-        }
-        else if(labelLength == 11) {
-            width = ((width * labelLength) - 60);
-        }
-        else if(labelLength == 10) {
-            width = ((width * labelLength) - 50);
-        }
-        else if(labelLength == 9) {
-            width = ((width * labelLength) - 40);
-        }
-        else if(labelLength == 8) {
-            width = ((width * labelLength) - 30);
-        }
-        else if(labelLength == 7) {
-            width = ((width * labelLength) - 20);
-        }
-        else if(labelLength == 6) {
-            width = ((width * labelLength) - 10);
-        }
-        else if(labelLength == 5) {
-            width = ((width * labelLength) - 10);
-        }
-        else if(labelLength == 4) {
-            width = ((width * labelLength) - 10);
-        }
-        else if(labelLength == 3) {
-            width = ((width * labelLength) - 10);
-        }
-        else if(labelLength == 2) {
-            width = ((width * labelLength));
-        }
-        else {
-            width = (width * labelLength - 5);
-        }
-
-        return width;
-
-    }
-
 }

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

@@ -0,0 +1,37 @@
+package org.mian.gitnex.helpers;
+
+/**
+ * Author opyale
+ */
+
+public class PathsHelper {
+
+	public static String join(String... paths) {
+
+		StringBuilder stringBuilder = new StringBuilder();
+
+		for(String path : paths) {
+
+			if(path != null && !path.isEmpty()) {
+
+				if(!path.startsWith("/")) {
+
+					stringBuilder.append("/");
+				}
+
+				if(path.endsWith("/")) {
+
+					path = path.substring(0, path.lastIndexOf("/"));
+				}
+
+				stringBuilder.append(path);
+
+			}
+
+		}
+
+		return stringBuilder.append("/").toString();
+
+	}
+
+}

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

@@ -17,7 +17,7 @@ import java.util.Map;
 import java.util.UUID;
 
 /**
- * Author anonTree1417
+ * Author opyale
  */
 
 public class PicassoCache implements Cache {

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

@@ -13,34 +13,34 @@ import org.mian.gitnex.R;
 
 public class Toasty {
 
-    public static void info(Context context, String message) {
+	public static void info(Context context, String message) {
 
-        LayoutInflater inflater = LayoutInflater.from(context);
+		LayoutInflater inflater = LayoutInflater.from(context);
-        View view = inflater.inflate( context.getResources().getLayout(R.layout.custom_toast), null );
+		View view = inflater.inflate(context.getResources().getLayout(R.layout.custom_toast), null);
 
-        TextView text = view.findViewById(R.id.toastText);
+		TextView text = view.findViewById(R.id.toastText);
-        text.setText(message);
+		text.setText(message);
 
-        Toast toast = new Toast(context);
+		Toast toast = new Toast(context);
-        toast.setDuration(Toast.LENGTH_LONG);
+		toast.setDuration(Toast.LENGTH_LONG);
-        toast.setView(view);
+		toast.setView(view);
-        toast.show();
+		toast.show();
 
-    }
+	}
 
-    public static void error(Context context, String message) {
+	public static void error(Context context, String message) {
 
-        LayoutInflater inflater = LayoutInflater.from(context);
+		LayoutInflater inflater = LayoutInflater.from(context);
-        View view = inflater.inflate( context.getResources().getLayout(R.layout.custom_toast_error), null );
+		View view = inflater.inflate(context.getResources().getLayout(R.layout.custom_toast_error), null);
 
-        TextView text = view.findViewById(R.id.toastText);
+		TextView text = view.findViewById(R.id.toastText);
-        text.setText(message);
+		text.setText(message);
 
-        Toast toast = new Toast(context);
+		Toast toast = new Toast(context);
-        toast.setDuration(Toast.LENGTH_LONG);
+		toast.setDuration(Toast.LENGTH_LONG);
-        toast.setView(view);
+		toast.setView(view);
-        toast.show();
+		toast.show();
 
-    }
+	}
 
 }

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

@@ -9,34 +9,39 @@ import java.net.URISyntaxException;
 
 public class UrlHelper {
 
-    public static String cleanUrl(String url) {
+	public static String cleanUrl(String url) {
 
-        URI uri = null;
+		URI uri = null;
-        try {
+		try {
-            uri = new URI(url);
+			uri = new URI(url);
-        } catch (URISyntaxException e) {
+		}
-            e.printStackTrace();
+		catch(URISyntaxException e) {
-        }
+			e.printStackTrace();
+		}
 
-        assert uri != null;
+		assert uri != null;
-        String urlProtocol = uri.getScheme();
+		String urlProtocol = uri.getScheme();
-        String urlHost = uri.getHost();
+		String urlHost = uri.getHost();
-        int urlPort = uri.getPort();
+		int urlPort = uri.getPort();
 
-        String urlFinal = null;
+		String urlFinal = null;
-        if(urlPort > 0) {
+		if(urlPort > 0) {
-            urlFinal = urlProtocol + "://" + urlHost + ":" + urlPort;
+			urlFinal = urlProtocol + "://" + urlHost + ":" + urlPort;
-        }
+		}
-        else if(urlProtocol != null) {
+		else if(urlProtocol != null) {
-            urlFinal = urlProtocol + "://" + urlHost;
+			urlFinal = urlProtocol + "://" + urlHost;
-        }
+		}
-        else {
+		else {
-            urlFinal = urlHost;
+			urlFinal = urlHost;
-        }
+		}
 
-        return urlFinal;
+		return urlFinal;
 
-    }
+	}
+
+	public static String fixScheme(String url, String scheme) {
+
+		return !url.matches("^(http|https)://.+$") ? scheme + "://" + url : url;
+	}
 
 }
-

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

@@ -1,7 +1,7 @@
 package org.mian.gitnex.helpers.ssl;
 
 /**
- * Author Georg Lukas, modified by anonTree1417
+ * Author Georg Lukas, modified by opyale
  */
 
 class MTMDecision {

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

@@ -7,7 +7,7 @@ import android.os.Bundle;
 import org.mian.gitnex.R;
 
 /**
- * Author Georg Lukas, modified by anonTree1417
+ * Author Georg Lukas, modified by opyale
  */
 
 public class MemorizingActivity extends Activity {
@@ -41,4 +41,4 @@ public class MemorizingActivity extends Activity {
 
 	}
 
-}
+}

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

@@ -39,7 +39,7 @@ import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
 /**
- * Author Georg Lukas, modified by anonTree1417
+ * Author Georg Lukas, modified by opyale
  */
 
 public class MemorizingTrustManager implements X509TrustManager {

app/src/main/java/org/mian/gitnex/util/AppUtil.java

@@ -9,6 +9,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.util.Base64;
 import android.util.DisplayMetrics;
+import android.view.View;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -28,7 +29,7 @@ public class AppUtil {
 		return str.replace(original, replace);
 	}
 
-	public static boolean haveNetworkConnection(Context context) {
+	public static boolean hasNetworkConnection(Context context) {
 
 		boolean haveConnectedWifi = false;
 		boolean haveConnectedMobile = false;
@@ -94,7 +95,7 @@ public class AppUtil {
 		return str.matches("^[\\w-]+$");
 	}
 
-	public Boolean checkIntegers(String str) {
+	public static Boolean checkIntegers(String str) {
 
 		return str.matches("\\d+");
 	}
@@ -116,16 +117,9 @@ public class AppUtil {
 
 	}
 
-	public static boolean httpCheck(String url) {
-
-		String pattern = "^(http|https)://.*$";
-		return url.matches(pattern);
-
-	}
-
 	public static String formatFileSize(long size) {
 
-		String repoSize = null;
+		String repoSize = size + " B";
 
 		double m = size / 1024.0;
 		double g = ((size / 1024.0) / 1024.0);
@@ -261,7 +255,7 @@ public class AppUtil {
 
 	public Boolean sourceCodeExtension(String ext) {
 
-		String[] extValues = new String[]{"md", "json", "java", "go", "php", "c", "cc", "cpp", "h", "cxx", "cyc", "m", "cs", "bash", "sh", "bsh", "cv", "python", "perl", "pm", "rb", "ruby", "javascript", "coffee", "rc", "rs", "rust", "basic", "clj", "css", "dart", "lisp", "erl", "hs", "lsp", "rkt", "ss", "llvm", "ll", "lua", "matlab", "pascal", "r", "scala", "sql", "latex", "tex", "vb", "vbs", "vhd", "tcl", "wiki.meta", "yaml", "yml", "markdown", "xml", "proto", "regex", "py", "pl", "js", "html", "htm", "volt", "ini", "htaccess", "conf", "gitignore", "gradle", "txt", "properties", "bat", "twig"};
+		String[] extValues = new String[]{"md", "json", "java", "go", "php", "c", "cc", "cpp", "h", "cxx", "cyc", "m", "cs", "bash", "sh", "bsh", "cv", "python", "perl", "pm", "rb", "ruby", "javascript", "coffee", "rc", "rs", "rust", "basic", "clj", "css", "dart", "lisp", "erl", "hs", "lsp", "rkt", "ss", "llvm", "ll", "lua", "matlab", "pascal", "r", "scala", "sql", "latex", "tex", "vb", "vbs", "vhd", "tcl", "wiki.meta", "yaml", "yml", "markdown", "xml", "proto", "regex", "py", "pl", "js", "html", "htm", "volt", "ini", "htaccess", "conf", "gitignore", "gradle", "txt", "properties", "bat", "twig", "cvs", "cmake", "in", "info", "spec", "m4", "am", "dist", "pam"};
 
 		return Arrays.asList(extValues).contains(ext);
 
@@ -297,4 +291,12 @@ public class AppUtil {
 
 	}
 
+	public static void setMultiVisibility(int visibility, View... views) {
+
+		for(View view : views) {
+
+			view.setVisibility(visibility);
+		}
+	}
+
 }

app/src/main/res/drawable/bottom_sheet_top_corners.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp" />
+
+    <padding android:top="12dp" />
+
+    <solid android:color="?attr/primaryBackgroundColor" />
+
+</shape>

app/src/main/res/layout/bottom_sheet_admin_users.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,10 +27,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_file_viewer.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,10 +27,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_issue_comments.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,7 +27,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/commentMenuDelete"
@@ -39,7 +39,31 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
+
+            <TextView
+                android:id="@+id/commentMenuQuote"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/menuQuoteText"
+                android:drawableStart="@drawable/ic_comment"
+                android:drawablePadding="24dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"
+                android:padding="12dp" />
+
+            <TextView
+                android:id="@+id/commentMenuCopy"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/menuCopyText"
+                android:drawableStart="@drawable/ic_content_copy"
+                android:drawablePadding="24dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/issueCommentShare"
@@ -51,10 +75,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_issues_filter.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,7 +27,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/closedIssues"
@@ -39,10 +39,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_labels_in_list.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -24,10 +24,16 @@
                 android:text="@string/labelName"
                 android:paddingStart="18dp"
                 android:paddingEnd="18dp"
-                android:paddingTop="16dp"
+                android:paddingBottom="18dp"
-                android:paddingBottom="16dp"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="18sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:id="@+id/divider"
+                android:layout_marginBottom="12dp"
+                android:background="?attr/dividerColor" />
 
             <TextView
                 android:id="@+id/labelMenuEdit"
@@ -39,7 +45,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/labelMenuDelete"
@@ -51,10 +57,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_milestones_filter.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,7 +27,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/closedMilestone"
@@ -39,10 +39,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_milestones_in_list.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,7 +27,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/openMilestone"
@@ -39,10 +39,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_organization.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,7 +27,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/createTeam"
@@ -39,10 +39,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_organization_teams.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,10 +27,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_profile.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,10 +27,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_pull_request_filter.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,7 +27,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/closedPr"
@@ -39,10 +39,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_repo.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -27,7 +27,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/createNewIssue"
@@ -39,7 +39,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/createNewMilestone"
@@ -51,7 +51,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/createLabel"
@@ -63,7 +63,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/createRelease"
@@ -75,13 +75,13 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="12dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginBottom="12dp"
                 android:layout_marginStart="64dp"
                 android:background="?attr/dividerColor" />
 
@@ -95,7 +95,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/starRepository"
@@ -107,7 +107,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/unStarRepository"
@@ -119,7 +119,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/watchRepository"
@@ -131,7 +131,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/unWatchRepository"
@@ -143,13 +143,13 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="12dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginBottom="12dp"
                 android:layout_marginStart="64dp"
                 android:background="?attr/dividerColor" />
 
@@ -160,10 +160,10 @@
                 android:layout_gravity="center_vertical"
                 android:drawableStart="@drawable/ic_share_24dp"
                 android:drawablePadding="24dp"
-                android:padding="16dp"
                 android:text="@string/shareRepository"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/openWebRepo"
@@ -172,13 +172,13 @@
                 android:layout_gravity="center_vertical"
                 android:drawableStart="@drawable/ic_open_in_browser"
                 android:drawablePadding="24dp"
-                android:padding="16dp"
                 android:text="@string/openWebRepo"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_repository_in_list.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -24,10 +24,16 @@
                 android:text="@string/repoName"
                 android:paddingStart="18dp"
                 android:paddingEnd="18dp"
-                android:paddingTop="16dp"
+                android:paddingBottom="18dp"
-                android:paddingBottom="16dp"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="18sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:id="@+id/divider"
+                android:layout_marginBottom="12dp"
+                android:background="?attr/dividerColor" />
 
             <TextView
                 android:id="@+id/repoOpenInBrowser"
@@ -39,7 +45,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/repoStargazers"
@@ -51,7 +57,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/repoWatchers"
@@ -63,10 +69,10 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/bottom_sheet_single_issue.xml

@@ -4,9 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
+    android:paddingTop="6dp"
-    android:background="?attr/primaryBackgroundColor"
+    android:paddingBottom="12dp"
-    android:paddingTop="8dp">
+    android:background="?attr/primaryBackgroundColor">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -28,7 +28,7 @@
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/mergePullRequest"
@@ -40,7 +40,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/editIssue"
@@ -52,7 +52,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/addRemoveAssignees"
@@ -64,7 +64,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/editLabels"
@@ -76,7 +76,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/subscribeIssue"
@@ -88,8 +88,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp"
+                android:padding="12dp" />
-                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/unsubscribeIssue"
@@ -98,17 +97,17 @@
                 android:layout_gravity="center_vertical"
                 android:drawableStart="@drawable/ic_watchers"
                 android:drawablePadding="24dp"
-                android:padding="16dp"
                 android:text="@string/singleIssueUnSubscribe"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:padding="12dp" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="12dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginBottom="12dp"
                 android:layout_marginStart="64dp"
                 android:background="?attr/dividerColor" />
 
@@ -119,10 +118,10 @@
                 android:layout_gravity="center_vertical"
                 android:drawableStart="@drawable/ic_share_24dp"
                 android:drawablePadding="24dp"
-                android:padding="16dp"
                 android:text="@string/shareIssue"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/copyIssueUrl"
@@ -131,16 +130,16 @@
                 android:layout_gravity="center_vertical"
                 android:drawableStart="@drawable/ic_content_copy"
                 android:drawablePadding="24dp"
-                android:padding="16dp"
                 android:text="@string/copyIssueUrl"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                android:padding="12dp" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="12dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginBottom="12dp"
                 android:layout_marginStart="64dp"
                 android:background="?attr/dividerColor" />
 
@@ -154,7 +153,7 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="12dp" />
 
             <TextView
                 android:id="@+id/reOpenIssue"
@@ -166,8 +165,8 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp"
+                android:visibility="gone"
-                android:visibility="gone" />
+                android:padding="12dp" />
 
         </LinearLayout>
 

app/src/main/res/layout/fragment_profile.xml

@@ -61,6 +61,7 @@
                     android:textSize="14sp" />
 
                 <View
+                    android:id="@+id/divider"
                     android:layout_width="50dp"
                     android:layout_height="1dp"
                     android:layout_marginBottom="10dp"
@@ -73,6 +74,7 @@
                     android:gravity="center_vertical">
 
                     <ImageView
+                        android:id="@+id/userLanguageIcon"
                         android:layout_width="wrap_content"
                         android:layout_height="18dp"
                         android:layout_marginRight="2dp"

app/src/main/res/layout/list_issue_comments.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -24,7 +23,7 @@
         android:id="@+id/commendBodyRaw"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/commenterUsername"

app/src/main/res/layout/list_labels.xml

@@ -1,61 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/linearLayoutMainFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
+    android:background="?attr/primaryBackgroundColor"
-    android:id="@+id/relativeLayoutMainFrame"
+    android:orientation="horizontal"
-    android:background="?attr/primaryBackgroundColor">
+    android:padding="10dp">
 
     <TextView
+        android:id="@+id/labelTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"
+        android:layout_weight="1"
-        android:id="@+id/labelTitle"/>
+        android:visibility="gone" />
 
     <TextView
+        android:id="@+id/labelId"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"
+        android:layout_weight="1"
-        android:id="@+id/labelId"/>
+        android:visibility="gone" />
 
     <TextView
+        android:id="@+id/labelColor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="gone"
+        android:layout_weight="1"
-        android:id="@+id/labelColor"/>
+        android:visibility="gone" />
 
-    <LinearLayout
+    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
+        android:id="@+id/labelView"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
-        android:layout_margin="15dp"
+        android:layout_height="wrap_content"
-        android:id="@+id/labelsFrame"
+        app:cardCornerRadius="5dp"
-        android:orientation="horizontal">
+        app:cardElevation="0dp"
+        app:contentPaddingBottom="3dp"
+        app:contentPaddingLeft="10dp"
+        app:contentPaddingRight="10dp"
+        app:contentPaddingTop="3dp">
 
-        <ImageView
+        <LinearLayout
-            android:id="@+id/labelsView"
+            android:layout_width="match_parent"
-            android:layout_width="0dp"
+            android:layout_height="match_parent"
-            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
-            android:layout_gravity="start"
+            android:orientation="horizontal">
-            android:paddingTop="5dp"
-            android:contentDescription="@string/labelMenuContentDesc"
-            android:gravity="start"
-            android:layout_weight="1"
-            android:scaleType="fitStart"
-            android:src="@drawable/ic_label" />
 
-        <ImageView
+            <ImageView
-            android:id="@+id/labelsOptionsMenu"
+                android:id="@+id/labelIcon"
-            android:layout_width="0dp"
+                android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+                android:layout_height="wrap_content"
-            android:layout_gravity="end"
+                android:layout_weight="0"
-            android:layout_weight="0.15"
+                android:contentDescription="@string/generalImgContentText"
-            android:contentDescription="@string/labelMenuContentDesc"
+                android:tint="@color/colorWhite"
-            android:gravity="end"
+                app:srcCompat="@drawable/ic_label" />
-            android:scaleType="fitEnd"
-            android:src="@drawable/ic_dotted_menu_horizontal" />
 
-    </LinearLayout>
+            <TextView
+                android:id="@+id/labelName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+                android:textColor="@color/colorWhite"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+        </LinearLayout>
 
-</RelativeLayout>
+    </androidx.cardview.widget.CardView>
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <ImageView
+        android:id="@+id/labelsOptionsMenu"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|end"
+        android:contentDescription="@string/labelMenuContentDesc"
+        android:paddingLeft="10dp"
+        android:src="@drawable/ic_dotted_menu_horizontal" />
+
+</LinearLayout>
 

app/src/main/res/layout/list_releases.xml

@@ -27,8 +27,7 @@
                 android:singleLine="true"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="18sp"
-                android:textStyle="bold"
+                android:textStyle="bold" />
-                tools:text="3.0.0-rc1" />
 
             <TextView
                 android:id="@+id/releaseType"
@@ -68,8 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="14sp"
+                    android:textSize="14sp" />
-                    tools:text="Published by @mmarif" />
 
             </LinearLayout>
 
@@ -99,8 +97,7 @@
                         android:layout_marginStart="5dp"
                         android:singleLine="true"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp"
+                        android:textSize="14sp" />
-                        tools:text="3.0.0-rc1" />
 
                 </LinearLayout>
 
@@ -125,8 +122,7 @@
                         android:layout_marginStart="5dp"
                         android:singleLine="true"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp"
+                        android:textSize="14sp" />
-                        tools:text="8b1c79c0c3" />
 
                 </LinearLayout>
 
@@ -150,8 +146,7 @@
                         android:layout_marginStart="5dp"
                         android:singleLine="true"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp"
+                        android:textSize="14sp" />
-                        tools:text="1 day ago" />
 
                 </LinearLayout>
 
@@ -172,9 +167,10 @@
             android:id="@+id/releaseBodyContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:autoLink="web|email"
+            android:textColorLink="@color/lightBlue"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp"
+            android:textSize="14sp" />
-            tools:text="Put your release body here" />
 
     </LinearLayout>
 
@@ -207,8 +203,7 @@
                 android:layout_marginStart="3dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp"
-                android:text="@string/releaseDownloadText"
+                android:text="@string/releaseDownloadText" />
-                tools:text="Downloads" />
 
         </LinearLayout>
 
@@ -229,8 +224,7 @@
                 android:drawableStart="@drawable/ic_file_download_24dp"
                 android:drawablePadding="8dp"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp"
+                android:textSize="14sp" />
-                tools:text="Source code (ZIP)" />
 
             <TextView
                 android:id="@+id/releaseTarDownload"
@@ -241,8 +235,7 @@
                 android:drawableStart="@drawable/ic_file_download_24dp"
                 android:drawablePadding="8dp"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="14sp"
+                android:textSize="14sp" />
-                tools:text="Source code (TAR)" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/downloadList"

app/src/main/res/layout/nav_header.xml

@@ -29,19 +29,17 @@
                 android:id="@+id/userAvatar"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_android"
                 android:maxHeight="24dp"
                 android:maxWidth="24dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="5dp"
-                android:contentDescription="@string/app_name"/>
+                android:contentDescription="@string/generalImgContentText"/>
 
             <TextView
                 android:id="@+id/userFullname"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="10dp"
-                android:text="@string/app_name"
                 android:textSize="18sp"
                 android:textIsSelectable="true"
                 android:textColor="@color/white"
@@ -59,7 +57,6 @@
                     android:layout_width="0dp"
                     android:layout_weight="0.85"
                     android:layout_height="wrap_content"
-                    android:text="@string/appEmail"
                     android:textSize="14sp"
                     android:textIsSelectable="true"
                     android:textColor="@color/white"

app/src/main/res/values-v23/themes.xml

@@ -24,6 +24,7 @@
         <item name="hintColor">@color/hintColor</item>
         <item name="colorControlActivated">@color/darkGreen</item>
         <item name="dividerColor">@color/lightThemeDividerColor</item>
+        <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
     </style>
 
-</resources>
+</resources>

app/src/main/res/values/protocols.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string-array name="protocolValues">
-        <item>HTTPS</item>
-        <item>HTTP</item>
-    </string-array>
-
-</resources>

app/src/main/res/values/sponsors.xml

@@ -9,6 +9,7 @@
         <item>Sameer Gupta</item>
         <item>Yin Yihang</item>
         <item>Svierne</item>
+        <item>Sam Forest</item>
     </string-array>
 
-</resources>
+</resources>

app/src/main/res/values/strings.xml

@@ -217,6 +217,7 @@
     <string name="noDataReleasesTab">No releases found</string>
     <string name="releaseTag">Tag: %1$s</string>
     <string name="releasePublishedBy">Published by @%1$s</string>
+    <string name="noReleaseBodyContent">Release notes are not provided by the publisher.</string>
 
     <string name="collaboratorsNameToast">Collaborator : %1$s</string>
     <string name="noDataCollaboratorTab">No collaborators found</string>
@@ -516,6 +517,7 @@
 
     <string name="copyIssueUrl">Copy Issue URL</string>
     <string name="copyIssueUrlToastMsg">URL copied to clipboard</string>
+    <string name="copyIssueCommentToastMsg">Copied comment to clipboard</string>
 
     <string name="milestoneCompletion">%1$d\uFF05 completed</string>
 
@@ -525,6 +527,8 @@
     <string name="filesGenericError">Sorry this file cannot be viewed as API returned an error</string>
     <string name="filesBreadcrumb">Root</string>
 
+    <string name="notSupported">Not supported</string>
+
     <!-- generic copy -->
     <string name="okButton">OK</string>
     <string name="doneButton">Done</string>
@@ -538,6 +542,8 @@
     <string name="menuContentDesc">Menu</string>
     <string name="menuEditText">Edit</string>
     <string name="menuDeleteText">Delete</string>
+    <string name="menuCopyText">Copy</string>
+    <string name="menuQuoteText">Quote and Reply</string>
     <string name="colorfulBulletSpan" translatable="false">\u0020\u0020\u0020\u25CF\u0020\u0020\u0020</string>
     <string name="modifiedText">edited</string>
     <string name="saveButton">Save</string>
@@ -587,6 +593,7 @@
     <string name="unauthorizedApiError">Instance has returned an error - Unauthorized. Check your credentials and try again</string>
     <string name="loginTokenError">Please enter the correct token</string>
 
+    <string name="prDeletedFrok">Deleted Fork</string>
     <string name="noDataPullRequests">No pull requests found</string>
     <string name="prCreator">Creator :\u0020</string>
     <string name="editPrText">Edit Pull Request</string>

app/src/main/res/values/themes.xml

@@ -24,6 +24,7 @@
         <item name="hintColor">@color/hintColor</item>
         <item name="colorControlActivated">@color/darkGreen</item>
         <item name="dividerColor">@color/dividerColorDark</item>
+        <item name="bottomSheetDialogTheme">@style/AppThemeDarkBottomSheetDialog</item>
     </style>
     <!-- Dark theme - default -->
 
@@ -50,9 +51,22 @@
         <item name="hintColor">@color/hintColor</item>
         <item name="colorControlActivated">@color/darkGreen</item>
         <item name="dividerColor">@color/lightThemeDividerColor</item>
+        <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
     </style>
     <!-- Light theme -->
 
+    <style name="AppThemeDarkBottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/AppBottomSheetModalStyle</item>
+    </style>
+
+    <style name="AppThemeLightBottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/AppBottomSheetModalStyle</item>
+    </style>
+
+    <style name="AppBottomSheetModalStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/bottom_sheet_top_corners</item>
+    </style>
+
     <style name="AppThemeLightSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
         <item name="android:textColor">@color/lightThemeTextColor</item>
         <item name="android:textColorHint">@color/lightThemeTextColor</item>
@@ -104,4 +118,4 @@
         <item name="buttonTint">@color/colorWhite</item>
     </style>
 
-</resources>
+</resources>

app/src/main/res/xml/changelog.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
 
-    <release version="3.0.0-rc2" versioncode="296">
+    <release version="3.0.0-rc3" versioncode="297">
         <change>Under development</change>
     </release>
 

fastlane/metadata/android/en-US/changelogs/297.txt

@@ -0,0 +1,5 @@
+3.0.0-rc3
+
+This release focuses to enhance the UI through out the app with few new features and fix the bugs you guys reported so far.
+
+Detailed release notes will be published with the stable release.