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

UI improvements and clean ups (#1074) 

This PR mostly intend to improve and re visualize the UI across the app including clean up of layouts and strings.

Some UI changes are experimental like bottom sheet grid layout for repo items and can be extended once mature enough for use.

Few screen shots attached.

Closes #1077
Closes #976

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1074
Reviewed-by: qwerty287 <qwerty287@noreply.codeberg.org>
This commit is contained in:
M M Arif 2022-03-18 09:56:49 +01:00
parent 7e514041bb
commit 5761c3519e
77 changed files with 1030 additions and 908 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -4,7 +4,7 @@ android {
compileSdkVersion 31
defaultConfig {
applicationId "org.mian.gitnex"
minSdkVersion 21
minSdkVersion 22
targetSdkVersion 31
versionCode 425
versionName "4.3.0"
@ -114,4 +114,5 @@ dependencies {
implementation 'androidx.biometric:biometric:1.1.0'
implementation 'com.github.chrisvest:stormpot:2.4.2'
implementation 'androidx.browser:browser:1.4.0'
implementation 'com.google.android.flexbox:flexbox:3.0.0'
}

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

@ -100,7 +100,7 @@ public class LabelsActions {
if(labelsList.isEmpty()) {
dialogLabels.dismiss();
Toasty.warning(ctx, ctx.getResources().getString(R.string.noLabelsFound));
Toasty.warning(ctx, ctx.getResources().getString(R.string.noDataFound));
}

2
app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
View File

@ -214,7 +214,7 @@ public class CreateFileActivity extends BaseActivity {
default:
enableProcessButton();
Toasty.error(ctx, getString(R.string.orgCreatedError));
Toasty.error(ctx, getString(R.string.genericError));
break;
}

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

@ -267,7 +267,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
}
else {
Toasty.error(ctx, getString(R.string.issueCreatedError));
Toasty.error(ctx, getString(R.string.genericError));
enableProcessButton();
}

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

@ -234,8 +234,8 @@ public class CreateLabelActivity extends BaseActivity {
else {
enableProcessButton();
labelColor = "";
Toasty.error(ctx, getString(R.string.labelGeneralError));
tinyDB.putString("labelColor", "");
Toasty.error(ctx, getString(R.string.genericError));
}
}
@ -290,9 +290,9 @@ public class CreateLabelActivity extends BaseActivity {
else {
enableProcessButton();
labelColor = "";
labelColorDefault = "";
Toasty.error(ctx, getString(R.string.labelGeneralError));
tinyDB.putString("labelColor", "");
tinyDB.putString("labelColorDefault", "");
Toasty.error(ctx, getString(R.string.genericError));
}
}
@ -355,7 +355,7 @@ public class CreateLabelActivity extends BaseActivity {
}
else {
Toasty.error(ctx, getString(R.string.labelDeleteErrorText));
Toasty.error(ctx, getString(R.string.genericError));
}
}

2
app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
View File

@ -174,7 +174,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
else {
enableProcessButton();
Toasty.error(ctx, getString(R.string.milestoneCreatedError));
Toasty.error(ctx, getString(R.string.genericError));
}
}

2
app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
View File

@ -175,7 +175,7 @@ public class CreateOrganizationActivity extends BaseActivity {
else {
enableProcessButton();
Toasty.error(ctx, getString(R.string.orgCreatedError));
Toasty.error(ctx, getString(R.string.genericError));
}
}
}

2
app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
View File

@ -193,7 +193,7 @@ public class CreateRepoActivity extends BaseActivity {
else {
enableProcessButton();
Toasty.error(ctx, getString(R.string.repoCreatedError));
Toasty.error(ctx, getString(R.string.genericError));
}
}

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

@ -319,7 +319,7 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
}
else {
Toasty.error(ctx, getString(R.string.teamCreatedError));
Toasty.error(ctx, getString(R.string.genericError));
}
}

2
app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
View File

@ -197,7 +197,7 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
break;
default:
runOnUiThread(() -> Toasty.error(ctx, getString(R.string.labelGeneralError)));
runOnUiThread(() -> Toasty.error(ctx, getString(R.string.genericError)));
}
}

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

@ -2,6 +2,7 @@ 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;
@ -25,6 +26,7 @@ import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.text.HtmlCompat;
import androidx.core.widget.ImageViewCompat;
import androidx.core.widget.NestedScrollView;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.DividerItemDecoration;
@ -590,12 +592,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
}
else if(response.code() == 404) {
if("Pull".equals(issue.getIssueType())) {
Toasty.warning(ctx, getResources().getString(R.string.noDataPullRequests));
}
else {
Toasty.warning(ctx, getResources().getString(R.string.noDataIssueTab));
}
Toasty.warning(ctx, getResources().getString(R.string.noDataFound));
finish();
}
}
@ -644,11 +641,13 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
getPullRequest();
if(issue.getIssue().getPull_request().isMerged()) { // merged
viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request_merged);
viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request);
ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconPrMergedColor)));
}
else if(!issue.getIssue().getPull_request().isMerged() && issue.getIssue().getState().equals("closed")) { // closed
viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request_closed);
viewBinding.issuePrState.setImageResource(R.drawable.ic_pull_request);
ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconIssuePrClosedColor)));
}
else { // open
@ -657,7 +656,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
}
else if(issue.getIssue().getState().equals("closed")) { // issue closed
viewBinding.issuePrState.setImageResource(R.drawable.ic_issue_closed_red);
viewBinding.issuePrState.setImageResource(R.drawable.ic_issue);
ImageViewCompat.setImageTintList(viewBinding.issuePrState, ColorStateList.valueOf(ctx.getResources().getColor(R.color.iconIssuePrClosedColor)));
} else {
viewBinding.issuePrState.setImageResource(R.drawable.ic_issue);
}

2
app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java
View File

@ -147,7 +147,7 @@ public class MyProfileEmailActivity extends BaseActivity {
else {
enableProcessButton();
Toasty.error(ctx, getString(R.string.labelGeneralError));
Toasty.error(ctx, getString(R.string.genericError));
}
}

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

