From 51ab3f7a92dd5267165efb53ee6cb61ad25ac6dc Mon Sep 17 00:00:00 2001 From: M M Arif Date: Thu, 5 Mar 2020 00:37:28 +0500 Subject: [PATCH] updated all the layouts and activities --- .../AddCollaboratorToRepositoryActivity.java | 12 ++-- .../AddRemoveAssigneesActivity.java | 11 ++-- .../activities/AddRemoveLabelsActivity.java | 11 ++-- .../activities/AdminGetUsersActivity.java | 11 ++-- .../activities/CreateIssueActivity.java | 12 ++-- .../activities/CreateLabelActivity.java | 11 ++-- .../activities/CreateNewUserActivity.java | 11 ++-- .../activities/CreateReleaseActivity.java | 11 ++-- .../gitnex/activities/EditIssueActivity.java | 11 ++-- .../gitnex/activities/FileDiffActivity.java | 11 ++-- .../activities/IssueDetailActivity.java | 1 - .../activities/MergePullRequestActivity.java | 11 ++-- .../gitnex/activities/NewFileActivity.java | 11 ++-- .../activities/NewMilestoneActivity.java | 11 ++-- .../activities/NewOrganizationActivity.java | 11 ++-- .../gitnex/activities/OrgDetailActivity.java | 11 ++-- .../activities/ProfileEmailActivity.java | 11 ++-- .../activities/ReplyToIssueActivity.java | 11 ++-- app/src/main/res/drawable/progress_bar.xml | 4 +- ...ctivity_add_collaborator_to_repository.xml | 16 ++--- .../layout/activity_add_remove_assignees.xml | 2 +- .../res/layout/activity_add_remove_labels.xml | 2 +- .../res/layout/activity_admin_get_users.xml | 10 +-- .../main/res/layout/activity_create_issue.xml | 42 ++++++------- .../main/res/layout/activity_create_label.xml | 16 ++--- .../res/layout/activity_create_new_user.xml | 38 ++++++------ .../res/layout/activity_create_release.xml | 38 ++++++------ .../layout/activity_create_team_by_org.xml | 34 +++++----- .../main/res/layout/activity_edit_issue.xml | 30 ++++----- .../main/res/layout/activity_file_diff.xml | 6 +- .../main/res/layout/activity_issue_detail.xml | 22 +++---- app/src/main/res/layout/activity_login.xml | 62 +++++++++---------- .../layout/activity_merge_pull_request.xml | 8 +-- app/src/main/res/layout/activity_new_file.xml | 49 +++++++-------- .../res/layout/activity_new_milestone.xml | 37 ++++++----- .../res/layout/activity_new_organization.xml | 29 +++++---- app/src/main/res/layout/activity_new_repo.xml | 4 +- .../res/layout/activity_profile_email.xml | 12 ++-- .../res/layout/activity_reply_to_issue.xml | 6 +- .../main/res/layout/activity_repo_detail.xml | 5 +- .../admin_users_bottom_sheet_layout.xml | 4 +- app/src/main/res/layout/admin_users_list.xml | 8 +-- app/src/main/res/layout/branches_list.xml | 8 +-- .../res/layout/collaborators_list_search.xml | 6 +- .../main/res/layout/custom_multi_select.xml | 14 ++--- app/src/main/res/layout/files_diffs_list.xml | 10 +-- app/src/main/res/layout/fragment_branches.xml | 4 +- .../main/res/layout/fragment_explore_repo.xml | 10 +-- app/src/main/res/layout/fragment_issues.xml | 4 +- .../res/layout/fragment_issues_closed.xml | 4 +- app/src/main/res/layout/fragment_labels.xml | 4 +- .../main/res/layout/fragment_milestones.xml | 4 +- .../res/layout/fragment_organization_info.xml | 10 +-- .../res/layout/fragment_organizations.xml | 5 +- app/src/main/res/layout/fragment_profile.xml | 9 ++- .../res/layout/fragment_profile_emails.xml | 4 +- .../res/layout/fragment_profile_followers.xml | 4 +- .../res/layout/fragment_profile_following.xml | 4 +- .../res/layout/fragment_pull_requests.xml | 4 +- app/src/main/res/layout/fragment_releases.xml | 4 +- .../main/res/layout/fragment_teams_by_org.xml | 4 +- app/src/main/res/layout/issue_comments.xml | 9 ++- app/src/main/res/layout/labels_list.xml | 2 +- .../main/res/layout/members_by_org_list.xml | 4 +- .../layout/members_by_team_by_org_list.xml | 4 +- app/src/main/res/layout/milestones_list.xml | 12 ++-- app/src/main/res/layout/multi_select_item.xml | 4 +- .../nav_sub_menu_bottom_sheet_layout.xml | 4 +- .../res/layout/org_bottom_sheet_layout.xml | 4 +- .../main/res/layout/organizations_list.xml | 8 +-- .../layout/profile_bottom_sheet_layout.xml | 4 +- .../main/res/layout/profile_emails_list.xml | 4 +- .../res/layout/profile_followers_list.xml | 6 +- .../res/layout/profile_following_list.xml | 6 +- app/src/main/res/layout/releases_list.xml | 19 +++--- .../res/layout/repo_bottom_sheet_layout.xml | 24 +++---- .../res/layout/repo_detail_issues_list.xml | 9 ++- app/src/main/res/layout/repo_pr_list.xml | 7 +-- .../res/layout/repositories_by_org_list.xml | 15 +++-- app/src/main/res/layout/row_load.xml | 3 +- .../single_issue_bottom_sheet_layout.xml | 20 +++--- app/src/main/res/layout/teams_by_org_list.xml | 8 +-- 82 files changed, 503 insertions(+), 463 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java index 2e6fd727..43815ae2 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java @@ -1,7 +1,6 @@ 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; @@ -25,13 +24,12 @@ 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 AppCompatActivity { +public class AddCollaboratorToRepositoryActivity extends BaseActivity { private View.OnClickListener onClickListener; final Context ctx = this; @@ -42,9 +40,13 @@ public class AddCollaboratorToRepositoryActivity extends AppCompatActivity { private RecyclerView mRecyclerView; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_add_collaborator_to_repository; + } + + @Override + public 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"); diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java index 83774b0d..15722d7e 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java @@ -1,7 +1,6 @@ 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; @@ -29,7 +28,7 @@ import retrofit2.Callback; * Author M M Arif */ -public class AddRemoveAssigneesActivity extends AppCompatActivity { +public class AddRemoveAssigneesActivity extends BaseActivity { private ArrayList listOfCollaborators = new ArrayList<>(); private ArrayList issueAssigneesIds = new ArrayList<>(); @@ -38,11 +37,15 @@ public class AddRemoveAssigneesActivity extends AppCompatActivity { final Context ctx = this; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_add_remove_assignees; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); supportRequestWindowFeature(Window.FEATURE_NO_TITLE); - setContentView(R.layout.activity_add_remove_assignees); getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT)); diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java index ee7fbe70..2c301ab3 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java @@ -1,7 +1,6 @@ package org.mian.gitnex.activities; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import retrofit2.Call; import retrofit2.Callback; import android.content.Context; @@ -27,7 +26,7 @@ import java.util.List; * Author M M Arif */ -public class AddRemoveLabelsActivity extends AppCompatActivity { +public class AddRemoveLabelsActivity extends BaseActivity { private ArrayList listOfLabels = new ArrayList<>(); private ArrayList issueLabelIds = new ArrayList<>(); @@ -36,10 +35,14 @@ public class AddRemoveLabelsActivity extends AppCompatActivity { final Context ctx = this; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_add_remove_labels; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); supportRequestWindowFeature(Window.FEATURE_NO_TITLE); - setContentView(R.layout.activity_add_remove_labels); getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT)); diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java index ca82dbe8..e5d60274 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java @@ -1,7 +1,6 @@ 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; @@ -35,7 +34,7 @@ import java.util.Objects; * Author M M Arif */ -public class AdminGetUsersActivity extends AppCompatActivity implements AdminUsersBottomSheetFragment.BottomSheetListener { +public class AdminGetUsersActivity extends BaseActivity implements AdminUsersBottomSheetFragment.BottomSheetListener { private View.OnClickListener onClickListener; final Context ctx = this; @@ -45,10 +44,14 @@ public class AdminGetUsersActivity extends AppCompatActivity implements AdminUse private Boolean searchFilter = false; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_admin_get_users; + } + + @Override + public 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"); diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java index 16448ae3..0d36d282 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java @@ -1,7 +1,6 @@ package org.mian.gitnex.activities; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -40,13 +39,12 @@ 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 AppCompatActivity implements View.OnClickListener { +public class CreateIssueActivity extends BaseActivity implements View.OnClickListener { private View.OnClickListener onClickListener; MultiSelectDialog multiSelectDialog; @@ -69,9 +67,13 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli private ArrayAdapter defaultMentionAdapter; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_create_issue; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_create_issue); boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java index e8d49ae8..5380f76a 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java @@ -2,7 +2,6 @@ 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; @@ -34,7 +33,7 @@ import java.util.Objects; * Author M M Arif */ -public class CreateLabelActivity extends AppCompatActivity { +public class CreateLabelActivity extends BaseActivity { private View.OnClickListener onClickListener; private TextView colorPicker; @@ -43,9 +42,13 @@ public class CreateLabelActivity extends AppCompatActivity { final Context ctx = this; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_create_label; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_create_label); final TinyDB tinyDb = new TinyDB(getApplicationContext()); String repoFullName = tinyDb.getString("repoFullName"); diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java index 634a82c0..a1bf3ef6 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java @@ -1,7 +1,6 @@ package org.mian.gitnex.activities; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import retrofit2.Call; import retrofit2.Callback; import android.content.Context; @@ -26,7 +25,7 @@ import org.mian.gitnex.util.TinyDB; * Author M M Arif */ -public class CreateNewUserActivity extends AppCompatActivity { +public class CreateNewUserActivity extends BaseActivity { private View.OnClickListener onClickListener; private EditText fullName; @@ -37,10 +36,14 @@ public class CreateNewUserActivity extends AppCompatActivity { final Context ctx = this; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_create_new_user; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_create_new_user); boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java index 19d56763..e64b0e07 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java @@ -1,7 +1,6 @@ package org.mian.gitnex.activities; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import retrofit2.Call; import retrofit2.Callback; import android.content.Context; @@ -33,7 +32,7 @@ import java.util.List; * Author M M Arif */ -public class CreateReleaseActivity extends AppCompatActivity { +public class CreateReleaseActivity extends BaseActivity { private View.OnClickListener onClickListener; public ImageView closeActivity; @@ -49,10 +48,14 @@ public class CreateReleaseActivity extends AppCompatActivity { List branchesList = new ArrayList<>(); @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_create_release; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_create_release); boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); diff --git a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java index 7b7887be..ac24b781 100644 --- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java @@ -1,7 +1,6 @@ package org.mian.gitnex.activities; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -45,7 +44,7 @@ import java.util.List; * Author M M Arif */ -public class EditIssueActivity extends AppCompatActivity implements View.OnClickListener { +public class EditIssueActivity extends BaseActivity implements View.OnClickListener { final Context ctx = this; private View.OnClickListener onClickListener; @@ -62,10 +61,14 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick private ArrayAdapter defaultMentionAdapter; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_edit_issue; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_edit_issue); final TinyDB tinyDb = new TinyDB(getApplicationContext()); diff --git a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java index 660656fe..876736b0 100644 --- a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java @@ -7,7 +7,6 @@ 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; @@ -31,7 +30,7 @@ import retrofit2.Callback; * Author M M Arif */ -public class FileDiffActivity extends AppCompatActivity { +public class FileDiffActivity extends BaseActivity { private View.OnClickListener onClickListener; private TextView toolbar_title; @@ -39,10 +38,14 @@ public class FileDiffActivity extends AppCompatActivity { private ProgressBar mProgressBar; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_file_diff; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_file_diff); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java index ead431b1..85e474b0 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -2,7 +2,6 @@ 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; diff --git a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java index 32c3cb4b..3eacf3e5 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java @@ -1,7 +1,6 @@ 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; @@ -33,7 +32,7 @@ import retrofit2.Response; * Author M M Arif */ -public class MergePullRequestActivity extends AppCompatActivity { +public class MergePullRequestActivity extends BaseActivity { public ImageView closeActivity; private View.OnClickListener onClickListener; @@ -45,9 +44,13 @@ public class MergePullRequestActivity extends AppCompatActivity { private Button mergeButton; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_merge_pull_request; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_merge_pull_request); boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); TinyDB tinyDb = new TinyDB(getApplicationContext()); diff --git a/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java index d3c27ee4..0bd99513 100644 --- a/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java @@ -13,7 +13,6 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.Spinner; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import com.google.gson.JsonElement; import org.mian.gitnex.R; import org.mian.gitnex.clients.RetrofitClient; @@ -33,7 +32,7 @@ import retrofit2.Callback; * Author M M Arif */ -public class NewFileActivity extends AppCompatActivity { +public class NewFileActivity extends BaseActivity { public ImageView closeActivity; private View.OnClickListener onClickListener; @@ -49,10 +48,14 @@ public class NewFileActivity extends AppCompatActivity { List branchesList = new ArrayList<>(); @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_new_file; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_new_file); boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); diff --git a/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java index 61d68c58..d7fda9da 100644 --- a/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java @@ -1,7 +1,6 @@ package org.mian.gitnex.activities; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import retrofit2.Call; import retrofit2.Callback; import android.app.DatePickerDialog; @@ -29,7 +28,7 @@ import java.util.Calendar; * Author M M Arif */ -public class NewMilestoneActivity extends AppCompatActivity implements View.OnClickListener { +public class NewMilestoneActivity extends BaseActivity implements View.OnClickListener { private EditText milestoneDueDate; private View.OnClickListener onClickListener; @@ -39,9 +38,13 @@ public class NewMilestoneActivity extends AppCompatActivity implements View.OnCl final Context ctx = this; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_new_milestone; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_new_milestone); boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); diff --git a/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java index 0472cada..51229abc 100644 --- a/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java @@ -4,7 +4,6 @@ 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; @@ -25,7 +24,7 @@ import retrofit2.Callback; * Author M M Arif */ -public class NewOrganizationActivity extends AppCompatActivity { +public class NewOrganizationActivity extends BaseActivity { public ImageView closeActivity; private View.OnClickListener onClickListener; @@ -36,9 +35,13 @@ public class NewOrganizationActivity extends AppCompatActivity { final Context ctx = this; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_new_organization; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_new_organization); boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); diff --git a/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java index 45ea48f6..43ba6d7d 100644 --- a/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java @@ -2,7 +2,6 @@ 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; @@ -30,12 +29,16 @@ import java.util.Objects; * Author M M Arif */ -public class OrgDetailActivity extends AppCompatActivity implements OrgBottomSheetFragment.BottomSheetListener { +public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFragment.BottomSheetListener { @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_org_detail; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_org_detail); TinyDB tinyDb = new TinyDB(getApplicationContext()); String orgName = tinyDb.getString("orgName"); diff --git a/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java b/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java index 9549875b..6f1a0b49 100644 --- a/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java @@ -1,7 +1,6 @@ package org.mian.gitnex.activities; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import retrofit2.Call; import retrofit2.Callback; import android.content.Context; @@ -30,7 +29,7 @@ import java.util.List; * Author M M Arif */ -public class ProfileEmailActivity extends AppCompatActivity { +public class ProfileEmailActivity extends BaseActivity { private View.OnClickListener onClickListener; private EditText userEmail; @@ -38,9 +37,13 @@ public class ProfileEmailActivity extends AppCompatActivity { private Button addEmailButton; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_profile_email; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_profile_email); boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); diff --git a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java index f5ac58e9..01fa41ed 100644 --- a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java @@ -1,7 +1,6 @@ package org.mian.gitnex.activities; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -33,7 +32,7 @@ import java.util.List; * Author M M Arif */ -public class ReplyToIssueActivity extends AppCompatActivity { +public class ReplyToIssueActivity extends BaseActivity { public ImageView closeActivity; private View.OnClickListener onClickListener; @@ -45,10 +44,14 @@ public class ReplyToIssueActivity extends AppCompatActivity { private Button replyButton; @Override - protected void onCreate(Bundle savedInstanceState) { + protected int getLayoutResourceId(){ + return R.layout.activity_reply_to_issue; + } + + @Override + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_reply_to_issue); boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext()); TinyDB tinyDb = new TinyDB(getApplicationContext()); diff --git a/app/src/main/res/drawable/progress_bar.xml b/app/src/main/res/drawable/progress_bar.xml index 49ed5a6c..935176f9 100644 --- a/app/src/main/res/drawable/progress_bar.xml +++ b/app/src/main/res/drawable/progress_bar.xml @@ -16,8 +16,8 @@ diff --git a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml b/app/src/main/res/layout/activity_add_collaborator_to_repository.xml index 33e81021..a6271eb2 100644 --- a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml +++ b/app/src/main/res/layout/activity_add_collaborator_to_repository.xml @@ -3,7 +3,7 @@ android:layout_height="match_parent" android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android" - android:background="@color/colorPrimary"> + android:background="?attr/primaryBackgroundColor"> @@ -54,10 +54,10 @@ android:inputType="text" android:labelFor="@+id/addCollaboratorSearch" android:background="@drawable/shape_inputs" - android:textColor="@color/white" - android:textColorHint="@color/colorAccent" + android:textColor="?attr/inputTextColor" + android:textColorHint="?attr/primaryBackgroundColor" + android:textColorHighlight="?attr/primaryTextColor" android:hint="@string/addCollaboratorSearchHint" - android:textColorHighlight="@color/white" android:imeOptions="actionSend"/> @@ -83,7 +83,7 @@ android:id="@+id/recyclerViewUserSearch" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorPrimary" + android:background="?attr/primaryBackgroundColor" android:layout_marginStart="0dp" android:layout_marginEnd="0dp" android:layout_marginTop="5dp" diff --git a/app/src/main/res/layout/activity_add_remove_assignees.xml b/app/src/main/res/layout/activity_add_remove_assignees.xml index bcc640e1..612c60f8 100644 --- a/app/src/main/res/layout/activity_add_remove_assignees.xml +++ b/app/src/main/res/layout/activity_add_remove_assignees.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorPrimary" + android:background="?attr/primaryBackgroundColor" tools:context=".activities.AddRemoveAssigneesActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_remove_labels.xml b/app/src/main/res/layout/activity_add_remove_labels.xml index 70b21c89..9d0dc751 100644 --- a/app/src/main/res/layout/activity_add_remove_labels.xml +++ b/app/src/main/res/layout/activity_add_remove_labels.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorPrimary" + android:background="?attr/primaryBackgroundColor" tools:context=".activities.AddRemoveLabelsActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_admin_get_users.xml b/app/src/main/res/layout/activity_admin_get_users.xml index 26a13588..0c9cd8f5 100644 --- a/app/src/main/res/layout/activity_admin_get_users.xml +++ b/app/src/main/res/layout/activity_admin_get_users.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorPrimary" + android:background="?attr/primaryBackgroundColor" android:fitsSystemWindows="true" android:orientation="vertical"> @@ -15,7 +15,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorPrimary" + android:background="?attr/primaryBackgroundColor" android:theme="@style/AppTheme.AppBarOverlay" tools:ignore="UnusedAttribute"> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="@string/adminUsers" - android:textColor="@color/white" + android:textColor="?attr/primaryTextColor" android:maxLines="1" android:textSize="20sp" /> @@ -52,7 +52,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorPrimary" + android:background="?attr/primaryBackgroundColor" android:padding="4dp" android:scrollbars="vertical" /> @@ -66,7 +66,7 @@ android:layout_margin="15dp" android:gravity="center" android:text="@string/noDataFound" - android:textColor="@color/white" + android:textColor="?attr/primaryTextColor" android:textSize="20sp" android:visibility="visible" /> diff --git a/app/src/main/res/layout/activity_create_issue.xml b/app/src/main/res/layout/activity_create_issue.xml index 2901239c..1bec3f36 100644 --- a/app/src/main/res/layout/activity_create_issue.xml +++ b/app/src/main/res/layout/activity_create_issue.xml @@ -3,7 +3,7 @@ android:layout_height="match_parent" android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android" - android:background="@color/colorPrimary"> + android:background="?attr/primaryBackgroundColor"> @@ -58,7 +58,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/newIssueTitle" - android:textColor="@color/colorWhite" + android:textColor="?attr/primaryTextColor" android:textSize="16sp" /> @@ -73,15 +73,15 @@ android:inputType="textCapSentences|text" android:labelFor="@+id/newIssueTitle" android:background="@drawable/shape_inputs" - android:textColor="@color/colorWhite" - android:textColorHint="@color/colorWhite" - android:textColorHighlight="@color/colorWhite"/> + android:textColor="?attr/inputTextColor" + android:textColorHint="?attr/primaryBackgroundColor" + android:textColorHighlight="?attr/primaryTextColor"/> @@ -109,7 +109,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/newIssueAssigneesListTitle" - android:textColor="@color/colorWhite" + android:textColor="?attr/primaryTextColor" android:textSize="16sp" android:layout_marginTop="10dp"/> @@ -122,10 +122,10 @@ android:textSize="14sp" tools:ignore="Autofill" android:background="@drawable/shape_inputs" - android:textColor="@color/colorWhite" - android:textColorHint="@color/colorWhite" + android:textColor="?attr/primaryTextColor" + android:textColorHint="?attr/primaryTextColor" android:inputType="none" - android:textColorHighlight="@color/colorWhite"/> + android:textColorHighlight="?attr/primaryTextColor"/> @@ -157,7 +157,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/newIssueLabelsTitle" - android:textColor="@color/colorWhite" + android:textColor="?attr/primaryTextColor" android:textSize="16sp" android:layout_marginTop="10dp"/> @@ -170,16 +170,16 @@ android:textSize="14sp" tools:ignore="Autofill" android:background="@drawable/shape_inputs" - android:textColor="@color/colorWhite" - android:textColorHint="@color/colorWhite" + android:textColor="?attr/primaryTextColor" + android:textColorHint="?attr/primaryTextColor" android:inputType="none" - android:textColorHighlight="@color/colorWhite"/> + android:textColorHighlight="?attr/primaryTextColor"/> @@ -193,9 +193,9 @@ android:textSize="14sp" tools:ignore="Autofill" android:background="@drawable/shape_inputs" - android:textColor="@color/colorWhite" - android:textColorHint="@color/colorWhite" - android:textColorHighlight="@color/colorWhite"/> + android:textColor="?attr/primaryTextColor" + android:textColorHint="?attr/primaryTextColor" + android:textColorHighlight="?attr/primaryTextColor"/>