GitNex/GitNex
GitNex
/
GitNex
mirror of https://codeberg.org/gitnex/GitNex.git
2
5
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Port app to M3 (Material You) (#1181) 

There are not any functinality changes except more of UI changes which comes with M3. There are still few things left but that are not there yet from Google side.

I will be merging this PR as it does not break any function but attaching a few screenshots if you would like to know how it looks like. Feel free to build from `main` to test it out.

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1181
This commit is contained in:
M M Arif 2022-08-07 21:34:02 +02:00
parent 181f0b5dea
commit 23df83110d
167 changed files with 2607 additions and 2791 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@ -50,7 +50,7 @@ configurations {
}
dependencies {
def lifecycle_version = '2.4.1'
def lifecycle_version = '2.5.1'
def markwon_version = '4.6.2'
def work_version = "2.7.1"
def acra = '5.8.4'
@ -58,6 +58,8 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.compose.material3:material3:1.0.0-alpha15'
implementation 'androidx.compose.material3:material3-window-size-class:1.0.0-alpha15'
implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.legacy:legacy-support-v4:1.0.0"
@ -101,12 +103,12 @@ dependencies {
implementation "ch.acra:acra-mail:$acra"
implementation "ch.acra:acra-limiter:$acra"
implementation "ch.acra:acra-notification:$acra"
implementation 'androidx.room:room-runtime:2.4.2'
annotationProcessor 'androidx.room:room-compiler:2.4.2'
implementation 'androidx.room:room-runtime:2.4.3'
annotationProcessor 'androidx.room:room-compiler:2.4.3'
implementation "androidx.work:work-runtime:$work_version"
implementation "io.mikael:urlbuilder:2.0.9"
implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.2.0"
implementation 'androidx.biometric:biometric:1.1.0'
implementation 'com.github.chrisvest:stormpot:2.4.2'
implementation 'androidx.browser:browser:1.4.0'

16
app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java
View File

@ -1,9 +1,10 @@
package org.mian.gitnex.actions;
import android.app.Dialog;
import android.content.Context;
import android.view.View;
import android.widget.ProgressBar;
import androidx.annotation.NonNull;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.Issue;
import org.gitnex.tea4j.v2.models.User;
import org.mian.gitnex.R;
@ -62,7 +63,7 @@ public class AssigneesActions {
});
}
public static void getRepositoryAssignees(Context ctx, String repoOwner, String repoName, List<User> assigneesList, Dialog dialogAssignees, AssigneesListAdapter assigneesAdapter, CustomAssigneesSelectionDialogBinding assigneesBinding) {
public static void getRepositoryAssignees(Context ctx, String repoOwner, String repoName, List<User> assigneesList, MaterialAlertDialogBuilder materialAlertDialogBuilder, AssigneesListAdapter assigneesAdapter, CustomAssigneesSelectionDialogBinding assigneesBinding, ProgressBar progressBar) {
Call<List<User>> call = RetrofitClient
.getApiInterface(ctx)
@ -76,9 +77,6 @@ public class AssigneesActions {
assigneesList.clear();
List<User> assigneesList_ = response.body();
assigneesBinding.progressBar.setVisibility(View.GONE);
assigneesBinding.dialogFrame.setVisibility(View.VISIBLE);
if(response.code() == 200) {
assert assigneesList_ != null;
@ -86,10 +84,10 @@ public class AssigneesActions {
if(assigneesList_.size() > 0) {
assigneesList.addAll(assigneesList_);
materialAlertDialogBuilder.show();
}
else {
dialogAssignees.dismiss();
Toasty.warning(ctx, ctx.getResources().getString(R.string.noAssigneesFound));
}
@ -100,11 +98,17 @@ public class AssigneesActions {
Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
}
if(progressBar != null) {
progressBar.setVisibility(View.GONE);
}
}
@Override
public void onFailure(@NonNull Call<List<User>> call, @NonNull Throwable t) {
if(progressBar != null) {
progressBar.setVisibility(View.GONE);
}
Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
}
});

21
app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
View File

@ -1,9 +1,10 @@
package org.mian.gitnex.actions;
import android.app.Dialog;
import android.content.Context;
import android.view.View;
import android.widget.ProgressBar;
import androidx.annotation.NonNull;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.Label;
import org.mian.gitnex.R;
import org.mian.gitnex.adapters.LabelsListAdapter;
@ -58,7 +59,7 @@ public class LabelsActions {
});
}
public static void getRepositoryLabels(Context ctx, String repoOwner, String repoName, List<Label> labelsList, Dialog dialogLabels, LabelsListAdapter labelsAdapter, CustomLabelsSelectionDialogBinding labelsBinding) {
public static void getRepositoryLabels(Context ctx, String repoOwner, String repoName, List<Label> labelsList, MaterialAlertDialogBuilder materialAlertDialogBuilder, LabelsListAdapter labelsAdapter, CustomLabelsSelectionDialogBinding labelsBinding, ProgressBar progressBar) {
Call<List<Label>> call = RetrofitClient
.getApiInterface(ctx)
@ -83,24 +84,20 @@ public class LabelsActions {
.getApiInterface(ctx)
.orgListLabels(repoOwner, null, null);
callOrgLabels.enqueue(new Callback<List<Label>>() {
callOrgLabels.enqueue(new Callback<>() {
@Override
public void onResponse(@NonNull Call<List<Label>> call, @NonNull retrofit2.Response<List<Label>> responseOrg) {
labelsBinding.progressBar.setVisibility(View.GONE);
labelsBinding.dialogFrame.setVisibility(View.VISIBLE);
if(responseOrg.body() != null) {
labelsList.addAll(responseOrg.body());
materialAlertDialogBuilder.show();
}
if(labelsList.isEmpty()) {
dialogLabels.dismiss();
Toasty.warning(ctx, ctx.getResources().getString(R.string.noDataFound));
}
labelsBinding.labelsRecyclerView.setAdapter(labelsAdapter);
@ -111,19 +108,23 @@ public class LabelsActions {
Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError));
}
});
}
else {
Toasty.error(ctx, ctx.getResources().getString(R.string.genericError));
}
if(progressBar != null) {
progressBar.setVisibility(View.GONE);
}
}
@Override
public void onFailure(@NonNull Call<List<Label>> call, @NonNull Throwable t) {
if(progressBar != null) {
progressBar.setVisibility(View.GONE);
}
Toasty.error(ctx, ctx.getResources().getString(R.string.genericServerResponseError));
}
});

55
app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
View File

@ -5,13 +5,9 @@ import android.os.Bundle;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.gitnex.tea4j.v2.models.InlineResponse2001;
import org.gitnex.tea4j.v2.models.User;
import org.mian.gitnex.R;
@ -21,6 +17,7 @@ import org.mian.gitnex.databinding.ActivityAddCollaboratorToRepositoryBinding;
import org.mian.gitnex.helpers.Toasty;
import org.mian.gitnex.helpers.contexts.RepositoryContext;
import java.util.List;
import java.util.Objects;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
@ -31,12 +28,8 @@ import retrofit2.Response;
public class AddCollaboratorToRepositoryActivity extends BaseActivity {
private ActivityAddCollaboratorToRepositoryBinding activityAddCollaboratorToRepositoryBinding;
private View.OnClickListener onClickListener;
private TextView addCollaboratorSearch;
private TextView noData;
private ProgressBar mProgressBar;
private RecyclerView mRecyclerView;
private RepositoryContext repository;
@Override
@ -44,41 +37,33 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
super.onCreate(savedInstanceState);
ActivityAddCollaboratorToRepositoryBinding activityAddCollaboratorToRepositoryBinding = ActivityAddCollaboratorToRepositoryBinding.inflate(getLayoutInflater());
activityAddCollaboratorToRepositoryBinding = ActivityAddCollaboratorToRepositoryBinding.inflate(getLayoutInflater());
setContentView(activityAddCollaboratorToRepositoryBinding.getRoot());
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
ImageView closeActivity = activityAddCollaboratorToRepositoryBinding.close;
addCollaboratorSearch = activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch;
mRecyclerView = activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch;
mProgressBar = activityAddCollaboratorToRepositoryBinding.progressBar;
noData = activityAddCollaboratorToRepositoryBinding.noData;
repository = RepositoryContext.fromIntent(getIntent());
addCollaboratorSearch.requestFocus();
activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch.requestFocus();
assert imm != null;
imm.showSoftInput(addCollaboratorSearch, InputMethodManager.SHOW_IMPLICIT);
imm.showSoftInput(activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch, InputMethodManager.SHOW_IMPLICIT);
initCloseListener();
closeActivity.setOnClickListener(onClickListener);
activityAddCollaboratorToRepositoryBinding.close.setOnClickListener(onClickListener);
addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_SEND) {
if(!addCollaboratorSearch.getText().toString().equals("")) {
if(!Objects.requireNonNull(activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch.getText()).toString().equals("")) {
mProgressBar.setVisibility(View.VISIBLE);
loadUserSearchList(addCollaboratorSearch.getText().toString());
activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(View.VISIBLE);
loadUserSearchList(activityAddCollaboratorToRepositoryBinding.addCollaboratorSearch.getText().toString());
}
}
return false;
});
}
public void loadUserSearchList(String searchKeyword) {
@ -92,7 +77,7 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
@Override
public void onResponse(@NonNull Call<InlineResponse2001> call, @NonNull Response<InlineResponse2001> response) {
mProgressBar.setVisibility(View.GONE);
activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(View.GONE);
if(response.isSuccessful()) {
@ -116,25 +101,25 @@ public class AddCollaboratorToRepositoryActivity extends BaseActivity {
CollaboratorSearchAdapter adapter = new CollaboratorSearchAdapter(dataList, context, repository);
mRecyclerView.setHasFixedSize(true);
mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(),
activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.setHasFixedSize(true);
activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.setLayoutManager(new LinearLayoutManager(ctx));
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.getContext(),
DividerItemDecoration.VERTICAL);
mRecyclerView.addItemDecoration(dividerItemDecoration);
activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.addItemDecoration(dividerItemDecoration);
mProgressBar.setVisibility(View.VISIBLE);
activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(View.VISIBLE);
if(adapter.getItemCount() > 0) {
mRecyclerView.setAdapter(adapter);
noData.setVisibility(View.GONE);
activityAddCollaboratorToRepositoryBinding.recyclerViewUserSearch.setAdapter(adapter);
activityAddCollaboratorToRepositoryBinding.noData.setVisibility(View.GONE);
}
else {
noData.setVisibility(View.VISIBLE);
activityAddCollaboratorToRepositoryBinding.noData.setVisibility(View.VISIBLE);
}
mProgressBar.setVisibility(View.GONE);
activityAddCollaboratorToRepositoryBinding.progressBar.setVisibility(View.GONE);
}
private void initCloseListener() {

60
app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
View File

@ -2,10 +2,7 @@ package org.mian.gitnex.activities;
import android.annotation.SuppressLint;
import android.app.DatePickerDialog;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@ -14,6 +11,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.ArrayAdapter;
import android.widget.TextView;
import androidx.annotation.NonNull;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.CreateIssueOption;
import org.gitnex.tea4j.v2.models.Issue;
import org.gitnex.tea4j.v2.models.Label;
@ -50,14 +48,7 @@ import retrofit2.Callback;
public class CreateIssueActivity extends BaseActivity implements View.OnClickListener, LabelsListAdapter.LabelsListAdapterListener, AssigneesListAdapter.AssigneesListAdapterListener {
private ActivityCreateIssueBinding viewBinding;
private CustomLabelsSelectionDialogBinding labelsBinding;
private CustomAssigneesSelectionDialogBinding assigneesBinding;
private View.OnClickListener onClickListener;
private int resultLimit;
private Dialog dialogLabels;
private Dialog dialogAssignees;
private String labelsSetter;
private String assigneesSetter;
private View.OnClickListener onClickListener;
private int milestoneId;
private Date currentDate = null;
@ -66,6 +57,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
private LabelsListAdapter labelsAdapter;
private AssigneesListAdapter assigneesAdapter;
private MaterialAlertDialogBuilder materialAlertDialogBuilder;
private List<Integer> labelsIds = new ArrayList<>();
private final List<Label> labelsList = new ArrayList<>();
private final LinkedHashMap<String, Milestone> milestonesList = new LinkedHashMap<>();
@ -85,9 +78,11 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
repository = RepositoryContext.fromIntent(getIntent());
resultLimit = Constants.getCurrentResultLimit(ctx);
int resultLimit = Constants.getCurrentResultLimit(ctx);
viewBinding.newIssueTitle.requestFocus();
assert imm != null;
@ -143,7 +138,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
@Override
public void assigneesInterface(List<String> data) {
assigneesSetter = String.valueOf(data);
String assigneesSetter = String.valueOf(data);
viewBinding.newIssueAssigneesList.setText(assigneesSetter.replace("]", "").replace("[", ""));
assigneesListData = data;
}
@ -151,7 +146,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
@Override
public void labelsInterface(List<String> data) {
labelsSetter = String.valueOf(data);
String labelsSetter = String.valueOf(data);
viewBinding.newIssueLabels.setText(labelsSetter.replace("]", "").replace("[", ""));
}
@ -163,42 +158,31 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
private void showAssignees() {
dialogAssignees = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
if (dialogAssignees.getWindow() != null) {
dialogAssignees.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
viewBinding.progressBar.setVisibility(View.VISIBLE);
CustomAssigneesSelectionDialogBinding assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(
LayoutInflater.from(ctx));
View view = assigneesBinding.getRoot();
dialogAssignees.setContentView(view);
materialAlertDialogBuilder.setView(view);
assigneesBinding.save.setOnClickListener(assigneesBinding_ -> dialogAssignees.dismiss());
materialAlertDialogBuilder.setNeutralButton(R.string.close, null);
dialogAssignees.show();
AssigneesActions.getRepositoryAssignees(ctx, repository.getOwner(), repository.getName(), assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding);
AssigneesActions.getRepositoryAssignees(ctx, repository.getOwner(), repository.getName(), assigneesList, materialAlertDialogBuilder, assigneesAdapter,
assigneesBinding, viewBinding.progressBar);
}
private void showLabels() {
dialogLabels = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
if (dialogLabels.getWindow() != null) {
dialogLabels.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
viewBinding.progressBar.setVisibility(View.VISIBLE);
CustomLabelsSelectionDialogBinding labelsBinding = CustomLabelsSelectionDialogBinding.inflate(
LayoutInflater.from(ctx));
View view = labelsBinding.getRoot();
dialogLabels.setContentView(view);
materialAlertDialogBuilder.setView(view);
labelsBinding.save.setOnClickListener(labelsBinding_ -> dialogLabels.dismiss());
materialAlertDialogBuilder.setNeutralButton(R.string.close, null);
dialogLabels.show();
LabelsActions.getRepositoryLabels(ctx, repository.getOwner(), repository.getName(), labelsList, dialogLabels, labelsAdapter, labelsBinding);
LabelsActions.getRepositoryLabels(ctx, repository.getOwner(), repository.getName(), labelsList, materialAlertDialogBuilder, labelsAdapter, labelsBinding, viewBinding.progressBar);
}
private void processNewIssue() {

201
app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
View File

@ -6,13 +6,9 @@ import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.ViewModelProvider;
import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
import org.gitnex.tea4j.v2.models.CreateLabelOption;
import org.gitnex.tea4j.v2.models.EditLabelOption;
@ -38,12 +34,8 @@ public class CreateLabelActivity extends BaseActivity {
public static boolean refreshLabels = false;
private OrganizationLabelsViewModel organizationLabelsViewModel;
private LabelsViewModel labelsViewModel;
private ActivityCreateLabelBinding activityCreateLabelBinding;
private View.OnClickListener onClickListener;
private TextView colorPicker;
private EditText labelName;
private Button createLabelButton;
private RepositoryContext repository;
private String labelColor = "";
@ -54,10 +46,8 @@ public class CreateLabelActivity extends BaseActivity {
super.onCreate(savedInstanceState);
ActivityCreateLabelBinding activityCreateLabelBinding = ActivityCreateLabelBinding.inflate(getLayoutInflater());
activityCreateLabelBinding = ActivityCreateLabelBinding.inflate(getLayoutInflater());
setContentView(activityCreateLabelBinding.getRoot());
labelsViewModel = new ViewModelProvider(this).get(LabelsViewModel.class);
organizationLabelsViewModel = new ViewModelProvider(this).get(OrganizationLabelsViewModel.class);
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
@ -72,53 +62,47 @@ public class CreateLabelActivity extends BaseActivity {
boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
ImageView closeActivity = activityCreateLabelBinding.close;
colorPicker = activityCreateLabelBinding.colorPicker;
labelName = activityCreateLabelBinding.labelName;
createLabelButton = activityCreateLabelBinding.createLabelButton;
labelName.requestFocus();
activityCreateLabelBinding.labelName.requestFocus();
assert imm != null;
imm.showSoftInput(labelName, InputMethodManager.SHOW_IMPLICIT);
imm.showSoftInput(activityCreateLabelBinding.labelName, InputMethodManager.SHOW_IMPLICIT);
final ColorPicker cp = new ColorPicker(CreateLabelActivity.this, 235, 113, 33);
initCloseListener();
closeActivity.setOnClickListener(onClickListener);
colorPicker.setOnClickListener(v -> cp.show());
activityCreateLabelBinding.close.setOnClickListener(onClickListener);
activityCreateLabelBinding.colorPicker.setOnClickListener(v -> cp.show());
cp.setCallback(color -> {
//Log.i("#Hex no alpha", String.format("#%06X", (0xFFFFFF & color)));
colorPicker.setBackgroundColor(color);
activityCreateLabelBinding.colorPicker.setBackgroundColor(color);
labelColor = String.format("#%06X", (0xFFFFFF & color));
cp.dismiss();
});
if(getIntent().getStringExtra("labelAction") != null && Objects.requireNonNull(getIntent().getStringExtra("labelAction")).equals("edit")) {
labelName.setText(getIntent().getStringExtra("labelTitle"));
activityCreateLabelBinding.labelName.setText(getIntent().getStringExtra("labelTitle"));
int labelColor_ = Color.parseColor("#" + getIntent().getStringExtra("labelColor"));
colorPicker.setBackgroundColor(labelColor_);
activityCreateLabelBinding.colorPicker.setBackgroundColor(labelColor_);
labelColorDefault = "#" + getIntent().getStringExtra("labelColor");
TextView toolbar_title = activityCreateLabelBinding.toolbarTitle;
toolbar_title.setText(getResources().getString(R.string.pageTitleLabelUpdate));
createLabelButton.setText(getResources().getString(R.string.newUpdateButtonCopy));
activityCreateLabelBinding.createLabelButton.setText(getResources().getString(R.string.newUpdateButtonCopy));
createLabelButton.setOnClickListener(updateLabelListener);
activityCreateLabelBinding.createLabelButton.setOnClickListener(updateLabelListener);
return;
}
if(!connToInternet) {
createLabelButton.setEnabled(false);
activityCreateLabelBinding.createLabelButton.setEnabled(false);
}
else {
createLabelButton.setOnClickListener(createLabelListener);
activityCreateLabelBinding.createLabelButton.setOnClickListener(createLabelListener);
}
}
private final View.OnClickListener createLabelListener = v -> processCreateLabel();
@ -129,7 +113,7 @@ public class CreateLabelActivity extends BaseActivity {
boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
String updateLabelName = labelName.getText().toString();
String updateLabelName = Objects.requireNonNull(activityCreateLabelBinding.labelName.getText()).toString();
String updateLabelColor;
if(labelColor.isEmpty()) {
@ -162,14 +146,13 @@ public class CreateLabelActivity extends BaseActivity {
disableProcessButton();
patchLabel(repository, updateLabelName, updateLabelColor, Integer.parseInt(
Objects.requireNonNull(getIntent().getStringExtra("labelId"))));
}
private void processCreateLabel() {
boolean connToInternet = AppUtil.hasNetworkConnection(appCtx);
String newLabelName = labelName.getText().toString();
String newLabelName = Objects.requireNonNull(activityCreateLabelBinding.labelName.getText()).toString();
String newLabelColor;
if(labelColor.isEmpty()) {
@ -222,38 +205,37 @@ public class CreateLabelActivity extends BaseActivity {
return;
}
call.enqueue(new Callback<Label>() {
call.enqueue(new Callback<>() {
@Override
public void onResponse(@NonNull Call<Label> call, @NonNull retrofit2.Response<Label> response) {
@Override
public void onResponse(@NonNull Call<Label> call, @NonNull retrofit2.Response<Label> response) {
if(response.code() == 201) {
if(response.code() == 201) {
Toasty.success(ctx, getString(R.string.labelCreated));
refreshLabels = true;
finish();
}
else if(response.code() == 401) {
Toasty.success(ctx, getString(R.string.labelCreated));
refreshLabels = true;
finish();
}
else if(response.code() == 401) {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx);
}
else {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx);
}
else {
enableProcessButton();
Toasty.error(ctx, getString(R.string.genericError));
}
}
enableProcessButton();
Toasty.error(ctx, getString(R.string.genericError));
}
}
@Override
public void onFailure(@NonNull Call<Label> call, @NonNull Throwable t) {
@Override
public void onFailure(@NonNull Call<Label> call, @NonNull Throwable t) {
labelColor = "";
Log.e("onFailure", t.toString());
enableProcessButton();
}
labelColor = "";
Log.e("onFailure", t.toString());
enableProcessButton();
}
});
}
private void patchLabel(RepositoryContext repository, String updateLabelName, String updateLabelColor, int labelId) {
@ -273,42 +255,41 @@ public class CreateLabelActivity extends BaseActivity {
call = RetrofitClient.getApiInterface(ctx).issueEditLabel(repository.getOwner(), repository.getName(), (long) labelId, createLabelFunc);
}
call.enqueue(new Callback<Label>() {
call.enqueue(new Callback<>() {
@Override
public void onResponse(@NonNull Call<Label> call, @NonNull retrofit2.Response<Label> response) {
@Override
public void onResponse(@NonNull Call<Label> call, @NonNull retrofit2.Response<Label> response) {
if(response.isSuccessful()) {
if(response.isSuccessful()) {
if(response.code() == 200) {
if(response.code() == 200) {
Toasty.success(ctx, getString(R.string.labelUpdated));
refreshLabels = true;
finish();
}
}
else if(response.code() == 401) {
Toasty.success(ctx, getString(R.string.labelUpdated));
refreshLabels = true;
finish();
}
}
else if(response.code() == 401) {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx);
}
else {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx);
}
else {
enableProcessButton();
Toasty.error(ctx, getString(R.string.genericError));
}
}
enableProcessButton();
Toasty.error(ctx, getString(R.string.genericError));
}
}
@Override
public void onFailure(@NonNull Call<Label> call, @NonNull Throwable t) {
@Override
public void onFailure(@NonNull Call<Label> call, @NonNull Throwable t) {
labelColor = "";
labelColorDefault = "";
Log.e("onFailure", t.toString());
enableProcessButton();
}
labelColor = "";
labelColorDefault = "";
Log.e("onFailure", t.toString());
enableProcessButton();
}
});
}
private void initCloseListener() {
@ -329,52 +310,52 @@ public class CreateLabelActivity extends BaseActivity {
call = RetrofitClient.getApiInterface(ctx).issueDeleteLabel(repository.getOwner(), repository.getName(), (long) labelId);
}
call.enqueue(new Callback<Void>() {
call.enqueue(new Callback<>() {
@Override
public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
@Override
public void onResponse(@NonNull Call<Void> call, @NonNull retrofit2.Response<Void> response) {
if(response.isSuccessful()) {
if(response.isSuccessful()) {
if(response.code() == 204) {
if(response.code() == 204) {
Toasty.success(ctx, getString(R.string.labelDeleteText));
if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
Toasty.success(ctx, getString(R.string.labelDeleteText));
if(getIntent().getStringExtra("type") != null && Objects.requireNonNull(getIntent().getStringExtra("type")).equals("org")) {
organizationLabelsViewModel.loadOrgLabelsList(getIntent().getStringExtra("orgName"), ctx, null, null);
}
else {
OrganizationLabelsViewModel.loadOrgLabelsList(getIntent().getStringExtra("orgName"), ctx, null, null);
}
else {
labelsViewModel.loadLabelsList(repository.getOwner(), repository.getName(), ctx);
}
}
}
else if(response.code() == 401) {
LabelsViewModel.loadLabelsList(repository.getOwner(), repository.getName(), ctx);
}
}
}
else if(response.code() == 401) {
AlertDialogs.authorizationTokenRevokedDialog(ctx);
}
else {
AlertDialogs.authorizationTokenRevokedDialog(ctx);
}
else {
Toasty.error(ctx, getString(R.string.genericError));
}
}
Toasty.error(ctx, getString(R.string.genericError));
}
}
@Override
public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
Log.e("onFailure", t.toString());
}
@Override
public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
Log.e("onFailure", t.toString());
}
});
}
private void disableProcessButton() {
createLabelButton.setEnabled(false);
activityCreateLabelBinding.createLabelButton.setEnabled(false);
}
private void enableProcessButton() {
createLabelButton.setEnabled(true);
activityCreateLabelBinding.createLabelButton.setEnabled(true);
}
@Override

39
app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java
View File

@ -2,9 +2,6 @@ package org.mian.gitnex.activities;
import android.annotation.SuppressLint;
import android.app.DatePickerDialog;
import android.app.Dialog;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@ -13,6 +10,7 @@ import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.Branch;
import org.gitnex.tea4j.v2.models.CreatePullRequestOption;
import org.gitnex.tea4j.v2.models.Label;
@ -45,17 +43,16 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
private View.OnClickListener onClickListener;
private ActivityCreatePrBinding viewBinding;
private int resultLimit;
private Dialog dialogLabels;
private List<Integer> labelsIds = new ArrayList<>();
private final List<String> assignees = new ArrayList<>();
private int milestoneId;
private Date currentDate = null;
private RepositoryContext repository;
private LabelsListAdapter labelsAdapter;
private MaterialAlertDialogBuilder materialAlertDialogBuilder;
LinkedHashMap<String, Milestone> milestonesList = new LinkedHashMap<>();
List<String> branchesList = new ArrayList<>();
List<Label> labelsList = new ArrayList<>();
@ -69,9 +66,11 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
viewBinding = ActivityCreatePrBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
repository = RepositoryContext.fromIntent(getIntent());
resultLimit = Constants.getCurrentResultLimit(ctx);
int resultLimit = Constants.getCurrentResultLimit(ctx);
viewBinding.prBody.setOnTouchListener((touchView, motionEvent) -> {
@ -224,23 +223,14 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
private void showLabels() {
dialogLabels = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
if (dialogLabels.getWindow() != null) {
dialogLabels.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding labelsBinding = CustomLabelsSelectionDialogBinding
.inflate(LayoutInflater.from(ctx));
viewBinding.progressBar.setVisibility(View.VISIBLE);
CustomLabelsSelectionDialogBinding labelsBinding = CustomLabelsSelectionDialogBinding.inflate(
LayoutInflater.from(ctx));
View view = labelsBinding.getRoot();
dialogLabels.setContentView(view);
materialAlertDialogBuilder.setView(view);
labelsBinding.save.setOnClickListener(editProperties -> dialogLabels.dismiss());
dialogLabels.show();
LabelsActions.getRepositoryLabels(ctx, repository.getOwner(), repository.getName(), labelsList, dialogLabels, labelsAdapter, labelsBinding);
materialAlertDialogBuilder.setNeutralButton(R.string.close, null);
LabelsActions.getRepositoryLabels(ctx, repository.getOwner(), repository.getName(), labelsList, materialAlertDialogBuilder, labelsAdapter, labelsBinding, viewBinding.progressBar);
}
private void getBranches(String repoOwner, String repoName) {
@ -249,7 +239,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
.getApiInterface(ctx)
.repoListBranches(repoOwner, repoName, null, null);
call.enqueue(new Callback<List<Branch>>() {
call.enqueue(new Callback<>() {
@Override
public void onResponse(@NonNull Call<List<Branch>> call, @NonNull retrofit2.Response<List<Branch>> response) {
@ -265,8 +255,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis
branchesList.add(i.getName());
}
ArrayAdapter<String> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this,
R.layout.list_spinner_items, branchesList);
ArrayAdapter<String> adapter = new ArrayAdapter<>(CreatePullRequestActivity.this, R.layout.list_spinner_items, branchesList);
viewBinding.mergeIntoBranchSpinner.setAdapter(adapter);
viewBinding.pullFromBranchSpinner.setAdapter(adapter);

153
app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
View File

@ -10,8 +10,8 @@ import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.core.content.res.ResourcesCompat;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.CreateTeamOption;
import org.gitnex.tea4j.v2.models.Team;
import org.mian.gitnex.R;
@ -96,43 +96,41 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
teamPermission.setOnClickListener(view -> {
AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
pBuilder.setTitle(R.string.newTeamPermission);
pBuilder.setCancelable(permissionSelectedChoice != -1);
MaterialAlertDialogBuilder materialAlertDialogBuilderPerm = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.newTeamPermission)
.setCancelable(permissionSelectedChoice != -1)
.setSingleChoiceItems(permissionList, permissionSelectedChoice, (dialogInterface, i) -> {
pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, (dialogInterface, i) -> {
permissionSelectedChoice = i;
teamPermission.setText(permissionList[i]);
permissionSelectedChoice = i;
teamPermission.setText(permissionList[i]);
switch(permissionList[i]) {
case "Read":
switch(permissionList[i]) {
case "Read":
teamPermissionDetail.setVisibility(View.VISIBLE);
teamPermissionDetail.setText(R.string.newTeamPermissionRead);
break;
case "Write":
teamPermissionDetail.setVisibility(View.VISIBLE);
teamPermissionDetail.setText(R.string.newTeamPermissionRead);
break;
case "Write":
teamPermissionDetail.setVisibility(View.VISIBLE);
teamPermissionDetail.setText(R.string.newTeamPermissionWrite);
break;
case "Admin":
teamPermissionDetail.setVisibility(View.VISIBLE);
teamPermissionDetail.setText(R.string.newTeamPermissionWrite);
break;
case "Admin":
teamPermissionDetail.setVisibility(View.VISIBLE);
teamPermissionDetail.setText(R.string.newTeamPermissionAdmin);
break;
default:
teamPermissionDetail.setVisibility(View.VISIBLE);
teamPermissionDetail.setText(R.string.newTeamPermissionAdmin);
break;
default:
teamPermissionDetail.setVisibility(View.GONE);
break;
}
teamPermissionDetail.setVisibility(View.GONE);
break;
}
dialogInterface.dismiss();
});
dialogInterface.dismiss();
});
AlertDialog pDialog = pBuilder.create();
pDialog.show();
materialAlertDialogBuilderPerm.create().show();
});
teamAccessControls.setOnClickListener(v -> {
@ -141,68 +139,63 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
teamAccessControlsArray.setText("");
pushAccessList = Arrays.asList(accessControlsList);
AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, (dialog, which, isChecked) -> {})
.setTitle(R.string.newTeamAccessControls)
.setPositiveButton(R.string.okButton, (dialog, which) -> {
aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, (dialog, which, isChecked) -> {
int selectedVal = 0;
while(selectedVal < selectedAccessControlsTrueFalse.length)
{
boolean value = selectedAccessControlsTrueFalse[selectedVal];
})
.setCancelable(false)
.setTitle(R.string.newTeamAccessControls)
.setPositiveButton(R.string.okButton, (dialog, which) -> {
String repoCode = "";
if(selectedVal == 0) {
repoCode = "repo.code";
}
if(selectedVal == 1) {
repoCode = "repo.issues";
}
if(selectedVal == 2) {
repoCode = "repo.pulls";
}
if(selectedVal == 3) {
repoCode = "repo.releases";
}
if(selectedVal == 4) {
repoCode = "repo.wiki";
}
if(selectedVal == 5) {
repoCode = "repo.ext_wiki";
}
if(selectedVal == 6) {
repoCode = "repo.ext_issues";
}
int selectedVal = 0;
while(selectedVal < selectedAccessControlsTrueFalse.length)
{
boolean value = selectedAccessControlsTrueFalse[selectedVal];
if(value){
String repoCode = "";
if(selectedVal == 0) {
repoCode = "repo.code";
}
if(selectedVal == 1) {
repoCode = "repo.issues";
}
if(selectedVal == 2) {
repoCode = "repo.pulls";
}
if(selectedVal == 3) {
repoCode = "repo.releases";
}
if(selectedVal == 4) {
repoCode = "repo.wiki";
}
if(selectedVal == 5) {
repoCode = "repo.ext_wiki";
}
if(selectedVal == 6) {
repoCode = "repo.ext_issues";
}
teamAccessControls.setText(getString(R.string.newTeamPermissionValues, teamAccessControls.getText(), pushAccessList.get(selectedVal)));
teamAccessControlsArray.setText(getString(R.string.newTeamPermissionValuesFinal, teamAccessControlsArray.getText(), repoCode));
}
if(value){
selectedVal++;
}
teamAccessControls.setText(getString(R.string.newTeamPermissionValues, teamAccessControls.getText(), pushAccessList.get(selectedVal)));
teamAccessControlsArray.setText(getString(R.string.newTeamPermissionValuesFinal, teamAccessControlsArray.getText(), repoCode));
}
String data = String.valueOf(teamAccessControls.getText());
if(!data.equals("")) {
selectedVal++;
}
teamAccessControls.setText(data.substring(0, data.length() - 2));
}
String data = String.valueOf(teamAccessControls.getText());
if(!data.equals("")) {
String dataArray = String.valueOf(teamAccessControlsArray.getText());
teamAccessControls.setText(data.substring(0, data.length() - 2));
}
if(!dataArray.equals("")) {
String dataArray = String.valueOf(teamAccessControlsArray.getText());
teamAccessControlsArray.setText(dataArray.substring(0, dataArray.length() - 2));
}
});
if(!dataArray.equals("")) {
teamAccessControlsArray.setText(dataArray.substring(0, dataArray.length() - 2));
}
});
AlertDialog aDialog = aDialogBuilder.create();
aDialog.show();
materialAlertDialogBuilder.create().show();
});
createTeamButton.setEnabled(false);

88
app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
View File

@ -1,11 +1,9 @@
package org.mian.gitnex.activities;
import android.app.Dialog;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@ -20,11 +18,9 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.text.HtmlCompat;
@ -33,6 +29,7 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.amulyakhare.textdrawable.TextDrawable;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.vdurmont.emoji.EmojiParser;
import org.gitnex.tea4j.v2.models.EditIssueOption;
import org.gitnex.tea4j.v2.models.Issue;
@ -53,6 +50,7 @@ import org.mian.gitnex.clients.RetrofitClient;
import org.mian.gitnex.databinding.ActivityIssueDetailBinding;
import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding;
import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
import org.mian.gitnex.databinding.CustomPrInfoDialogBinding;
import org.mian.gitnex.fragments.BottomSheetReplyFragment;
import org.mian.gitnex.fragments.BottomSheetSingleIssueFragment;
import org.mian.gitnex.fragments.IssuesFragment;
@ -107,12 +105,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
private List<String> assigneesListData = new ArrayList<>();
private List<String> currentAssignees = new ArrayList<>();
private Dialog dialogLabels;
private Dialog dialogAssignees;
private CustomLabelsSelectionDialogBinding labelsBinding;
private CustomAssigneesSelectionDialogBinding assigneesBinding;
private ActivityIssueDetailBinding viewBinding;
private MaterialAlertDialogBuilder materialAlertDialogBuilder;
public static boolean singleIssueUpdate = false;
public boolean commentEdited = false;
@ -154,6 +148,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
Objects.requireNonNull(getSupportActionBar()).setTitle(repoName);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
issueCommentsModel = new ViewModelProvider(this).get(IssueCommentsViewModel.class);
viewBinding.recyclerView.setHasFixedSize(true);
@ -233,20 +229,13 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
private void showAssignees() {
assigneesAdapter.updateList(currentAssignees);
dialogAssignees = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
dialogAssignees.setCancelable(true);
if (dialogAssignees.getWindow() != null) {
dialogAssignees.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
viewBinding.progressBar.setVisibility(View.VISIBLE);
CustomAssigneesSelectionDialogBinding assigneesBinding = CustomAssigneesSelectionDialogBinding.inflate(
LayoutInflater.from(ctx));
View view = assigneesBinding.getRoot();
dialogAssignees.setContentView(view);
materialAlertDialogBuilder.setView(view);
assigneesBinding.save.setOnClickListener(assigneesBinding_ -> {
materialAlertDialogBuilder.setPositiveButton(R.string.saveButton, (dialog, whichButton) -> {
currentAssignees = new ArrayList<>(new LinkedHashSet<>(currentAssignees));
assigneesListData = new ArrayList<>(new LinkedHashSet<>(assigneesListData));
@ -257,33 +246,20 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
updateIssueAssignees();
}
else {
dialogAssignees.dismiss();
}
});
dialogAssignees.show();
AssigneesActions.getRepositoryAssignees(ctx, repoOwner, repoName, assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding);
AssigneesActions.getRepositoryAssignees(ctx, repoOwner, repoName, assigneesList, materialAlertDialogBuilder, assigneesAdapter, assigneesBinding, viewBinding.progressBar);
}
public void showLabels() {
labelsAdapter.updateList(currentLabelsIds);
dialogLabels = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
dialogLabels.setCancelable(true);
if (dialogLabels.getWindow() != null) {
dialogLabels.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
viewBinding.progressBar.setVisibility(View.VISIBLE);
CustomLabelsSelectionDialogBinding labelsBinding = CustomLabelsSelectionDialogBinding.inflate(LayoutInflater.from(ctx));
View view = labelsBinding.getRoot();
dialogLabels.setContentView(view);
materialAlertDialogBuilder.setView(view);
labelsBinding.save.setOnClickListener(labelsBinding_ -> {
materialAlertDialogBuilder.setPositiveButton(R.string.saveButton, (dialog, whichButton) -> {
currentLabelsIds = new ArrayList<>(new LinkedHashSet<>(currentLabelsIds));
labelsIds = new ArrayList<>(new LinkedHashSet<>(labelsIds));
@ -294,14 +270,9 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
updateIssueLabels();
}
else {
dialogLabels.dismiss();
}
});
dialogLabels.show();
LabelsActions.getRepositoryLabels(ctx, repoOwner, repoName, labelsList, dialogLabels, labelsAdapter, labelsBinding);
LabelsActions.getRepositoryLabels(ctx, repoOwner, repoName, labelsList, materialAlertDialogBuilder, labelsAdapter, labelsBinding, viewBinding.progressBar);
}
private void updateIssueAssignees() {
@ -312,7 +283,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
.getApiInterface(ctx)
.issueEditIssue(repoOwner, repoName, (long) issueIndex, updateAssigneeJson);
call3.enqueue(new Callback<Issue>() {
call3.enqueue(new Callback<>() {
@Override
public void onResponse(@NonNull Call<Issue> call, @NonNull retrofit2.Response<Issue> response2) {
@ -321,8 +292,6 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
Toasty.success(ctx, ctx.getString(R.string.assigneesUpdated));
dialogAssignees.dismiss();
viewBinding.frameAssignees.removeAllViews();
viewBinding.frameLabels.removeAllViews();
issue.setIssue(response2.body());
@ -378,7 +347,6 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
if(response.code() == 200) {
Toasty.success(ctx, ctx.getString(R.string.labelsUpdated));
dialogLabels.dismiss();
viewBinding.frameAssignees.removeAllViews();
viewBinding.frameLabels.removeAllViews();
@ -467,20 +435,18 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
else if(id == R.id.prInfo) {
if(issue.getPullRequest() != null) {
View view = LayoutInflater.from(ctx).inflate(R.layout.custom_pr_info_dialog, null);
TextView baseBranch = view.findViewById(R.id.baseBranch);
TextView headBranch = view.findViewById(R.id.headBranch);
MaterialAlertDialogBuilder materialAlertDialogBuilderPrInfo = new MaterialAlertDialogBuilder(ctx);
CustomPrInfoDialogBinding customPrInfoDialogBinding = CustomPrInfoDialogBinding.inflate(LayoutInflater.from(ctx));
View view = customPrInfoDialogBinding.getRoot();
materialAlertDialogBuilderPrInfo.setView(view);
baseBranch.setText(issue.getPullRequest().getBase().getRef());
headBranch.setText(issue.getPullRequest().getHead().getRef());
customPrInfoDialogBinding.baseBranch.setText(issue.getPullRequest().getBase().getRef());
customPrInfoDialogBinding.headBranch.setText(issue.getPullRequest().getHead().getRef());
AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx);
alertDialog.setTitle(getResources().getString(R.string.prMergeInfo));
alertDialog.setView(view);
alertDialog.setPositiveButton(getString(R.string.okButton), null);
alertDialog.create().show();
materialAlertDialogBuilderPrInfo.setTitle(getResources().getString(R.string.prMergeInfo));
materialAlertDialogBuilderPrInfo.setNeutralButton(getString(R.string.close), null);
materialAlertDialogBuilderPrInfo.create().show();
}
return true;
}
@ -716,7 +682,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
ImageView assigneesView = new ImageView(ctx);
PicassoService.getInstance(ctx).get().load(issue.getIssue().getAssignees().get(i).getAvatarUrl())
.placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(8, 0)).resize(100, 100).centerCrop()
.placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(48, 0)).resize(96, 96).centerCrop()
.into(assigneesView);
viewBinding.frameAssignees.addView(assigneesView);

4
app/src/main/java/org/mian/gitnex/activities/MainActivity.java
View File

@ -15,12 +15,12 @@ import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.cardview.widget.CardView;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.card.MaterialCardView;
import com.google.android.material.navigation.NavigationView;
import org.gitnex.tea4j.v2.models.GeneralAPISettings;
import org.gitnex.tea4j.v2.models.NotificationCount;
@ -183,7 +183,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
TextView userFullName = hView.findViewById(R.id.userFullname);
ImageView userAvatar = hView.findViewById(R.id.userAvatar);
ImageView userAvatarBackground = hView.findViewById(R.id.userAvatarBackground);
CardView navRecyclerViewFrame = hView.findViewById(R.id.userAccountsFrame);
MaterialCardView navRecyclerViewFrame = hView.findViewById(R.id.userAccountsFrame);
List<UserAccount> userAccountsList = new ArrayList<>();
UserAccountsApi userAccountsApi;

52
app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
View File

@ -17,12 +17,12 @@ import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager2.adapter.FragmentStateAdapter;
import androidx.viewpager2.widget.ViewPager2;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.progressindicator.LinearProgressIndicator;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
@ -84,6 +84,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
public static boolean updateRepo = false;
private Dialog progressDialog;
private MaterialAlertDialogBuilder materialAlertDialogBuilder;
private final ActivityResultLauncher<Intent> createReleaseLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
result -> {
if(result.getResultCode() == 201) {
@ -137,6 +139,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
Toolbar toolbar = findViewById(R.id.toolbar);
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
TextView toolbarTitle = findViewById(R.id.toolbar_title);
toolbarTitle.setText(repository.getFullName());
@ -411,21 +415,18 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
}
}
AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
pBuilder.setTitle(R.string.selectMilestone);
materialAlertDialogBuilder.setTitle(R.string.selectMilestone)
.setSingleChoiceItems(milestonesList.toArray(new String[0]), selectedMilestone, (dialogInterface, i) -> {
pBuilder.setSingleChoiceItems(milestonesList.toArray(new String[0]), selectedMilestone, (dialogInterface, i) -> {
repository.setIssueMilestoneFilterName(milestonesList.get(i));
repository.setIssueMilestoneFilterName(milestonesList.get(i));
if(getFragmentRefreshListenerFilterIssuesByMilestone() != null) {
getFragmentRefreshListenerFilterIssuesByMilestone().onRefresh(milestonesList.get(i));
}
dialogInterface.dismiss();
});
pBuilder.setNeutralButton(R.string.cancelButton, null);
pBuilder.create().show();
if(getFragmentRefreshListenerFilterIssuesByMilestone() != null) {
getFragmentRefreshListenerFilterIssuesByMilestone().onRefresh(milestonesList.get(i));
}
dialogInterface.dismiss();
})
.setNeutralButton(R.string.cancelButton, null);
materialAlertDialogBuilder.create().show();
}
}
@ -478,21 +479,18 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetListe
}
}
AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
pBuilder.setTitle(R.string.pageTitleChooseBranch);
materialAlertDialogBuilder.setTitle(R.string.pageTitleChooseBranch)
.setSingleChoiceItems(branchesList.toArray(new String[0]), selectedBranch, (dialogInterface, i) -> {
pBuilder.setSingleChoiceItems(branchesList.toArray(new String[0]), selectedBranch, (dialogInterface, i) -> {
repository.setBranchRef(branchesList.get(i));
repository.setBranchRef(branchesList.get(i));
if(getFragmentRefreshListenerFiles() != null) {
getFragmentRefreshListenerFiles().onRefresh(branchesList.get(i));
}
dialogInterface.dismiss();
});
pBuilder.setNeutralButton(R.string.cancelButton, null);
pBuilder.create().show();
if(getFragmentRefreshListenerFiles() != null) {
getFragmentRefreshListenerFiles().onRefresh(branchesList.get(i));
}
dialogInterface.dismiss();
})
.setNeutralButton(R.string.cancelButton, null);
materialAlertDialogBuilder.create().show();
}
}

64
app/src/main/java/org/mian/gitnex/activities/RepositorySettingsActivity.java
View File

@ -1,14 +1,13 @@
package org.mian.gitnex.activities;
import android.app.Dialog;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.EditRepoOption;
import org.gitnex.tea4j.v2.models.InternalTracker;
import org.gitnex.tea4j.v2.models.Repository;
@ -37,9 +36,15 @@ public class RepositorySettingsActivity extends BaseActivity {
private CustomRepositoryEditPropertiesDialogBinding propBinding;
private CustomRepositoryDeleteDialogBinding deleteRepoBinding;
private CustomRepositoryTransferDialogBinding transferRepoBinding;
private Dialog dialogProp;
private Dialog dialogDeleteRepository;
private Dialog dialogTransferRepository;
private AlertDialog dialogRepo;
//private AlertDialog dialogRepoDelete;
private MaterialAlertDialogBuilder materialAlertDialogBuilder;
//private Dialog dialogProp;
//private Dialog dialogDeleteRepository;
//private Dialog dialogTransferRepository;
private View.OnClickListener onClickListener;
private RepositoryContext repository;
@ -59,6 +64,8 @@ public class RepositorySettingsActivity extends BaseActivity {
initCloseListener();
closeActivity.setOnClickListener(onClickListener);
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
viewBinding.editProperties.setOnClickListener(editProperties -> showRepositoryProperties());
viewBinding.deleteRepositoryFrame.setOnClickListener(deleteRepository -> showDeleteRepository());
@ -68,19 +75,19 @@ public class RepositorySettingsActivity extends BaseActivity {
private void showTransferRepository() {
dialogTransferRepository = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
/*dialogTransferRepository = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
if (dialogTransferRepository.getWindow() != null) {
dialogTransferRepository.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
}*/
transferRepoBinding = CustomRepositoryTransferDialogBinding.inflate(LayoutInflater.from(ctx));
View view = transferRepoBinding.getRoot();
dialogTransferRepository.setContentView(view);
materialAlertDialogBuilder.setView(view);
transferRepoBinding.cancel.setOnClickListener(editProperties -> dialogTransferRepository.dismiss());
//transferRepoBinding.cancel.setOnClickListener(editProperties -> dialogRepo.dismiss());
transferRepoBinding.transfer.setOnClickListener(deleteRepo -> {
@ -101,8 +108,7 @@ public class RepositorySettingsActivity extends BaseActivity {
}
});
dialogTransferRepository.setCancelable(false);
dialogTransferRepository.show();
dialogRepo = materialAlertDialogBuilder.show();
}
private void transferRepository(String newOwner) {
@ -124,7 +130,7 @@ public class RepositorySettingsActivity extends BaseActivity {
if (response.code() == 202) {
dialogTransferRepository.dismiss();
dialogRepo.dismiss();
Toasty.success(ctx, getString(R.string.repoTransferSuccess));
finish();
@ -159,19 +165,10 @@ public class RepositorySettingsActivity extends BaseActivity {
private void showDeleteRepository() {
dialogDeleteRepository = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
if (dialogDeleteRepository.getWindow() != null) {
dialogDeleteRepository.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
deleteRepoBinding = CustomRepositoryDeleteDialogBinding.inflate(LayoutInflater.from(ctx));
View view = deleteRepoBinding.getRoot();
dialogDeleteRepository.setContentView(view);
deleteRepoBinding.cancel.setOnClickListener(editProperties -> dialogDeleteRepository.dismiss());
materialAlertDialogBuilder.setView(view);
deleteRepoBinding.delete.setOnClickListener(deleteRepo -> {
@ -185,8 +182,7 @@ public class RepositorySettingsActivity extends BaseActivity {
}
});
dialogDeleteRepository.setCancelable(false);
dialogDeleteRepository.show();
dialogRepo = materialAlertDialogBuilder.show();
}
private void deleteRepository() {
@ -205,7 +201,7 @@ public class RepositorySettingsActivity extends BaseActivity {
if (response.code() == 204) {
dialogDeleteRepository.dismiss();
dialogRepo.dismiss();
Toasty.success(ctx, getString(R.string.repoDeletionSuccess));
finish();
@ -234,25 +230,16 @@ public class RepositorySettingsActivity extends BaseActivity {
private void showRepositoryProperties() {
dialogProp = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
if (dialogProp.getWindow() != null) {
dialogProp.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
propBinding = CustomRepositoryEditPropertiesDialogBinding.inflate(LayoutInflater.from(ctx));
View view = propBinding.getRoot();
dialogProp.setContentView(view);
materialAlertDialogBuilder.setView(view);
propBinding.cancel.setOnClickListener(editProperties -> dialogProp.dismiss());
Repository repoInfo = repository.getRepository();
propBinding.progressBar.setVisibility(View.GONE);
propBinding.mainView.setVisibility(View.VISIBLE);
assert repoInfo != null;
propBinding.repoName.setText(repoInfo.getName());
propBinding.repoWebsite.setText(repoInfo.getWebsite());
@ -297,8 +284,7 @@ public class RepositorySettingsActivity extends BaseActivity {
propBinding.repoEnableMerge.isChecked(), propBinding.repoEnableRebase.isChecked(),
propBinding.repoEnableSquash.isChecked(), propBinding.repoEnableForceMerge.isChecked()));
dialogProp.setCancelable(false);
dialogProp.show();
dialogRepo = materialAlertDialogBuilder.show();
}
private void saveRepositoryProperties(String repoName, String repoWebsite, String repoDescription,
@ -335,7 +321,7 @@ public class RepositorySettingsActivity extends BaseActivity {
if (response.code() == 200) {
dialogProp.dismiss();
dialogRepo.dismiss();
Toasty.success(ctx, getString(R.string.repoPropertiesSaveSuccess));
assert response.body() != null;
repository.setRepository(response.body());

108
app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
View File

@ -8,8 +8,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TimePicker;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.switchmaterial.SwitchMaterial;
import org.mian.gitnex.R;
import org.mian.gitnex.databinding.ActivitySettingsAppearanceBinding;
@ -115,26 +115,22 @@ public class SettingsAppearanceActivity extends BaseActivity {
// theme selection dialog
themeFrame.setOnClickListener(view -> {
AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.themeSelectorDialogTitle)
.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {
tsBuilder.setTitle(getResources().getString(R.string.themeSelectorDialogTitle));
tsBuilder.setCancelable(themeSelectedChoice != -1);
themeSelectedChoice = i;
activitySettingsAppearanceBinding.themeSelected.setText(themeList[i]);
tinyDB.putInt("themeId", i);
tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, (dialogInterfaceTheme, i) -> {
SettingsFragment.refreshParent = true;
this.recreate();
this.overridePendingTransition(0, 0);
dialogInterfaceTheme.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
themeSelectedChoice = i;
activitySettingsAppearanceBinding.themeSelected.setText(themeList[i]);
tinyDB.putInt("themeId", i);
SettingsFragment.refreshParent = true;
this.recreate();
this.overridePendingTransition(0, 0);
dialogInterfaceTheme.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
AlertDialog cfDialog = tsBuilder.create();
cfDialog.show();
materialAlertDialogBuilder.create().show();
});
lightTimeFrame.setOnClickListener(view -> {
@ -150,59 +146,53 @@ public class SettingsAppearanceActivity extends BaseActivity {
// custom font dialog
customFontFrame.setOnClickListener(view -> {
AlertDialog.Builder cfBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.settingsCustomFontSelectorDialogTitle)
.setCancelable(customFontSelectedChoice != -1)
.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {
cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
cfBuilder.setCancelable(customFontSelectedChoice != -1);
customFontSelectedChoice = i;
activitySettingsAppearanceBinding.customFontSelected.setText(customFontList[i]);
tinyDB.putInt("customFontId", i);
AppUtil.typeface = null; // reset typeface
FontsOverride.setDefaultFont(this);
cfBuilder.setSingleChoiceItems(customFontList, customFontSelectedChoice, (dialogInterfaceCustomFont, i) -> {
SettingsFragment.refreshParent = true;
this.recreate();
this.overridePendingTransition(0, 0);
dialogInterfaceCustomFont.dismiss();
Toasty.success(appCtx, appCtx.getResources().getString(R.string.settingsSave));
});
customFontSelectedChoice = i;
activitySettingsAppearanceBinding.customFontSelected.setText(customFontList[i]);
tinyDB.putInt("customFontId", i);
AppUtil.typeface = null; // reset typeface
FontsOverride.setDefaultFont(this);
SettingsFragment.refreshParent = true;
this.recreate();
this.overridePendingTransition(0, 0);
dialogInterfaceCustomFont.dismiss();
Toasty.success(appCtx, appCtx.getResources().getString(R.string.settingsSave));
});
AlertDialog cfDialog = cfBuilder.create();
cfDialog.show();
materialAlertDialogBuilder.create().show();
});
// time and date dialog
timeFrame.setOnClickListener(view -> {
AlertDialog.Builder tBuilder = new AlertDialog.Builder(SettingsAppearanceActivity.this);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.settingsTimeSelectorDialogTitle)
.setCancelable(timeSelectedChoice != -1)
.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {
tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
tBuilder.setCancelable(timeSelectedChoice != -1);
timeSelectedChoice = i;
activitySettingsAppearanceBinding.tvDateTimeSelected.setText(timeList[i]);
tinyDB.putInt("timeId", i);
tBuilder.setSingleChoiceItems(timeList, timeSelectedChoice, (dialogInterfaceTime, i) -> {
switch(i) {
case 0:
tinyDB.putString("dateFormat", "pretty");
break;
case 1:
tinyDB.putString("dateFormat", "normal");
break;
}
timeSelectedChoice = i;
activitySettingsAppearanceBinding.tvDateTimeSelected.setText(timeList[i]);
tinyDB.putInt("timeId", i);
dialogInterfaceTime.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
switch(i) {
case 0:
tinyDB.putString("dateFormat", "pretty");
break;
case 1:
tinyDB.putString("dateFormat", "normal");
break;
}
dialogInterfaceTime.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
AlertDialog tDialog = tBuilder.create();
tDialog.show();
materialAlertDialogBuilder.create().show();
});
}

40
app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
View File

@ -2,7 +2,7 @@ package org.mian.gitnex.activities;
import android.os.Bundle;
import android.view.View;
import androidx.appcompat.app.AlertDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.mian.gitnex.R;
import org.mian.gitnex.databinding.ActivitySettingsGeneralBinding;
import org.mian.gitnex.helpers.Toasty;
@ -96,12 +96,10 @@ public class SettingsGeneralActivity extends BaseActivity {
viewBinding.homeScreenFrame.setOnClickListener(setDefaultHomeScreen -> {
AlertDialog.Builder hsBuilder = new AlertDialog.Builder(SettingsGeneralActivity.this);
hsBuilder.setTitle(R.string.settingsHomeScreenSelectorDialogTitle);
hsBuilder.setCancelable(homeScreenSelectedChoice != -1);
hsBuilder.setSingleChoiceItems(homeScreenArray, homeScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.settingsHomeScreenSelectorDialogTitle)
.setCancelable(homeScreenSelectedChoice != -1)
.setSingleChoiceItems(homeScreenArray, homeScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
homeScreenSelectedChoice = i;
viewBinding.homeScreenSelected.setText(homeScreenArray[i]);
@ -111,8 +109,7 @@ public class SettingsGeneralActivity extends BaseActivity {
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
AlertDialog hsDialog = hsBuilder.create();
hsDialog.show();
materialAlertDialogBuilder.create().show();
});
// home screen
@ -128,23 +125,20 @@ public class SettingsGeneralActivity extends BaseActivity {
viewBinding.setDefaultLinkHandler.setOnClickListener(setDefaultLinkHandler -> {
AlertDialog.Builder dlBuilder = new AlertDialog.Builder(SettingsGeneralActivity.this);
dlBuilder.setTitle(R.string.linkSelectorDialogTitle);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.linkSelectorDialogTitle)
.setCancelable(defaultLinkHandlerScreenSelectedChoice != -1)
.setSingleChoiceItems(linksArray, defaultLinkHandlerScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
dlBuilder.setCancelable(defaultLinkHandlerScreenSelectedChoice != -1);
defaultLinkHandlerScreenSelectedChoice = i;
viewBinding.generalDeepLinkSelected.setText(linksArray[i]);
tinyDB.putInt("defaultScreenId", i);
dlBuilder.setSingleChoiceItems(linksArray, defaultLinkHandlerScreenSelectedChoice, (dialogInterfaceHomeScreen, i) -> {
dialogInterfaceHomeScreen.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
defaultLinkHandlerScreenSelectedChoice = i;
viewBinding.generalDeepLinkSelected.setText(linksArray[i]);
tinyDB.putInt("defaultScreenId", i);
dialogInterfaceHomeScreen.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
AlertDialog dlDialog = dlBuilder.create();
dlDialog.show();
materialAlertDialogBuilder.create().show();
});
// link handler

34
app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java
View File

@ -4,7 +4,7 @@ import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
import android.widget.NumberPicker;
import androidx.appcompat.app.AlertDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.pes.androidmaterialcolorpickerdialog.ColorPicker;
import org.mian.gitnex.R;
import org.mian.gitnex.databinding.ActivitySettingsNotificationsBinding;
@ -14,7 +14,7 @@ import org.mian.gitnex.helpers.Toasty;
import org.mian.gitnex.notifications.Notifications;
/**
* Template Author M M Arif
* @author M M Arif
* @author opyale
*/
@ -91,26 +91,24 @@ public class SettingsNotificationsActivity extends BaseActivity {
numberPicker.setValue(tinyDB.getInt("pollingDelayMinutes", Constants.defaultPollingDelay));
numberPicker.setWrapSelectorWheel(true);
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
builder.setTitle(getString(R.string.pollingDelayDialogHeaderText));
builder.setMessage(getString(R.string.pollingDelayDialogDescriptionText));
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.pollingDelayDialogHeaderText)
.setMessage(getString(R.string.pollingDelayDialogDescriptionText))
.setCancelable(true)
.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss())
.setPositiveButton(getString(R.string.okButton), (dialog, which) -> {
builder.setCancelable(true);
builder.setPositiveButton(getString(R.string.okButton), (dialog, which) -> {
tinyDB.putInt("pollingDelayMinutes", numberPicker.getValue());
tinyDB.putInt("pollingDelayMinutes", numberPicker.getValue());
Notifications.stopWorker(ctx);
Notifications.startWorker(ctx);
Notifications.stopWorker(ctx);
Notifications.startWorker(ctx);
viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
builder.setView(numberPicker);
builder.create().show();
viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
materialAlertDialogBuilder.setView(numberPicker);
materialAlertDialogBuilder.create().show();
});
// lights switcher

109
app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java
View File

@ -9,8 +9,8 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.biometric.BiometricManager;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.switchmaterial.SwitchMaterial;
import org.apache.commons.io.FileUtils;
import org.mian.gitnex.R;
@ -150,91 +150,82 @@ public class SettingsSecurityActivity extends BaseActivity {
// clear cache
clearCacheFrame.setOnClickListener(v1 -> {
AlertDialog.Builder builder = new AlertDialog.Builder(SettingsSecurityActivity.this);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.clearCacheDialogHeader)
.setMessage(getResources().getString(R.string.clearCacheDialogMessage))
.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss())
.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
builder.setTitle(getResources().getString(R.string.clearCacheDialogHeader));
builder.setMessage(getResources().getString(R.string.clearCacheDialogMessage));
builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
try {
try {
FileUtils.deleteDirectory(cacheDir);
FileUtils.forceMkdir(cacheDir);
this.recreate();
this.overridePendingTransition(0, 0);
}
catch (IOException e) {
FileUtils.deleteDirectory(cacheDir);
FileUtils.forceMkdir(cacheDir);
this.recreate();
this.overridePendingTransition(0, 0);
}
catch (IOException e) {
Log.e("SettingsSecurity", e.toString());
}
});
builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
builder.create().show();
Log.e("SettingsSecurity", e.toString());
}
});
materialAlertDialogBuilder.create().show();
});
// cache size images selection dialog
cacheSizeImagesFrame.setOnClickListener(view -> {
AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.cacheSizeImagesDialogHeader)
.setCancelable(cacheSizeImagesSelectedChoice != -1)
.setSingleChoiceItems(cacheSizeImagesList, cacheSizeImagesSelectedChoice, (dialogInterfaceTheme, i) -> {
tsBuilder.setTitle(getResources().getString(R.string.cacheSizeImagesDialogHeader));
tsBuilder.setCancelable(cacheSizeImagesSelectedChoice != -1);
cacheSizeImagesSelectedChoice = i;
cacheSizeImagesSelected.setText(cacheSizeImagesList[i]);
tinyDB.putString("cacheSizeImagesStr", cacheSizeImagesList[i]);
tinyDB.putInt("cacheSizeImagesId", i);
tsBuilder.setSingleChoiceItems(cacheSizeImagesList, cacheSizeImagesSelectedChoice, (dialogInterfaceTheme, i) -> {
dialogInterfaceTheme.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
cacheSizeImagesSelectedChoice = i;
cacheSizeImagesSelected.setText(cacheSizeImagesList[i]);
tinyDB.putString("cacheSizeImagesStr", cacheSizeImagesList[i]);
tinyDB.putInt("cacheSizeImagesId", i);
dialogInterfaceTheme.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
AlertDialog cfDialog = tsBuilder.create();
cfDialog.show();
materialAlertDialogBuilder.create().show();
});
// cache size data selection dialog
cacheSizeDataFrame.setOnClickListener(view -> {
AlertDialog.Builder tsBuilder = new AlertDialog.Builder(SettingsSecurityActivity.this);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.cacheSizeDataDialogHeader)
.setCancelable(cacheSizeDataSelectedChoice != -1)
.setSingleChoiceItems(cacheSizeDataList, cacheSizeDataSelectedChoice, (dialogInterfaceTheme, i) -> {
tsBuilder.setTitle(getResources().getString(R.string.cacheSizeDataDialogHeader));
tsBuilder.setCancelable(cacheSizeDataSelectedChoice != -1);
cacheSizeDataSelectedChoice = i;
cacheSizeDataSelected.setText(cacheSizeDataList[i]);
tinyDB.putString("cacheSizeStr", cacheSizeDataList[i]);
tinyDB.putInt("cacheSizeId", i);
tsBuilder.setSingleChoiceItems(cacheSizeDataList, cacheSizeDataSelectedChoice, (dialogInterfaceTheme, i) -> {
dialogInterfaceTheme.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
cacheSizeDataSelectedChoice = i;
cacheSizeDataSelected.setText(cacheSizeDataList[i]);
tinyDB.putString("cacheSizeStr", cacheSizeDataList[i]);
tinyDB.putInt("cacheSizeId", i);
dialogInterfaceTheme.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
AlertDialog cfDialog = tsBuilder.create();
cfDialog.show();
materialAlertDialogBuilder.create().show();
});
// certs deletion
certsFrame.setOnClickListener(v1 -> {
AlertDialog.Builder builder = new AlertDialog.Builder(SettingsSecurityActivity.this);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.settingsCertsPopupTitle)
.setMessage(getResources().getString(R.string.settingsCertsPopupMessage))
.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss())
.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
builder.setTitle(getResources().getString(R.string.settingsCertsPopupTitle));
builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage));
builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
appCtx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply();
AppUtil.logout(this);
});
appCtx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE).edit().remove(MemorizingTrustManager.KEYSTORE_KEY).apply();
AppUtil.logout(this);
});
builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
builder.create().show();
materialAlertDialogBuilder.create().show();
});
}

36
app/src/main/java/org/mian/gitnex/activities/SettingsTranslationActivity.java
View File

@ -5,7 +5,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.mian.gitnex.R;
import org.mian.gitnex.databinding.ActivitySettingsTranslationBinding;
import org.mian.gitnex.fragments.SettingsFragment;
@ -58,28 +58,24 @@ public class SettingsTranslationActivity extends BaseActivity {
// language dialog
langFrame.setOnClickListener(view -> {
AlertDialog.Builder lBuilder = new AlertDialog.Builder(SettingsTranslationActivity.this);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.settingsLanguageSelectorDialogTitle)
.setCancelable(langSelectedChoice != -1)
.setNeutralButton(getString(R.string.cancelButton), null)
.setSingleChoiceItems(langs.values().toArray(new String[0]), langSelectedChoice, (dialogInterface, i) -> {
lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
lBuilder.setCancelable(langSelectedChoice != -1);
String selectedLanguage = langs.keySet().toArray(new String[0])[i];
tinyDB.putInt("langId", i);
tinyDB.putString("locale", selectedLanguage);
lBuilder.setSingleChoiceItems(langs.values().toArray(new String[0]), langSelectedChoice, (dialogInterface, i) -> {
SettingsFragment.refreshParent = true;
this.overridePendingTransition(0, 0);
dialogInterface.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
this.recreate();
});
String selectedLanguage = langs.keySet().toArray(new String[0])[i];
tinyDB.putInt("langId", i);
tinyDB.putString("locale", selectedLanguage);
SettingsFragment.refreshParent = true;
this.overridePendingTransition(0, 0);
dialogInterface.dismiss();
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
this.recreate();
});
lBuilder.setNeutralButton(getString(R.string.cancelButton), null);
AlertDialog lDialog = lBuilder.create();
lDialog.show();
materialAlertDialogBuilder.create().show();
});
}

13
app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
View File

@ -8,8 +8,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.apache.commons.lang3.StringUtils;
import org.gitnex.tea4j.v2.models.Cron;
import org.mian.gitnex.R;
@ -74,13 +74,12 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAd
lastRunContent.setText(lastRun);
execTimeContent.setText(String.valueOf(cronTasks.getExecTimes()));
AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx);
alertDialog.setTitle(StringUtils.capitalize(cronTasks.getName().replace("_", " ")));
alertDialog.setView(view);
alertDialog.setPositiveButton(ctx.getString(R.string.close), null);
alertDialog.create().show();
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(StringUtils.capitalize(cronTasks.getName().replace("_", " ")))
.setView(view)
.setPositiveButton(ctx.getString(R.string.close), null);
materialAlertDialogBuilder.create().show();
});
cronTasksRun.setOnClickListener(taskInfo -> {

4
app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
View File

@ -101,7 +101,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
void bindData(User users) {
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
userLoginId = users.getLogin();
@ -127,7 +127,7 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<RecyclerView.View
userRole.setVisibility(View.VISIBLE);
TextDrawable drawable = TextDrawable.builder().beginConfig()
.textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null)).fontSize(44).width(180).height(60)
.textColor(ResourcesCompat.getColor(context.getResources(), R.color.colorWhite, null)).fontSize(60).width(200).height(80)
.endConfig().buildRoundRect(context.getResources().getString(R.string.userRoleAdmin).toLowerCase(), ResourcesCompat.getColor(context.getResources(), R.color.releasePre, null), 8);
userRole.setImageDrawable(drawable);
}

9
app/src/main/java/org/mian/gitnex/adapters/AdminUnadoptedReposAdapter.java
View File

@ -7,8 +7,8 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.mian.gitnex.R;
import org.mian.gitnex.clients.RetrofitClient;
import org.mian.gitnex.databinding.ActivityAdminCronTasksBinding;
@ -45,11 +45,14 @@ public class AdminUnadoptedReposAdapter extends RecyclerView.Adapter<AdminUnadop
itemView.setOnClickListener(taskInfo -> {
String[] repoSplit = repoName.split("/");
new AlertDialog.Builder(ctx)
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(repoName).setMessage(ctx.getString(R.string.unadoptedReposMessage, repoSplit[1], repoSplit[0]))
.setNeutralButton(R.string.close, null)
.setPositiveButton(R.string.menuDeleteText, ((dialog, which) -> delete(ctx, repoName)))
.setNegativeButton(R.string.adoptRepo, ((dialog, which) -> adopt(ctx, repoName, getBindingAdapterPosition()))).show();
.setNegativeButton(R.string.adoptRepo, ((dialog, which) -> adopt(ctx, repoName, getBindingAdapterPosition())));
materialAlertDialogBuilder.create().show();
});
}
}

2
app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java
View File

@ -75,7 +75,7 @@ public class AssigneesListAdapter extends RecyclerView.Adapter<AssigneesListAdap
public void onBindViewHolder(@NonNull AssigneesListAdapter.AssigneesViewHolder holder, int position) {
User currentItem = assigneesList.get(position);
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 90);
if(currentItem.getFullName().equals("")) {

29
app/src/main/java/org/mian/gitnex/adapters/CollaboratorSearchAdapter.java
View File

@ -14,6 +14,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.User;
import org.mian.gitnex.R;
import org.mian.gitnex.actions.CollaboratorActions;
@ -69,22 +70,20 @@ public class CollaboratorSearchAdapter extends RecyclerView.Adapter<Collaborator
addCollaboratorButtonRemove = itemView.findViewById(R.id.addCollaboratorButtonRemove);
addCollaboratorButtonAdd.setOnClickListener(v -> {
AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
pBuilder.setTitle(R.string.newTeamPermission);
pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, null)
.setCancelable(false)
.setNeutralButton(R.string.cancelButton, null)
.setPositiveButton(R.string.addButton, (dialog, which) -> {
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context)
.setTitle(R.string.newTeamPermission)
.setSingleChoiceItems(permissionList, permissionSelectedChoice, null)
.setNeutralButton(R.string.cancelButton, null)
.setPositiveButton(R.string.addButton, (dialog, which) -> {
ListView lw = ((AlertDialog)dialog).getListView();
Object checkedItem = lw.getAdapter().getItem(lw.getCheckedItemPosition());
ListView lw = ((AlertDialog)dialog).getListView();
Object checkedItem = lw.getAdapter().getItem(lw.getCheckedItemPosition());
CollaboratorActions.addCollaborator(context, String.valueOf(checkedItem).toLowerCase(), userInfo.getLogin(), repository);
});
CollaboratorActions.addCollaborator(context, String.valueOf(checkedItem).toLowerCase(), userInfo.getLogin(), repository);
});
AlertDialog pDialog = pBuilder.create();
pDialog.show();
materialAlertDialogBuilder.create().show();
});
addCollaboratorButtonRemove.setOnClickListener(v -> AlertDialogs.collaboratorRemoveDialog(context, userInfo.getLogin(), repository));
@ -119,7 +118,7 @@ public class CollaboratorSearchAdapter extends RecyclerView.Adapter<Collaborator
public void onBindViewHolder(@NonNull final CollaboratorSearchViewHolder holder, int position) {
User currentItem = usersSearchList.get(position);
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
holder.userInfo = currentItem;
if (!currentItem.getFullName().equals("")) {
@ -170,18 +169,14 @@ public class CollaboratorSearchAdapter extends RecyclerView.Adapter<Collaborator
holder.addCollaboratorButtonRemove.setVisibility(View.GONE);
holder.addCollaboratorButtonAdd.setVisibility(View.GONE);
}
}
@Override
public void onFailure(@NonNull Call<Void> call, @NonNull Throwable t) {
Log.i("onFailure", t.toString());
}
});
}
}
@Override

2
app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
View File

@ -96,7 +96,7 @@ public class CollaboratorsAdapter extends BaseAdapter {
private void initData(ViewHolder viewHolder, int position) {
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 90);
User currentItem = collaboratorsList.get(position);
PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(180, 180).centerCrop().into(viewHolder.collaboratorAvatar);

4
app/src/main/java/org/mian/gitnex/adapters/CommitsAdapter.java
View File

@ -121,7 +121,7 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
commitAuthorAvatar.setVisibility(View.VISIBLE);
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
PicassoService.getInstance(context).get()
.load(commitsModel.getAuthor().getAvatarUrl())
@ -142,7 +142,7 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
commitCommitterAvatar.setVisibility(View.VISIBLE);
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
PicassoService.getInstance(context).get()
.load(commitsModel.getCommitter().getAvatarUrl())

2
app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java
View File

@ -142,7 +142,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter<RecyclerView.View
void bindData(Issue issue) {
this.issue = issue;
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
Locale locale = context.getResources().getConfiguration().locale;
String timeFormat = tinyDb.getString("dateFormat", "pretty");

4
app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
View File

@ -110,7 +110,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
void bindData(org.gitnex.tea4j.v2.models.Repository userRepositories) {
this.userRepositories = userRepositories;
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
Locale locale = context.getResources().getConfiguration().locale;
String timeFormat = tinyDb.getString("dateFormat", "pretty");
@ -122,7 +122,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<RecyclerVie
int color = generator.getColor(userRepositories.getName());
String firstCharacter = String.valueOf(userRepositories.getFullName().charAt(0));
TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 14);
if(userRepositories.getAvatarUrl() != null) {
if(!userRepositories.getAvatarUrl().equals("")) {

8
app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
View File

@ -11,10 +11,10 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.cardview.widget.CardView;
import androidx.core.widget.ImageViewCompat;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.card.MaterialCardView;
import org.gitnex.tea4j.v2.models.Label;
import org.mian.gitnex.R;
import org.mian.gitnex.activities.CreateLabelActivity;
@ -39,7 +39,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
private Label labels;
private final CardView labelView;
private final MaterialCardView labelView;
private final ImageView labelIcon;
private final TextView labelName;
@ -143,4 +143,8 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
return labelsList.size();
}
@SuppressLint("NotifyDataSetChanged")
public void notifyDataChanged() {
notifyDataSetChanged();
}
}

2
app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
View File

@ -91,7 +91,7 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<RecyclerView.
void bindData(Organization org) {
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
this.userOrganizations = org;
orgName.setText(org.getUsername());

8
app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
View File

@ -11,10 +11,10 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.Release;
import org.mian.gitnex.R;
import org.mian.gitnex.activities.MainActivity;
@ -267,10 +267,10 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
private void deleteRelease(final Context context, final String releaseName, final Long releaseId, final String owner, final String repo, int position) {
new AlertDialog.Builder(context)
.setTitle(String.format(context.getString(R.string.deleteGenericTitle), releaseName))
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
materialAlertDialogBuilder.setTitle(String.format(context.getString(R.string.deleteGenericTitle), releaseName))
.setMessage(R.string.deleteReleaseConfirmation)
.setIcon(R.drawable.ic_delete)
.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient
.getApiInterface(context).repoDeleteRelease(owner, repo, releaseId).enqueue(new Callback<>() {

4
app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
View File

@ -121,7 +121,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
void bindData(org.gitnex.tea4j.v2.models.Repository repositories) {
this.userRepositories = repositories;
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
Locale locale = context.getResources().getConfiguration().locale;
String timeFormat = tinyDb.getString("dateFormat", "pretty");
@ -133,7 +133,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
int color = generator.getColor(repositories.getName());
String firstCharacter = String.valueOf(repositories.getFullName().charAt(0));
TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 3);
TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28).endConfig().buildRoundRect(firstCharacter, color, 14);
if(repositories.getAvatarUrl() != null) {
if(!repositories.getAvatarUrl().equals("")) {

11
app/src/main/java/org/mian/gitnex/adapters/TagsAdapter.java
View File

@ -9,9 +9,9 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.Tag;
import org.mian.gitnex.R;
import org.mian.gitnex.activities.RepoDetailActivity;
@ -184,10 +184,11 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
private void tagDeleteDialog(final Context context, final String tagName, final String owner, final String repo, int position) {
new AlertDialog.Builder(context)
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context)
.setTitle(String.format(context.getString(R.string.deleteGenericTitle), tagName))
.setMessage(R.string.deleteTagConfirmation)
.setIcon(R.drawable.ic_delete)
.setCancelable(false)
.setNeutralButton(R.string.cancelButton, null)
.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient
.getApiInterface(context).repoDeleteTag(owner, repo, tagName).enqueue(new Callback<>() {
@ -218,6 +219,8 @@ public class TagsAdapter extends RecyclerView.Adapter<TagsAdapter.TagsViewHolder
Toasty.error(context, context.getString(R.string.genericError));
}
}))
.setNeutralButton(R.string.cancelButton, null).show();
.setNeutralButton(R.string.cancelButton, null);
materialAlertDialogBuilder.create().show();
}
}

4
app/src/main/java/org/mian/gitnex/adapters/TeamRepositoriesAdapter.java
View File

@ -107,12 +107,12 @@ public class TeamRepositoriesAdapter extends RecyclerView.Adapter<TeamRepositori
Repository currentItem = reposList.get(position);
holder.repoInfo = currentItem;
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 60);
holder.name.setText(currentItem.getName());
TextDrawable drawable = TextDrawable.builder().beginConfig().useFont(Typeface.DEFAULT).fontSize(18).toUpperCase().width(28).height(28)
.endConfig().buildRoundRect(String.valueOf(currentItem.getFullName().charAt(0)), ColorGenerator.Companion.getMATERIAL().getColor(currentItem.getName()), 3);
.endConfig().buildRoundRect(String.valueOf(currentItem.getFullName().charAt(0)), ColorGenerator.Companion.getMATERIAL().getColor(currentItem.getName()), 14);
if(currentItem.getAvatarUrl() != null && !currentItem.getAvatarUrl().equals("")) {
PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated)

2
app/src/main/java/org/mian/gitnex/adapters/UserGridAdapter.java
View File

@ -102,7 +102,7 @@ public class UserGridAdapter extends BaseAdapter implements Filterable {
private void initData(UserGridAdapter.ViewHolder viewHolder, int position) {
User currentItem = membersList.get(position);
int imgRadius = AppUtil.getPixelsFromDensity(context, 3);
int imgRadius = AppUtil.getPixelsFromDensity(context, 0);
PicassoService.getInstance(context).get().load(currentItem.getAvatarUrl()).placeholder(R.drawable.loader_animated).transform(new RoundedTransformation(imgRadius, 0)).resize(120, 120).centerCrop().into(viewHolder.memberAvatar);

8
app/src/main/java/org/mian/gitnex/adapters/WikiListAdapter.java
View File

@ -10,12 +10,12 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.core.text.HtmlCompat;
import androidx.recyclerview.widget.RecyclerView;
import com.amulyakhare.textdrawable.TextDrawable;
import com.amulyakhare.textdrawable.util.ColorGenerator;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.WikiPageMetaData;
import org.mian.gitnex.R;
import org.mian.gitnex.activities.RepoDetailActivity;
@ -200,10 +200,10 @@ public class WikiListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
private void deleteWiki(final String owner, final String repo, final String pageName, int position, final Context context) {
new AlertDialog.Builder(context)
.setTitle(String.format(context.getString(R.string.deleteGenericTitle), pageName))
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
materialAlertDialogBuilder.setTitle(String.format(context.getString(R.string.deleteGenericTitle), pageName))
.setMessage(context.getString(R.string.deleteWikiPageMessage, pageName))
.setIcon(R.drawable.ic_delete)
.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient
.getApiInterface(context).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() {

20
app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
View File

@ -1,9 +1,6 @@
package org.mian.gitnex.fragments;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@ -18,6 +15,7 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.Repository;
import org.gitnex.tea4j.v2.models.SearchResults;
import org.mian.gitnex.R;
@ -52,7 +50,6 @@ public class ExploreRepositoriesFragment extends Fragment {
private List<Repository> dataList;
private ExploreRepositoriesAdapter adapter;
private Dialog dialogFilterOptions;
private CustomExploreRepositoriesDialogBinding filterBinding;
private boolean includeTopic = false;
@ -219,16 +216,11 @@ public class ExploreRepositoriesFragment extends Fragment {
private void showFilterOptions() {
dialogFilterOptions = new Dialog(context, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
if (dialogFilterOptions.getWindow() != null) {
dialogFilterOptions.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
filterBinding = CustomExploreRepositoriesDialogBinding.inflate(LayoutInflater.from(context));
View view = filterBinding.getRoot();
dialogFilterOptions.setContentView(view);
materialAlertDialogBuilder.setView(view);
filterBinding.includeTopic.setOnClickListener(includeTopic -> this.includeTopic = filterBinding.includeTopic.isChecked());
@ -243,9 +235,8 @@ public class ExploreRepositoriesFragment extends Fragment {
filterBinding.includeTemplate.setChecked(includeTemplate);
filterBinding.onlyArchived.setChecked(onlyArchived);
filterBinding.cancel.setOnClickListener(editProperties -> dialogFilterOptions.dismiss());
dialogFilterOptions.show();
materialAlertDialogBuilder.setNeutralButton(getString(R.string.close), null);
materialAlertDialogBuilder.show();
}
@Override
@ -257,6 +248,5 @@ public class ExploreRepositoriesFragment extends Fragment {
loadInitial(searchQuery, resultLimit);
MainActivity.reloadRepos = false;
}
}
}

9
app/src/main/java/org/mian/gitnex/fragments/LabelsFragment.java
View File

@ -27,7 +27,6 @@ import org.mian.gitnex.viewmodels.LabelsViewModel;
public class LabelsFragment extends Fragment {
private LabelsViewModel labelsViewModel;
private ProgressBar mProgressBar;
private RecyclerView mRecyclerView;
private LabelsAdapter adapter;
@ -56,7 +55,6 @@ public class LabelsFragment extends Fragment {
FragmentLabelsBinding fragmentLabelsBinding = FragmentLabelsBinding.inflate(inflater, container, false);
setHasOptionsMenu(true);
labelsViewModel = new ViewModelProvider(this).get(LabelsViewModel.class);
final SwipeRefreshLayout swipeRefresh = fragmentLabelsBinding.pullToRefresh;
noData = fragmentLabelsBinding.noData;
@ -74,7 +72,7 @@ public class LabelsFragment extends Fragment {
swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
swipeRefresh.setRefreshing(false);
labelsViewModel.loadLabelsList(repository.getOwner(), repository.getName(), getContext());
LabelsViewModel.loadLabelsList(repository.getOwner(), repository.getName(), getContext());
}, 200));
fetchDataAsync(repository.getOwner(), repository.getName());
@ -89,7 +87,7 @@ public class LabelsFragment extends Fragment {
if(CreateLabelActivity.refreshLabels) {
labelsViewModel.loadLabelsList(repository.getOwner(), repository.getName(), getContext());
LabelsViewModel.loadLabelsList(repository.getOwner(), repository.getName(), getContext());
CreateLabelActivity.refreshLabels = false;
}
}
@ -109,14 +107,13 @@ public class LabelsFragment extends Fragment {
}
else {
adapter.notifyDataSetChanged();
adapter.notifyDataChanged();
mRecyclerView.setAdapter(adapter);
noData.setVisibility(View.VISIBLE);
}
mProgressBar.setVisibility(View.GONE);
});
}
}

2
app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
View File

@ -62,7 +62,7 @@ public class MyRepositoriesFragment extends Fragment {
RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
fragmentRepositoriesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 200);
fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 240);
fragmentRepositoriesBinding.recyclerView.setClipToPadding(false);
fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {

6
app/src/main/java/org/mian/gitnex/fragments/OrganizationLabelsFragment.java
View File

@ -79,7 +79,7 @@ public class OrganizationLabelsFragment extends Fragment {
swipeRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {
swipeRefresh.setRefreshing(false);
organizationLabelsViewModel.loadOrgLabelsList(repoOwner, getContext(), mProgressBar, noData);
OrganizationLabelsViewModel.loadOrgLabelsList(repoOwner, getContext(), mProgressBar, noData);
}, 200));
@ -96,7 +96,7 @@ public class OrganizationLabelsFragment extends Fragment {
if(CreateLabelActivity.refreshLabels) {
organizationLabelsViewModel.loadOrgLabelsList(repoOwner, getContext(), mProgressBar, noData);
OrganizationLabelsViewModel.loadOrgLabelsList(repoOwner, getContext(), mProgressBar, noData);
CreateLabelActivity.refreshLabels = false;
}
}
@ -114,7 +114,7 @@ public class OrganizationLabelsFragment extends Fragment {
}
else {
adapter.notifyDataSetChanged();
adapter.notifyDataChanged();
mRecyclerView.setAdapter(adapter);
noData.setVisibility(View.VISIBLE);
}

2
app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
View File

@ -61,7 +61,7 @@ public class OrganizationsFragment extends Fragment {
RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
fragmentOrganizationsBinding.recyclerView.addItemDecoration(dividerItemDecoration);
fragmentOrganizationsBinding.recyclerView.setPadding(0, 0, 0, 200);
fragmentOrganizationsBinding.recyclerView.setPadding(0, 0, 0, 240);
fragmentOrganizationsBinding.recyclerView.setClipToPadding(false);
fragmentOrganizationsBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {

12
app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
View File

@ -9,8 +9,8 @@ import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.apache.commons.io.FileUtils;
import org.gitnex.tea4j.v2.models.Organization;
import org.gitnex.tea4j.v2.models.Repository;
@ -232,13 +232,13 @@ public class RepoInfoFragment extends Fragment {
repoUrlHeader.setText(getString(R.string.infoTabRepoRepoUrl));
repoUrlContent.setText(repoInfo.getHtmlUrl());
AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx);
alertDialog.setTitle(getResources().getString(R.string.infoMoreInformation));
alertDialog.setView(view);
alertDialog.setPositiveButton(getString(R.string.okButton), null);
alertDialog.create().show();
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(R.string.infoMoreInformation)
.setView(view)
.setNeutralButton(getString(R.string.close), null);
materialAlertDialogBuilder.create().show();
});
if(repoInfo.isArchived()) {

2
app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
View File

@ -59,7 +59,7 @@ public class RepositoriesFragment extends Fragment {
RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
fragmentRepositoriesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 200);
fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 240);
fragmentRepositoriesBinding.recyclerView.setClipToPadding(false);
fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {

24
app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
View File

@ -1,11 +1,8 @@
package org.mian.gitnex.fragments;
import android.app.Dialog;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
@ -14,6 +11,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.mian.gitnex.R;
import org.mian.gitnex.activities.BaseActivity;
import org.mian.gitnex.activities.MainActivity;
@ -37,7 +35,7 @@ public class SettingsFragment extends Fragment {
public static boolean refreshParent = false;
private Context ctx;
private Dialog aboutAppDialog;
private MaterialAlertDialogBuilder materialAlertDialogBuilder;
@Nullable
@Override
@ -46,7 +44,7 @@ public class SettingsFragment extends Fragment {
FragmentSettingsBinding fragmentSettingsBinding = FragmentSettingsBinding.inflate(inflater, container, false);
ctx = getContext();
aboutAppDialog = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
((MainActivity) requireActivity()).setActionBarTitle(getResources().getString(R.string.navSettings));
@ -78,13 +76,10 @@ public class SettingsFragment extends Fragment {
public void showAboutAppDialog() {
if (aboutAppDialog.getWindow() != null) {
aboutAppDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
CustomAboutDialogBinding aboutAppDialogBinding = CustomAboutDialogBinding.inflate(LayoutInflater.from(ctx));
View view = aboutAppDialogBinding.getRoot();
aboutAppDialog.setContentView(view);
materialAlertDialogBuilder.setView(view);
aboutAppDialogBinding.appVersionBuild.setText(getString(R.string.appVersionBuild, AppUtil.getAppVersion(ctx), AppUtil.getAppBuildNo(ctx)));
aboutAppDialogBinding.userServerVersion.setText(((BaseActivity) requireActivity()).getAccount().getServerVersion().toString());
@ -93,6 +88,10 @@ public class SettingsFragment extends Fragment {
AppUtil.openUrlInBrowser(requireContext(), getResources().getString(R.string.supportLinkPatreon));
});
aboutAppDialogBinding.donationLinkBuyMeaCoffee.setOnClickListener(v11 -> {
AppUtil.openUrlInBrowser(requireContext(), getResources().getString(R.string.supportLinkBuyMeaCoffee));
});
aboutAppDialogBinding.translateLink.setOnClickListener(v13 -> {
AppUtil.openUrlInBrowser(requireContext(), getResources().getString(R.string.crowdInLink));
});
@ -103,12 +102,11 @@ public class SettingsFragment extends Fragment {
if(AppUtil.isPro(requireContext())) {
aboutAppDialogBinding.supportHeader.setVisibility(View.GONE);
aboutAppDialogBinding.dividerSupport.setVisibility(View.GONE);
aboutAppDialogBinding.donationLinkPatreon.setVisibility(View.GONE);
aboutAppDialogBinding.donationLinkBuyMeaCoffee.setVisibility(View.GONE);
}
aboutAppDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
aboutAppDialog.show();
materialAlertDialogBuilder.show();
}
public void rateThisApp() {

2
app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
View File

@ -59,7 +59,7 @@ public class StarredRepositoriesFragment extends Fragment {
RecyclerView.ItemDecoration dividerItemDecoration = new DividerItemDecorator(ContextCompat.getDrawable(requireContext(), R.drawable.shape_list_divider));
fragmentRepositoriesBinding.recyclerView.addItemDecoration(dividerItemDecoration);
fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 200);
fragmentRepositoriesBinding.recyclerView.setPadding(0, 0, 0, 240);
fragmentRepositoriesBinding.recyclerView.setClipToPadding(false);
fragmentRepositoriesBinding.pullToRefresh.setOnRefreshListener(() -> new Handler(Looper.getMainLooper()).postDelayed(() -> {

124
app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
View File

@ -1,17 +1,17 @@
package org.mian.gitnex.helpers;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.widget.Button;
import android.view.LayoutInflater;
import android.view.View;
import androidx.appcompat.app.AlertDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.mian.gitnex.R;
import org.mian.gitnex.actions.CollaboratorActions;
import org.mian.gitnex.actions.PullRequestActions;
import org.mian.gitnex.actions.TeamActions;
import org.mian.gitnex.activities.CreateLabelActivity;
import org.mian.gitnex.databinding.CustomPrUpdateStrategyDialogBinding;
import org.mian.gitnex.helpers.contexts.RepositoryContext;
/**
@ -20,110 +20,108 @@ import org.mian.gitnex.helpers.contexts.RepositoryContext;
public class AlertDialogs {
private static MaterialAlertDialogBuilder materialAlertDialogBuilder;
public static void authorizationTokenRevokedDialog(final Context context) {
new AlertDialog.Builder(context)
.setTitle(R.string.alertDialogTokenRevokedTitle)
.setMessage(R.string.alertDialogTokenRevokedMessage)
.setCancelable(true)
.setIcon(R.drawable.ic_warning)
.setNeutralButton(R.string.cancelButton, null)
.setPositiveButton(R.string.navLogout, (dialog, which) -> AppUtil.logout(context))
.show();
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
materialAlertDialogBuilder.setTitle(R.string.alertDialogTokenRevokedTitle)
.setMessage(R.string.alertDialogTokenRevokedMessage)
.setCancelable(true)
.setNeutralButton(R.string.cancelButton, null)
.setPositiveButton(R.string.navLogout, (dialog, which) -> AppUtil.logout(context))
.show();
}
public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String type, String orgName,
RepositoryContext repository) {
new AlertDialog.Builder(context)
.setTitle(context.getString(R.string.deleteGenericTitle, labelTitle))
.setMessage(R.string.labelDeleteMessage)
.setIcon(R.drawable.ic_delete)
.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> {
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
Intent intent = new Intent(context, CreateLabelActivity.class);
intent.putExtra("labelId", labelId);
intent.putExtra("labelAction", "delete");
intent.putExtra("type", type);
intent.putExtra("orgName", orgName);
intent.putExtra(RepositoryContext.INTENT_EXTRA, repository);
context.startActivity(intent);
})
.setNeutralButton(R.string.cancelButton, null).show();
materialAlertDialogBuilder.setTitle(context.getString(R.string.deleteGenericTitle, labelTitle))
.setMessage(R.string.labelDeleteMessage)
.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> {
Intent intent = new Intent(context, CreateLabelActivity.class);
intent.putExtra("labelId", labelId);
intent.putExtra("labelAction", "delete");
intent.putExtra("type", type);
intent.putExtra("orgName", orgName);
intent.putExtra(RepositoryContext.INTENT_EXTRA, repository);
context.startActivity(intent);
})
.setNeutralButton(R.string.cancelButton, null).show();
}
public static void collaboratorRemoveDialog(final Context context, final String userNameMain, RepositoryContext repository) {
new AlertDialog.Builder(context)
.setTitle(context.getString(R.string.removeCollaboratorDialogTitle, userNameMain))
.setMessage(R.string.removeCollaboratorMessage)
.setPositiveButton(R.string.removeButton, (dialog, whichButton) -> CollaboratorActions.deleteCollaborator(context, userNameMain, repository))
.setNeutralButton(R.string.cancelButton, null).show();
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
materialAlertDialogBuilder.setTitle(context.getString(R.string.removeCollaboratorDialogTitle, userNameMain))
.setMessage(R.string.removeCollaboratorMessage)
.setPositiveButton(R.string.removeButton, (dialog, whichButton) -> CollaboratorActions.deleteCollaborator(context, userNameMain, repository))
.setNeutralButton(R.string.cancelButton, null).show();
}
public static void addMemberDialog(final Context context, final String userNameMain, int teamId) {
new AlertDialog.Builder(context)
.setTitle(context.getResources().getString(R.string.addTeamMember, userNameMain))
.setMessage(R.string.addTeamMemberMessage)
.setPositiveButton(R.string.addButton, (dialog, whichButton) -> TeamActions.addTeamMember(context, userNameMain, teamId))
.setNeutralButton(R.string.cancelButton, null).show();
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
materialAlertDialogBuilder.setTitle(context.getResources().getString(R.string.addTeamMember, userNameMain))
.setMessage(R.string.addTeamMemberMessage)
.setPositiveButton(R.string.addButton, (dialog, whichButton) -> TeamActions.addTeamMember(context, userNameMain, teamId))
.setNeutralButton(R.string.cancelButton, null).show();
}
public static void removeMemberDialog(final Context context, final String userNameMain, int teamId) {
new AlertDialog.Builder(context)
.setTitle(context.getResources().getString(R.string.removeTeamMember, userNameMain))
.setMessage(R.string.removeTeamMemberMessage)
.setPositiveButton(R.string.removeButton, (dialog, whichButton) -> TeamActions.removeTeamMember(context, userNameMain, teamId))
.setNeutralButton(R.string.cancelButton, null).show();
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
materialAlertDialogBuilder.setTitle(context.getResources().getString(R.string.removeTeamMember, userNameMain))
.setMessage(R.string.removeTeamMemberMessage)
.setPositiveButton(R.string.removeButton, (dialog, whichButton) -> TeamActions.removeTeamMember(context, userNameMain, teamId))
.setNeutralButton(R.string.cancelButton, null).show();
}
public static void addRepoDialog(final Context context, final String orgName, String repo, int teamId, String teamName) {
new AlertDialog.Builder(context)
.setTitle(context.getResources().getString(R.string.addTeamMember, repo))
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
materialAlertDialogBuilder.setTitle(context.getResources().getString(R.string.addTeamMember, repo))
.setMessage(context.getResources().getString(R.string.repoAddToTeamMessage, repo, orgName, teamName))
.setPositiveButton(context.getResources().getString(R.string.addButton), (dialog, whichButton) -> TeamActions.addTeamRepo(context, orgName, teamId, repo))
.setNeutralButton(context.getResources().getString(R.string.cancelButton), null).show();
}
public static void removeRepoDialog(final Context context, final String orgName, String repo, int teamId, String teamName) {
new AlertDialog.Builder(context)
.setTitle(context.getResources().getString(R.string.removeTeamMember, repo))
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
materialAlertDialogBuilder.setTitle(context.getResources().getString(R.string.removeTeamMember, repo))
.setMessage(context.getResources().getString(R.string.repoRemoveTeamMessage, repo, teamName))
.setPositiveButton(context.getResources().getString(R.string.removeButton), (dialog, whichButton) -> TeamActions.removeTeamRepo(context, orgName, teamId, repo))
.setNeutralButton(context.getResources().getString(R.string.cancelButton), null).show();
}
public static void selectPullUpdateStrategy(Context context, String repoOwner, String repo, String issueNumber) {
Dialog dialog = new Dialog(context, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
if (dialog.getWindow() != null) {
dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_Material3_Dialog_Alert);
dialog.setContentView(R.layout.custom_pr_update_strategy_dialog);
Button mergeBtn = dialog.findViewById(R.id.updatePullMerge);
Button rebaseBtn = dialog.findViewById(R.id.updatePullRebase);
Button cancelBtn = dialog.findViewById(R.id.cancelPullUpdate);
mergeBtn.setOnClickListener((v) -> {
PullRequestActions.updatePr(context, repoOwner, repo, issueNumber, false);
dialog.dismiss();
CustomPrUpdateStrategyDialogBinding binding = CustomPrUpdateStrategyDialogBinding.inflate(LayoutInflater.from(context));
View view = binding.getRoot();
materialAlertDialogBuilder.setView(view);
AlertDialog dialog = materialAlertDialogBuilder.show();
binding.updatePullMerge.setOnClickListener((v) -> {
PullRequestActions.updatePr(context, repoOwner, repo, issueNumber, false);
dialog.dismiss();
});
rebaseBtn.setOnClickListener((v) -> {
binding.updatePullRebase.setOnClickListener((v) -> {
PullRequestActions.updatePr(context, repoOwner, repo, issueNumber, true);
dialog.dismiss();
});
cancelBtn.setOnClickListener((v) -> dialog.dismiss());
dialog.show();
}
}

4
app/src/main/java/org/mian/gitnex/viewmodels/LabelsViewModel.java
View File

@ -20,7 +20,7 @@ import retrofit2.Response;
public class LabelsViewModel extends ViewModel {
private MutableLiveData<List<Label>> labelsList;
private static MutableLiveData<List<Label>> labelsList;
public LiveData<List<Label>> getLabelsList(String owner, String repo, Context ctx) {
@ -30,7 +30,7 @@ public class LabelsViewModel extends ViewModel {
return labelsList;
}
public void loadLabelsList(String owner, String repo, Context ctx) {
public static void loadLabelsList(String owner, String repo, Context ctx) {
Call<List<Label>> call = RetrofitClient
.getApiInterface(ctx)

4
app/src/main/java/org/mian/gitnex/viewmodels/OrganizationLabelsViewModel.java
View File

@ -23,7 +23,7 @@ import retrofit2.Response;
public class OrganizationLabelsViewModel extends ViewModel {
private MutableLiveData<List<Label>> orgLabelsList;
private static MutableLiveData<List<Label>> orgLabelsList;
public LiveData<List<Label>> getOrgLabelsList(String owner, Context ctx, ProgressBar progressBar, TextView noData) {
@ -33,7 +33,7 @@ public class OrganizationLabelsViewModel extends ViewModel {
return orgLabelsList;
}
public void loadOrgLabelsList(String owner, Context ctx, ProgressBar progressBar, TextView noData) {
public static void loadOrgLabelsList(String owner, Context ctx, ProgressBar progressBar, TextView noData) {
Call<List<Label>> call = RetrofitClient
.getApiInterface(ctx)

16
app/src/main/java/org/mian/gitnex/views/ReactionList.java
View File

@ -9,10 +9,10 @@ import android.view.ViewGroup;
import android.widget.HorizontalScrollView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.card.MaterialCardView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.vdurmont.emoji.Emoji;
import com.vdurmont.emoji.EmojiManager;
import org.gitnex.tea4j.v2.models.Reaction;
@ -115,7 +115,7 @@ public class ReactionList extends HorizontalScrollView {
List<Reaction> issueReactions = sortedReactions.get(content);
@SuppressLint("InflateParams") CardView reactionBadge = (CardView) LayoutInflater.from(context).inflate(R.layout.layout_reaction_badge, this, false);
@SuppressLint("InflateParams") MaterialCardView reactionBadge = (MaterialCardView) LayoutInflater.from(context).inflate(R.layout.layout_reaction_badge, this, false);
for(Reaction issueReaction : issueReactions) {
if(issueReaction.getUser().getLogin().equals(loginUid)) {
@ -142,14 +142,12 @@ public class ReactionList extends HorizontalScrollView {
recyclerView.setAdapter(adapter);
assert emoji != null;
AlertDialog alertDialog = new AlertDialog.Builder(context)
.setView(recyclerView)
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(context)
.setTitle(emoji.getUnicode())
.setPositiveButton(R.string.okButton, (dialog, which) -> dialog.cancel())
.setCancelable(true)
.create();
.setView(recyclerView)
.setNeutralButton(R.string.close, null);
alertDialog.show();
materialAlertDialogBuilder.create().show();
});

4
app/src/main/java/org/mian/gitnex/views/ReactionSpinner.java
View File

@ -10,7 +10,7 @@ import android.view.ViewGroup;
import android.widget.HorizontalScrollView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.cardview.widget.CardView;
import com.google.android.material.card.MaterialCardView;
import com.vdurmont.emoji.Emoji;
import com.vdurmont.emoji.EmojiManager;
import org.gitnex.tea4j.v2.models.EditReactionOption;
@ -82,7 +82,7 @@ public class ReactionSpinner extends HorizontalScrollView {
// Show all allowed reactions
for(String allowedReaction : allowedReactions) {
@SuppressLint("InflateParams") CardView reactionButton = (CardView) LayoutInflater.from(context)
@SuppressLint("InflateParams") MaterialCardView reactionButton = (MaterialCardView) LayoutInflater.from(context)
.inflate(R.layout.layout_reaction_button, root, false);
// Checks if current user reacted with 'allowedReaction'

6
app/src/main/res/drawable/shape_bottom_sheet_top_corners.xml
View File

@ -3,10 +3,10 @@
android:shape="rectangle">
<corners
android:topLeftRadius="12dp"
android:topRightRadius="12dp" />
android:topLeftRadius="@dimen/dimen16dp"
android:topRightRadius="@dimen/dimen16dp" />
<padding android:top="12dp" />
<padding android:top="@dimen/dimen12dp" />
<solid android:color="?attr/primaryBackgroundColor" />

2
app/src/main/res/drawable/shape_round_corners.xml
View File

@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<solid android:color="?attr/primaryBackgroundColor"/>
<corners android:radius="12dp"/>
<corners android:radius="18dp"/>
</shape>

14
app/src/main/res/drawable/switch_thumb.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:bottom="4dp"
android:left="4dp"
android:right="4dp"
android:top="4dp">
<shape android:shape="oval">
<size
android:width="20dp"
android:height="20dp" />
</shape>
</item>
</layer-list>

11
app/src/main/res/drawable/switch_track.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="56dp" />
<size
android:width="64dp"
android:height="28dp" />
</shape>
</item>
</layer-list>

38
app/src/main/res/layout/activity_add_collaborator_to_repository.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/collaborator"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -58,10 +58,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp">
android:layout_marginStart="@dimen/dimen10dp"
android:layout_marginEnd="@dimen/dimen10dp"
android:layout_marginTop="@dimen/dimen10dp"
android:layout_marginBottom="@dimen/dimen10dp">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/addCollaboratorSearchLayout"
@ -71,8 +71,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:startIconDrawable="@drawable/ic_search"
app:startIconTint="?attr/iconsColor"
app:endIconMode="clear_text"
@ -89,7 +89,7 @@
android:singleLine="true"
android:imeOptions="actionSend"
android:inputType="text"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -99,11 +99,11 @@
android:id="@+id/noData"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
android:layout_margin="@dimen/dimen16dp"
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
@ -111,10 +111,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="0dp"
android:layout_marginStart="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen0dp"
android:layout_marginTop="@dimen/dimen6dp"
android:layout_marginBottom="@dimen/dimen0dp"
android:scrollbars="vertical" />
</LinearLayout>

43
app/src/main/res/layout/activity_add_new_account.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Widget.AppCompat.SearchView"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.appbar.MaterialToolbar
@ -24,10 +24,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:src="@drawable/ic_arrow_back" />
@ -42,8 +42,8 @@
android:ellipsize="none"
android:scrollbars="horizontal"
android:singleLine="true"
android:layout_marginEnd="20dp"
android:textSize="18sp" />
android:layout_marginEnd="@dimen/dimen20dp"
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -53,7 +53,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textfield.TextInputLayout
@ -63,11 +63,11 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/protocol"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/protocolSpinner"
@ -77,7 +77,7 @@
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/protocolSpinner"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -89,8 +89,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:startIconDrawable="@drawable/ic_link"
app:startIconTint="?attr/iconsColor"
app:endIconMode="clear_text"
@ -106,7 +106,7 @@
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -118,8 +118,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:startIconDrawable="@drawable/ic_lock"
app:startIconTint="?attr/iconsColor"
app:endIconMode="clear_text"
@ -135,18 +135,19 @@
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/addNewAccount"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/addNewAccountText"
android:textColor="@color/btnTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>

38
app/src/main/res/layout/activity_add_new_team_member.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/addRemove"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -58,10 +58,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp">
android:layout_marginStart="@dimen/dimen10dp"
android:layout_marginEnd="@dimen/dimen10dp"
android:layout_marginTop="@dimen/dimen10dp"
android:layout_marginBottom="@dimen/dimen10dp">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/addNewTeamMemberLayout"
@ -71,8 +71,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:startIconDrawable="@drawable/ic_search"
app:startIconTint="?attr/iconsColor"
app:endIconMode="clear_text"
@ -88,7 +88,7 @@
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:inputType="text"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -98,11 +98,11 @@
android:id="@+id/noData"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="16dp"
android:layout_margin="@dimen/dimen16dp"
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
@ -110,10 +110,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="0dp"
android:layout_marginStart="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen0dp"
android:layout_marginTop="@dimen/dimen6dp"
android:layout_marginBottom="@dimen/dimen0dp"
android:scrollbars="vertical" />
</LinearLayout>

16
app/src/main/res/layout/activity_admin_cron_tasks.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -22,10 +22,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -41,7 +41,7 @@
android:text="@string/adminCron"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -76,11 +76,11 @@
android:id="@+id/noData"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="16dp"
android:layout_margin="@dimen/dimen16dp"
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
</RelativeLayout>

24
app/src/main/res/layout/activity_admin_get_users.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -42,8 +42,8 @@
android:ellipsize="none"
android:scrollbars="horizontal"
android:singleLine="true"
android:layout_marginEnd="20dp"
android:textSize="18sp" />
android:layout_marginEnd="@dimen/dimen20dp"
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -52,7 +52,7 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/pull_to_refresh"
android:layout_width="match_parent"
android:layout_marginTop="56dp"
android:layout_marginTop="@dimen/dimen56dp"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
@ -68,20 +68,20 @@
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:layout_marginTop="@dimen/dimen56dp"
android:indeterminate="true"
style="@style/Widget.MaterialComponents.LinearProgressIndicator"
style="@style/Widget.Material3.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
<TextView
android:id="@+id/no_data_users"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="16dp"
android:layout_margin="@dimen/dimen16dp"
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
</RelativeLayout>

18
app/src/main/res/layout/activity_code_editor.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/codeEditor"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -50,13 +50,13 @@
android:id="@+id/codeView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="56dp"
android:layout_marginTop="@dimen/dimen56dp"
android:layout_above="@+id/source_info_layout"
android:background="@color/colorPrimary"
android:dropDownWidth="@dimen/dimen150dp"
android:dropDownHorizontalOffset="0dp"
android:dropDownHorizontalOffset="@dimen/dimen0dp"
android:dropDownSelector="@color/colorPrimary"
android:textSize="14sp"
android:textSize="@dimen/dimen14sp"
android:gravity="top|start" />
<RelativeLayout

22
app/src/main/res/layout/activity_commits.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -42,8 +42,8 @@
android:ellipsize="none"
android:scrollbars="horizontal"
android:singleLine="true"
android:layout_marginEnd="20dp"
android:textSize="18sp" />
android:layout_marginEnd="@dimen/dimen20dp"
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -53,7 +53,7 @@
android:id="@+id/pullToRefresh"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="56dp">
android:layout_marginTop="@dimen/dimen56dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
@ -68,7 +68,7 @@
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:layout_marginTop="@dimen/dimen56dp"
android:indeterminate="true"
style="@style/Widget.MaterialComponents.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
@ -77,11 +77,11 @@
android:id="@+id/noDataCommits"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="16dp"
android:layout_margin="@dimen/dimen16dp"
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
</RelativeLayout>

47
app/src/main/res/layout/activity_create_file.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/pageTitleNewFile"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -54,7 +54,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -65,8 +65,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:helperTextEnabled="true"
@ -84,7 +84,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -96,8 +96,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newFileContentTintCopy">
@ -105,14 +105,14 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/newFileContent"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="@dimen/dimen140dp"
android:gravity="top|start"
android:inputType="textMultiLine|textCapSentences"
android:scrollbars="vertical"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -123,14 +123,14 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newFileBranches"
app:endIconTint="?attr/iconsColor"
app:helperTextEnabled="true"
app:helperText="@string/newFileEmptyBranchMessage"
app:helperTextTextColor="?attr/inputTextColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/new_file_branches"
@ -142,7 +142,7 @@
android:singleLine="true"
android:imeOptions="actionNext"
android:textColor="?attr/inputTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -154,8 +154,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:counterEnabled="true"
@ -172,15 +172,16 @@
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/newFileCreate"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newFileButtonCopy"
android:textColor="@color/btnTextColor" />

68
app/src/main/res/layout/activity_create_issue.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,12 +40,21 @@
android:text="@string/pageTitleCreateNewIssue"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="gone"
style="@style/Widget.Material3.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -54,7 +63,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -65,8 +74,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:counterEnabled="true"
@ -84,7 +93,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -96,8 +105,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newIssueDescriptionTitle">
@ -105,14 +114,14 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/newIssueDescription"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="@dimen/dimen140dp"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:gravity="top|start"
android:scrollbars="vertical"
android:inputType="textCapSentences|textMultiLine"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -123,8 +132,8 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newIssueAssigneesListTitle">
<com.google.android.material.textfield.TextInputEditText
@ -135,7 +144,7 @@
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:focusable="false"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -146,11 +155,11 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newIssueMilestoneTitle"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/newIssueMilestoneSpinner"
@ -159,7 +168,7 @@
android:inputType="none"
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/newIssueMilestoneSpinner"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -170,8 +179,8 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newIssueLabelsTitle">
<com.google.android.material.textfield.TextInputEditText
@ -182,7 +191,7 @@
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:focusable="false"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -194,8 +203,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newIssueDueDateTitle">
@ -209,15 +218,16 @@
android:textColorHint="?attr/hintColor"
android:maxLines="1"
android:focusable="false"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/createNewIssueButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newCreateButtonCopy"
android:textColor="@color/btnTextColor" />

50
app/src/main/res/layout/activity_create_label.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/pageTitleCreateLabel"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -49,7 +49,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -60,8 +60,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/labelName">
@ -73,14 +73,14 @@
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="32dp"
android:layout_marginTop="10dp"
android:layout_height="@dimen/dimen32dp"
android:layout_marginTop="@dimen/dimen10dp"
android:orientation="horizontal">
<TextView
@ -92,21 +92,31 @@
android:text="@string/labelColor"
android:textColor="?attr/primaryTextColor"
android:layout_weight=".95"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
<TextView
android:id="@+id/colorPicker"
android:layout_width="28dp"
android:layout_height="28dp"
android:background="@color/releasePre" />
<com.google.android.material.card.MaterialCardView
android:layout_width="@dimen/dimen28dp"
android:layout_height="@dimen/dimen28dp"
style="?attr/materialCardViewFilledStyle"
app:cardElevation="@dimen/dimen0dp"
app:cardCornerRadius="@dimen/dimen16dp">
<TextView
android:id="@+id/colorPicker"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/releasePre" />
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
<Button
android:id="@+id/createLabelButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newCreateButtonCopy"
android:textColor="@color/btnTextColor" />

39
app/src/main/res/layout/activity_create_milestone.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/pageTitleCreateMilestone"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -54,7 +54,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -65,8 +65,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newMilestoneTitle">
@ -81,7 +81,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -93,8 +93,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:counterEnabled="true"
@ -105,14 +105,14 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/milestoneDescription"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="@dimen/dimen140dp"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:gravity="top|start"
android:scrollbars="vertical"
android:inputType="textCapSentences|textMultiLine"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -124,8 +124,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newMilestoneDueDate">
@ -139,15 +139,16 @@
android:textColorHint="?attr/hintColor"
android:maxLines="1"
android:focusable="false"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/createNewMilestoneButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newCreateButtonCopy"
android:textColor="@color/btnTextColor" />

43
app/src/main/res/layout/activity_create_new_user.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/adminCreateNewUser"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -54,7 +54,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -65,8 +65,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/userFullNameText">
@ -81,7 +81,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -93,8 +93,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/userUserName">
@ -108,7 +108,7 @@
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -120,8 +120,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/userEmail">
@ -135,7 +135,7 @@
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -147,8 +147,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/userPassword">
@ -161,15 +161,16 @@
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/createUserButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newCreateButtonCopy"
android:textColor="@color/btnTextColor" />

33
app/src/main/res/layout/activity_create_organization.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/pageTitleCreateOrganization"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -54,7 +54,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -65,8 +65,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newOrgTintCopy">
@ -81,7 +81,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -93,8 +93,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:counterEnabled="true"
@ -105,22 +105,23 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/newOrganizationDescription"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="@dimen/dimen140dp"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:gravity="top|start"
android:scrollbars="vertical"
android:inputType="textCapSentences|textMultiLine"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/createNewOrganizationButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newCreateButtonCopy"
android:textColor="@color/btnTextColor" />

78
app/src/main/res/layout/activity_create_pr.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,12 +40,21 @@
android:text="@string/pageTitleNewPullRequest"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="gone"
style="@style/Widget.Material3.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -54,7 +63,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -65,8 +74,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:counterEnabled="true"
@ -84,7 +93,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -96,8 +105,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newIssueDescriptionTitle">
@ -105,14 +114,14 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/prBody"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="@dimen/dimen140dp"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:gravity="top|start"
android:scrollbars="vertical"
android:inputType="textCapSentences|textMultiLine"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -123,11 +132,11 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/mergeIntoBranch"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/mergeIntoBranchSpinner"
@ -136,7 +145,7 @@
android:inputType="none"
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/mergeIntoBranchSpinner"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -147,11 +156,11 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/pullFromBranch"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/pullFromBranchSpinner"
@ -160,7 +169,7 @@
android:inputType="none"
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/pullFromBranchSpinner"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -171,11 +180,11 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newIssueMilestoneTitle"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/milestonesSpinner"
@ -184,7 +193,7 @@
android:inputType="none"
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/milestonesSpinner"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -195,8 +204,8 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newIssueLabelsTitle">
<com.google.android.material.textfield.TextInputEditText
@ -207,7 +216,7 @@
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:focusable="false"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -219,8 +228,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newIssueDueDateTitle">
@ -234,15 +243,16 @@
android:textColorHint="?attr/hintColor"
android:maxLines="1"
android:focusable="false"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/createPr"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newCreateButtonCopy"
android:textColor="@color/btnTextColor" />

60
app/src/main/res/layout/activity_create_release.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/createRelease"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -54,7 +54,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -65,8 +65,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/releaseTitleText">
@ -81,7 +81,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -93,8 +93,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/releaseTagNameText">
@ -109,7 +109,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -121,8 +121,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/releaseContentText">
@ -130,14 +130,14 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/releaseContent"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="@dimen/dimen140dp"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:gravity="top|start"
android:scrollbars="vertical"
android:inputType="textCapSentences"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -148,11 +148,11 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/releaseBranchText"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/releaseBranch"
@ -161,7 +161,7 @@
android:inputType="none"
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/releaseBranch"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -171,8 +171,8 @@
android:layout_height="wrap_content"
android:text="@string/releaseTypeText"
android:checked="false"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen10dp"
android:textColor="?attr/primaryTextColor"/>
<CheckBox
@ -181,23 +181,25 @@
android:layout_height="wrap_content"
android:text="@string/releaseDraftText"
android:checked="false"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen10dp"
android:textColor="?attr/primaryTextColor"/>
<Button
android:id="@+id/createNewRelease"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newCreateButtonCopy"
android:textColor="@color/btnTextColor" />
<Button
android:id="@+id/createNewTag"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/create_tag"
android:textColor="@color/btnTextColor" />

45
app/src/main/res/layout/activity_create_repo.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/pageTitleNewRepo"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -54,7 +54,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -64,11 +64,11 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newRepoOwner"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/ownerSpinner"
@ -77,7 +77,7 @@
android:inputType="none"
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/ownerSpinner"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -89,8 +89,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newRepoTintCopy">
@ -103,7 +103,7 @@
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:inputType="textCapSentences"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -115,8 +115,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:counterEnabled="true"
@ -127,13 +127,13 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/newRepoDescription"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="@dimen/dimen140dp"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:gravity="top|start"
android:inputType="textCapSentences|textMultiLine"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -143,15 +143,16 @@
android:layout_height="wrap_content"
android:text="@string/newRepoPrivateCopy"
android:checked="true"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen10dp"
android:textColor="?attr/primaryTextColor"/>
<Button
android:id="@+id/createNewRepoButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newCreateButtonCopy"
android:textColor="@color/btnTextColor" />

45
app/src/main/res/layout/activity_create_team_by_org.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/pageTitleCreateTeam"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -54,7 +54,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -65,8 +65,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newTeamTitle">
@ -81,7 +81,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -93,8 +93,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:counterEnabled="true"
@ -111,7 +111,7 @@
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -123,8 +123,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newTeamPermission">
<com.google.android.material.textfield.TextInputEditText
@ -136,7 +136,7 @@
android:textColorHint="?attr/hintColor"
android:maxLines="1"
android:focusable="false"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -145,7 +145,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp"
android:textSize="@dimen/dimen12sp"
android:gravity="start"
android:visibility="gone" />
@ -157,8 +157,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newTeamAccessControls">
<com.google.android.material.textfield.TextInputEditText
@ -170,7 +170,7 @@
android:textColorHint="?attr/hintColor"
android:maxLines="1"
android:focusable="false"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -183,8 +183,9 @@
<Button
android:id="@+id/createTeamButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/newCreateButtonCopy"
android:textColor="@color/btnTextColor" />

68
app/src/main/res/layout/activity_deeplinks.xml
View File

@ -28,10 +28,10 @@
android:id="@+id/addNewAccountFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="32dp"
android:paddingBottom="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="@dimen/dimen32dp"
android:paddingBottom="@dimen/dimen16dp"
android:paddingStart="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp"
android:visibility="gone"
android:orientation="vertical">
@ -41,34 +41,34 @@
android:layout_height="wrap_content"
android:text="@string/accountDoesNotExist"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
<Button
android:id="@+id/addNewAccount"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="@dimen/dimen60dp"
android:text="@string/addNewAccountText"
android:textColor="@color/btnTextColor"
android:textSize="16sp"
android:layout_marginTop="24dp" />
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen24dp" />
<Button
android:id="@+id/openInBrowser"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="@dimen/dimen60dp"
android:text="@string/openWebRepo"
android:textColor="@color/btnTextColor"
android:textSize="16sp"
android:layout_marginTop="8dp" />
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen8dp" />
<Button
android:id="@+id/launchApp"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="@dimen/dimen60dp"
android:text="@string/launchApp"
android:textColor="@color/btnTextColor"
android:textSize="16sp"
android:layout_marginTop="8dp" />
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen8dp" />
</LinearLayout>
@ -76,10 +76,10 @@
android:id="@+id/noActionFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="32dp"
android:paddingBottom="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="@dimen/dimen32dp"
android:paddingBottom="@dimen/dimen16dp"
android:paddingStart="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp"
android:visibility="gone"
android:orientation="vertical">
@ -89,52 +89,52 @@
android:layout_height="wrap_content"
android:text="@string/noActionText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
<Button
android:id="@+id/repository"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="@dimen/dimen60dp"
android:text="@string/navRepos"
android:textColor="@color/btnTextColor"
android:textSize="16sp"
android:layout_marginTop="24dp" />
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen24dp" />
<Button
android:id="@+id/organization"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="@dimen/dimen60dp"
android:text="@string/navOrg"
android:textColor="@color/btnTextColor"
android:textSize="16sp"
android:layout_marginTop="8dp" />
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen8dp" />
<Button
android:id="@+id/notification"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="@dimen/dimen60dp"
android:text="@string/pageTitleNotifications"
android:textColor="@color/btnTextColor"
android:textSize="16sp"
android:layout_marginTop="8dp" />
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen8dp" />
<Button
android:id="@+id/explore"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="@dimen/dimen60dp"
android:text="@string/pageTitleExplore"
android:textColor="@color/btnTextColor"
android:textSize="16sp"
android:layout_marginTop="8dp" />
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen8dp" />
<Button
android:id="@+id/launchApp2"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="@dimen/dimen60dp"
android:text="@string/launchApp"
android:textColor="@color/btnTextColor"
android:textSize="16sp"
android:layout_marginTop="8dp" />
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen8dp" />
</LinearLayout>

47
app/src/main/res/layout/activity_edit_issue.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/editIssueNavHeader"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -54,7 +54,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -65,8 +65,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newIssueTitle">
@ -81,7 +81,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -93,8 +93,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newIssueDescriptionTitle">
@ -102,14 +102,14 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/editIssueDescription"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="@dimen/dimen180dp"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:gravity="top|start"
android:scrollbars="vertical"
android:inputType="textCapSentences|textMultiLine"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -120,11 +120,11 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/newIssueMilestoneTitle"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/editIssueMilestoneSpinner"
@ -133,7 +133,7 @@
android:inputType="none"
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/editIssueMilestoneSpinner"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -145,8 +145,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newIssueDueDateTitle">
@ -160,15 +160,16 @@
android:textColorHint="?attr/hintColor"
android:maxLines="1"
android:focusable="false"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/editIssueButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/saveButton"
android:textColor="@color/btnTextColor" />

22
app/src/main/res/layout/activity_file_view.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -22,10 +22,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -43,8 +43,8 @@
android:ellipsize="none"
android:scrollbars="horizontal"
android:singleLine="true"
android:layout_marginEnd="20dp"
android:textSize="18sp" />
android:layout_marginEnd="@dimen/dimen20sp"
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -74,7 +74,7 @@
android:layout_height="wrap_content"
android:background="?attr/primaryBackgroundColor"
android:orientation="vertical"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:visibility="gone">
<androidx.recyclerview.widget.RecyclerView
@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:textIsSelectable="true"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
<TextView
android:id="@+id/markdownTv"
@ -92,7 +92,7 @@
android:textColor="?attr/primaryTextColor"
android:textIsSelectable="true"
android:visibility="gone"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
@ -106,7 +106,7 @@
<com.github.chrisbanes.photoview.PhotoView
android:id="@+id/photo_view"
android:visibility="gone"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

78
app/src/main/res/layout/activity_issue_detail.xml
View File

@ -12,7 +12,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -26,8 +26,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_issue"
android:paddingStart="0dp"
android:paddingEnd="8dp"
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen8dp"
android:visibility="gone"
android:contentDescription="@string/generalImgContentText" />
@ -36,7 +36,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textSize="18sp"
android:textSize="@dimen/dimen20sp"
android:textColor="?attr/primaryTextColor"
android:id="@+id/toolbar_title" />
@ -48,16 +48,16 @@
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:layout_marginTop="@dimen/dimen56dp"
android:indeterminate="true"
style="@style/Widget.MaterialComponents.LinearProgressIndicator"
style="@style/Widget.Material3.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/addNewComment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_margin="@dimen/dimen16dp"
android:text="@string/commentButtonText"
android:contentDescription="@string/commentButtonText"
android:textColor="@color/colorWhite"
@ -69,7 +69,7 @@
<RelativeLayout
android:id="@+id/relativeMainLayoutFrame"
android:layout_width="match_parent"
android:layout_marginTop="56dp"
android:layout_marginTop="@dimen/dimen56dp"
android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@ -93,32 +93,42 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="15dp">
android:padding="@dimen/dimen16dp">
<ImageView
android:id="@+id/assigneeAvatar"
android:layout_width="@dimen/list_avatar_size"
android:layout_height="@dimen/list_avatar_size"
android:layout_marginEnd="10dp"
android:contentDescription="@string/generalImgContentText" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/assigneeAvatarFrame"
android:layout_width="@dimen/dimen24dp"
android:layout_height="@dimen/dimen24dp"
style="?attr/materialCardViewFilledStyle"
app:cardElevation="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen12dp"
app:cardCornerRadius="@dimen/dimen12dp">
<ImageView
android:id="@+id/assigneeAvatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/generalImgContentText" />
</com.google.android.material.card.MaterialCardView>
<TextView
android:id="@+id/issueTitle"
android:layout_toEndOf="@+id/assigneeAvatar"
android:layout_toEndOf="@+id/assigneeAvatarFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:textColor="?attr/primaryTextColor"
android:textIsSelectable="true"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
<LinearLayout
android:id="@+id/msdueFrame"
android:layout_toEndOf="@+id/assigneeAvatar"
android:layout_toEndOf="@+id/assigneeAvatarFrame"
android:layout_below="@+id/issueTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginTop="@dimen/dimen10dp"
android:orientation="vertical">
<LinearLayout
@ -131,7 +141,7 @@
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="18dp"
android:layout_width="@dimen/dimen20dp"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_calendar"
android:contentDescription="@string/generalImgContentText" />
@ -140,10 +150,10 @@
android:id="@+id/issueDueDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginStart="@dimen/dimen8dp"
android:singleLine="true"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
@ -157,7 +167,7 @@
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="18dp"
android:layout_width="@dimen/dimen20dp"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_milestone"
android:contentDescription="@string/generalImgContentText" />
@ -166,10 +176,10 @@
android:id="@+id/issueMilestone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginStart="@dimen/dimen8dp"
android:singleLine="true"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
@ -192,7 +202,7 @@
android:orientation="horizontal"
android:layout_gravity="end"
android:gravity="end"
android:layout_marginTop="10dp">
android:layout_marginTop="@dimen/dimen10dp">
</LinearLayout>
</HorizontalScrollView>
@ -207,7 +217,7 @@
android:autoLink="web"
android:textColorLink="@color/lightBlue"
android:textIsSelectable="true"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
<HorizontalScrollView
android:layout_below="@+id/issueDescription"
@ -224,7 +234,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="10dp">
android:layout_marginTop="@dimen/dimen10dp">
</LinearLayout>
</HorizontalScrollView>
@ -235,7 +245,7 @@
android:id="@+id/issueTimeFrame"
android:layout_below="@+id/labelsScrollView"
android:orientation="horizontal"
android:layout_marginTop="10dp">
android:layout_marginTop="@dimen/dimen10dp">
<TextView
android:id="@+id/issueCreatedTime"
@ -244,7 +254,7 @@
android:gravity="start"
android:visibility="gone"
android:textColor="?attr/hintColor"
android:textSize="12sp" />
android:textSize="@dimen/dimen12sp" />
<TextView
android:id="@+id/issueModified"
@ -252,7 +262,7 @@
android:layout_height="wrap_content"
android:textColor="?attr/hintColor"
android:layout_toEndOf="@+id/issueCreatedTime"
android:textSize="12sp"
android:textSize="@dimen/dimen12sp"
android:visibility="gone"
android:text="@string/modifiedText" />
@ -264,7 +274,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/issueTimeFrame"
android:visibility="gone"
android:layout_marginTop="10dp"
android:layout_marginTop="@dimen/dimen10dp"
android:orientation="horizontal" />
</RelativeLayout>
@ -272,7 +282,7 @@
<View
android:layout_below="@id/mainIssueLayout"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="@dimen/dimen1dp"
android:id="@+id/divider"
android:visibility="gone"
android:background="?attr/dividerColor" />
@ -287,7 +297,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:paddingBottom="64dp"
android:paddingBottom="@dimen/dimen64dp"
android:clipToPadding="false"
android:scrollbars="vertical" />

74
app/src/main/res/layout/activity_login.xml
View File

@ -12,15 +12,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:fitsSystemWindows="true" >
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="@dimen/dimen100dp"
android:layout_height="@dimen/dimen100dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="@dimen/dimen20dp"
android:layout_marginBottom="@dimen/dimen20dp"
android:baselineAligned="false"
android:contentDescription="@string/appName"
android:src="@mipmap/app_logo" />
@ -30,22 +30,22 @@
android:layout_height="wrap_content"
android:text="@string/loginMethodText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp"
android:layout_marginBottom="10dp"
android:textSize="@dimen/dimen12sp"
android:layout_marginBottom="@dimen/dimen10dp"
android:gravity="start" />
<RadioGroup
android:id="@+id/loginMethod"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:orientation="vertical">
<RadioButton
android:id="@+id/loginToken"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_height="@dimen/dimen36dp"
android:text="@string/copyToken"
android:checked="true"
android:textColor="?attr/primaryTextColor"/>
@ -53,7 +53,7 @@
<RadioButton
android:id="@+id/loginUsernamePassword"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_height="@dimen/dimen36dp"
android:text="@string/loginViaPassword"
android:textColor="?attr/primaryTextColor"/>
@ -66,8 +66,8 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/protocol"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
@ -79,7 +79,7 @@
android:inputType="none"
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/httpsSpinner"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -91,8 +91,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:startIconDrawable="@drawable/ic_link"
app:startIconTint="?attr/iconsColor"
app:endIconMode="clear_text"
@ -108,7 +108,7 @@
android:textColorHint="?attr/hintColor"
android:inputType="textUri"
android:singleLine="true"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -120,8 +120,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:startIconDrawable="@drawable/ic_person"
app:startIconTint="?attr/iconsColor"
app:endIconMode="clear_text"
@ -136,7 +136,7 @@
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -148,8 +148,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:startIconDrawable="@drawable/ic_lock"
app:startIconTint="?attr/iconsColor"
app:endIconTint="?attr/iconsColor"
@ -165,7 +165,7 @@
android:textColorHint="?attr/hintColor"
android:inputType="textPassword"
android:singleLine="true"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -177,8 +177,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:startIconDrawable="@drawable/ic_otp"
app:startIconTint="?attr/iconsColor"
app:endIconMode="clear_text"
@ -197,7 +197,7 @@
android:textColorHint="?attr/hintColor"
android:inputType="number"
android:singleLine="true"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -209,8 +209,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:startIconDrawable="@drawable/ic_lock"
app:startIconTint="?attr/iconsColor"
app:endIconMode="clear_text"
@ -225,15 +225,15 @@
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:singleLine="true"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/login_button"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="@dimen/dimen60dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/btnLogin"
android:textColor="@color/btnTextColor" />
@ -242,22 +242,22 @@
android:layout_height="wrap_content"
android:text="@string/appRepoLink"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
android:textSize="@dimen/dimen14sp"
android:gravity="center"
android:autoLink="web"
android:textColorLink="@color/lightBlue"
android:layout_marginTop="20dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" />
android:layout_marginTop="@dimen/dimen20dp"
android:layout_marginStart="@dimen/dimen10dp"
android:layout_marginEnd="@dimen/dimen10dp" />
<TextView
android:id="@+id/appVersion"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="5dp"
android:layout_marginTop="@dimen/dimen6dp"
android:layout_weight="1"
android:maxLines="1"
android:textSize="14sp"
android:textSize="@dimen/dimen14sp"
android:textColor="?attr/primaryTextColor"
android:layout_gravity="center_horizontal"/>

7
app/src/main/res/layout/activity_main.xml
View File

@ -7,7 +7,6 @@
android:layout_height="match_parent"
tools:context=".activities.MainActivity"
android:id="@+id/drawer_layout"
android:fitsSystemWindows="true"
tools:openDrawer="start">
<LinearLayout
@ -22,14 +21,14 @@
android:id="@+id/toolbar"
app:titleTextColor="?attr/primaryTextColor"
android:theme="@style/Widget.AppCompat.SearchView"
android:elevation="0dp">
android:elevation="@dimen/dimen0dp">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textSize="18sp"
android:textSize="@dimen/dimen20sp"
android:textColor="?attr/primaryTextColor"
android:id="@+id/toolbar_title" />
@ -43,7 +42,7 @@
</LinearLayout>
<com.google.android.material.navigation.NavigationView
android:layout_width="320dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:id="@+id/nav_view"

61
app/src/main/res/layout/activity_merge_pull_request.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -37,8 +37,8 @@
android:layout_height="wrap_content"
android:id="@+id/replyToPRNavHeader"
android:foregroundGravity="right"
android:layout_marginEnd="25dp"
android:layout_marginStart="0dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:layout_marginStart="@dimen/dimen0dp"
android:scrollbarThumbHorizontal="@android:color/transparent"
android:fillViewport="true">
@ -49,7 +49,7 @@
android:layout_gravity="center_vertical"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</HorizontalScrollView>
@ -65,7 +65,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -76,8 +76,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
app:counterEnabled="true"
@ -95,7 +95,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -107,8 +107,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/mergeCommentText">
@ -116,13 +116,13 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/mergeDescription"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_height="@dimen/dimen140dp"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:gravity="top|start"
android:inputType="textCapSentences"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -133,11 +133,11 @@
app:boxBackgroundColor="?attr/inputBackgroundColor"
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:hint="@string/mergeStrategy"
app:endIconTint="?attr/iconsColor"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
<AutoCompleteTextView
android:id="@+id/mergeSpinner"
@ -146,7 +146,7 @@
android:inputType="none"
android:textColor="?attr/inputTextColor"
android:labelFor="@+id/mergeSpinner"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -156,8 +156,8 @@
android:layout_height="wrap_content"
android:text="@string/deleteBranchAfterMerge"
android:checked="false"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:textSize="@dimen/dimen16sp"
android:layout_marginTop="@dimen/dimen10dp"
android:visibility="gone"
android:textColor="?attr/primaryTextColor"/>
@ -167,9 +167,9 @@
android:layout_height="wrap_content"
android:text="@string/deleteBranchForkInfo"
android:textColor="?attr/hintColor"
android:textSize="12sp"
android:textSize="@dimen/dimen12sp"
android:gravity="start"
android:layout_marginTop="0dp" />
android:layout_marginTop="@dimen/dimen0dp" />
<TextView
android:id="@+id/mergeInfo"
@ -177,15 +177,16 @@
android:layout_height="wrap_content"
android:text="@string/mergeNoteText"
android:textColor="?attr/hintColor"
android:textSize="12sp"
android:textSize="@dimen/dimen12sp"
android:gravity="start"
android:layout_marginTop="15dp" />
android:layout_marginTop="@dimen/dimen16dp" />
<Button
android:id="@+id/mergeButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/mergePullRequestButtonText"
android:textColor="@color/btnTextColor" />
@ -195,10 +196,10 @@
android:layout_height="wrap_content"
android:text="@string/mergeInfoDisabledMessage"
android:textColor="?attr/hintColor"
android:textSize="12sp"
android:textSize="@dimen/dimen12sp"
android:gravity="start"
android:visibility="gone"
android:layout_marginTop="10dp" />
android:layout_marginTop="@dimen/dimen10dp" />
</LinearLayout>

4
app/src/main/res/layout/activity_org_detail.xml
View File

@ -13,7 +13,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -29,7 +29,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textSize="18sp"
android:textSize="@dimen/dimen20sp"
android:textColor="?attr/primaryTextColor"
android:id="@+id/toolbar_title" />

12
app/src/main/res/layout/activity_org_team_info.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/close"
@ -39,7 +39,7 @@
android:layout_gravity="center_vertical"
android:maxLines="1"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>

4
app/src/main/res/layout/activity_profile.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -27,7 +27,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textSize="18sp"
android:textSize="@dimen/dimen20sp"
android:textColor="?attr/primaryTextColor"
android:id="@+id/toolbarTitle" />

25
app/src/main/res/layout/activity_profile_email.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -23,10 +23,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -42,7 +42,7 @@
android:text="@string/pageTitleAddEmail"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -51,7 +51,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:padding="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -62,8 +62,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/profileEmailTitle">
@ -75,15 +75,16 @@
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/addEmailButton"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen8dp"
android:textStyle="bold"
android:text="@string/saveButton"
android:textColor="@color/btnTextColor" />

8
app/src/main/res/layout/activity_repo_detail.xml
View File

@ -14,7 +14,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -29,8 +29,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/generalImgContentText"
android:paddingStart="0dp"
android:paddingEnd="8dp"
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen8dp"
android:src="@drawable/ic_lock"
android:visibility="gone"
tools:visibility="visible" />
@ -40,7 +40,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:textSize="18sp"
android:textSize="@dimen/dimen20sp"
android:textColor="?attr/primaryTextColor"
android:id="@+id/toolbar_title" />

24
app/src/main/res/layout/activity_repo_forks.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -42,8 +42,8 @@
android:ellipsize="none"
android:scrollbars="horizontal"
android:singleLine="true"
android:layout_marginEnd="20dp"
android:textSize="18sp" />
android:layout_marginEnd="@dimen/dimen20dp"
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -52,7 +52,7 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/pullToRefresh"
android:layout_width="match_parent"
android:layout_marginTop="56dp"
android:layout_marginTop="@dimen/dimen56dp"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
@ -68,7 +68,7 @@
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:layout_marginTop="@dimen/dimen56dp"
android:indeterminate="true"
style="@style/Widget.MaterialComponents.LinearProgressIndicator"
app:indicatorColor="?attr/progressIndicatorColor" />
@ -77,7 +77,7 @@
android:id="@+id/progressLoadMore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:layout_marginTop="@dimen/dimen56dp"
android:visibility="gone"
android:indeterminate="true"
style="@style/Widget.MaterialComponents.LinearProgressIndicator"
@ -87,11 +87,11 @@
android:id="@+id/noData"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="16dp"
android:layout_margin="@dimen/dimen16dp"
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
</RelativeLayout>

18
app/src/main/res/layout/activity_repo_stargazers.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -22,10 +22,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:layout_gravity="center_vertical"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -50,9 +50,9 @@
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:horizontalSpacing="10dp"
android:horizontalSpacing="@dimen/dimen10dp"
android:numColumns="4"
android:columnWidth="80dp"
android:columnWidth="@dimen/dimen80dp"
android:stretchMode="columnWidth"
android:background="?attr/primaryBackgroundColor"
android:gravity="center"/>
@ -72,7 +72,7 @@
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
</LinearLayout>

18
app/src/main/res/layout/activity_repo_watchers.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -22,10 +22,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:layout_gravity="center_vertical"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -50,9 +50,9 @@
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:horizontalSpacing="10dp"
android:horizontalSpacing="@dimen/dimen10dp"
android:numColumns="4"
android:columnWidth="80dp"
android:columnWidth="@dimen/dimen80dp"
android:stretchMode="columnWidth"
android:background="?attr/primaryBackgroundColor"
android:gravity="center" />
@ -72,7 +72,7 @@
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
</LinearLayout>

60
app/src/main/res/layout/activity_repository_settings.xml
View File

@ -11,8 +11,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:elevation="0dp"
android:layout_marginBottom="@dimen/dimen10dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -23,10 +23,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center_vertical"
@ -42,7 +42,7 @@
android:maxLines="1"
android:text="@string/repoSettingsTitle"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -63,18 +63,18 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:drawablePadding="32dp"
android:padding="16dp"
android:drawablePadding="@dimen/dimen32dp"
android:padding="@dimen/dimen16dp"
android:focusable="true"
android:clickable="true"
android:text="@string/repoSettingsEditProperties"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
android:textSize="@dimen/dimen16sp"
app:drawableStartCompat="@drawable/ic_edit" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="@dimen/dimen1dp"
android:background="?attr/dividerColor" />
<LinearLayout
@ -92,13 +92,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:drawablePadding="32dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:paddingEnd="16dp"
android:drawablePadding="@dimen/dimen32dp"
android:paddingStart="@dimen/dimen16dp"
android:paddingTop="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp"
android:text="@string/repoSettingsTransferOwnership"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
android:textSize="@dimen/dimen16sp"
app:drawableStartCompat="@drawable/ic_arrow_up" />
<TextView
@ -106,16 +106,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="72dp"
android:paddingEnd="16dp"
android:paddingBottom="16dp"
android:paddingStart="@dimen/dimen72dp"
android:paddingEnd="@dimen/dimen16dp"
android:paddingBottom="@dimen/dimen16dp"
android:text="@string/repoSettingsTransferOwnershipHint"
android:textColor="?attr/hintColor"
android:textSize="12sp" />
android:textSize="@dimen/dimen12sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="@dimen/dimen1dp"
android:background="?attr/dividerColor" />
</LinearLayout>
@ -128,20 +128,20 @@
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
android:paddingBottom="16dp">
android:paddingBottom="@dimen/dimen16dp">
<TextView
android:id="@+id/deleteRepository"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:drawablePadding="32dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
android:paddingEnd="16dp"
android:drawablePadding="@dimen/dimen32dp"
android:paddingStart="@dimen/dimen16dp"
android:paddingTop="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp"
android:text="@string/repoSettingsDelete"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
android:textSize="@dimen/dimen16sp"
app:drawableStartCompat="@drawable/ic_delete" />
<TextView
@ -149,11 +149,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="72dp"
android:paddingEnd="16dp"
android:paddingStart="@dimen/dimen72dp"
android:paddingEnd="@dimen/dimen16dp"
android:text="@string/repoSettingsDeleteHint"
android:textColor="?attr/hintColor"
android:textSize="12sp" />
android:textSize="@dimen/dimen12sp" />
</LinearLayout>

136
app/src/main/res/layout/activity_settings_appearance.xml
View File

@ -10,8 +10,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:elevation="0dp"
android:layout_marginBottom="@dimen/dimen10dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -23,10 +23,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:contentDescription="@string/close"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -42,7 +42,7 @@
android:maxLines="1"
android:text="@string/settingsAppearanceHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -56,28 +56,28 @@
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/themeHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/themeSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/themeSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/themeSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -89,28 +89,28 @@
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/lightThemeTimeHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsLightThemeTimeSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/lightThemeSelectedTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsThemeTimeSelectedHint"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -122,28 +122,28 @@
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/darkThemeTimeHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsDarkThemeTimeSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/darkThemeSelectedTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsThemeTimeSelectedHint"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -155,28 +155,28 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/customFontHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsCustomFontHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/customFontSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsCustomFontDefault"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -188,28 +188,28 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/tvDateTimeHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsDateTimeHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/tvDateTimeSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsDateTimeHeaderDefault"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -219,30 +219,30 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/tvCounterBadgeHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen48dp"
android:text="@string/settingsCounterBadges"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchCounterBadge"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="@dimen/dimen24dp"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_toEndOf="@+id/tvCounterBadgeHeader"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="24dp"
android:switchMinWidth="56dp" />
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen24dp"
android:switchMinWidth="@dimen/dimen56dp" />
</RelativeLayout>
@ -252,40 +252,40 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen60dp">
<TextView
android:id="@+id/tvLabelsInListHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen48dp"
android:text="@string/settingsLabelsInListHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchLabelsInListBadge"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="@dimen/dimen32dp"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_toEndOf="@+id/tvLabelsInListHeader"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="24dp"
android:switchMinWidth="56dp" />
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen24dp"
android:switchMinWidth="@dimen/dimen56dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/switchLabelsInListBadge"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen72dp"
android:text="@string/settingsLabelsInListHint"
android:textColor="?attr/hintColor"
android:textSize="12sp" />
android:textSize="@dimen/dimen12sp" />
</RelativeLayout>

38
app/src/main/res/layout/activity_settings_drafts.xml
View File

@ -10,8 +10,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:elevation="0dp"
android:layout_marginBottom="@dimen/dimen10dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -23,10 +23,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:contentDescription="@string/close"
android:gravity="center_vertical"
android:focusable="true"
@ -42,7 +42,7 @@
android:maxLines="1"
android:text="@string/draftsHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -54,40 +54,40 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/enableCommentsDeletionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen72dp"
android:text="@string/settingsEnableCommentsDeletionText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/commentsDeletionSwitch"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="@dimen/dimen24dp"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_toEndOf="@+id/enableCommentsDeletionHeader"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="25dp"
android:switchMinWidth="56dp" />
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen24dp"
android:switchMinWidth="@dimen/dimen56dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/enableCommentsDeletionHeader"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen48dp"
android:text="@string/settingsEnableCommentsDeletionHintText"
android:textColor="?attr/hintColor"
android:textSize="12sp" />
android:textSize="@dimen/dimen12sp" />
</RelativeLayout>

70
app/src/main/res/layout/activity_settings_general.xml
View File

@ -10,8 +10,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:elevation="0dp"
android:layout_marginBottom="@dimen/dimen10dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -23,10 +23,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:contentDescription="@string/close"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -42,7 +42,7 @@
android:maxLines="1"
android:text="@string/settingsGeneralHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -56,37 +56,37 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/generalDeepLinkDefaultScreen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/generalDeepLinkDefaultScreen"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/generalDeepLinkDefaultScreenHintText"
android:textColor="?attr/hintColor"
android:textSize="12sp" />
android:textSize="@dimen/dimen12sp" />
<TextView
android:id="@+id/generalDeepLinkSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/generalDeepLinkSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -98,28 +98,28 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/homeScreenHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsHomeScreenHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/homeScreenSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsHomeScreenSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -129,30 +129,30 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/customTabsHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen72dp"
android:text="@string/useCustomTabs"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchTabs"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="@dimen/dimen24dp"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_toEndOf="@+id/customTabsHeader"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="24dp"
android:switchMinWidth="56dp" />
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen24dp"
android:switchMinWidth="@dimen/dimen56dp" />
</RelativeLayout>

105
app/src/main/res/layout/activity_settings_notifications.xml
View File

@ -11,8 +11,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:elevation="0dp"
android:layout_marginBottom="@dimen/dimen10dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<androidx.appcompat.widget.Toolbar
@ -25,10 +25,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:contentDescription="@string/close"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -44,7 +44,7 @@
android:maxLines="1"
android:text="@string/pageTitleNotifications"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</androidx.appcompat.widget.Toolbar>
@ -56,30 +56,30 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/enableNotificationsHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen72dp"
android:text="@string/enableNotificationsHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/enableNotificationsMode"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="@dimen/dimen24dp"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_toEndOf="@+id/enableNotificationsHeader"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="25dp"
android:switchMinWidth="56dp" />
android:paddingEnd="@dimen/dimen24dp"
android:switchMinWidth="@dimen/dimen56dp" />
</RelativeLayout>
@ -89,28 +89,28 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="6dp">
<TextView
android:id="@+id/pollingDelayHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/notificationsPollingHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/pollingDelaySelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/pollingDelaySelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -120,30 +120,30 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="6dp">
<TextView
android:id="@+id/enableLightsHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/enableLightsHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/enableLightsMode"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="@dimen/dimen24dp"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_toEndOf="@+id/enableLightsHeader"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="25dp"
android:switchMinWidth="56dp" />
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen24dp"
android:switchMinWidth="@dimen/dimen56dp" />
</RelativeLayout>
@ -153,29 +153,30 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="6dp">
<TextView
android:id="@+id/chooseColorHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/chooseColorSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<androidx.cardview.widget.CardView
<com.google.android.material.card.MaterialCardView
android:id="@+id/chooseColorState"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_width="@dimen/dimen28dp"
android:layout_height="@dimen/dimen28dp"
style="?attr/materialCardViewFilledStyle"
android:layout_alignEnd="@id/chooseColorHeader"
android:layout_alignParentEnd="true"
android:layout_marginEnd="30dp"
android:layout_marginEnd="@dimen/dimen28dp"
android:gravity="end"
app:cardCornerRadius="15dp"
app:cardElevation="0dp" />
app:cardCornerRadius="@dimen/dimen16dp"
app:cardElevation="@dimen/dimen0dp" />
</RelativeLayout>
@ -185,30 +186,30 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/enableVibrationHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen72dp"
android:text="@string/enableVibrationHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/enableVibrationMode"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="@dimen/dimen24dp"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_toEndOf="@+id/enableVibrationHeader"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="25dp"
android:switchMinWidth="56dp" />
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen24dp"
android:switchMinWidth="@dimen/dimen56dp" />
</RelativeLayout>

32
app/src/main/res/layout/activity_settings_reports.xml
View File

@ -10,8 +10,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:elevation="0dp"
android:layout_marginBottom="@dimen/dimen10dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -22,10 +22,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:contentDescription="@string/close"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -41,7 +41,7 @@
android:maxLines="1"
android:text="@string/reportViewerHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -53,30 +53,30 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/enableReportsHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen72dp"
android:text="@string/settingsEnableReportsText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/crashReportsSwitch"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="@dimen/dimen24dp"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_toEndOf="@+id/enableReportsHeader"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="25dp"
android:switchMinWidth="56dp" />
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen24dp"
android:switchMinWidth="@dimen/dimen56dp" />
</RelativeLayout>

88
app/src/main/res/layout/activity_settings_security.xml
View File

@ -10,8 +10,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:elevation="0dp"
android:layout_marginBottom="@dimen/dimen10dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -22,10 +22,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:contentDescription="@string/close"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -41,7 +41,7 @@
android:maxLines="1"
android:text="@string/settingsSecurityHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -53,30 +53,30 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/biometricHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen72dp"
android:text="@string/settingsBiometricHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchBiometric"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_height="@dimen/dimen24dp"
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:layout_toEndOf="@+id/biometricHeader"
android:gravity="end"
android:paddingStart="0dp"
android:paddingEnd="24dp"
android:switchMinWidth="56dp" />
android:paddingStart="@dimen/dimen0dp"
android:paddingEnd="@dimen/dimen24dp"
android:switchMinWidth="@dimen/dimen56dp" />
</RelativeLayout>
@ -86,15 +86,15 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/tvCertHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsCertsSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
@ -107,28 +107,28 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/cacheSizeDataHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/cacheSizeDataSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/cacheSizeDataSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/cacheSizeDataSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -138,28 +138,28 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/cacheSizeImagesHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/cacheSizeImagesSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/cacheSizeImagesSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/cacheSizeImagesSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -169,28 +169,28 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="vertical"
android:padding="15dp"
android:layout_marginBottom="5dp">
android:padding="@dimen/dimen16dp"
android:layout_marginBottom="@dimen/dimen6dp">
<TextView
android:id="@+id/clearCacheHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/clearCacheSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/clearCacheSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/clearCacheSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>

38
app/src/main/res/layout/activity_settings_translation.xml
View File

@ -10,8 +10,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
app:elevation="0dp"
android:layout_marginBottom="@dimen/dimen10dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -22,10 +22,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:contentDescription="@string/close"
android:gravity="center_vertical"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -41,7 +41,7 @@
android:maxLines="1"
android:text="@string/settingsLanguageHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -55,27 +55,27 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:padding="15dp">
android:padding="@dimen/dimen16dp">
<TextView
android:id="@+id/tvLanguageHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsLanguageSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
android:textSize="@dimen/dimen18sp" />
<TextView
android:id="@+id/tvLanguageSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="@dimen/dimen24dp"
android:layout_marginEnd="@dimen/dimen24dp"
android:text="@string/settingsLanguageSelectedHeaderDefault"
android:textColor="?attr/selectedTextColor"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>
@ -83,14 +83,14 @@
android:id="@+id/helpTranslate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="39dp"
android:paddingBottom="15dp"
android:paddingTop="15dp"
android:paddingEnd="24dp"
android:paddingStart="@dimen/dimen40dp"
android:paddingBottom="@dimen/dimen16dp"
android:paddingTop="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen24dp"
android:background="?android:attr/selectableItemBackground"
android:autoLink="web"
android:text="@string/settingsHelpTranslateText"
android:textColor="@color/lightBlue"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</LinearLayout>

48
app/src/main/res/layout/activity_wiki.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -22,10 +22,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -43,8 +43,8 @@
android:ellipsize="none"
android:scrollbars="horizontal"
android:singleLine="true"
android:layout_marginEnd="20dp"
android:textSize="18sp" />
android:layout_marginEnd="@dimen/dimen20dp"
android:textSize="@dimen/dimen18sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -81,10 +81,10 @@
android:layout_height="wrap_content"
android:background="?attr/primaryBackgroundColor"
android:orientation="vertical"
android:paddingTop="0dp"
android:paddingBottom="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="@dimen/dimen0dp"
android:paddingBottom="@dimen/dimen16dp"
android:paddingStart="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp"
android:visibility="gone">
<androidx.recyclerview.widget.RecyclerView
@ -93,7 +93,7 @@
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:textIsSelectable="true"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</LinearLayout>
@ -110,10 +110,10 @@
android:id="@+id/create_wiki"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="0dp"
android:paddingBottom="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="@dimen/dimen0dp"
android:paddingBottom="@dimen/dimen16dp"
android:paddingStart="@dimen/dimen16dp"
android:paddingEnd="@dimen/dimen16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -124,8 +124,8 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
app:endIconMode="clear_text"
app:endIconTint="?attr/iconsColor"
android:hint="@string/newIssueTitle">
@ -140,7 +140,7 @@
android:inputType="textCapSentences"
android:singleLine="true"
android:imeOptions="actionNext"
android:textSize="16sp" />
android:textSize="@dimen/dimen16sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -152,20 +152,20 @@
android:textColorHint="?attr/hintColor"
app:hintTextColor="?attr/hintColor"
app:boxStrokeErrorColor="@color/darkRed"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp">
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/wiki_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="480dp"
android:minHeight="@dimen/dimen480dp"
android:textColor="?attr/inputTextColor"
android:textColorHighlight="?attr/hintColor"
android:textColorHint="?attr/hintColor"
android:gravity="top|start"
android:singleLine="false"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</com.google.android.material.textfield.TextInputLayout>
@ -177,7 +177,7 @@
android:textIsSelectable="true"
android:layout_marginTop="@dimen/dimen8dp"
android:layout_marginBottom="@dimen/dimen8dp"
android:textSize="14sp" />
android:textSize="@dimen/dimen14sp" />
</LinearLayout>

24
app/src/main/res/layout/add_new_team_repository.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
app:elevation="@dimen/dimen0dp"
android:theme="@style/Widget.AppCompat.SearchView">
<com.google.android.material.appbar.MaterialToolbar
@ -21,10 +21,10 @@
<ImageView
android:id="@+id/close"
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:layout_width="@dimen/dimen26dp"
android:layout_height="@dimen/dimen26dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:gravity="center_vertical"
android:contentDescription="@string/close"
android:background="?android:attr/selectableItemBackgroundBorderless"
@ -40,7 +40,7 @@
android:text="@string/addButton"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />
android:textSize="@dimen/dimen20sp" />
</com.google.android.material.appbar.MaterialToolbar>
@ -59,11 +59,11 @@
android:id="@+id/noData"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="16dp"
android:layout_margin="@dimen/dimen16dp"
android:gravity="center"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="@dimen/dimen20sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
@ -71,10 +71,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="0dp"
android:layout_marginStart="@dimen/dimen0dp"
android:layout_marginEnd="@dimen/dimen0dp"
android:layout_marginTop="@dimen/dimen6dp"
android:layout_marginBottom="@dimen/dimen0dp"
android:scrollbars="vertical" />
</LinearLayout>

8
app/src/main/res/layout/badge_issue.xml
View File

@ -9,7 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="16sp"
android:textSize="@dimen/dimen16sp"
app:textAllCaps="true"
android:text="@string/pageTitleIssues"
android:textColor="@color/lightGray" />
@ -19,9 +19,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="12sp"
android:layout_marginTop="1dp"
android:layout_marginStart="8dp"
android:textSize="@dimen/dimen12sp"
android:layout_marginTop="@dimen/dimen1dp"
android:layout_marginStart="@dimen/dimen8dp"
android:layout_toEndOf="@+id/counterBadgeIssueText"
android:background="@drawable/shape_badge_background"
android:text="@string/infoTabRepoZero"

6
app/src/main/res/layout/badge_notification.xml
View File

@ -13,9 +13,9 @@
android:maxLength="4"
android:ellipsize="marquee"
android:background="@drawable/shape_badge_background"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:paddingStart="@dimen/dimen4dp"
android:paddingEnd="@dimen/dimen4dp"
android:textColor="@color/colorWhite"
android:textSize="12sp" />
android:textSize="@dimen/dimen12sp" />
</LinearLayout>

6
app/src/main/res/layout/badge_pull.xml
View File

@ -13,17 +13,17 @@
android:gravity="center"
android:text="@string/tabPullRequests"
android:textColor="@color/lightGray"
android:textSize="16sp"
android:textSize="@dimen/dimen16sp"
app:textAllCaps="true" />
<TextView
android:id="@+id/counterBadgePull"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginStart="@dimen/dimen8dp"
android:background="@drawable/shape_badge_background"
android:text="@string/infoTabRepoZero"
android:textColor="@color/colorWhite"
android:textSize="12sp" />
android:textSize="@dimen/dimen12sp" />
</LinearLayout>

6
app/src/main/res/layout/badge_release.xml
View File

@ -13,17 +13,17 @@
android:gravity="center"
android:text="@string/tabTextReleases"
android:textColor="@color/lightGray"
android:textSize="16sp"
android:textSize="@dimen/dimen16sp"
app:textAllCaps="true" />
<TextView
android:id="@+id/counterBadgeRelease"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginStart="@dimen/dimen8dp"
android:background="@drawable/shape_badge_background"
android:text="@string/infoTabRepoZero"
android:textColor="@color/colorWhite"
android:textSize="12sp" />
android:textSize="@dimen/dimen12sp" />
</LinearLayout>

9
app/src/main/res/layout/bottom_sheet_admin_users.xml
View File

@ -41,13 +41,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app:alignContent="stretch" >
app:alignItems="flex_start"
app:justifyContent="center"
android:padding="4dp"
app:alignContent="center" >
<TextView
android:id="@+id/createNewUser"
android:layout_width="98dp"
android:layout_width="100dp"
android:layout_height="100dp"
android:padding="4dp"
android:background="?android:attr/selectableItemBackgroundBorderless"

9
app/src/main/res/layout/bottom_sheet_drafts.xml
View File

@ -41,13 +41,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app:alignContent="stretch" >
app:alignItems="flex_start"
app:justifyContent="center"
android:padding="4dp"
app:alignContent="center" >
<TextView
android:id="@+id/deleteAllDrafts"
android:layout_width="98dp"
android:layout_width="100dp"
android:layout_height="100dp"
android:padding="4dp"
android:background="?android:attr/selectableItemBackgroundBorderless"

Some files were not shown because too many files have changed in this diff Show More