@ -76,7 +76,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
);
}
Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
viewBinding.enableNotificationsFrame.setOnClickListener(
@ -104,7 +104,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
Notifications.startWorker(ctx);
viewBinding.pollingDelaySelected.setText(String.format(getString(R.string.pollingDelaySelectedText), numberPicker.getValue()));
Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
@ -123,7 +123,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
}
tinyDB.putBoolean("notificationsEnableLights", isChecked);
Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
viewBinding.enableLightsFrame.setOnClickListener(v -> viewBinding.enableLightsMode.setChecked(!viewBinding.enableLightsMode.isChecked()));
@ -138,7 +138,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
tinyDB.putInt("notificationsLightColor", color);
viewBinding.chooseColorState.setCardBackgroundColor(color);
colorPicker.dismiss();
Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
colorPicker.show();
@ -149,7 +149,7 @@ public class SettingsNotificationsActivity extends BaseActivity {
viewBinding.enableVibrationMode.setOnCheckedChangeListener((buttonView, isChecked) -> {
tinyDB.putBoolean("notificationsEnableVibration", isChecked);
Toasty.info(appCtx, getResources().getString(R.string.settingsSave));
Toasty.success(appCtx, getResources().getString(R.string.settingsSave));
});
viewBinding.enableVibrationFrame.setOnClickListener(

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

@ -137,7 +137,7 @@ public class SettingsSecurityActivity extends BaseActivity {
else {
tinyDB.putBoolean("biometricStatus", false);
Toasty.success(appCtx, getResources().getString(R.string.biometricNotSupported));
Toasty.warning(appCtx, getResources().getString(R.string.biometricNotSupported));
}
});

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

@ -59,6 +59,12 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
context.startActivity(intent);
});
userAvatar.setOnClickListener(loginId -> {
Intent intent = new Intent(context, ProfileActivity.class);
intent.putExtra("username", userLoginId);
context.startActivity(intent);
});
userAvatar.setOnLongClickListener(loginId -> {
AppUtil.copyToClipboard(context, userLoginId, context.getString(R.string.copyLoginIdToClipBoard, userLoginId));
return true;

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

@ -32,7 +32,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
private List<NotificationThread> notificationThreads;
private final OnMoreClickedListener onMoreClickedListener;
private final OnNotificationClickedListener onNotificationClickedListener;
private Runnable loadMoreListener;
private boolean isLoading = false, isMoreDataAvailable = true;
public NotificationsAdapter(Context context, List<NotificationThread> notificationThreads, OnMoreClickedListener onMoreClickedListener, OnNotificationClickedListener onNotificationClickedListener) {
@ -57,9 +56,8 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading && loadMoreListener != null) {
if(position >= getItemCount() - 1 && isMoreDataAvailable && !isLoading) {
isLoading = true;
loadMoreListener.run();
}
if(getItemViewType(position) == TYPE_LOAD) {
@ -186,10 +184,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
isLoading = false;
}
public void setLoadMoreListener(Runnable loadMoreListener) {
this.loadMoreListener = loadMoreListener;
}
public void updateList(List<NotificationThread> list) {
notificationThreads = list;
notifyDataChanged();

2
app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java
View File

@ -54,7 +54,7 @@ public class RetrofitClient {
if(cacheEnabled) {
int cacheSize = FilesData.returnOnlyNumber(tinyDB.getString("cacheSizeStr", context.getString(R.string.cacheSizeDataSelectionSelectedText))) * 1024 * 1024;
int cacheSize = FilesData.returnOnlyNumberFileSize(tinyDB.getString("cacheSizeStr", context.getString(R.string.cacheSizeDataSelectionSelectedText))) * 1024 * 1024;
Cache cache = new Cache(new File(context.getCacheDir(), "responses"), cacheSize);
okHttpClient.cache(cache).addInterceptor(chain -> {

5
app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java
View File

@ -39,6 +39,11 @@ public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
bottomSheetOrganizationBinding.createLabel.setVisibility(View.GONE);
bottomSheetOrganizationBinding.createTeam.setVisibility(View.GONE);
}
if(!permissions.canCreateRepositories() || !permissions.isOwner()) {
bottomSheetOrganizationBinding.orgCreate.setVisibility(View.GONE);
bottomSheetOrganizationBinding.orgCreateSection.setVisibility(View.GONE);
bottomSheetOrganizationBinding.orgDivider.setVisibility(View.GONE);
}
}
bottomSheetOrganizationBinding.createTeam.setOnClickListener(v1 -> {

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

@ -203,7 +203,7 @@ public class BottomSheetReplyFragment extends BottomSheetDialogFragment {
}
else {
Toasty.error(getContext(), getString(R.string.commentError));
Toasty.error(getContext(), getString(R.string.genericError));
}
dismiss();

3
app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java
View File

@ -46,7 +46,6 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
TextView unWatchRepository = bottomSheetRepoBinding.unWatchRepository;
TextView shareRepository = bottomSheetRepoBinding.shareRepository;
TextView copyRepoUrl = bottomSheetRepoBinding.copyRepoUrl;
View repoSettingsDivider = bottomSheetRepoBinding.repoSettingsDivider;
TextView repoSettings = bottomSheetRepoBinding.repoSettings;
TextView createPullRequest = bottomSheetRepoBinding.createPullRequest;
@ -66,7 +65,6 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
createLabel.setVisibility(View.GONE);
createRelease.setVisibility(View.GONE);
newFile.setVisibility(View.GONE);
bottomSheetRepoBinding.createDivider.setVisibility(View.GONE);
}
createLabel.setOnClickListener(v112 -> {
@ -126,7 +124,6 @@ public class BottomSheetRepoFragment extends BottomSheetDialogFragment {
else {
addCollaborator.setVisibility(View.GONE);
repoSettingsDivider.setVisibility(View.GONE);
repoSettings.setVisibility(View.GONE);
}

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

@ -117,7 +117,7 @@ public class CommitDetailFragment extends Fragment {
break;
default:
requireActivity().runOnUiThread(() -> Toasty.error(requireContext(), getString(R.string.labelGeneralError)));
requireActivity().runOnUiThread(() -> Toasty.error(requireContext(), getString(R.string.genericError)));
}
}

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

@ -112,7 +112,7 @@ public class DiffFilesFragment extends Fragment {
break;
default:
requireActivity().runOnUiThread(() -> Toasty.error(ctx, getString(R.string.labelGeneralError)));
requireActivity().runOnUiThread(() -> Toasty.error(ctx, getString(R.string.genericError)));
}
} catch(IOException ignored) {}

11
app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java
View File

@ -90,15 +90,16 @@ public class NotificationsFragment extends Fragment implements NotificationsAdap
viewBinding.notifications.setAdapter(notificationsAdapter);
viewBinding.notifications.addItemDecoration(dividerItemDecoration);
notificationsAdapter.setLoadMoreListener(() -> {
pageCurrentIndex++;
loadNotifications(true);
});
viewBinding.notifications.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
if(!recyclerView.canScrollVertically(1) && dy != 0) {
pageCurrentIndex++;
loadNotifications(true);
}
if(currentFilterMode.equalsIgnoreCase("unread")) {
if(dy > 0 && viewBinding.markAllAsRead.isShown()) {
viewBinding.markAllAsRead.setVisibility(View.GONE);

10
app/src/main/java/org/mian/gitnex/helpers/FilesData.java
View File

@ -6,8 +6,14 @@ package org.mian.gitnex.helpers;
public class FilesData {
public static int returnOnlyNumber(String fileSize) {
public static int returnOnlyNumberFileSize(String fileSize) {
return Integer.parseInt(fileSize.substring(0, fileSize.indexOf(" ")));
final int i = Integer.parseInt(fileSize.substring(0, fileSize.indexOf(" ")));
if(fileSize.substring(fileSize.lastIndexOf(" ") + 1).equals("GB")) {
return i * 1000;
}
else {
return i;
}
}
}

2
app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java
View File

@ -38,7 +38,7 @@ public class PicassoCache implements Cache {
TinyDB tinyDb = TinyDB.getInstance(ctx);
CACHE_SIZE = FilesData.returnOnlyNumber(tinyDb.getString("cacheSizeImagesStr", ctx.getString(R.string.cacheSizeImagesSelectionSelectedText))) * 1024 * 1024;
CACHE_SIZE = FilesData.returnOnlyNumberFileSize(tinyDb.getString("cacheSizeImagesStr", ctx.getString(R.string.cacheSizeImagesSelectionSelectedText))) * 1024 * 1024;
this.cachePath = cachePath;
cacheMap = new HashMap<>();
this.ctx = ctx;

45
app/src/main/res/drawable/app_logo.xml Normal file
View File

@ -0,0 +1,45 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="512dp"
android:height="512dp"
android:viewportWidth="135.47"
android:viewportHeight="135.47">
<path
android:pathData="M67.528,0.045L68.043,0.045A67.735,67.735 0,0 1,135.778 67.78L135.778,67.78A67.735,67.735 0,0 1,68.043 135.515L67.528,135.515A67.735,67.735 0,0 1,-0.207 67.78L-0.207,67.78A67.735,67.735 0,0 1,67.528 0.045z"
android:strokeLineJoin="round"
android:strokeWidth="0"
android:fillColor="#222222"
android:strokeColor="#609926"
android:fillAlpha="0.988235"
android:strokeLineCap="round"/>
<path
android:pathData="M33.02,44.728a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
android:fillColor="#609926"/>
<path
android:pathData="M33.155,111.207a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
android:fillColor="#609926"/>
<path
android:pathData="M62.351,78.22a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
android:fillColor="#609926"/>
<path
android:pathData="M35.626,19.74l6.968,0.002l-0.095,81.437l-6.968,-0.002z"
android:fillColor="#609926"/>
<path
android:pathData="m39.1,38.561c31.431,0.121 29.323,-4.209 29.431,34.699"
android:strokeWidth="8.466067"
android:fillColor="#00000000"
android:strokeColor="#609926"/>
<path
android:pathData="M97.96,105.418C66.529,105.297 68.637,109.628 68.529,70.72"
android:strokeWidth="8.466067"
android:fillColor="#00000000"
android:strokeColor="#609926"/>
<path
android:pathData="M91.659,44.728a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
android:fillColor="#609926"/>
<path
android:pathData="M91.655,111.208a8.691,9.059 89.28,1 0,12.644 -12.462a8.691,9.059 89.28,1 0,-12.644 12.462z"
android:fillColor="#609926"/>
<path
android:pathData="M94.543,35.641l6.968,0.002l-0.095,65.533l-6.968,-0.002z"
android:fillColor="#609926"/>
</vector>

20
app/src/main/res/drawable/ic_issue_closed_red.xml
View File

@ -1,20 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M22,11.08V12a10,10 0,1 1,-5.93 -9.14"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconIssuePrClosedColor"
android:strokeLineCap="round"/>
<path
android:pathData="M22,4l-10,10.01l-3,-3"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconIssuePrClosedColor"
android:strokeLineCap="round"/>
</vector>

34
app/src/main/res/drawable/ic_pull_request_closed.xml
View File

@ -1,34 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M18,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconIssuePrClosedColor"
android:strokeLineCap="round"/>
<path
android:pathData="M6,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconIssuePrClosedColor"
android:strokeLineCap="round"/>
<path
android:pathData="M13,6h3a2,2 0,0 1,2 2v7"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconIssuePrClosedColor"
android:strokeLineCap="round"/>
<path
android:pathData="M6,9L6,21"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconIssuePrClosedColor"
android:strokeLineCap="round"/>
</vector>

34
app/src/main/res/drawable/ic_pull_request_merged.xml
View File

@ -1,34 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M18,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconPrMergedColor"
android:strokeLineCap="round"/>
<path
android:pathData="M6,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconPrMergedColor"
android:strokeLineCap="round"/>
<path
android:pathData="M13,6h3a2,2 0,0 1,2 2v7"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconPrMergedColor"
android:strokeLineCap="round"/>
<path
android:pathData="M6,9L6,21"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/iconPrMergedColor"
android:strokeLineCap="round"/>
</vector>

12
app/src/main/res/drawable/shape_circle_white.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval" >
<size
android:width="36dp"
android:height="36dp" />
<solid
android:color="@color/colorWhite" />
</shape>

5
app/src/main/res/drawable/shape_custom_dialog.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?attr/primaryBackgroundColor" />
<corners android:radius="8dp" />
</shape>

21
app/src/main/res/drawable/shape_dropdown.xml
View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="?attr/inputBackgroundColor">
</solid>
<corners
android:radius="3dp">
</corners>
<padding
android:top="0dp"
android:right="0dp"
android:left="5dp"
android:bottom="0dp">
</padding>
</shape>

7
app/src/main/res/drawable/shape_full_circle.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<solid android:color="?attr/primaryBackgroundColor"/>
<corners android:radius="32dp"/>
</shape>

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="8dp"/>
<corners android:radius="12dp"/>
</shape>

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

@ -37,7 +37,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/addCollaboratorTitle"
android:text="@string/collaborator"
android:textColor="?attr/primaryTextColor"
android:maxLines="1"
android:textSize="20sp" />

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

@ -55,13 +55,13 @@
android:id="@+id/tabItem_repos"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/orgTabRepos" />
android:text="@string/navRepos" />
<com.google.android.material.tabs.TabItem
android:id="@+id/tabItem_labels"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tabTextLabels" />
android:text="@string/newIssueLabelsTitle" />
<com.google.android.material.tabs.TabItem
android:id="@+id/tabItem_teams"

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

@ -103,7 +103,7 @@
android:id="@+id/tab_item_labels"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tabTextLabels" />
android:text="@string/newIssueLabelsTitle" />
<com.google.android.material.tabs.TabItem
android:id="@+id/tab_item_collaborators"

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

@ -56,28 +56,28 @@
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/themeHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/themeSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/themeSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/themeSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -89,28 +89,28 @@
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/lightThemeTimeHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsLightThemeTimeSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/lightThemeSelectedTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsThemeTimeSelectedHint"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -122,28 +122,28 @@
android:orientation="vertical"
android:focusable="true"
android:clickable="true"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/darkThemeTimeHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsDarkThemeTimeSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/darkThemeSelectedTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsThemeTimeSelectedHint"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -155,28 +155,28 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/customFontHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsCustomFontHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/customFontSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsCustomFontDefault"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -188,28 +188,28 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/tvDateTimeHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsDateTimeHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/tvDateTimeSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsDateTimeHeaderDefault"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -217,19 +217,20 @@
android:id="@+id/counterBadgeFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/tvCounterBadgeHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:text="@string/settingsCounterBadges"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchCounterBadge"

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

@ -52,19 +52,20 @@
android:id="@+id/enableDraftsCommentsDeletion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/enableCommentsDeletionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:text="@string/settingsEnableCommentsDeletionText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/commentsDeletionSwitch"
@ -82,8 +83,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/enableCommentsDeletionHeader"
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:text="@string/settingsEnableCommentsDeletionHintText"
android:textColor="?attr/hintColor"
android:textSize="12sp" />

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

@ -56,24 +56,24 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/generalDeepLinkDefaultScreen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/generalDeepLinkDefaultScreen"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/generalDeepLinkDefaultScreenHintText"
android:textColor="?attr/hintColor"
android:textSize="12sp" />
@ -82,11 +82,11 @@
android:id="@+id/generalDeepLinkSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/generalDeepLinkSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -98,28 +98,28 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/homeScreenHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsHomeScreenHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/homeScreenSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsHomeScreenSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -127,19 +127,20 @@
android:id="@+id/customTabsFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/customTabsHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:text="@string/useCustomTabs"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchTabs"

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

@ -54,19 +54,20 @@
android:id="@+id/enableNotificationsFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/enableNotificationsHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:text="@string/enableNotificationsHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/enableNotificationsMode"
@ -87,31 +88,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/pollingDelayHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/notificationsPollingHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/pollingDelaySelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="4dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/pollingDelaySelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -119,19 +118,20 @@
android:id="@+id/enableLightsFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/enableLightsHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/enableLightsHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/enableLightsMode"
@ -151,19 +151,20 @@
android:id="@+id/chooseColorFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/chooseColorHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/chooseColorSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<androidx.cardview.widget.CardView
android:id="@+id/chooseColorState"
@ -182,19 +183,20 @@
android:id="@+id/enableVibrationFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/enableVibrationHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:text="@string/enableVibrationHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/enableVibrationMode"

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

@ -51,19 +51,20 @@
android:id="@+id/enableSendReports"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/enableReportsHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:text="@string/settingsEnableReportsText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/crashReportsSwitch"

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

@ -51,19 +51,20 @@
android:id="@+id/biometricFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/biometricHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="72dp"
android:text="@string/settingsBiometricHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switchBiometric"
@ -84,21 +85,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/tvCertHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsCertsSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
</LinearLayout>
@ -107,31 +106,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/cacheSizeDataHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/cacheSizeDataSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/cacheSizeDataSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/cacheSizeDataSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -140,31 +137,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/cacheSizeImagesHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/cacheSizeImagesSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/cacheSizeImagesSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/cacheSizeImagesSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>
@ -173,31 +168,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/clearCacheHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/clearCacheSelectionHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/clearCacheSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/clearCacheSelectionSelectedText"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>

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

@ -55,40 +55,40 @@
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/tvLanguageHeaderSelector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsLanguageSelectorHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
android:textSize="18sp" />
<TextView
android:id="@+id/tvLanguageSelected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/settingsLanguageSelectedHeaderDefault"
android:textColor="?attr/selectedTextColor"
android:textSize="14sp" />
android:textSize="16sp" />
<TextView
android:id="@+id/helpTranslate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginStart="24dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="24dp"
android:autoLink="web"
android:text="@string/settingsHelpTranslateText"
android:textColor="@color/lightBlue"
android:textSize="14sp" />
android:textSize="16sp" />
</LinearLayout>

159
app/src/main/res/layout/bottom_sheet_organization.xml
View File

@ -18,65 +18,120 @@
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:id="@+id/createRepository"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/createRepository"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_repo" />
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
<TextView
android:id="@+id/createLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/createLabel"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_label" />
<TextView
android:id="@+id/bottomSheetHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/createTeam"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/orgCreateTeam"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_people" />
</LinearLayout>
<TextView
android:id="@+id/copyOrgUrl"
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/orgCreateSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app:alignContent="stretch" >
<TextView
android:id="@+id/createRepository"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_repo"
android:text="@string/repository"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/createTeam"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_people"
android:text="@string/team"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/createLabel"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_label"
android:text="@string/label"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
</com.google.android.flexbox.FlexboxLayout>
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:id="@+id/orgDivider"
android:layout_marginBottom="16dp"
android:background="?attr/dividerColor" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/genericCopyUrl"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_copy" />
android:padding="8dp"
android:orientation="vertical">
<TextView
android:id="@+id/bottomSheetHeaderOrg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/organization"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app:alignContent="stretch" >
<TextView
android:id="@+id/copyOrgUrl"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_copy"
android:text="@string/genericCopyUrl"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
</com.google.android.flexbox.FlexboxLayout>
</LinearLayout>

455
app/src/main/res/layout/bottom_sheet_repo.xml
View File

@ -18,256 +18,263 @@
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:id="@+id/newFile"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/pageTitleNewFile"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_file" />
android:id="@+id/repoCreate"
android:padding="8dp"
android:orientation="vertical">
<TextView
android:id="@+id/createNewIssue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/pageTitleCreateNewIssue"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_issue" />
<TextView
android:id="@+id/bottomSheetHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/createPullRequest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/pageTitleNewPullRequest"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_pull_request" />
</LinearLayout>
<TextView
android:id="@+id/createNewMilestone"
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/pageTitleCreateMilestone"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_milestone" />
android:layout_height="match_parent"
android:id="@+id/repoCreateSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app:alignContent="stretch" >
<TextView
android:id="@+id/createLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/createLabel"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_label" />
<TextView
android:id="@+id/newFile"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_file"
android:text="@string/file"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/createRelease"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/createRelease"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_release" />
<TextView
android:id="@+id/createNewIssue"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_issue"
android:text="@string/issue"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<View
android:id="@+id/createDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="64dp"
android:background="?attr/dividerColor" />
<TextView
android:id="@+id/createLabel"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_label"
android:text="@string/label"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/addCollaborator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/addCollaboratorTitle"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_person_add" />
<TextView
android:id="@+id/createNewMilestone"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_milestone"
android:text="@string/newIssueMilestoneTitle"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/starRepository"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/starRepository"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_star_unfilled" />
<TextView
android:id="@+id/createRelease"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_release"
android:text="@string/release"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/unStarRepository"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/unStarRepository"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_star" />
<TextView
android:id="@+id/createPullRequest"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_pull_request"
android:text="@string/pr"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/watchRepository"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/watchRepository"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_unwatch" />
<TextView
android:id="@+id/addCollaborator"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_person_add"
android:text="@string/collaborator"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/unWatchRepository"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/unWatchRepository"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_watchers" />
</com.google.android.flexbox.FlexboxLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="64dp"
android:layout_height="4dp"
android:id="@+id/repoDivider"
android:layout_marginBottom="16dp"
android:background="?attr/dividerColor" />
<TextView
android:id="@+id/copyRepoUrl"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/genericCopyUrl"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_copy" />
android:padding="8dp"
android:orientation="vertical">
<TextView
android:id="@+id/shareRepository"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/shareRepository"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_share" />
<TextView
android:id="@+id/bottomSheetHeaderRepo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/repository"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/openWebRepo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/openWebRepo"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_browser" />
</LinearLayout>
<View
android:id="@+id/repoSettingsDivider"
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="64dp"
android:background="?attr/dividerColor" />
android:layout_height="match_parent"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app:alignContent="stretch" >
<TextView
android:id="@+id/repoSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/navSettings"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_settings" />
<TextView
android:id="@+id/starRepository"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_star"
android:text="@string/starMember"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/unStarRepository"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_star_unfilled"
android:text="@string/unstar"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/watchRepository"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_watchers"
android:text="@string/watch"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/unWatchRepository"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_unwatch"
android:text="@string/unwatch"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/copyRepoUrl"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_copy"
android:text="@string/genericCopyUrl"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/shareRepository"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_share"
android:text="@string/share"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/openWebRepo"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_browser"
android:text="@string/isOpen"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/repoSettings"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_settings"
android:text="@string/navSettings"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
</com.google.android.flexbox.FlexboxLayout>
</LinearLayout>

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

@ -15,7 +15,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_custom_dialog"
android:background="@drawable/shape_round_corners"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
@ -194,7 +194,7 @@
android:layout_height="80dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:src="@mipmap/app_logo"
android:src="@drawable/app_logo"
android:contentDescription="@string/appName" />
</androidx.cardview.widget.CardView>

2
app/src/main/res/layout/custom_assignees_selection_dialog.xml
View File

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/shape_custom_dialog"
android:background="@drawable/shape_round_corners"
android:orientation="vertical">
<com.google.android.material.progressindicator.LinearProgressIndicator

2
app/src/main/res/layout/custom_explore_repositories_dialog.xml
View File

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/shape_custom_dialog"
android:background="@drawable/shape_round_corners"
android:orientation="vertical">
<LinearLayout

2
app/src/main/res/layout/custom_labels_selection_dialog.xml
View File

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/shape_custom_dialog"
android:background="@drawable/shape_round_corners"
android:orientation="vertical">
<com.google.android.material.progressindicator.LinearProgressIndicator

2
app/src/main/res/layout/custom_pr_update_strategy_dialog.xml
View File

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_custom_dialog">
android:background="@drawable/shape_round_corners">
<TextView
android:id="@+id/selectStrategy"

2
app/src/main/res/layout/custom_repository_delete_dialog.xml
View File

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/shape_custom_dialog"
android:background="@drawable/shape_round_corners"
android:orientation="vertical">
<LinearLayout

2
app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
View File

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/shape_custom_dialog"
android:background="@drawable/shape_round_corners"
android:orientation="vertical">
<com.google.android.material.progressindicator.LinearProgressIndicator

2
app/src/main/res/layout/custom_repository_transfer_dialog.xml
View File

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/shape_custom_dialog"
android:background="@drawable/shape_round_corners"
android:orientation="vertical">

2
app/src/main/res/layout/custom_toast_error.xml
View File

@ -5,7 +5,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="15dp"
android:background="@drawable/shape_round_corners"
android:background="@drawable/shape_full_circle"
android:backgroundTint="@color/colorRed">
<TextView android:id="@+id/toastText"

2
app/src/main/res/layout/custom_toast_info.xml
View File

@ -5,7 +5,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="15dp"
android:background="@drawable/shape_round_corners"
android:background="@drawable/shape_full_circle"
android:backgroundTint="@color/toastBackground">
<TextView android:id="@+id/toastText"

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

@ -5,8 +5,8 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="15dp"
android:background="@drawable/shape_round_corners"
android:backgroundTint="@color/successColor">
android:background="@drawable/shape_full_circle"
android:backgroundTint="@color/darkGreen">
<TextView android:id="@+id/toastText"
android:layout_width="wrap_content"

2
app/src/main/res/layout/custom_toast_warning.xml
View File

@ -5,7 +5,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="15dp"
android:background="@drawable/shape_round_corners"
android:background="@drawable/shape_full_circle"
android:backgroundTint="@color/warningColor">
<TextView android:id="@+id/toastText"

2
app/src/main/res/layout/custom_user_accounts_dialog.xml
View File

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_custom_dialog"
android:background="@drawable/shape_round_corners"
android:orientation="vertical">
<LinearLayout

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

@ -31,9 +31,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noDataCollaboratorTab"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
</RelativeLayout>

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

@ -47,9 +47,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noDataFilesTab"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
<com.google.android.material.progressindicator.LinearProgressIndicator

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

@ -33,10 +33,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
android:text="@string/noDataIssueTab"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:gravity="center"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
</RelativeLayout>

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

@ -34,9 +34,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noDataLabelsTab"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
</RelativeLayout>

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

@ -31,9 +31,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noDataMembers"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
</RelativeLayout>

17
app/src/main/res/layout/fragment_milestones.xml
View File

@ -43,22 +43,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noDataMilestonesTab"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
<ImageView
android:src="@drawable/ic_add"
android:id="@+id/createNewMilestone"
android:layout_width="54dp"
android:layout_height="54dp"
android:layout_margin="15dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:background="@drawable/shape_circle"
android:padding="@dimen/fab_padding"
android:visibility="gone"
android:contentDescription="@string/addNewContent" />
</RelativeLayout>

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

@ -34,10 +34,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
android:text="@string/noData"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:gravity="center"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton

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

@ -36,9 +36,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noDataMembers"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
</LinearLayout>

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

@ -32,10 +32,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
android:text="@string/noDataOrg"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:gravity="center"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton

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

@ -33,10 +33,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
android:text="@string/noDataPullRequests"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:gravity="center"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
</RelativeLayout>

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

@ -34,9 +34,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noDataReleasesTab"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
</RelativeLayout>

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

@ -35,9 +35,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noData"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton

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

@ -34,9 +34,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noData"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
</RelativeLayout>

592
app/src/main/res/layout/fragment_settings.xml
View File

@ -23,34 +23,53 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/tvGeneral"
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="24dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/settingsGeneralHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_otp" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_otp" />
<TextView
android:id="@+id/generalHintText"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="60dp"
android:paddingEnd="12dp"
android:text="@string/generalHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tvGeneral"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/settingsGeneralHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<TextView
android:id="@+id/generalHintText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:layout_gravity="center_vertical"
android:text="@string/generalHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_chevron_right"
android:contentDescription="@string/generalImgContentText" />
</LinearLayout>
@ -59,34 +78,53 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/tvAppearance"
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="24dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/settingsAppearanceHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_appearance" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_appearance" />
<TextView
android:id="@+id/appearanceHintText"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="60dp"
android:paddingEnd="12dp"
android:text="@string/appearanceHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tvAppearance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/settingsAppearanceHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<TextView
android:id="@+id/appearanceHintText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/appearanceHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_chevron_right"
android:contentDescription="@string/generalImgContentText" />
</LinearLayout>
@ -95,34 +133,53 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/draftsHeader"
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="24dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/draftsHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_drafts" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_drafts" />
<TextView
android:id="@+id/draftsHintText"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="60dp"
android:paddingEnd="12dp"
android:text="@string/draftsHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/draftsHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/draftsHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<TextView
android:id="@+id/draftsHintText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/draftsHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_chevron_right"
android:contentDescription="@string/generalImgContentText" />
</LinearLayout>
@ -131,34 +188,53 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/tvSecurity"
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="24dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/settingsSecurityHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_security" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_security" />
<TextView
android:id="@+id/securityHintText"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="60dp"
android:paddingEnd="12dp"
android:text="@string/securityHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tvSecurity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/settingsSecurityHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<TextView
android:id="@+id/securityHintText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/securityHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_chevron_right"
android:contentDescription="@string/generalImgContentText" />
</LinearLayout>
@ -167,35 +243,53 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:visibility="gone">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/notificationsHeader"
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="24dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/pageTitleNotifications"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_notifications" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_notifications" />
<TextView
android:id="@+id/notificationsHintText"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="60dp"
android:paddingEnd="12dp"
android:text="@string/notificationsHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/notificationsHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/pageTitleNotifications"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<TextView
android:id="@+id/notificationsHintText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/notificationsHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_chevron_right"
android:contentDescription="@string/generalImgContentText" />
</LinearLayout>
@ -204,34 +298,53 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/tvLanguages"
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="24dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/settingsLanguageHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_flag" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_flag" />
<TextView
android:id="@+id/languagesHintText"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="60dp"
android:paddingEnd="12dp"
android:text="@string/languagesHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/tvLanguages"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/settingsLanguageHeaderText"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<TextView
android:id="@+id/languagesHintText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/languagesHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_chevron_right"
android:contentDescription="@string/generalImgContentText" />
</LinearLayout>
@ -240,34 +353,53 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/appReports"
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="24dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/reportViewerHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_bug_report" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_bug_report" />
<TextView
android:id="@+id/reportsHintText"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="60dp"
android:paddingEnd="12dp"
android:text="@string/reportsHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/appReports"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/reportViewerHeader"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<TextView
android:id="@+id/reportsHintText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/reportsHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_chevron_right"
android:contentDescription="@string/generalImgContentText" />
</LinearLayout>
@ -276,34 +408,47 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/rateApp"
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="24dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/navRate"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_like" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_like" />
<TextView
android:id="@+id/rateAppHintText"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="60dp"
android:paddingEnd="12dp"
android:text="@string/rateAppHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/rateApp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/navRate"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<TextView
android:id="@+id/rateAppHintText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/rateAppHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
@ -312,34 +457,47 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="15dp"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/aboutApp"
android:layout_width="match_parent"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="24dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/navAbout"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_info" />
android:contentDescription="@string/generalImgContentText"
app:srcCompat="@drawable/ic_info" />
<TextView
android:id="@+id/aboutAppHintText"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="60dp"
android:paddingEnd="12dp"
android:text="@string/aboutAppHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/aboutApp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/navAbout"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp" />
<TextView
android:id="@+id/aboutAppHintText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/aboutAppHintText"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>

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

@ -35,9 +35,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noData"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton

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

@ -34,9 +34,9 @@
android:layout_height="match_parent"
android:layout_margin="15dp"
android:gravity="center"
android:text="@string/noDataTeams"
android:text="@string/noDataFound"
android:textColor="?attr/primaryTextColor"
android:textSize="20sp"
android:textSize="18sp"
android:visibility="gone" />
</RelativeLayout>

1
app/src/main/res/values/colors.xml
View File

@ -28,7 +28,6 @@
<color name="dividerColorDark">#1d1d1d</color>
<color name="lightYellow">#efd34a</color>
<color name="warningColor">#dbb109</color>
<color name="successColor">#1e9c37</color>
<color name="lightThemeDiffRemovedColor">#FCEDED</color>
<color name="lightThemeDiffAddedColor">#EAF8ED</color>

51
app/src/main/res/values/strings.xml
View File

@ -52,10 +52,8 @@
<string name="repoName">Demo repo</string>
<string name="repoDescription">Demo description</string>
<string name="noData">No repositories found</string>
<string name="orgName">Demo organization</string>
<string name="noDataOrg">No organizations found</string>
<string name="newCreateButtonCopy">Create</string>
<string name="newUpdateButtonCopy">Update</string>
@ -93,7 +91,6 @@
<string name="repoNameErrorReservedPatterns">Repository name contains reserved keywords</string>
<string name="repoDescError">Repository description exceeds the max 255 characters limit</string>
<string name="repoCreated">Repository created successfully</string>
<string name="repoCreatedError">Something went wrong, please try again</string>
<string name="repoExistsError">Repository of this name already exists under selected Owner</string>
<string name="repoOwnerError">Select owner for the repository</string>
@ -101,7 +98,6 @@
<string name="orgNameErrorInvalid">Organization name is not valid, [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
<string name="orgDescError">Organization description exceeds the max 255 characters limit</string>
<string name="orgCreated">Organization created successfully</string>
<string name="orgCreatedError">Something went wrong, please try again</string>
<string name="orgExistsError">Organization already exists</string>
<string name="diffStatistics">%s addition(s) and %s deletion(s)</string>
@ -124,12 +120,9 @@
<string name="tabTextMl">Milestones</string>
<string name="tabTextReleases">Releases</string>
<string name="tabTextBranches">Branches</string>
<string name="tabTextLabels">Labels</string>
<string name="tabTextCollaborators">Collaborators</string>
<string name="tabPullRequests">Pull Requests</string>
<string name="noDataIssueTab">No issues found</string>
<string name="infoTabRepoSize">Size</string>
<string name="infoTabRepoDefaultBranch">Default Branch</string>
<string name="infoTabRepoSshUrl">SSH URL</string>
@ -154,26 +147,20 @@
<string name="commentButtonText">Comment</string>
<string name="commentEmptyError">Please write your comment</string>
<string name="commentSuccess">Comment posted</string>
<string name="commentError">Something went wrong, please try again</string>
<string name="featureDeprecated">This function will be removed in the future</string>
<string name="screamingInFearEmoticon" translatable="false">😱</string>
<string name="generalImgContentText">Image</string>
<string name="noDataMilestonesTab">No milestones found</string>
<string name="commitAuthor">Commit author: %1$s</string>
<string name="releaseDownloadText">Downloads</string>
<string name="releaseTypePre" translatable="false">Pre-Release</string>
<string name="releaseTypeStable" translatable="false">Stable</string>
<string name="noDataReleasesTab">No releases found</string>
<string name="releasePublishedBy">Published by @%1$s</string>
<string name="noReleaseBodyContent">Release notes are not provided by the publisher.</string>
<string name="noDataCollaboratorTab">No collaborators found</string>
<string name="newMilestoneTitle">Title</string>
<string name="newMilestoneDescription">Description</string>
<string name="newMilestoneDueDate">Due Date</string>
@ -181,7 +168,6 @@
<string name="milestoneNameErrorEmpty">Milestone title is empty</string>
<string name="milestoneDescError">Milestone description exceeds the max 255 characters limit</string>
<string name="milestoneCreated">Milestone created successfully</string>
<string name="milestoneCreatedError">Something went wrong, please try again</string>
<string name="milestoneDateEmpty">Please choose due date</string>
<string name="milestoneNoDueDate">No due date</string>
<string name="milestoneNoDescription">No description</string>
@ -200,10 +186,8 @@
<string name="issueTitleEmpty">Issue title is empty</string>
<string name="issueDescriptionEmpty">Issue description is empty</string>
<string name="issueCreated">New issue created successfully</string>
<string name="issueCreatedError">Something went wrong, please try again</string>
<string name="issueCreatedNoMilestone">No milestone</string>
<string name="noAssigneesFound">No assignees found</string>
<string name="noLabelsFound">No labels found</string>
<!-- settings -->
<string name="settingsLanguageHeaderText">Translation</string>
@ -271,16 +255,12 @@
<string name="labelColor">Label Color</string>
<string name="labelEmptyError">Label name is empty</string>
<string name="labelNameError">Label name is not valid</string>
<string name="labelCreated">Label created.</string>
<string name="labelGeneralError">Something went wrong, please try again</string>
<string name="labelUpdated">Label updated.</string>
<string name="labelCreated">Label created</string>
<string name="labelUpdated">Label updated</string>
<string name="noDataLabelsTab">No labels found</string>
<string name="labelMenuContentDesc">Desc</string>
<string name="labelDeleteText">Label deleted</string>
<string name="labelDeleteErrorText">Something went wrong, please try again</string>
<string name="noDataBranchesTab">No branches found</string>
<string name="selectBranchError">Select a branch for release</string>
<string name="alertDialogTokenRevokedTitle">Authorization Error</string>
@ -289,11 +269,8 @@
<string name="labelDeleteMessage">Do you really want to delete this label?</string>
<!-- org tabbed layout str -->
<string name="orgTabRepos">Repositories</string>
<string name="orgTabTeams">Teams</string>
<string name="orgTabMembers">Members</string>
<string name="orgCreateTeam">New Team</string>
<string name="noDataTeams">No teams found</string>
<string name="teamTitle">Team name</string>
<string name="teamDescription">Team desc</string>
<string name="teamPermissions">Permissions</string>
@ -303,7 +280,6 @@
<string name="teamPermissionAdmin">• Members of this team can push to and from team repositories and add collaborators.</string>
<string name="teamPermissionOwner">• Members of this team have owner permissions.</string>
<string name="teamShowAll">show all</string>
<string name="noDataMembers">No members found</string>
<string name="orgMember">Org members</string>
<string name="orgTeamMembers">Organization team members</string>
<string name="addNewMember">Add / Remove New Member</string>
@ -331,7 +307,6 @@
<string name="teamDescError">Team description have illegal characters</string>
<string name="teamDescLimit">Team description have more than 100 characters</string>
<string name="teamCreated">Team created successfully</string>
<string name="teamCreatedError">Something went wrong, please try again</string>
<!-- create team -->
<!-- issue comments -->
@ -343,7 +318,6 @@
<!-- issue comments -->
<!-- add collaborator -->
<string name="addCollaboratorTitle">Add / Remove Collaborator</string>
<string name="addCollaboratorSearchHint">Search users</string>
<string name="addCollaboratorViewUserDesc">Username</string>
<string name="removeCollaboratorDialogTitle">Remove %s?</string>
@ -468,7 +442,6 @@
<string name="milestoneCompletion">%1$d\uFF05 completed</string>
<!-- files -->
<string name="noDataFilesTab">No files found</string>
<string name="filesGenericError">Sorry this file cannot be viewed as API returned an error</string>
<string name="colonDivider" translatable="false">\u0020:\u0020</string>
<string name="fileTypeCannotBeEdited">Files of this type cannot be edited</string>
@ -480,7 +453,7 @@
<string name="cancelButton">Cancel</string>
<string name="genericError">Something went wrong, please try again</string>
<string name="apiNotFound">This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea.</string>
<string name="noDataFound">No data found</string>
<string name="noDataFound">🌟 Nothing in here 🌟</string>
<string name="addButton">Add</string>
<string name="removeButton">Remove</string>
<string name="authorizeError">You are not authorized to perform this action.</string>
@ -508,17 +481,26 @@
<string name="genericServerResponseError">We cannot reach the server at the moment, please check your server status and try again</string>
<string name="genericCopyUrl">Copy URL</string>
<string name="genericWaitFor">Hold on ☕</string>
<string name="file">File</string>
<string name="issue">Issue</string>
<string name="label">Label</string>
<string name="release">Release</string>
<string name="pr">Pull Request</string>
<string name="collaborator">Collaborator</string>
<string name="unstar">Unstar</string>
<string name="watch">Watch</string>
<string name="unwatch">Unwatch</string>
<string name="share">Share</string>
<string name="repository">Repository</string>
<string name="team">Team</string>
<string name="organization">Organization</string>
<!-- generic copy -->
<string name="exploreUsers">Explore users</string>
<string name="exploreIssues">Explore issues</string>
<string name="exploreTextBoxHint">Explore repositories</string>
<string name="starRepository">Star Repository</string>
<string name="unStarRepository">Unstar Repository</string>
<string name="starRepositorySuccess">Repository added to starred list</string>
<string name="unStarRepositorySuccess">Repository removed from starred list</string>
<string name="watchRepository">Watch Repository</string>
<string name="unWatchRepository">Unwatch Repository</string>
<string name="watchRepositorySuccess">Repository added to watch list</string>
<string name="unWatchRepositorySuccess">Repository removed from watch list</string>
<string name="titleDrafts">Drafts</string>
@ -535,7 +517,6 @@
<string name="loginTokenError">Token is required</string>
<string name="prDeletedFork">Deleted Fork</string>
<string name="noDataPullRequests">No pull requests found</string>
<string name="editPrText">Edit Pull Request</string>
<string name="copyPrUrlText">Copy Pull Request URL</string>
<string name="editPrNavHeader">Edit Pull Request #%1$s</string>