diff --git a/app/build.gradle b/app/build.gradle index efa87775..a75d3ec5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' } diff --git a/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java b/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java index ca52c3b2..fb86daba 100644 --- a/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java +++ b/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java @@ -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)); } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java index 4d00baa0..bb207e18 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java @@ -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; } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java index 16be9056..85f74fe5 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java @@ -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(); } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java index 77bd2519..ee79dda4 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java @@ -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)); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java index f0189fa3..e9cc271b 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java @@ -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)); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java index 96c9d7e1..2efa7a29 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java @@ -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)); } } } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java index 48f7c2fb..b0f50260 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java @@ -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)); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java index db9c806e..152fd631 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java @@ -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)); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java index 1dc571ba..22ab7fc8 100644 --- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java @@ -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))); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java index 893145e8..1b28138d 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -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); } diff --git a/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java b/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java index 129b5d75..d23f9676 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java @@ -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)); } } diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java index 7d431b9e..6b92d720 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SettingsNotificationsActivity.java @@ -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( diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java index 2f750f98..7544df67 100644 --- a/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/SettingsSecurityActivity.java @@ -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)); } }); diff --git a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java index c4f63d55..66bcfb17 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java @@ -59,6 +59,12 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter { + 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; diff --git a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java index 5db17796..2126f29c 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java @@ -32,7 +32,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter notificationThreads; private final OnMoreClickedListener onMoreClickedListener; private final OnNotificationClickedListener onNotificationClickedListener; - private Runnable loadMoreListener; private boolean isLoading = false, isMoreDataAvailable = true; public NotificationsAdapter(Context context, List notificationThreads, OnMoreClickedListener onMoreClickedListener, OnNotificationClickedListener onNotificationClickedListener) { @@ -57,9 +56,8 @@ public class NotificationsAdapter extends RecyclerView.Adapter= 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 list) { notificationThreads = list; notifyDataChanged(); diff --git a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java b/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java index e8486bfb..b0402478 100644 --- a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java +++ b/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java @@ -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 -> { diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java index be37e10a..0b43f537 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java @@ -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 -> { diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java index 22dbc6de..4fe938d1 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetReplyFragment.java @@ -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(); diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java index 3da09599..939d3510 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetRepoFragment.java @@ -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); } diff --git a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java index 9559a673..78d1bf6b 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java @@ -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))); } } diff --git a/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java index 54ee8347..f1f83e86 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java @@ -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) {} diff --git a/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java index 0a9494ee..2968c6a0 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/NotificationsFragment.java @@ -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); diff --git a/app/src/main/java/org/mian/gitnex/helpers/FilesData.java b/app/src/main/java/org/mian/gitnex/helpers/FilesData.java index 23d39a2f..89e5a5dc 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/FilesData.java +++ b/app/src/main/java/org/mian/gitnex/helpers/FilesData.java @@ -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; + } } } diff --git a/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java b/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java index 69d42c9e..469c07ce 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java +++ b/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java @@ -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; diff --git a/app/src/main/res/drawable/app_logo.xml b/app/src/main/res/drawable/app_logo.xml new file mode 100644 index 00000000..7af56a17 --- /dev/null +++ b/app/src/main/res/drawable/app_logo.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_issue_closed_red.xml b/app/src/main/res/drawable/ic_issue_closed_red.xml deleted file mode 100644 index 0f0ee63f..00000000 --- a/app/src/main/res/drawable/ic_issue_closed_red.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_pull_request_closed.xml b/app/src/main/res/drawable/ic_pull_request_closed.xml deleted file mode 100644 index 2845a5c8..00000000 --- a/app/src/main/res/drawable/ic_pull_request_closed.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_pull_request_merged.xml b/app/src/main/res/drawable/ic_pull_request_merged.xml deleted file mode 100644 index e68c8a06..00000000 --- a/app/src/main/res/drawable/ic_pull_request_merged.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/shape_circle_white.xml b/app/src/main/res/drawable/shape_circle_white.xml deleted file mode 100644 index d622c72d..00000000 --- a/app/src/main/res/drawable/shape_circle_white.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/shape_custom_dialog.xml b/app/src/main/res/drawable/shape_custom_dialog.xml deleted file mode 100644 index 1e0f424e..00000000 --- a/app/src/main/res/drawable/shape_custom_dialog.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/shape_dropdown.xml b/app/src/main/res/drawable/shape_dropdown.xml deleted file mode 100644 index f967901c..00000000 --- a/app/src/main/res/drawable/shape_dropdown.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/shape_full_circle.xml b/app/src/main/res/drawable/shape_full_circle.xml new file mode 100644 index 00000000..bca322a9 --- /dev/null +++ b/app/src/main/res/drawable/shape_full_circle.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/shape_round_corners.xml b/app/src/main/res/drawable/shape_round_corners.xml index e24719e2..97773612 100644 --- a/app/src/main/res/drawable/shape_round_corners.xml +++ b/app/src/main/res/drawable/shape_round_corners.xml @@ -2,6 +2,6 @@ - + diff --git a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml b/app/src/main/res/layout/activity_add_collaborator_to_repository.xml index 34114444..0e7c6dab 100644 --- a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml +++ b/app/src/main/res/layout/activity_add_collaborator_to_repository.xml @@ -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" /> diff --git a/app/src/main/res/layout/activity_org_detail.xml b/app/src/main/res/layout/activity_org_detail.xml index fa4dddfc..4c338d50 100644 --- a/app/src/main/res/layout/activity_org_detail.xml +++ b/app/src/main/res/layout/activity_org_detail.xml @@ -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" /> + android:text="@string/newIssueLabelsTitle" /> + android:text="@string/newIssueLabelsTitle" /> + android:padding="15dp" + android:layout_marginBottom="5dp"> + android:textSize="18sp" /> + android:textSize="16sp" /> @@ -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"> + android:textSize="18sp" /> + android:textSize="16sp" /> @@ -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"> + android:textSize="18sp" /> + android:textSize="16sp" /> @@ -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"> + android:textSize="18sp" /> + android:textSize="16sp" /> @@ -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"> + android:textSize="18sp" /> + android:textSize="16sp" /> @@ -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"> + android:textSize="18sp" /> + android:padding="15dp" + android:layout_marginBottom="5dp"> + android:textSize="18sp" /> diff --git a/app/src/main/res/layout/activity_settings_general.xml b/app/src/main/res/layout/activity_settings_general.xml index 1e0a7e2f..f334d074 100644 --- a/app/src/main/res/layout/activity_settings_general.xml +++ b/app/src/main/res/layout/activity_settings_general.xml @@ -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"> + android:textSize="18sp" /> @@ -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" /> @@ -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"> + android:textSize="18sp" /> + android:textSize="16sp" /> @@ -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"> + android:textSize="18sp" /> + android:padding="15dp" + android:layout_marginBottom="5dp"> + android:textSize="18sp" /> + android:padding="15dp" + android:layout_marginBottom="5dp"> + android:textSize="18sp" /> + android:textSize="16sp" /> @@ -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"> + android:textSize="18sp" /> + android:padding="15dp" + android:layout_marginBottom="5dp"> + android:textSize="18sp" /> + android:padding="15dp" + android:layout_marginBottom="5dp"> + android:textSize="18sp" /> + android:padding="15dp" + android:layout_marginBottom="5dp"> + android:textSize="18sp" /> + android:padding="15dp" + android:layout_marginBottom="5dp"> + android:textSize="18sp" /> + android:padding="15dp" + android:layout_marginBottom="5dp"> + android:textSize="18sp" /> @@ -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"> + android:textSize="18sp" /> + android:textSize="16sp" /> @@ -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"> + android:textSize="18sp" /> + android:textSize="16sp" /> @@ -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"> + android:textSize="18sp" /> + android:textSize="16sp" /> diff --git a/app/src/main/res/layout/activity_settings_translation.xml b/app/src/main/res/layout/activity_settings_translation.xml index 374447e5..ffda7c7a 100644 --- a/app/src/main/res/layout/activity_settings_translation.xml +++ b/app/src/main/res/layout/activity_settings_translation.xml @@ -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"> + android:textSize="18sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> diff --git a/app/src/main/res/layout/bottom_sheet_organization.xml b/app/src/main/res/layout/bottom_sheet_organization.xml index e4bbef2e..575aeea1 100644 --- a/app/src/main/res/layout/bottom_sheet_organization.xml +++ b/app/src/main/res/layout/bottom_sheet_organization.xml @@ -18,65 +18,120 @@ android:orientation="vertical" android:layout_height="wrap_content"> - + android:id="@+id/orgCreate" + android:padding="8dp" + android:orientation="vertical"> - + - + - + + + + + + + + + + + + + android:padding="8dp" + android:orientation="vertical"> + + + + + + + + + + diff --git a/app/src/main/res/layout/bottom_sheet_repo.xml b/app/src/main/res/layout/bottom_sheet_repo.xml index b411c47e..13785094 100644 --- a/app/src/main/res/layout/bottom_sheet_repo.xml +++ b/app/src/main/res/layout/bottom_sheet_repo.xml @@ -18,256 +18,263 @@ android:orientation="vertical" android:layout_height="wrap_content"> - + android:id="@+id/repoCreate" + android:padding="8dp" + android:orientation="vertical"> - + - + - + android:layout_height="match_parent" + android:id="@+id/repoCreateSection" + app:flexWrap="wrap" + app:alignItems="stretch" + android:padding="8dp" + app:alignContent="stretch" > - + - + - + - + - + - + - + - + - + android:padding="8dp" + android:orientation="vertical"> - + - + - + android:layout_height="match_parent" + app:flexWrap="wrap" + app:alignItems="stretch" + android:padding="8dp" + app:alignContent="stretch" > - + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/custom_about_dialog.xml b/app/src/main/res/layout/custom_about_dialog.xml index b40d2648..ce025d19 100644 --- a/app/src/main/res/layout/custom_about_dialog.xml +++ b/app/src/main/res/layout/custom_about_dialog.xml @@ -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" /> diff --git a/app/src/main/res/layout/custom_assignees_selection_dialog.xml b/app/src/main/res/layout/custom_assignees_selection_dialog.xml index 729f440f..cc338de0 100644 --- a/app/src/main/res/layout/custom_assignees_selection_dialog.xml +++ b/app/src/main/res/layout/custom_assignees_selection_dialog.xml @@ -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"> + android:background="@drawable/shape_round_corners"> diff --git a/app/src/main/res/layout/custom_toast_error.xml b/app/src/main/res/layout/custom_toast_error.xml index 1963f7b2..6b9278ca 100644 --- a/app/src/main/res/layout/custom_toast_error.xml +++ b/app/src/main/res/layout/custom_toast_error.xml @@ -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"> + android:background="@drawable/shape_full_circle" + android:backgroundTint="@color/darkGreen"> diff --git a/app/src/main/res/layout/fragment_files.xml b/app/src/main/res/layout/fragment_files.xml index e18d6289..0b228b3b 100644 --- a/app/src/main/res/layout/fragment_files.xml +++ b/app/src/main/res/layout/fragment_files.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_labels.xml b/app/src/main/res/layout/fragment_labels.xml index f8ba7773..e6da5cc7 100644 --- a/app/src/main/res/layout/fragment_labels.xml +++ b/app/src/main/res/layout/fragment_labels.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_members_by_org.xml b/app/src/main/res/layout/fragment_members_by_org.xml index 281e7474..eefa2be3 100644 --- a/app/src/main/res/layout/fragment_members_by_org.xml +++ b/app/src/main/res/layout/fragment_members_by_org.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_milestones.xml b/app/src/main/res/layout/fragment_milestones.xml index d2eb5fcb..ae477874 100644 --- a/app/src/main/res/layout/fragment_milestones.xml +++ b/app/src/main/res/layout/fragment_milestones.xml @@ -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" /> - - diff --git a/app/src/main/res/layout/fragment_my_repositories.xml b/app/src/main/res/layout/fragment_my_repositories.xml index 6bbd8554..7ddfcc98 100644 --- a/app/src/main/res/layout/fragment_my_repositories.xml +++ b/app/src/main/res/layout/fragment_my_repositories.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_organizations.xml b/app/src/main/res/layout/fragment_organizations.xml index 3bc18ea9..617b155b 100644 --- a/app/src/main/res/layout/fragment_organizations.xml +++ b/app/src/main/res/layout/fragment_organizations.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_releases.xml b/app/src/main/res/layout/fragment_releases.xml index 76557021..91999995 100644 --- a/app/src/main/res/layout/fragment_releases.xml +++ b/app/src/main/res/layout/fragment_releases.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_repositories.xml b/app/src/main/res/layout/fragment_repositories.xml index a8c8d022..258b59d6 100644 --- a/app/src/main/res/layout/fragment_repositories.xml +++ b/app/src/main/res/layout/fragment_repositories.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 3bb79988..50616bc4 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -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"> - + android:contentDescription="@string/generalImgContentText" + app:srcCompat="@drawable/ic_otp" /> - + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + + @@ -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"> - + android:contentDescription="@string/generalImgContentText" + app:srcCompat="@drawable/ic_appearance" /> - + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + + @@ -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"> - + android:contentDescription="@string/generalImgContentText" + app:srcCompat="@drawable/ic_drafts" /> - + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + + @@ -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"> - + android:contentDescription="@string/generalImgContentText" + app:srcCompat="@drawable/ic_security" /> - + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + + @@ -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"> - + android:contentDescription="@string/generalImgContentText" + app:srcCompat="@drawable/ic_notifications" /> - + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + + @@ -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"> - + android:contentDescription="@string/generalImgContentText" + app:srcCompat="@drawable/ic_flag" /> - + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + + @@ -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"> - + android:contentDescription="@string/generalImgContentText" + app:srcCompat="@drawable/ic_bug_report" /> - + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + + + @@ -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"> - + android:contentDescription="@string/generalImgContentText" + app:srcCompat="@drawable/ic_like" /> - + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + @@ -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"> - + android:contentDescription="@string/generalImgContentText" + app:srcCompat="@drawable/ic_info" /> - + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" + android:layout_weight="1" + android:orientation="vertical"> + + + + + + diff --git a/app/src/main/res/layout/fragment_starred_repositories.xml b/app/src/main/res/layout/fragment_starred_repositories.xml index a8c8d022..258b59d6 100644 --- a/app/src/main/res/layout/fragment_starred_repositories.xml +++ b/app/src/main/res/layout/fragment_starred_repositories.xml @@ -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" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7eb2c893..82de5ff6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -28,7 +28,6 @@ #1d1d1d #efd34a #dbb109 - #1e9c37 #FCEDED #EAF8ED diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9a98aecc..d4ddbb5e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,10 +52,8 @@ Demo repo Demo description - No repositories found Demo organization - No organizations found Create Update @@ -93,7 +91,6 @@ Repository name contains reserved keywords Repository description exceeds the max 255 characters limit Repository created successfully - Something went wrong, please try again Repository of this name already exists under selected Owner Select owner for the repository @@ -101,7 +98,6 @@ Organization name is not valid, [a–z A–Z 0–9 – _] Organization description exceeds the max 255 characters limit Organization created successfully - Something went wrong, please try again Organization already exists %s addition(s) and %s deletion(s) @@ -124,12 +120,9 @@ Milestones Releases Branches - Labels Collaborators Pull Requests - No issues found - Size Default Branch SSH URL @@ -154,26 +147,20 @@ Comment Please write your comment Comment posted - Something went wrong, please try again This function will be removed in the future 😱 Image - No milestones found - Commit author: %1$s Downloads Pre-Release Stable - No releases found Published by @%1$s Release notes are not provided by the publisher. - No collaborators found - Title Description Due Date @@ -181,7 +168,6 @@ Milestone title is empty Milestone description exceeds the max 255 characters limit Milestone created successfully - Something went wrong, please try again Please choose due date No due date No description @@ -200,10 +186,8 @@ Issue title is empty Issue description is empty New issue created successfully - Something went wrong, please try again No milestone No assignees found - No labels found Translation @@ -271,16 +255,12 @@ Label Color Label name is empty Label name is not valid - Label created. - Something went wrong, please try again - Label updated. + Label created + Label updated - No labels found Desc Label deleted - Something went wrong, please try again - No branches found Select a branch for release Authorization Error @@ -289,11 +269,8 @@ Do you really want to delete this label? - Repositories Teams Members - New Team - No teams found Team name Team desc Permissions @@ -303,7 +280,6 @@ • Members of this team can push to and from team repositories and add collaborators. • Members of this team have owner permissions. show all - No members found Org members Organization team members Add / Remove New Member @@ -331,7 +307,6 @@ Team description have illegal characters Team description have more than 100 characters Team created successfully - Something went wrong, please try again @@ -343,7 +318,6 @@ - Add / Remove Collaborator Search users Username Remove %s? @@ -468,7 +442,6 @@ %1$d\uFF05 completed - No files found Sorry this file cannot be viewed as API returned an error \u0020:\u0020 Files of this type cannot be edited @@ -480,7 +453,7 @@ Cancel Something went wrong, please try again This request needs higher Gitea version than the one installed. Please upgrade your instance to the latest version of Gitea. - No data found + 🌟 Nothing in here 🌟 Add Remove You are not authorized to perform this action. @@ -508,17 +481,26 @@ We cannot reach the server at the moment, please check your server status and try again Copy URL Hold on ☕ + File + Issue + Label + Release + Pull Request + Collaborator + Unstar + Watch + Unwatch + Share + Repository + Team + Organization Explore users Explore issues Explore repositories - Star Repository - Unstar Repository Repository added to starred list Repository removed from starred list - Watch Repository - Unwatch Repository Repository added to watch list Repository removed from watch list Drafts @@ -535,7 +517,6 @@ Token is required Deleted Fork - No pull requests found Edit Pull Request Copy Pull Request URL Edit Pull Request #%1$s