Merge branch 'releae-2.3.1' of gitnex/GitNex into release-2.3

.gitattributes

@@ -1 +0,0 @@
-* text=auto eol=lf

CONTRIBUTORS.md

@@ -18,7 +18,6 @@ This part lists all PUBLIC individuals having contributed content to the transla
  * erardiflorian
  * IndeedNotJames
  * jaqra
- * Lafriks
  * ljoonal
  * Lunny Xiao (xiaolunwen)
  * lxs

README.md

@@ -19,7 +19,7 @@ No trackers are used and source code is available here for anyone to audit.
 [<img alt='Download APK' src='https://gitnex.com/img/download-apk.png' height="80"/>](https://gitea.com/gitnex/GitNex/releases)
 
 ## Note about Gitea version
-Please make sure that you are on latest stable release or later for better app experience.
+Please make sure that you are on Gitea **1.10.x** stable release or later. Below this may not work as one would expect because of the newly added objects to the API at later versions. Please consider updating your Gitea server.
 
 Check the versions [compatibility page](https://gitea.com/gitnex/GitNex/wiki/Compatibility) which lists all the supported versions with compatibility ratio.
 
@@ -89,6 +89,5 @@ Open source libraries
 - Apache/commons-io
 - Caverock/androidsvg
 - Droidsonroids.gif/android-gif-drawable
-- Barteksc/AndroidPdfViewer
 
 [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 91
-        versionName "2.4.1"
+        versionCode 81
+        versionName "2.3.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -23,12 +23,12 @@ android {
 }
 
 dependencies {
-    def lifecycle_version = "2.2.0"
+    def lifecycle_version = "2.2.0-rc02"
     final def markwon_version = "4.1.1"
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "com.google.android.material:material:1.2.0-alpha05"
+    implementation "com.google.android.material:material:1.2.0-alpha02"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     testImplementation "junit:junit:4.12"
@@ -69,5 +69,4 @@ dependencies {
     implementation "commons-io:commons-io:2.6"
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
     implementation "com.pddstudio:highlightjs-android:1.5.0"
-    implementation "com.github.barteksc:android-pdf-viewer:3.2.0-beta.1"
 }

app/src/main/AndroidManifest.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="org.mian.gitnex">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:allowBackup="true"
@@ -14,8 +12,8 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/app_logo_round"
         android:supportsRtl="true"
-        tools:targetApi="n">
-        <activity android:name=".activities.MergePullRequestActivity" />
+        android:theme="@style/AppTheme">
+        <activity android:name=".activities.MergePullRequestActivity"></activity>
         <activity
             android:name=".activities.FileViewActivity"
             android:theme="@style/AppTheme.NoActionBar" />
@@ -59,7 +57,7 @@
             android:name=".activities.RepoDetailActivity"
             android:label="@string/title_activity_repo_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+        <activity android:name=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -24,12 +25,13 @@ import org.mian.gitnex.models.UserSearch;
 import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Author M M Arif
  */
 
-public class AddCollaboratorToRepositoryActivity extends BaseActivity {
+public class AddCollaboratorToRepositoryActivity extends AppCompatActivity {
 
     private View.OnClickListener onClickListener;
     final Context ctx = this;
@@ -40,13 +42,9 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
     private RecyclerView mRecyclerView;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_add_collaborator_to_repository;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_collaborator_to_repository);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -1,11 +1,13 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -16,7 +18,7 @@ import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.Issues;
 import org.mian.gitnex.models.MultiSelectModel;
-import org.mian.gitnex.models.UpdateIssueAssignees;
+import org.mian.gitnex.models.UpdateIssueAssignee;
 import org.mian.gitnex.util.TinyDB;
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +29,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class AddRemoveAssigneesActivity extends BaseActivity {
+public class AddRemoveAssigneesActivity extends AppCompatActivity {
 
     private ArrayList<MultiSelectModel> listOfCollaborators = new ArrayList<>();
     private ArrayList<Integer> issueAssigneesIds = new ArrayList<>();
@@ -36,15 +38,11 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
     final Context ctx = this;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_add_remove_assignees;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.activity_add_remove_assignees);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
@@ -236,14 +234,14 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
 
     private void updateIssueAssignees(final String instanceUrl, final String instanceToken, String repoOwner, String repoName, String loginUid, int issueIndex, List<String> issueAssigneesList) {
 
-        UpdateIssueAssignees updateAssigneeJson = new UpdateIssueAssignees(issueAssigneesList);
+        UpdateIssueAssignee updateAssigneeJson = new UpdateIssueAssignee(issueAssigneesList);
 
         Call<JsonElement> call3;
 
         call3 = RetrofitClient
                 .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
-                .patchIssueAssignees(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
+                .patchIssueAssignee(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, issueIndex, updateAssigneeJson);
 
         call3.enqueue(new Callback<JsonElement>() {
 

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -8,6 +9,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -25,7 +27,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class AddRemoveLabelsActivity extends BaseActivity {
+public class AddRemoveLabelsActivity extends AppCompatActivity {
 
     private ArrayList<MultiSelectModel> listOfLabels = new ArrayList<>();
     private ArrayList<Integer> issueLabelIds = new ArrayList<>();
@@ -34,14 +36,10 @@ public class AddRemoveLabelsActivity extends BaseActivity {
     final Context ctx = this;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_add_remove_labels;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.activity_add_remove_labels);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
@@ -34,7 +35,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class AdminGetUsersActivity extends BaseActivity implements AdminUsersBottomSheetFragment.BottomSheetListener {
+public class AdminGetUsersActivity extends AppCompatActivity implements AdminUsersBottomSheetFragment.BottomSheetListener {
 
     private View.OnClickListener onClickListener;
     final Context ctx = this;
@@ -44,14 +45,10 @@ public class AdminGetUsersActivity extends BaseActivity implements AdminUsersBot
     private Boolean searchFilter = false;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_admin_get_users;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_admin_get_users);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -1,69 +0,0 @@
-package org.mian.gitnex.activities;
-
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import org.mian.gitnex.R;
-import org.mian.gitnex.helpers.FontsOverride;
-import org.mian.gitnex.util.TinyDB;
-
-/**
- * Author M M Arif
- */
-
-public abstract class BaseActivity extends AppCompatActivity {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-
-        if(tinyDb.getInt("themeId") == 1) {
-            setTheme(R.style.AppThemeLight);
-        }
-        else {
-            setTheme(R.style.AppTheme);
-        }
-
-        super.onCreate(savedInstanceState);
-        setContentView(getLayoutResourceId());
-
-        if(tinyDb.getInt("customFontId") == 0) {
-
-            FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
-            FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
-            FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
-            FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
-
-            FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf");
-            FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf");
-            FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf");
-            FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf");
-            FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf");
-            FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf");
-            FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
-            FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
-            FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
-            FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
-
-        }
-
-    }
-
-    protected abstract int getLayoutResourceId();
-
-}
-
-

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -39,12 +40,13 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Author M M Arif
  */
 
-public class CreateIssueActivity extends BaseActivity implements View.OnClickListener {
+public class CreateIssueActivity extends AppCompatActivity implements View.OnClickListener {
 
     private View.OnClickListener onClickListener;
     MultiSelectDialog multiSelectDialog;
@@ -67,20 +69,15 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
     private ArrayAdapter<Mention> defaultMentionAdapter;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_create_issue;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_issue);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
         final String loginUid = tinyDb.getString("loginUid");
-        final String loginFullName = tinyDb.getString("userFullname");
         String repoFullName = tinyDb.getString("repoFullName");
         String[] parts = repoFullName.split("/");
         final String repoOwner = parts[0];
@@ -113,7 +110,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
 
         getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
-        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid, loginFullName);
+        getCollaborators(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
 
         disableProcessButton();
 
@@ -343,13 +340,13 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
                         List<Milestones> milestonesList_ = response.body();
 
-                        milestonesList.add(new Milestones(0,getString(R.string.issueCreatedNoMilestone)));
+                        milestonesList.add(new Milestones(0,"No milestone"));
                         assert milestonesList_ != null;
                         if(milestonesList_.size() > 0) {
                             for (int i = 0; i < milestonesList_.size(); i++) {
 
-                                //Don't translate "open" is a enum
-                                if(milestonesList_.get(i).getState().equals("open")) {
+                                //String mStone = getString(R.string.spinnerMilestoneText, milestonesList_.get(i).getTitle(), milestonesList_.get(i).getState());
+                                if(milestonesList_.get(i).getState().equals(getString(R.string.issueStatusOpen))) {
                                     Milestones data = new Milestones(
                                             milestonesList_.get(i).getId(),
                                             milestonesList_.get(i).getTitle()
@@ -380,15 +377,13 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
 
     }
 
-    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid, String loginFullName) {
+    private void getCollaborators(String instanceUrl, String instanceToken, String repoOwner, String repoName, String loginUid) {
 
         Call<List<Collaborators>> call = RetrofitClient
                 .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
                 .getCollaborators(Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName);
 
-        listOfAssignees.add(new MultiSelectModel(-1, loginFullName));
-
         call.enqueue(new Callback<List<Collaborators>>() {
 
             @Override

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -33,7 +34,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class CreateLabelActivity extends BaseActivity {
+public class CreateLabelActivity extends AppCompatActivity {
 
     private View.OnClickListener onClickListener;
     private TextView colorPicker;
@@ -42,13 +43,9 @@ public class CreateLabelActivity extends BaseActivity {
     final Context ctx = this;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_create_label;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_label);
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
         String repoFullName = tinyDb.getString("repoFullName");

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -25,7 +26,7 @@ import org.mian.gitnex.util.TinyDB;
  * Author M M Arif
  */
 
-public class CreateNewUserActivity extends BaseActivity {
+public class CreateNewUserActivity extends AppCompatActivity {
 
     private View.OnClickListener onClickListener;
     private EditText fullName;
@@ -36,14 +37,10 @@ public class CreateNewUserActivity extends BaseActivity {
     final Context ctx = this;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_create_new_user;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_new_user);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -32,7 +33,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class CreateReleaseActivity extends BaseActivity {
+public class CreateReleaseActivity extends AppCompatActivity {
 
     private View.OnClickListener onClickListener;
     public ImageView closeActivity;
@@ -48,14 +49,10 @@ public class CreateReleaseActivity extends BaseActivity {
     List<Branches> branchesList = new ArrayList<>();
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_create_release;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_release);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -29,7 +30,7 @@ import android.util.Log;
  * Author M M Arif
  */
 
-public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener {
+public class CreateTeamByOrgActivity extends AppCompatActivity implements View.OnClickListener {
 
     final Context ctx = CreateTeamByOrgActivity.this;
     private View.OnClickListener onClickListener;
@@ -43,11 +44,6 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
     private String[] permissionList = {"Read", "Write", "Admin"};
     public int permissionSelectedChoice = -1;
 
-    @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_create_team_by_org;
-    }
-
     private String[] accessControlsList = new String[] {
             "Code",
             "Issues",
@@ -71,8 +67,9 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
     };
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_create_team_by_org);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -92,7 +89,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
 
                 pBuilder.setTitle(R.string.newTeamPermission);
                 if(permissionSelectedChoice != -1) {
@@ -144,7 +141,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
                 teamAccessControlsArray.setText("");
                 pushAccessList = Arrays.asList(accessControlsList);
 
-                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
 
                 aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, new DialogInterface.OnMultiChoiceClickListener() {
 

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -17,19 +18,15 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class CreditsActivity extends BaseActivity {
+public class CreditsActivity extends AppCompatActivity {
 
     private View.OnClickListener onClickListener;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_credits;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_credits);
 
         ImageView closeActivity = findViewById(R.id.close);
 

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -44,7 +45,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class EditIssueActivity extends BaseActivity implements View.OnClickListener {
+public class EditIssueActivity extends AppCompatActivity implements View.OnClickListener {
 
     final Context ctx = this;
     private View.OnClickListener onClickListener;
@@ -61,14 +62,10 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
     private ArrayAdapter<Mention> defaultMentionAdapter;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_edit_issue;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_edit_issue);
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 

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

@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -30,7 +31,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class FileDiffActivity extends BaseActivity {
+public class FileDiffActivity extends AppCompatActivity {
 
     private View.OnClickListener onClickListener;
     private TextView toolbar_title;
@@ -38,14 +39,10 @@ public class FileDiffActivity extends BaseActivity {
     private ProgressBar mProgressBar;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_file_diff;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_file_diff);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
@@ -142,11 +139,7 @@ public class FileDiffActivity extends BaseActivity {
 
                                     String fileExtension = FilenameUtils.getExtension(getFileNameFinal);
 
-                                    if(appUtil.imageExtension(FilenameUtils.getExtension(getFileNameFinal))) {
-
-                                        fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension), "", binaryFileFinal));
-                                    }
-
+                                    fileContentsArray.add(new FileDiffView(getFileNameFinal, appUtil.imageExtension(fileExtension),"", binaryFileFinal));
                                 }
 
                             }

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

@@ -1,50 +1,33 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
-import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Base64;
 import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import com.github.barteksc.pdfviewer.PDFView;
-import com.github.barteksc.pdfviewer.util.FitPolicy;
 import com.github.chrisbanes.photoview.PhotoView;
 import com.pddstudio.highlightjs.HighlightJsView;
 import com.pddstudio.highlightjs.models.Theme;
 import org.apache.commons.io.FilenameUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.fragments.BottomSheetFileViewerFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Files;
 import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.Objects;
 import retrofit2.Call;
 import retrofit2.Callback;
 
@@ -52,31 +35,21 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class FileViewActivity extends BaseActivity implements BottomSheetFileViewerFragment.BottomSheetListener {
+public class FileViewActivity extends AppCompatActivity {
 
     private View.OnClickListener onClickListener;
     private TextView singleFileContents;
-    private LinearLayout singleFileContentsFrame;
     private HighlightJsView singleCodeContents;
     private PhotoView imageView;
     final Context ctx = this;
     private ProgressBar mProgressBar;
     private byte[] imageData;
-    private PDFView pdfView;
-    private LinearLayout pdfViewFrame;
-    private byte[] decodedPdf;
-    private Boolean pdfNightMode;
-    private static final int PERMISSION_REQUEST_CODE = 1;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_file_view;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_file_view);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
@@ -93,26 +66,22 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
         singleFileContents = findViewById(R.id.singleFileContents);
         singleCodeContents = findViewById(R.id.singleCodeContents);
         imageView = findViewById(R.id.imageView);
+        singleFileContents.setVisibility(View.GONE);
         mProgressBar = findViewById(R.id.progress_bar);
-        pdfView = findViewById(R.id.pdfView);
-        pdfViewFrame = findViewById(R.id.pdfViewFrame);
-        singleFileContentsFrame = findViewById(R.id.singleFileContentsFrame);
 
         String singleFileName = getIntent().getStringExtra("singleFileName");
 
         TextView toolbar_title = findViewById(R.id.toolbar_title);
         toolbar_title.setMovementMethod(new ScrollingMovementMethod());
+        toolbar_title.setText(singleFileName);
 
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        tinyDb.putString("downloadFileContents", "");
-
         try {
 
             singleFileName = URLDecoder.decode(singleFileName, "UTF-8");
             singleFileName = singleFileName.replaceAll("//", "/");
-            singleFileName = singleFileName.startsWith("/") ? singleFileName.substring(1) : singleFileName;
 
         }
         catch (UnsupportedEncodingException e) {
@@ -122,16 +91,12 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
         }
 
-        toolbar_title.setText(singleFileName);
-
         getSingleFileContents(instanceUrl, instanceToken, repoOwner, repoName, singleFileName);
 
     }
 
     private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-
         Call<Files> call = RetrofitClient
                 .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
@@ -152,15 +117,10 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
                         String fileExtension = FilenameUtils.getExtension(filename);
                         mProgressBar.setVisibility(View.GONE);
 
-                        // download file meta
-                        tinyDb.putString("downloadFileName", filename);
-                        tinyDb.putString("downloadFileContents", response.body().getContent());
-
                         if(appUtil.imageExtension(fileExtension)) { // file is image
 
-                            singleFileContentsFrame.setVisibility(View.GONE);
+                            singleFileContents.setVisibility(View.GONE);
                             singleCodeContents.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.GONE);
                             imageView.setVisibility(View.VISIBLE);
 
                             imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
@@ -171,62 +131,19 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
                         else if (appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
 
                             imageView.setVisibility(View.GONE);
-                            singleFileContentsFrame.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.GONE);
+                            singleFileContents.setVisibility(View.GONE);
                             singleCodeContents.setVisibility(View.VISIBLE);
 
                             singleCodeContents.setTheme(Theme.GRUVBOX_DARK);
                             singleCodeContents.setShowLineNumbers(true);
                             singleCodeContents.setSource(appUtil.decodeBase64(response.body().getContent()));
 
-                        }
-                        else if (appUtil.pdfExtension(fileExtension)) { // file is pdf
-
-                            imageView.setVisibility(View.GONE);
-                            singleFileContentsFrame.setVisibility(View.GONE);
-                            singleCodeContents.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.VISIBLE);
-
-                            pdfNightMode = tinyDb.getBoolean("enablePdfMode");
-
-                            decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
-                            pdfView.fromBytes(decodedPdf)
-                                    .enableSwipe(true)
-                                    .swipeHorizontal(false)
-                                    .enableDoubletap(true)
-                                    .defaultPage(0)
-                                    .enableAnnotationRendering(false)
-                                    .password(null)
-                                    .scrollHandle(null)
-                                    .enableAntialiasing(true)
-                                    .spacing(0)
-                                    .autoSpacing(true)
-                                    .pageFitPolicy(FitPolicy.WIDTH)
-                                    .fitEachPage(true)
-                                    .pageSnap(false)
-                                    .pageFling(true)
-                                    .nightMode(pdfNightMode)
-                                    .load();
-
-                        }
-                        else if (appUtil.excludeFilesInFileViewerExtension(fileExtension)) { // files need to be excluded
-
-                            imageView.setVisibility(View.GONE);
-                            singleCodeContents.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.GONE);
-                            singleFileContentsFrame.setVisibility(View.VISIBLE);
-
-                            singleFileContents.setText(getResources().getString(R.string.excludeFilesInFileviewer));
-                            singleFileContents.setGravity(Gravity.CENTER);
-                            singleFileContents.setTypeface(null, Typeface.BOLD);
-
                         }
                         else { // file type not known - plain text view
 
                             imageView.setVisibility(View.GONE);
                             singleCodeContents.setVisibility(View.GONE);
-                            pdfViewFrame.setVisibility(View.GONE);
-                            singleFileContentsFrame.setVisibility(View.VISIBLE);
+                            singleFileContents.setVisibility(View.VISIBLE);
 
                             singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
 
@@ -273,113 +190,6 @@ public class FileViewActivity extends BaseActivity implements BottomSheetFileVie
 
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.generic_nav_dotted_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        int id = item.getItemId();
-
-        switch (id) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.genericMenu:
-                BottomSheetFileViewerFragment bottomSheet = new BottomSheetFileViewerFragment();
-                bottomSheet.show(getSupportFragmentManager(), "fileViewerBottomSheet");
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-
-    }
-
-    @Override
-    public void onButtonClicked(String text) {
-
-        switch (text) {
-            case "downloadFile":
-
-                if (Build.VERSION.SDK_INT >= 23)
-                {
-                    if (checkPermission())
-                    {
-                        requestFileDownload();
-                    }
-                    else {
-                        requestPermission();
-                    }
-                }
-                else
-                {
-                    requestFileDownload();
-                }
-                break;
-
-        }
-
-    }
-
-    private void requestFileDownload() {
-
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-
-        if(!tinyDb.getString("downloadFileContents").isEmpty()) {
-
-            File outputFileName = new File(tinyDb.getString("downloadFileName"));
-            final File downloadFilePath = new File(Environment.getExternalStorageDirectory().getPath() + "/Download/" + outputFileName.getName());
-
-            byte[] pdfAsBytes = Base64.decode(tinyDb.getString("downloadFileContents"), 0);
-            FileOutputStream fileOutputStream = null;
-
-            try {
-
-                fileOutputStream = new FileOutputStream(downloadFilePath, false);
-                Objects.requireNonNull(fileOutputStream).write(pdfAsBytes);
-                fileOutputStream.flush();
-                fileOutputStream.close();
-                Toasty.info(getApplicationContext(), getString(R.string.downloadFileSaved));
-
-            }
-            catch (IOException e) {
-                Log.e("errorFileDownloading", Objects.requireNonNull(e.getMessage()));
-            }
-
-        }
-        else {
-            Toasty.error(getApplicationContext(), getString(R.string.waitLoadingDownloadFile));
-        }
-
-    }
-
-    private boolean checkPermission() {
-        int result = ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
-        return result == PackageManager.PERMISSION_GRANTED;
-    }
-
-    private void requestPermission() {
-        ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        switch (requestCode) {
-            case PERMISSION_REQUEST_CODE:
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    Log.i("PermissionsCheck", "Permission Granted");
-                }
-                else {
-                    Log.e("PermissionsCheck", "Permission Denied");
-                }
-                break;
-        }
-    }
-
     private void initCloseListener() {
         onClickListener = new View.OnClickListener() {
             @Override

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
@@ -35,7 +36,6 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;
 import android.view.Gravity;
@@ -80,7 +80,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class IssueDetailActivity extends BaseActivity {
+public class IssueDetailActivity extends AppCompatActivity {
 
     public ImageView closeActivity;
     private IssueCommentsAdapter adapter;
@@ -100,14 +100,10 @@ public class IssueDetailActivity extends BaseActivity {
     private LinearLayout assigneesLayout;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_issue_detail;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_issue_detail);
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
@@ -136,8 +132,6 @@ public class IssueDetailActivity extends BaseActivity {
         assigneesLayout = findViewById(R.id.frameAssignees);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
-        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setTitle(repoName);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -164,31 +158,6 @@ public class IssueDetailActivity extends BaseActivity {
             }
         });
 
-        Typeface myTypeface;
-        if(tinyDb.getInt("customFontId") == 0) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
-
-        }
-
-        toolbarTitle.setTypeface(myTypeface);
-        toolbarTitle.setText(repoName);
-
         getSingleIssue(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
         fetchDataAsync(instanceUrl, instanceToken, repoOwner, repoName, issueIndex, loginUid);
 
@@ -389,8 +358,7 @@ public class IssueDetailActivity extends BaseActivity {
                         tinyDb.putString("issueTitle", singleIssue.getTitle());
 
                         Picasso.get().load(singleIssue.getUser().getAvatar_url()).transform(new RoundedTransformation(8, 0)).resize(120, 120).centerCrop().into(assigneeAvatar);
-                        String issueNumber_ = "<font color='" + getApplicationContext().getResources().getColor(R.color.lightGray) + "'>" + getApplicationContext().getResources().getString(R.string.hash) + singleIssue.getNumber() + "</font>";
-                        issueTitle.setText(Html.fromHtml(issueNumber_ + " " + singleIssue.getTitle()));
+                        issueTitle.setText(getString(R.string.issueTitleWithId, singleIssue.getNumber(), singleIssue.getTitle()));
                         String cleanIssueDescription = singleIssue.getBody().trim();
                         Spanned bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(cleanIssueDescription));
                         markwon.setParsedMarkdown(issueDescription, UserMentions.UserMentionsFunc(getApplicationContext(), bodyWithMD, cleanIssueDescription));

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

@@ -20,6 +20,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import com.tooltip.Tooltip;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -32,7 +33,6 @@ import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -44,7 +44,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class LoginActivity extends BaseActivity implements View.OnClickListener {
+public class LoginActivity extends AppCompatActivity implements View.OnClickListener {
 
     private Button loginButton;
     private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode;
@@ -55,14 +55,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     private String device_id = "token";
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_login;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
@@ -285,7 +281,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
                     if(appUtil.checkIntegers(loginOTP_)) {
 
-                        loginOTP = Integer.parseInt(loginOTP_);
+                        loginOTP = Integer.valueOf(loginOTP_);
                     }
                     else {
 
@@ -404,7 +400,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                             return;
                         case UNSUPPORTED_OLD:
 
-                            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx);
+                            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
 
                             alertDialogBuilder
                                     .setTitle(getString(R.string.versionAlertDialogHeader))
@@ -531,7 +527,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
     private void letTheUserIn(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP) {
 
-        final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
+        final String credential = Credentials.basic(loginUid, loginPass);
 
         Call<List<UserTokens>> call;
         if(loginOTP != 0) {

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

@@ -5,13 +5,10 @@ import android.content.Context;
 import android.content.Intent;
 import androidx.annotation.NonNull;
 import com.google.android.material.navigation.NavigationView;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import android.graphics.Typeface;
+import androidx.appcompat.app.AppCompatActivity;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
@@ -48,25 +45,17 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener {
+public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
 
     private DrawerLayout drawer;
     private TextView userFullName;
     private TextView userEmail;
     private ImageView userAvatar;
-    private TextView toolbarTitle;
     final Context ctx = this;
-    private Typeface myTypeface;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_main;
-    }
+    protected void onCreate(Bundle savedInstanceState) {
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-
-        super.onCreate(savedInstanceState);
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
         tinyDb.putBoolean("noConnection", false);
         //userAvatar = findViewById(R.id.userAvatar);
@@ -97,62 +86,17 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
         if(!tinyDb.getBoolean("loggedInMode")) {
             logout();
             return;
         }
 
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
-        if(tinyDb.getInt("customFontId") == 0) {
-
-            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
-
-            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(getAssets(), "fonts/roboto.ttf");
-
-        }
-
-        toolbarTitle.setTypeface(myTypeface);
+        androidx.appcompat.widget.Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        FragmentManager fm = getSupportFragmentManager();
-        Fragment fragmentById = fm.findFragmentById(R.id.fragment_container);
-        if (fragmentById instanceof SettingsFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
-        }
-        else if (fragmentById instanceof MyRepositoriesFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
-        }
-        else if (fragmentById instanceof StarredRepositoriesFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
-        }
-        else if (fragmentById instanceof OrganizationsFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
-        }
-        else if (fragmentById instanceof ExploreRepositoriesFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
-        }
-        else if (fragmentById instanceof ProfileFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
-        }
-        else if (fragmentById instanceof AboutFragment) {
-            toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
-        }
-
         drawer = findViewById(R.id.drawer_layout);
         NavigationView navigationView = findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
@@ -168,7 +112,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
                 R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.darkGreen));
+        toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.white));
         drawer.addDrawerListener(toggle);
 
         drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
@@ -186,6 +130,8 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
                     tinyDb.putBoolean("noConnection", false);
                 }
 
+                //tinyDb.putBoolean("noConnection", true);
+
                 String userEmailNav = tinyDb.getString("userEmail");
                 String userFullNameNav = tinyDb.getString("userFullname");
                 String userAvatarNav = tinyDb.getString("userAvatar");
@@ -193,13 +139,11 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
                 userEmail = hView.findViewById(R.id.userEmail);
                 if (!userEmailNav.equals("")) {
                     userEmail.setText(userEmailNav);
-                    userEmail.setTypeface(myTypeface);
                 }
 
                 userFullName = hView.findViewById(R.id.userFullname);
                 if (!userFullNameNav.equals("")) {
                     userFullName.setText(userFullNameNav);
-                    userFullName.setTypeface(myTypeface);
                 }
 
                 userAvatar = hView.findViewById(R.id.userAvatar);
@@ -232,37 +176,31 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
         if(savedInstanceState == null) {
             if(tinyDb.getInt("homeScreenId") == 0) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new MyRepositoriesFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_home);
             }
             else if(tinyDb.getInt("homeScreenId") == 1) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new StarredRepositoriesFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_starred_repos);
             }
             else if(tinyDb.getInt("homeScreenId") == 2) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new OrganizationsFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_organizations);
             }
             else if(tinyDb.getInt("homeScreenId") == 3) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new RepositoriesFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_repositories);
             }
             else if(tinyDb.getInt("homeScreenId") == 4) {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new ProfileFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_profile);
             }
             else {
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new MyRepositoriesFragment()).commit();
                 navigationView.setCheckedItem(R.id.nav_home);
@@ -308,28 +246,22 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
         switch (menuItem.getItemId()) {
             case R.id.nav_home:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new MyRepositoriesFragment()).commit();
                 break;
             case R.id.nav_organizations:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new OrganizationsFragment()).commit();
                 break;
             case R.id.nav_profile:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new ProfileFragment()).commit();
                 break;
             case R.id.nav_repositories:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new RepositoriesFragment()).commit();
-
                 break;
             case R.id.nav_settings:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new SettingsFragment()).commit();
                 break;
@@ -338,7 +270,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
                 overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
                 break;
             case R.id.nav_about:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleAbout));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new AboutFragment()).commit();
                 break;
@@ -346,12 +277,10 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
                 rateThisApp();
                 break;
             case R.id.nav_starred_repos:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new StarredRepositoriesFragment()).commit();
                 break;
             case R.id.nav_explore:
-                toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
                 getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,
                         new ExploreRepositoriesFragment()).commit();
                 break;
@@ -410,7 +339,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
             }
 
             @Override
-            public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
+            public void onFailure(@NonNull Call<GiteaVersion> callVersion, Throwable t) {
 
                 Log.e("onFailure-version", t.toString());
 

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
@@ -32,7 +33,7 @@ import retrofit2.Response;
  * Author M M Arif
  */
 
-public class MergePullRequestActivity extends BaseActivity {
+public class MergePullRequestActivity extends AppCompatActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -44,13 +45,9 @@ public class MergePullRequestActivity extends BaseActivity {
     private Button mergeButton;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_merge_pull_request;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_merge_pull_request);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         TinyDB tinyDb = new TinyDB(getApplicationContext());

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

@@ -13,6 +13,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -32,7 +33,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewFileActivity extends BaseActivity {
+public class NewFileActivity extends AppCompatActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -48,14 +49,10 @@ public class NewFileActivity extends BaseActivity {
     List<Branches> branchesList = new ArrayList<>();
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_new_file;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new_file);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.app.DatePickerDialog;
@@ -17,7 +18,6 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Authorization;
-import org.mian.gitnex.helpers.VersionCheck;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.models.Milestones;
 import org.mian.gitnex.util.AppUtil;
@@ -28,7 +28,7 @@ import java.util.Calendar;
  * Author M M Arif
  */
 
-public class NewMilestoneActivity extends BaseActivity implements View.OnClickListener {
+public class NewMilestoneActivity extends AppCompatActivity implements View.OnClickListener {
 
     private EditText milestoneDueDate;
     private View.OnClickListener onClickListener;
@@ -38,13 +38,9 @@ public class NewMilestoneActivity extends BaseActivity implements View.OnClickLi
     final Context ctx = this;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_new_milestone;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new_milestone);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -121,16 +117,15 @@ public class NewMilestoneActivity extends BaseActivity implements View.OnClickLi
             }
         }
 
-        String finalMilestoneDueDate = null;
-        if(!newMilestoneDueDate.isEmpty()) {
-            finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
-        } else if (VersionCheck.compareVersion("1.10.0", tinyDb.getString("giteaVersion")) > 1) {
-            // if Gitea version is less than 1.10.0 DueDate is required
+        if(newMilestoneDueDate.equals("")) {
+
             Toasty.info(getApplicationContext(), getString(R.string.milestoneDateEmpty));
             return;
+
         }
 
         disableProcessButton();
+        String finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate)));
         createNewMilestone(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName, newMilestoneTitle, newMilestoneDescription, finalMilestoneDueDate);
 
     }

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -24,7 +25,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewOrganizationActivity extends BaseActivity {
+public class NewOrganizationActivity extends AppCompatActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -35,13 +36,9 @@ public class NewOrganizationActivity extends BaseActivity {
     final Context ctx = this;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_new_organization;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new_organization);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 

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

@@ -5,6 +5,7 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -32,7 +33,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewRepoActivity extends BaseActivity {
+public class NewRepoActivity extends AppCompatActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -46,13 +47,9 @@ public class NewRepoActivity extends BaseActivity {
     List<OrgOwner> orgsList = new ArrayList<>();
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_new_repo;
-    }
-    
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_new_repo);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 

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

@@ -2,20 +2,17 @@ package org.mian.gitnex.activities;
 
 import com.google.android.material.tabs.TabLayout;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import android.content.Intent;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.fragments.MembersByOrgFragment;
 import org.mian.gitnex.fragments.OrgBottomSheetFragment;
@@ -29,23 +26,17 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFragment.BottomSheetListener {
+public class OrgDetailActivity extends AppCompatActivity implements OrgBottomSheetFragment.BottomSheetListener {
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_org_detail;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_org_detail);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         String orgName = tinyDb.getString("orgName");
 
         Toolbar toolbar = findViewById(R.id.toolbar);
-        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setTitle(orgName);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -57,44 +48,6 @@ public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFra
 
         TabLayout tabLayout = findViewById(R.id.tabs);
 
-        Typeface myTypeface;
-        if(tinyDb.getInt("customFontId") == 0) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
-
-        }
-
-        toolbarTitle.setTypeface(myTypeface);
-        toolbarTitle.setText(orgName);
-
-        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
-        int tabsCount = vg.getChildCount();
-        for (int j = 0; j < tabsCount; j++) {
-            ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
-            int tabChildCount = vgTab.getChildCount();
-            for (int i = 0; i < tabChildCount; i++) {
-                View tabViewChild = vgTab.getChildAt(i);
-                if (tabViewChild instanceof TextView) {
-                    ((TextView) tabViewChild).setTypeface(myTypeface);
-                }
-            }
-        }
-
         mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.os.Bundle;
@@ -15,13 +16,12 @@ import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.viewmodels.TeamMembersByOrgViewModel;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
  */
 
-public class OrgTeamMembersActivity extends BaseActivity {
+public class OrgTeamMembersActivity extends AppCompatActivity {
 
     private TextView noDataMembers;
     private View.OnClickListener onClickListener;
@@ -29,13 +29,9 @@ public class OrgTeamMembersActivity extends BaseActivity {
     private GridView mGridView;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_org_team_members;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_org_team_members);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -50,7 +46,7 @@ public class OrgTeamMembersActivity extends BaseActivity {
         initCloseListener();
         closeActivity.setOnClickListener(onClickListener);
 
-        if(getIntent().getStringExtra("teamTitle") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamTitle")).equals("")) {
+        if(getIntent().getStringExtra("teamTitle") != null && !getIntent().getStringExtra("teamTitle").equals("")) {
             toolbarTitle.setText(getIntent().getStringExtra("teamTitle"));
         }
         else {
@@ -58,7 +54,7 @@ public class OrgTeamMembersActivity extends BaseActivity {
         }
 
         String teamId;
-        if(getIntent().getStringExtra("teamId") != null && !Objects.requireNonNull(getIntent().getStringExtra("teamId")).equals("")){
+        if(getIntent().getStringExtra("teamId") != null && !getIntent().getStringExtra("teamId").equals("")){
             teamId = getIntent().getStringExtra("teamId");
         }
         else {
@@ -68,7 +64,6 @@ public class OrgTeamMembersActivity extends BaseActivity {
         getIntent().getStringExtra("teamId");
         //Log.i("teamId", getIntent().getStringExtra("teamId"));
 
-        assert teamId != null;
         fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), Integer.valueOf(teamId));
 
     }

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -29,7 +30,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class ProfileEmailActivity extends BaseActivity {
+public class ProfileEmailActivity extends AppCompatActivity {
 
     private View.OnClickListener onClickListener;
     private EditText userEmail;
@@ -37,13 +38,9 @@ public class ProfileEmailActivity extends BaseActivity {
     private Button addEmailButton;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_profile_email;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_profile_email);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 

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

@@ -1,6 +1,7 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -32,7 +33,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class ReplyToIssueActivity extends BaseActivity {
+public class ReplyToIssueActivity extends AppCompatActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -44,14 +45,10 @@ public class ReplyToIssueActivity extends BaseActivity {
     private Button replyButton;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_reply_to_issue;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_reply_to_issue);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         TinyDB tinyDb = new TinyDB(getApplicationContext());

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

@@ -3,6 +3,7 @@ package org.mian.gitnex.activities;
 import com.google.android.material.tabs.TabLayout;
 import com.google.gson.JsonElement;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -13,7 +14,6 @@ import retrofit2.Callback;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.res.ColorStateList;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -21,7 +21,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.TextView;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -48,18 +47,14 @@ import android.net.Uri;
  * Author M M Arif
  */
 
-public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetFragment.BottomSheetListener {
+public class RepoDetailActivity extends AppCompatActivity implements RepoBottomSheetFragment.BottomSheetListener {
 
     private TextView textViewBadge;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_repo_detail;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_repo_detail);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         String repoFullName = tinyDb.getString("repoFullName");
@@ -75,8 +70,6 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
         AppUtil.setAppLocale(getResources(), appLocale);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
-        TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
-
         setSupportActionBar(toolbar);
         Objects.requireNonNull(getSupportActionBar()).setTitle(repoName1);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -88,44 +81,6 @@ public class RepoDetailActivity extends BaseActivity implements RepoBottomSheetF
 
         TabLayout tabLayout = findViewById(R.id.tabs);
 
-        Typeface myTypeface;
-        if(tinyDb.getInt("customFontId") == 0) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getApplicationContext()).getAssets(), "fonts/roboto.ttf");
-
-        }
-
-        toolbarTitle.setTypeface(myTypeface);
-        toolbarTitle.setText(repoName1);
-
-        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
-        int tabsCount = vg.getChildCount();
-        for (int j = 0; j < tabsCount; j++) {
-            ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
-            int tabChildCount = vgTab.getChildCount();
-            for (int i = 0; i < tabChildCount; i++) {
-                View tabViewChild = vgTab.getChildAt(i);
-                if (tabViewChild instanceof TextView) {
-                    ((TextView) tabViewChild).setTypeface(myTypeface);
-                }
-            }
-        }
-
         mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.activities;
 
 import android.os.Bundle;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
@@ -21,7 +22,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class RepoStargazersActivity extends BaseActivity {
+public class RepoStargazersActivity extends AppCompatActivity {
 
     private TextView noDataStargazers;
     private View.OnClickListener onClickListener;
@@ -30,13 +31,9 @@ public class RepoStargazersActivity extends BaseActivity {
     private ProgressBar mProgressBar;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_repo_stargazers;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_repo_stargazers);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -2,6 +2,7 @@ package org.mian.gitnex.activities;
 
 import android.os.Bundle;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
@@ -21,7 +22,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class RepoWatchersActivity extends BaseActivity {
+public class RepoWatchersActivity extends AppCompatActivity {
 
     private TextView noDataWatchers;
     private View.OnClickListener onClickListener;
@@ -30,13 +31,9 @@ public class RepoWatchersActivity extends BaseActivity {
     private ProgressBar mProgressBar;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_repo_watchers;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_repo_watchers);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");

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

@@ -1,5 +1,6 @@
 package org.mian.gitnex.activities;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -17,18 +18,14 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class SponsorsActivity extends BaseActivity {
+public class SponsorsActivity extends AppCompatActivity {
 
     private View.OnClickListener onClickListener;
 
     @Override
-    protected int getLayoutResourceId(){
-        return R.layout.activity_sponsors;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sponsors);
 
         ImageView closeActivity = findViewById(R.id.close);
 

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

@@ -26,7 +26,6 @@ import org.mian.gitnex.models.UserRepositories;
 import org.mian.gitnex.util.TinyDB;
 import java.lang.reflect.Field;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
@@ -90,9 +89,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
@@ -103,7 +102,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
                         fMenuHelper.setAccessible(true);
                         menuHelper = fMenuHelper.get(popupMenu);
                         argTypes = new Class[] { boolean.class };
-                        Objects.requireNonNull(menuHelper).getClass().getDeclaredMethod("setForceShowIcon",
+                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
                                 argTypes).invoke(menuHelper, true);
 
                     } catch (Exception e) {

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

@@ -90,9 +90,9 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
                     popupMenu.inflate(R.menu.issue_comment_menu);
 
                     Object menuHelper;

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

@@ -56,9 +56,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
                     popupMenu.inflate(R.menu.labels_menu);
 
                     Object menuHelper;

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

@@ -88,9 +88,9 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +12,6 @@ import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
 /**
@@ -25,7 +23,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
     private List<UserInfo> stargazersList;
     private Context mCtx;
 
-    private static class ViewHolder {
+    private class ViewHolder {
 
         private ImageView memberAvatar;
         private TextView memberName;
@@ -64,7 +62,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
 
         if (finalView == null) {
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_stargazers_list, null);
-            viewHolder = new ViewHolder(finalView);
+            viewHolder = new RepoStargazersAdapter.ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
@@ -81,44 +79,11 @@ public class RepoStargazersAdapter extends BaseAdapter {
         UserInfo currentItem = stargazersList.get(position);
         Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
 
-        final TinyDB tinyDb = new TinyDB(mCtx);
-        Typeface myTypeface;
-
-        if(tinyDb.getInt("customFontId") == 0) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
-
-        }
-
         if(!currentItem.getFullname().equals("")) {
             viewHolder.memberName.setText(currentItem.getFullname());
-            viewHolder.memberName.setTypeface(myTypeface);
         }
         else {
             viewHolder.memberName.setText(currentItem.getLogin());
-            viewHolder.memberName.setTypeface(myTypeface);
-        }
-
-        if(tinyDb.getInt("themeId") == 1) { //light
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
-        }
-        else { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
     }

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +12,6 @@ import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
 /**
@@ -25,7 +23,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
     private List<UserInfo> watchersList;
     private Context mCtx;
 
-    private static class ViewHolder {
+    private class ViewHolder {
 
         private ImageView memberAvatar;
         private TextView memberName;
@@ -64,7 +62,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
 
         if (finalView == null) {
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_watchers_list, null);
-            viewHolder = new ViewHolder(finalView);
+            viewHolder = new RepoWatchersAdapter.ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
@@ -81,44 +79,11 @@ public class RepoWatchersAdapter extends BaseAdapter {
         UserInfo currentItem = watchersList.get(position);
         Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
 
-        final TinyDB tinyDb = new TinyDB(mCtx);
-        Typeface myTypeface;
-
-        if(tinyDb.getInt("customFontId") == 0) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
-
-        }
-
         if(!currentItem.getFullname().equals("")) {
             viewHolder.memberName.setText(currentItem.getFullname());
-            viewHolder.memberName.setTypeface(myTypeface);
         }
         else {
             viewHolder.memberName.setText(currentItem.getLogin());
-            viewHolder.memberName.setTypeface(myTypeface);
-        }
-
-        if(tinyDb.getInt("themeId") == 1) { //light
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
-        }
-        else { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
     }

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

@@ -91,9 +91,9 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
@@ -104,7 +104,6 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
                         fMenuHelper.setAccessible(true);
                         menuHelper = fMenuHelper.get(popupMenu);
                         argTypes = new Class[] { boolean.class };
-                        assert menuHelper != null;
                         menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
                                 argTypes).invoke(menuHelper, true);
 

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

@@ -88,9 +88,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;

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

@@ -88,9 +88,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.AppThemeConfirmDialog);
+                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
+                    PopupMenu popupMenu = new PopupMenu(context_, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;

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

@@ -2,7 +2,6 @@ package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +12,6 @@ import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.models.UserInfo;
-import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 
 /**
@@ -25,7 +23,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
     private List<UserInfo> teamMembersList;
     private Context mCtx;
 
-    private static class ViewHolder {
+    private class ViewHolder {
 
         private ImageView memberAvatar;
         private TextView memberName;
@@ -65,7 +63,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
 
         if (finalView == null) {
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_team_by_org_list, null);
-            viewHolder = new ViewHolder(finalView);
+            viewHolder = new TeamMembersByOrgAdapter.ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
@@ -82,44 +80,11 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
         UserInfo currentItem = teamMembersList.get(position);
         Picasso.get().load(currentItem.getAvatar()).transform(new RoundedTransformation(8, 0)).resize(180, 180).centerCrop().into(viewHolder.memberAvatar);
 
-        final TinyDB tinyDb = new TinyDB(mCtx);
-        Typeface myTypeface;
-
-        if(tinyDb.getInt("customFontId") == 0) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
-
-        }
-
         if(!currentItem.getFullname().equals("")) {
             viewHolder.memberName.setText(currentItem.getFullname());
-            viewHolder.memberName.setTypeface(myTypeface);
         }
         else {
             viewHolder.memberName.setText(currentItem.getLogin());
-            viewHolder.memberName.setTypeface(myTypeface);
-        }
-
-        if(tinyDb.getInt("themeId") == 1) { //light
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
-        }
-        else { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
     }

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

@@ -68,7 +68,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
 
                     final Context context = v.getContext();
 
-                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
+                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);
 
                     pBuilder.setTitle(R.string.newTeamPermission);
                     pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, new DialogInterface.OnClickListener() {

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

@@ -27,6 +27,7 @@ public class AboutFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View v = inflater.inflate(R.layout.fragment_about, container, false);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleAbout));
 
         TinyDB tinyDb = new TinyDB(getContext());
 

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

@@ -1,57 +0,0 @@
-package org.mian.gitnex.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import org.mian.gitnex.R;
-
-/**
- * Author M M Arif
- */
-
-public class BottomSheetFileViewerFragment extends BottomSheetDialogFragment {
-
-    private BottomSheetFileViewerFragment.BottomSheetListener bmListener;
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-        View v = inflater.inflate(R.layout.bottom_sheet_file_viewer, container, false);
-
-        TextView downloadFile = v.findViewById(R.id.downloadFile);
-
-        downloadFile.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                bmListener.onButtonClicked("downloadFile");
-                dismiss();
-            }
-        });
-
-        return v;
-    }
-
-    public interface BottomSheetListener {
-        void onButtonClicked(String text);
-    }
-
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-
-        try {
-            bmListener = (BottomSheetFileViewerFragment.BottomSheetListener) context;
-        } catch (ClassCastException e) {
-            throw new ClassCastException(context.toString()
-                    + " must implement BottomSheetListener");
-        }
-    }
-
-}

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

@@ -51,8 +51,6 @@ public class ClosedIssuesFragment extends Fragment {
     private int pageSize = 1;
     private TextView noDataIssuesClosed;
     private String issueState = "closed";
-    private int resultLimit = 50;
-    private String requestType = "issues";
 
     @Nullable
     @Override
@@ -88,7 +86,7 @@ public class ClosedIssuesFragment extends Fragment {
                     public void run() {
 
                         swipeRefresh.setRefreshing(false);
-                        loadInitial(instanceToken, repoOwner, repoName, issueState, resultLimit, requestType);
+                        loadInitial(instanceToken, repoOwner, repoName, issueState);
                         adapterClosed.notifyDataChanged();
 
                     }
@@ -107,7 +105,7 @@ public class ClosedIssuesFragment extends Fragment {
                         if(issuesListClosed.size() == 10 || pageSize == 10) {
 
                             int page = (issuesListClosed.size() + 10) / 10;
-                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, issueState, resultLimit, requestType);
+                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, issueState);
 
                         }
                         /*else {
@@ -126,7 +124,7 @@ public class ClosedIssuesFragment extends Fragment {
         recyclerViewClosed.setAdapter(adapterClosed);
 
         apiClosed = IssuesService.createService(ApiInterface.class, instanceUrl, getContext());
-        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit, requestType);
+        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState);
 
         return v;
 
@@ -146,16 +144,16 @@ public class ClosedIssuesFragment extends Fragment {
 
         if(tinyDb.getBoolean("resumeClosedIssues")) {
 
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState, resultLimit, requestType);
+            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, issueState);
             tinyDb.putBoolean("resumeClosedIssues", false);
 
         }
 
     }
 
-    private void loadInitial(String token, String repoOwner, String repoName, String issueState, int resultLimit, String requestType) {
+    private void loadInitial(String token, String repoOwner, String repoName, String issueState) {
 
-        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName,  1, issueState, resultLimit, requestType);
+        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName,  1, issueState);
 
         call.enqueue(new Callback<List<Issues>>() {
 
@@ -195,13 +193,13 @@ public class ClosedIssuesFragment extends Fragment {
 
     }
 
-    private void loadMore(String token, String repoOwner, String repoName, int page, String issueState, int resultLimit, String requestType){
+    private void loadMore(String token, String repoOwner, String repoName, int page, String issueState){
 
         //add loading progress view
         issuesListClosed.add(new Issues("load"));
         adapterClosed.notifyItemInserted((issuesListClosed.size() - 1));
 
-        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName, page, issueState, resultLimit, requestType);
+        Call<List<Issues>> call = apiClosed.getClosedIssues(token, repoOwner, repoName, page, issueState);
 
         call.enqueue(new Callback<List<Issues>>() {
 

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

@@ -17,11 +17,13 @@ import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.adapters.ExploreRepositoriesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.models.ExploreRepositories;
 import org.mian.gitnex.models.UserRepositories;
+import org.mian.gitnex.util.AppUtil;
 import org.mian.gitnex.util.TinyDB;
 import java.util.List;
 import java.util.Objects;
@@ -74,8 +76,11 @@ public class ExploreRepositoriesFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
+        boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
+
         final View v = inflater.inflate(R.layout.fragment_explore_repo, container, false);
         //setHasOptionsMenu(true);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleExplore));
 
         TinyDB tinyDb = new TinyDB(getContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -87,8 +92,6 @@ public class ExploreRepositoriesFragment extends Fragment {
         mProgressBar = v.findViewById(R.id.progress_bar);
         mRecyclerView = v.findViewById(R.id.recyclerViewReposSearch);
 
-        mProgressBar.setVisibility(View.VISIBLE);
-
         searchKeyword.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -103,43 +106,10 @@ public class ExploreRepositoriesFragment extends Fragment {
             }
         });
 
-        int limitDefault = 10;
-        loadDefaultList(instanceUrl, instanceToken, loginUid, repoTypeInclude, sort, order, getContext(), limitDefault);
-
         return v;
 
     }
 
-    private void loadDefaultList(String instanceUrl, String instanceToken, String loginUid, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
-
-        Call<ExploreRepositories> call = RetrofitClient
-                .getInstance(instanceUrl, getContext())
-                .getApiInterface()
-                .queryRepos(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), null, repoTypeInclude, sort, order, limit);
-
-        call.enqueue(new Callback<ExploreRepositories>() {
-
-            @Override
-            public void onResponse(@NonNull Call<ExploreRepositories> call, @NonNull Response<ExploreRepositories> response) {
-
-                if (response.isSuccessful()) {
-                    assert response.body() != null;
-                    getReposList(response.body().getSearchedData(), context);
-                } else {
-                    Log.i("onResponse", String.valueOf(response.code()));
-                }
-
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<ExploreRepositories> call, @NonNull Throwable t) {
-                Log.i("onFailure", Objects.requireNonNull(t.getMessage()));
-            }
-
-        });
-
-    }
-
     private void loadSearchReposList(String instanceUrl, String instanceToken, String loginUid, String searchKeyword, Boolean repoTypeInclude, String sort, String order, final Context context, int limit) {
 
         Call<ExploreRepositories> call = RetrofitClient

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

@@ -140,10 +140,6 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
 
         fileStructure.setText(breadcrumbBuilder);
 
-        String dirName_ = fileStructure.getText().toString();
-        dirName_ = dirName_.startsWith("/") ? dirName_.substring(1) : dirName_;
-        final String finalDirName_ = dirName_;
-
         mBreadcrumbsView.addItem(createItem(dirName));
         mBreadcrumbsView.setCallback(new DefaultBreadcrumbsCallback<BreadcrumbItem>() {
             @Override
@@ -158,10 +154,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
                 String filterDir = fileStructure.getText().toString();
                 String result = filterDir.substring(0, filterDir.indexOf(item.getSelectedItem()));
                 fileStructure.setText(result + item.getSelectedItem());
-
-                String currentIndex = (result + item.getSelectedItem()).substring(1);
-
-                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, currentIndex);
+                fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, fileStructure.getText().toString());
 
             }
 
@@ -171,7 +164,7 @@ public class FilesFragment extends Fragment implements FilesAdapter.FilesAdapter
             }
         });
 
-        fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, finalDirName_);
+        fetchDataAsyncSub(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, fileStructure.getText().toString());
 
     }
 

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

@@ -50,8 +50,6 @@ public class IssuesFragment extends Fragment {
     private Context context;
     private int pageSize = 1;
     private TextView noDataIssues;
-    private int resultLimit = 50;
-    private String requestType = "issues";
 
     @Nullable
     @Override
@@ -87,7 +85,7 @@ public class IssuesFragment extends Fragment {
                     public void run() {
 
                         swipeRefresh.setRefreshing(false);
-                        loadInitial(instanceToken, repoOwner, repoName, resultLimit, requestType);
+                        loadInitial(instanceToken, repoOwner, repoName);
                         adapter.notifyDataChanged();
 
                     }
@@ -106,7 +104,7 @@ public class IssuesFragment extends Fragment {
                         if(issuesList.size() == 10 || pageSize == 10) {
 
                             int page = (issuesList.size() + 10) / 10;
-                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, resultLimit, requestType);
+                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page);
 
                         }
                         /*else {
@@ -125,7 +123,7 @@ public class IssuesFragment extends Fragment {
         recyclerView.setAdapter(adapter);
 
         api = IssuesService.createService(ApiInterface.class, instanceUrl, getContext());
-        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType);
+        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
 
         return v;
 
@@ -145,16 +143,16 @@ public class IssuesFragment extends Fragment {
 
         if(tinyDb.getBoolean("resumeIssues")) {
 
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType);
+            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName);
             tinyDb.putBoolean("resumeIssues", false);
 
         }
 
     }
 
-    private void loadInitial(String token, String repoOwner, String repoName, int resultLimit, String requestType) {
+    private void loadInitial(String token, String repoOwner, String repoName) {
 
-        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName,  1, resultLimit, requestType);
+        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName,  1);
 
         call.enqueue(new Callback<List<Issues>>() {
 
@@ -194,13 +192,13 @@ public class IssuesFragment extends Fragment {
 
     }
 
-    private void loadMore(String token, String repoOwner, String repoName, int page, int resultLimit, String requestType){
+    private void loadMore(String token, String repoOwner, String repoName, int page){
 
         //add loading progress view
         issuesList.add(new Issues("load"));
         adapter.notifyItemInserted((issuesList.size() - 1));
 
-        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, page, resultLimit, requestType);
+        Call<List<Issues>> call = api.getIssues(token, repoOwner, repoName, page);
 
         call.enqueue(new Callback<List<Issues>>() {
 

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

@@ -24,6 +24,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.NewRepoActivity;
 import org.mian.gitnex.adapters.MyReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
@@ -48,9 +49,6 @@ public class MyRepositoriesFragment extends Fragment {
     private ImageView createNewRepo;
     private TextView noDataMyRepo;
 
-    private int pageSize = 1;
-    private int resultLimit = 50;
-
     private String mParam1;
     private String mParam2;
 
@@ -85,6 +83,7 @@ public class MyRepositoriesFragment extends Fragment {
 
         final View v = inflater.inflate(R.layout.fragment_my_repositories, container, false);
         setHasOptionsMenu(true);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleMyRepos));
 
         TinyDB tinyDb = new TinyDB(getContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -140,13 +139,13 @@ public class MyRepositoriesFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
+                        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext());
                     }
                 }, 50);
             }
         });
 
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, pageSize, resultLimit);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin);
 
         return v;
 
@@ -161,18 +160,15 @@ public class MyRepositoriesFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
         final String userLogin =  tinyDb.getString("userLogin");
 
-        if(tinyDb.getBoolean("repoCreated")) {
-            MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext(),  pageSize, resultLimit);
-            tinyDb.putBoolean("repoCreated", false);
-        }
+        MyRepositoriesViewModel.loadMyReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), userLogin, getContext());
 
     }
 
-    private void fetchDataAsync(String instanceUrl, String instanceToken, String userLogin, int  pageSize, int resultLimit) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String userLogin) {
 
         MyRepositoriesViewModel myRepoModel = new ViewModelProvider(this).get(MyRepositoriesViewModel.class);
 
-        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
+        myRepoModel.getCurrentUserRepositories(instanceUrl, instanceToken, userLogin, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
             @Override
             public void onChanged(@Nullable List<UserRepositories> myReposListMain) {
                 adapter = new MyReposListAdapter(getContext(), myReposListMain);

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

@@ -23,6 +23,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.NewOrganizationActivity;
 import org.mian.gitnex.adapters.OrganizationsListAdapter;
 import org.mian.gitnex.helpers.Authorization;
@@ -49,6 +50,7 @@ public class OrganizationsFragment extends Fragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleOrganizations));
         final View v = inflater.inflate(R.layout.fragment_organizations, container, false);
         setHasOptionsMenu(true);
 

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

@@ -1,7 +1,6 @@
 package org.mian.gitnex.fragments;
 
 import android.content.Context;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -38,6 +37,7 @@ public class ProfileFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View v = inflater.inflate(R.layout.fragment_profile, container, false);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleProfile));
         setHasOptionsMenu(true);
 
         TinyDB tinyDb = new TinyDB(getContext());
@@ -57,43 +57,8 @@ public class ProfileFragment extends Fragment {
         ViewPager mViewPager = v.findViewById(R.id.container);
         mViewPager.setAdapter(mSectionsPagerAdapter);
 
-        Typeface myTypeface;
-        if(tinyDb.getInt("customFontId") == 0) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 1) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/manroperegular.ttf");
-
-        }
-        else if (tinyDb.getInt("customFontId") == 2) {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/sourcecodeproregular.ttf");
-
-        }
-        else {
-
-            myTypeface = Typeface.createFromAsset(Objects.requireNonNull(getContext()).getAssets(), "fonts/roboto.ttf");
-
-        }
-
         TabLayout tabLayout = v.findViewById(R.id.tabs);
 
-        ViewGroup vg = (ViewGroup) tabLayout.getChildAt(0);
-        int tabsCount = vg.getChildCount();
-        for (int j = 0; j < tabsCount; j++) {
-            ViewGroup vgTab = (ViewGroup) vg.getChildAt(j);
-            int tabChildCount = vgTab.getChildCount();
-            for (int i = 0; i < tabChildCount; i++) {
-                View tabViewChild = vgTab.getChildAt(i);
-                if (tabViewChild instanceof TextView) {
-                    ((TextView) tabViewChild).setTypeface(myTypeface);
-                }
-            }
-        }
-
         mViewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout));
         tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 

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

@@ -52,7 +52,6 @@ public class PullRequestsFragment extends Fragment {
     private int pageSize = 1;
     private TextView noData;
     private String prState = "open";
-    private int resultLimit = 50;
 
     @Nullable
     @Override
@@ -88,7 +87,7 @@ public class PullRequestsFragment extends Fragment {
                     public void run() {
 
                         swipeRefresh.setRefreshing(false);
-                        loadInitial(instanceToken, repoOwner, repoName, pageSize, prState, resultLimit);
+                        loadInitial(instanceToken, repoOwner, repoName, pageSize, prState);
                         adapter.notifyDataChanged();
 
                     }
@@ -107,7 +106,7 @@ public class PullRequestsFragment extends Fragment {
                         if(prList.size() == 10 || pageSize == 10) {
 
                             int page = (prList.size() + 10) / 10;
-                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, prState, resultLimit);
+                            loadMore(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, page, prState);
 
                         }
                         /*else {
@@ -129,7 +128,7 @@ public class PullRequestsFragment extends Fragment {
         recyclerView.setAdapter(adapter);
 
         apiPR = PullRequestsService.createService(ApiInterface.class, instanceUrl, getContext());
-        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
+        loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState);
 
         return v;
 
@@ -149,16 +148,16 @@ public class PullRequestsFragment extends Fragment {
 
         if(tinyDb.getBoolean("resumePullRequests")) {
 
-            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState, resultLimit);
+            loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, prState);
             tinyDb.putBoolean("resumePullRequests", false);
 
         }
 
     }
 
-    private void loadInitial(String token, String repoOwner, String repoName, int page, String prState, int resultLimit) {
+    private void loadInitial(String token, String repoOwner, String repoName, int page, String prState) {
 
-        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
+        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState);
 
         call.enqueue(new Callback<List<PullRequests>>() {
 
@@ -200,13 +199,13 @@ public class PullRequestsFragment extends Fragment {
 
     }
 
-    private void loadMore(String token, String repoOwner, String repoName, int page, String prState, int resultLimit){
+    private void loadMore(String token, String repoOwner, String repoName, int page, String prState){
 
         //add loading progress view
         prList.add(new PullRequests("load"));
         adapter.notifyItemInserted((prList.size() - 1));
 
-        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState, resultLimit);
+        Call<List<PullRequests>> call = apiPR.getPullRequests(token, repoOwner, repoName, page, prState);
 
         call.enqueue(new Callback<List<PullRequests>>() {
 

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

@@ -45,8 +45,6 @@ public class RepositoriesByOrgFragment extends Fragment {
     private TextView noData;
     private static String orgNameF = "param2";
     private String orgName;
-    private int pageSize = 1;
-    private int resultLimit = 50;
 
     public RepositoriesByOrgFragment() {
     }
@@ -99,13 +97,13 @@ public class RepositoriesByOrgFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
+                        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext());
                     }
                 }, 200);
             }
         });
 
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, pageSize, resultLimit);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName);
 
         return v;
     }
@@ -119,18 +117,15 @@ public class RepositoriesByOrgFragment extends Fragment {
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        if(tinyDb.getBoolean("repoCreated")) {
-            RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext(), pageSize, resultLimit);
-            tinyDb.putBoolean("repoCreated", false);
-        }
+        RepositoriesByOrgViewModel.loadOrgRepos(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), orgName, getContext());
 
     }
 
-    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner, int pageSize, int resultLimit) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken, String owner) {
 
         RepositoriesByOrgViewModel orgRepoModel = new ViewModelProvider(this).get(RepositoriesByOrgViewModel.class);
 
-        orgRepoModel.getRepositoriesByOrg(instanceUrl, instanceToken, owner, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
+        orgRepoModel.getRepositoriesByOrg(instanceUrl, instanceToken, owner, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
             @Override
             public void onChanged(@Nullable List<UserRepositories> orgReposListMain) {
                 adapter = new RepositoriesByOrgAdapter(getContext(), orgReposListMain);

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

@@ -22,6 +22,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.NewRepoActivity;
 import org.mian.gitnex.adapters.ReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
@@ -44,8 +45,6 @@ public class RepositoriesFragment extends Fragment {
     private ReposListAdapter adapter;
     private ImageView createNewRepo;
     private TextView noDataRepo;
-    private int pageSize = 1;
-    private int resultLimit = 50;
 
     @Nullable
     @Override
@@ -55,6 +54,7 @@ public class RepositoriesFragment extends Fragment {
 
         final View v = inflater.inflate(R.layout.fragment_repositories, container, false);
         setHasOptionsMenu(true);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleRepositories));
 
         TinyDB tinyDb = new TinyDB(getContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -109,13 +109,13 @@ public class RepositoriesFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+                        RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
                     }
                 }, 50);
             }
         });
 
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), pageSize, resultLimit);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 
         return v;
 
@@ -130,16 +130,16 @@ public class RepositoriesFragment extends Fragment {
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
         if(tinyDb.getBoolean("repoCreated")) {
-            RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+            RepositoriesListViewModel.loadReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
             tinyDb.putBoolean("repoCreated", false);
         }
     }
 
-    private void fetchDataAsync(String instanceUrl, String instanceToken, int pageSize, int resultLimit) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken) {
 
         RepositoriesListViewModel repoModel = new ViewModelProvider(this).get(RepositoriesListViewModel.class);
 
-        repoModel.getUserRepositories(instanceUrl, instanceToken, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
+        repoModel.getUserRepositories(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
             @Override
             public void onChanged(@Nullable List<UserRepositories> reposListMain) {
                 adapter = new ReposListAdapter(getContext(), reposListMain);

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

@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.util.TinyDB;
 import java.util.Objects;
@@ -29,7 +30,7 @@ public class SettingsFragment extends Fragment {
 
     private Context ctx = null;
 
-    private static String[] langList = {"Arabic", "Chinese", "English", "Finnish", "French", "German", "Italian", "Latvian", "Persian", "Portuguese/Brazilian", "Russian", "Serbian", "Turkish", "Ukrainian"};
+    private static String[] langList = {"Arabic", "Chinese", "English", "Finnish", "French", "German", "Italian", "Persian", "Portuguese/Brazilian", "Russian", "Serbian", "Turkish", "Ukrainian"};
     private static int langSelectedChoice = 0;
 
     private static String[] timeList = {"Pretty", "Normal"};
@@ -41,16 +42,11 @@ public class SettingsFragment extends Fragment {
     private static String[] homeScreenList = {"My Repositories", "Starred Repositories", "Organizations", "Repositories", "Profile"};
     private static int homeScreenSelectedChoice = 0;
 
-    private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
-    private static int customFontSelectedChoice = 0;
-
-    private static String[] themeList = {"Dark", "Light"};
-    private static int themeSelectedChoice = 0;
-
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleSettings));
         View v = inflater.inflate(R.layout.fragment_settings, container, false);
         final TinyDB tinyDb = new TinyDB(getContext());
 
@@ -58,18 +54,13 @@ public class SettingsFragment extends Fragment {
         final TextView tvDateTimeSelected = v.findViewById(R.id.tvDateTimeSelected); // setter for time
         final TextView codeBlockSelected = v.findViewById(R.id.codeBlockSelected); // setter for code block
         final TextView homeScreenSelected = v.findViewById(R.id.homeScreenSelected); // setter for home screen
-        final TextView customFontSelected = v.findViewById(R.id.customFontSelected); // setter for custom font
-        final TextView themeSelected = v.findViewById(R.id.themeSelected); // setter for theme
 
         LinearLayout langFrame = v.findViewById(R.id.langFrame);
         LinearLayout timeFrame = v.findViewById(R.id.timeFrame);
         LinearLayout codeBlockFrame = v.findViewById(R.id.codeBlockFrame);
         LinearLayout homeScreenFrame = v.findViewById(R.id.homeScreenFrame);
-        LinearLayout customFontFrame = v.findViewById(R.id.customFontFrame);
-        LinearLayout themeFrame = v.findViewById(R.id.themeSelectionFrame);
 
         Switch issuesSwitch =  v.findViewById(R.id.switchIssuesBadge);
-        Switch pdfModeSwitch =  v.findViewById(R.id.switchPdfMode);
         TextView helpTranslate = v.findViewById(R.id.helpTranslate);
 
         helpTranslate.setOnClickListener(new View.OnClickListener() {
@@ -98,14 +89,6 @@ public class SettingsFragment extends Fragment {
             homeScreenSelected.setText(tinyDb.getString("homeScreenStr"));
         }
 
-        if(!tinyDb.getString("customFontStr").isEmpty()) {
-            customFontSelected.setText(tinyDb.getString("customFontStr"));
-        }
-
-        if(!tinyDb.getString("themeStr").isEmpty()) {
-            themeSelected.setText(tinyDb.getString("themeStr"));
-        }
-
         if(langSelectedChoice == 0) {
             langSelectedChoice = tinyDb.getInt("langId");
         }
@@ -122,27 +105,9 @@ public class SettingsFragment extends Fragment {
             homeScreenSelectedChoice = tinyDb.getInt("homeScreenId");
         }
 
-        if(customFontSelectedChoice == 0) {
-            customFontSelectedChoice = tinyDb.getInt("customFontId");
-        }
-
-        if(themeSelectedChoice == 0) {
-            themeSelectedChoice = tinyDb.getInt("themeId");
-        }
-
         if(tinyDb.getBoolean("enableCounterIssueBadge")) {
             issuesSwitch.setChecked(true);
         }
-        else {
-            issuesSwitch.setChecked(false);
-        }
-
-        if(tinyDb.getBoolean("enablePdfMode")) {
-            pdfModeSwitch.setChecked(true);
-        }
-        else {
-            pdfModeSwitch.setChecked(false);
-        }
 
         // issues badge switcher
         issuesSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -159,103 +124,12 @@ public class SettingsFragment extends Fragment {
             }
         });
 
-        // pdf night mode switcher
-        pdfModeSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    tinyDb.putBoolean("enablePdfMode", true);
-                    tinyDb.putString("enablePdfModeInit", "yes");
-                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-                } else {
-                    tinyDb.putBoolean("enablePdfMode", false);
-                    tinyDb.putString("enablePdfModeInit", "yes");
-                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-                }
-            }
-        });
-
-        // theme selection dialog
-        themeFrame.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                AlertDialog.Builder tsBuilder = new AlertDialog.Builder(ctx);
-
-                tsBuilder.setTitle(R.string.themeSelectorDialogTitle);
-                if(themeSelectedChoice != -1) {
-                    tsBuilder.setCancelable(true);
-                }
-                else {
-                    tsBuilder.setCancelable(false);
-                }
-
-                tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterfaceTheme, int i) {
-
-                        themeSelectedChoice = i;
-                        themeSelected.setText(themeList[i]);
-                        tinyDb.putString("themeStr", themeList[i]);
-                        tinyDb.putInt("themeId", i);
-
-                        Objects.requireNonNull(getActivity()).recreate();
-                        getActivity().overridePendingTransition(0, 0);
-                        dialogInterfaceTheme.dismiss();
-                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-
-                    }
-                });
-
-                AlertDialog cfDialog = tsBuilder.create();
-                cfDialog.show();
-
-            }
-        });
-
-        // custom font dialog
-        customFontFrame.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx);
-
-                cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
-                if(customFontSelectedChoice != -1) {
-                    cfBuilder.setCancelable(true);
-                }
-                else {
-                    cfBuilder.setCancelable(false);
-                }
-
-                cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterfaceCustomFont, int i) {
-
-                        customFontSelectedChoice = i;
-                        customFontSelected.setText(customFontList[i]);
-                        tinyDb.putString("customFontStr", customFontList[i]);
-                        tinyDb.putInt("customFontId", i);
-
-                        Objects.requireNonNull(getActivity()).recreate();
-                        getActivity().overridePendingTransition(0, 0);
-                        dialogInterfaceCustomFont.dismiss();
-                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
-
-                    }
-                });
-
-                AlertDialog cfDialog = cfBuilder.create();
-                cfDialog.show();
-
-            }
-        });
-
         // home screen dialog
         homeScreenFrame.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
 
                 hsBuilder.setTitle(R.string.settingshomeScreenSelectorDialogTitle);
                 if(homeScreenSelectedChoice != -1) {
@@ -291,7 +165,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
 
                 cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
                 if(codeBlockSelectedChoice != -1) {
@@ -350,7 +224,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
 
                 lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
                 if(langSelectedChoice != -1) {
@@ -388,9 +262,6 @@ public class SettingsFragment extends Fragment {
                             case "Italian":
                                 tinyDb.putString("locale", "it");
                                 break;
-                            case "Latvian":
-                                tinyDb.putString("locale", "lv");
-                                break;
                             case "Persian":
                                 tinyDb.putString("locale", "fa");
                                 break;
@@ -439,7 +310,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx);
+                AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
 
                 tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
                 if(timeSelectedChoice != -1) {

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

@@ -24,6 +24,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import org.mian.gitnex.R;
+import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.activities.NewRepoActivity;
 import org.mian.gitnex.adapters.StarredReposListAdapter;
 import org.mian.gitnex.helpers.Authorization;
@@ -47,8 +48,6 @@ public class StarredRepositoriesFragment extends Fragment {
     private StarredReposListAdapter adapter;
     private ImageView createNewRepo;
     private TextView noData;
-    private int pageSize = 1;
-    private int resultLimit = 50;
 
     private OnFragmentInteractionListener mListener;
 
@@ -80,6 +79,7 @@ public class StarredRepositoriesFragment extends Fragment {
         View v = inflater.inflate(R.layout.fragment_starred_repositories, container, false);
         boolean connToInternet = AppUtil.haveNetworkConnection(Objects.requireNonNull(getContext()));
         setHasOptionsMenu(true);
+        ((MainActivity) Objects.requireNonNull(getActivity())).setActionBarTitle(getResources().getString(R.string.pageTitleStarredRepos));
 
         TinyDB tinyDb = new TinyDB(getContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
@@ -134,13 +134,13 @@ public class StarredRepositoriesFragment extends Fragment {
                     @Override
                     public void run() {
                         swipeRefresh.setRefreshing(false);
-                        StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
+                        StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
                     }
                 }, 50);
             }
         });
 
-        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), pageSize, resultLimit);
+        fetchDataAsync(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken));
 
         return v;
     }
@@ -153,18 +153,15 @@ public class StarredRepositoriesFragment extends Fragment {
         final String loginUid = tinyDb.getString("loginUid");
         final String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
 
-        if(tinyDb.getBoolean("repoCreated")) {
-            StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext(), pageSize, resultLimit);
-            tinyDb.putBoolean("repoCreated", false);
-        }
+        StarredRepositoriesViewModel.loadStarredReposList(instanceUrl, Authorization.returnAuthentication(getContext(), loginUid, instanceToken), getContext());
 
     }
 
-    private void fetchDataAsync(String instanceUrl, String instanceToken, int pageSize, int resultLimit) {
+    private void fetchDataAsync(String instanceUrl, String instanceToken) {
 
         StarredRepositoriesViewModel starredRepoModel = new ViewModelProvider(this).get(StarredRepositoriesViewModel.class);
 
-        starredRepoModel.getUserStarredRepositories(instanceUrl, instanceToken, getContext(), pageSize, resultLimit).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
+        starredRepoModel.getUserStarredRepositories(instanceUrl, instanceToken, getContext()).observe(getViewLifecycleOwner(), new Observer<List<UserRepositories>>() {
             @Override
             public void onChanged(@Nullable List<UserRepositories> starredReposListMain) {
                 adapter = new StarredReposListAdapter(getContext(), starredReposListMain);

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

@@ -18,7 +18,7 @@ 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, R.style.confirmDialog);
 
         alertDialogBuilder
                 .setTitle(title)
@@ -52,7 +52,7 @@ public class AlertDialogs {
 
     public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String title, String message, String positiveButton, String negativeButton) {
 
-        new AlertDialog.Builder(context)
+        new AlertDialog.Builder(context, R.style.confirmDialog)
             .setTitle(title + labelTitle)
             .setMessage(message)
             .setIcon(R.drawable.ic_delete)
@@ -71,7 +71,7 @@ public class AlertDialogs {
 
     public static void collaboratorRemoveDialog(final Context context, final String userNameMain, String title, String message, String positiveButton, String negativeButton, final String searchKeyword) {
 
-        new AlertDialog.Builder(context)
+        new AlertDialog.Builder(context, R.style.confirmDialog)
                 .setTitle(title + userNameMain)
                 .setMessage(message)
                 .setIcon(R.drawable.ic_warning)

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

@@ -1,43 +0,0 @@
-package org.mian.gitnex.helpers;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.util.Log;
-import java.lang.reflect.Field;
-import java.util.Objects;
-
-/**
- * Author M M Arif
- */
-
-public class FontsOverride {
-
-    public static void setDefaultFont(Context context,
-                                      String staticTypefaceFieldName, String fontAssetName) {
-
-        final Typeface regular = Typeface.createFromAsset(context.getAssets(),
-                fontAssetName);
-        replaceFont(staticTypefaceFieldName, regular);
-
-    }
-
-    private static void replaceFont(String staticTypefaceFieldName,
-                                    final Typeface newTypeface) {
-
-        try {
-
-            final Field staticField = Typeface.class
-                    .getDeclaredField(staticTypefaceFieldName);
-            staticField.setAccessible(true);
-            staticField.set(null, newTypeface);
-
-        }
-        catch (NoSuchFieldException | IllegalAccessException e) {
-
-            Log.e("error", Objects.requireNonNull(e.getMessage()));
-
-        }
-
-    }
-
-}

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

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

app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java

@@ -8,7 +8,7 @@ import org.mian.gitnex.models.Files;
 import org.mian.gitnex.models.MergePullRequest;
 import org.mian.gitnex.models.NewFile;
 import org.mian.gitnex.models.PullRequests;
-import org.mian.gitnex.models.UpdateIssueAssignees;
+import org.mian.gitnex.models.UpdateIssueAssignee;
 import org.mian.gitnex.models.UpdateIssueState;
 import org.mian.gitnex.models.Collaborators;
 import org.mian.gitnex.models.CreateIssue;
@@ -81,7 +81,7 @@ public interface ApiInterface {
     Call<List<OrgOwner>> getOrgOwners(@Header("Authorization") String token);
 
     @GET("user/repos") // get user repositories
-    Call<List<UserRepositories>> getUserRepositories(@Header("Authorization") String token, @Query("page") int page, @Query("limit") int limit);
+    Call<List<UserRepositories>> getUserRepositories(@Header("Authorization") String token);
 
     @POST("user/repos") // create new repository
     Call<OrganizationRepository> createNewUserRepository(@Header("Authorization") String token, @Body OrganizationRepository jsonStr);
@@ -90,10 +90,10 @@ public interface ApiInterface {
     Call<UserRepositories> getUserRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
 
     @GET("repos/{owner}/{repo}/issues") // get issues by repo
-    Call<List<Issues>> getIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("limit") int limit, @Query("type") String requestType);
+    Call<List<Issues>> getIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page);
 
     @GET("repos/{owner}/{repo}/issues") // get closed issues by repo
-    Call<List<Issues>> getClosedIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String issueState, @Query("limit") int limit, @Query("type") String requestType);
+    Call<List<Issues>> getClosedIssues(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String issueState);
 
     @GET("repos/{owner}/{repo}/issues/{index}") // get issue by id
     Call<Issues> getIssueByIndex(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int issueIndex);
@@ -126,7 +126,7 @@ public interface ApiInterface {
     Call<List<Labels>> getlabels(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
 
     @GET("users/{username}/repos") // get current logged in user repositories
-    Call<List<UserRepositories>> getCurrentUserRepositories(@Header("Authorization") String token, @Path("username") String username, @Query("page") int page, @Query("limit") int limit);
+    Call<List<UserRepositories>> getCurrentUserRepositories(@Header("Authorization") String token, @Path("username") String username);
 
     @POST("repos/{owner}/{repo}/labels") // create label
     Call<CreateLabel> createLabel(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Body CreateLabel jsonStr);
@@ -138,10 +138,10 @@ public interface ApiInterface {
     Call<CreateLabel> patchLabel(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int labelIndex, @Body CreateLabel jsonStr);
 
     @GET("user/starred") // get user starred repositories
-    Call<List<UserRepositories>> getUserStarredRepos(@Header("Authorization") String token, @Query("page") int page, @Query("limit") int limit);
+    Call<List<UserRepositories>> getUserStarredRepos(@Header("Authorization") String token);
 
     @GET("orgs/{orgName}/repos") // get repositories by org
-    Call<List<UserRepositories>> getReposByOrg(@Header("Authorization") String token, @Path("orgName") String orgName, @Query("page") int page, @Query("limit") int limit);
+    Call<List<UserRepositories>> getReposByOrg(@Header("Authorization") String token, @Path("orgName") String orgName);
 
     @GET("orgs/{orgName}/teams") // get teams by org
     Call<List<Teams>> getTeamsByOrg(@Header("Authorization") String token, @Path("orgName") String orgName);
@@ -207,7 +207,7 @@ public interface ApiInterface {
     Call<Releases> createNewRelease(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Body Releases jsonStr);
 
     @PATCH("repos/{owner}/{repo}/issues/{issueIndex}") // patch issue assignees
-    Call<JsonElement> patchIssueAssignees(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("issueIndex") int issueIndex, @Body UpdateIssueAssignees jsonStr);
+    Call<JsonElement> patchIssueAssignee(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("issueIndex") int issueIndex, @Body UpdateIssueAssignee jsonStr);
 
     @GET("admin/users") // get all users
     Call<List<UserInfo>> adminGetUsers(@Header("Authorization") String token);
@@ -252,7 +252,7 @@ public interface ApiInterface {
     Call<JsonElement> unWatchRepository(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName);
 
     @GET("repos/{owner}/{repo}/pulls") // get repository pull requests
-    Call<List<PullRequests>> getPullRequests(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String state, @Query("limit") int limit);
+    Call<List<PullRequests>> getPullRequests(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("state") String state);
 
     @GET("{owner}/{repo}/pulls/{filename}") // get pull diff file contents
     Call<ResponseBody> getFileDiffContents(@Path("owner") String owner, @Path("repo") String repo, @Path("filename") String fileName);

app/src/main/java/org/mian/gitnex/models/CreateIssue.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 public class CreateIssue {
 
+    private String assignee;
     private String body;
     private boolean closed;
     private String due_date;
@@ -18,6 +19,7 @@ public class CreateIssue {
     private int[] labels;
 
     public CreateIssue(String assignee, String body, boolean closed, String due_date, int milestone, String title, List<String> assignees, int[] labels) {
+        this.assignee = assignee;
         this.body = body;
         this.closed = closed;
         this.due_date = due_date;

app/src/main/java/org/mian/gitnex/models/Issues.java

@@ -25,6 +25,7 @@ public class Issues {
     private List<labelsObject> labels;
     private pullRequestObject pull_request;
     private milestoneObject milestone;
+    private assigneeObject assignee;
     private List<assigneesObject> assignees;
 
     public Issues(String body) {
@@ -153,6 +154,45 @@ public class Issues {
         }
     }
 
+    public class assigneeObject {
+
+        private int id;
+        private String login;
+        private String full_name;
+        private String email;
+        private String avatar_url;
+        private String language;
+        private String username;
+
+        public int getId() {
+            return id;
+        }
+
+        public String getLogin() {
+            return login;
+        }
+
+        public String getFull_name() {
+            return full_name;
+        }
+
+        public String getEmail() {
+            return email;
+        }
+
+        public String getAvatar_url() {
+            return avatar_url;
+        }
+
+        public String getLanguage() {
+            return language;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+    }
+
     public class assigneesObject {
 
         private int id;
@@ -252,6 +292,10 @@ public class Issues {
         return milestone;
     }
 
+    public assigneeObject getAssignee() {
+        return assignee;
+    }
+
     public List<assigneesObject> getAssignees() {
         return assignees;
     }

app/src/main/java/org/mian/gitnex/models/UpdateIssueAssignee.java

@@ -6,11 +6,11 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class UpdateIssueAssignees {
+public class UpdateIssueAssignee {
 
     private List<String> assignees;
 
-    public UpdateIssueAssignees(List<String> assignees) {
+    public UpdateIssueAssignee(List<String> assignees) {
         this.assignees = assignees;
     }
 

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

@@ -213,21 +213,12 @@ public class AppUtil {
 
     public Boolean sourceCodeExtension(String ext) {
 
-        String[] extValues = new String[] {"md", "json", "java", "go", "php", "c", "cc", "cpp", "h", "cxx", "cyc", "m",
+        String[] extValues = new String[] {"md", "json", "java", "go", "php", "c", "cc", "cpp", "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"};
-
-        return Arrays.asList(extValues).contains(ext);
-
-    }
-
-    public Boolean pdfExtension(String ext) {
-
-        String[] extValues = new String[] {"pdf"};
+                "html", "htm", "volt", "ini", "htaccess", "conf", "gitignore", "gradle", "txt", "properties", "bat"};
 
         return Arrays.asList(extValues).contains(ext);
 
@@ -241,16 +232,6 @@ public class AppUtil {
 
     }
 
-    public Boolean excludeFilesInFileViewerExtension(String ext) {
-
-        String[] extValues = new String[] {"doc", "docx", "ppt", "pptx", "xls", "xlsx", "xlsm", "odt",
-                "ott", "odf", "ods", "ots", "exe", "jar", "odg", "otg", "odp", "otp", "bin", "dmg", "psd",
-                "xcf"};
-
-        return Arrays.asList(extValues).contains(ext);
-
-    }
-
     public String getLastCharactersOfWord( String str, int count ) {
 
         return str.substring(str.length() - count);

app/src/main/java/org/mian/gitnex/viewmodels/MyRepositoriesViewModel.java

@@ -21,22 +21,22 @@ public class MyRepositoriesViewModel extends ViewModel {
 
     private static MutableLiveData<List<UserRepositories>> myReposList;
 
-    public LiveData<List<UserRepositories>> getCurrentUserRepositories(String instanceUrl, String token, String username, Context ctx, int page, int limit) {
+    public LiveData<List<UserRepositories>> getCurrentUserRepositories(String instanceUrl, String token, String username, Context ctx) {
 
         //if (myReposList == null) {
         myReposList = new MutableLiveData<>();
-        loadMyReposList(instanceUrl, token, username, ctx, page, limit);
+        loadMyReposList(instanceUrl, token, username, ctx);
         //}
 
         return myReposList;
     }
 
-    public static void loadMyReposList(String instanceUrl, String token, String username, Context ctx, int page, int limit) {
+    public static void loadMyReposList(String instanceUrl, String token, String username, Context ctx) {
 
         Call<List<UserRepositories>> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getCurrentUserRepositories(token, username, page, limit);
+                .getCurrentUserRepositories(token, username);
 
         call.enqueue(new Callback<List<UserRepositories>>() {
 

app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesByOrgViewModel.java

@@ -21,20 +21,20 @@ public class RepositoriesByOrgViewModel extends ViewModel {
 
     private static MutableLiveData<List<UserRepositories>> orgReposList;
 
-    public LiveData<List<UserRepositories>> getRepositoriesByOrg(String instanceUrl, String token, String orgName, Context ctx, int page, int limit) {
+    public LiveData<List<UserRepositories>> getRepositoriesByOrg(String instanceUrl, String token, String orgName, Context ctx) {
 
         orgReposList = new MutableLiveData<>();
-        loadOrgRepos(instanceUrl, token, orgName, ctx, page, limit);
+        loadOrgRepos(instanceUrl, token, orgName, ctx);
 
         return orgReposList;
     }
 
-    public static void loadOrgRepos(String instanceUrl, String token, String orgName, Context ctx, int page, int limit) {
+    public static void loadOrgRepos(String instanceUrl, String token, String orgName, Context ctx) {
 
         Call<List<UserRepositories>> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getReposByOrg(token, orgName, page, limit);
+                .getReposByOrg(token, orgName);
 
         call.enqueue(new Callback<List<UserRepositories>>() {
 

app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesListViewModel.java

@@ -21,22 +21,22 @@ public class RepositoriesListViewModel extends ViewModel {
 
     private static MutableLiveData<List<UserRepositories>> reposList;
 
-    public LiveData<List<UserRepositories>> getUserRepositories(String instanceUrl, String token, Context ctx, int page, int limit) {
+    public LiveData<List<UserRepositories>> getUserRepositories(String instanceUrl, String token, Context ctx) {
 
         //if (reposList == null) {
             reposList = new MutableLiveData<>();
-            loadReposList(instanceUrl, token, ctx, page, limit);
+            loadReposList(instanceUrl, token, ctx);
         //}
 
         return reposList;
     }
 
-    public static void loadReposList(String instanceUrl, String token, Context ctx, int page, int limit) {
+    public static void loadReposList(String instanceUrl, String token, Context ctx) {
 
         Call<List<UserRepositories>> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getUserRepositories(token, page, limit);
+                .getUserRepositories(token);
 
         call.enqueue(new Callback<List<UserRepositories>>() {
 

app/src/main/java/org/mian/gitnex/viewmodels/StarredRepositoriesViewModel.java

@@ -21,20 +21,20 @@ public class StarredRepositoriesViewModel extends ViewModel {
 
     private static MutableLiveData<List<UserRepositories>> reposList;
 
-    public LiveData<List<UserRepositories>> getUserStarredRepositories(String instanceUrl, String token, Context ctx, int page, int limit) {
+    public LiveData<List<UserRepositories>> getUserStarredRepositories(String instanceUrl, String token, Context ctx) {
 
         reposList = new MutableLiveData<>();
-        loadStarredReposList(instanceUrl, token, ctx, page, limit);
+        loadStarredReposList(instanceUrl, token, ctx);
 
         return reposList;
     }
 
-    public static void loadStarredReposList(String instanceUrl, String token, Context ctx, int page, int limit) {
+    public static void loadStarredReposList(String instanceUrl, String token, Context ctx) {
 
         Call<List<UserRepositories>> call = RetrofitClient
                 .getInstance(instanceUrl, ctx)
                 .getApiInterface()
-                .getUserStarredRepos(token, page, limit);
+                .getUserStarredRepos(token);
 
         call.enqueue(new Callback<List<UserRepositories>>() {
 

app/src/main/res/drawable-v23/spinner.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
 <item>
-    <shape>
+    <shape
+        xmlns:android="http://schemas.android.com/apk/res/android">
 
         <solid
             android:color="@color/inputBackground">

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

@@ -1,5 +1,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <solid
-        android:color="@color/darkGreen"/>
+        android:color="@color/lightBlue"/>
 </shape>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>

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

@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#368F73" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2h-1L18,1h-2zM19,19L5,19L5,8h14v11z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="16dp" android:tint="#368f73"
+<vector android:height="16dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="20dp" android:tint="#368f73"
+<vector android:height="20dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>

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

@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#368F73" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
-</vector>

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

@@ -6,6 +6,6 @@
     android:viewportHeight="16"
     tools:ignore="VectorRaster">
   <path
-      android:fillColor="#368f73"
+      android:fillColor="#FFFFFF"
       android:pathData="m13.707,3.293 l-3,-3c-0.1875,-0.1875 -0.4419,-0.293 -0.707,-0.293h-7c-0.5522,0 -1,0.4478 -1,1v14c0,0.5527 0.4478,1 1,1h10c0.5522,0 1,-0.4473 1,-1v-11c0,-0.2651 -0.1055,-0.5195 -0.293,-0.707zM8,12h-3v-2h3zM11,9h-6v-2h6zM11,4c-0.5523,0 -1,-0.4478 -1,-1v-2l3,3z"/>
 </vector>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>