diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-10-04 15:54:04 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-10-04 15:54:04 +0300 |
| commit | e03866f4d306192a4d4247868104da4219a993c3 (patch) | |
| tree | cf3bb2595bb80509a46429f47ad3968fd2dd3781 /app/src/main | |
| parent | 6dbafb0a98acc35a78e3aec4f13b9bf2e0375618 (diff) | |
| parent | 8141a952a8709de8d8ae19c9e4290808d628efb5 (diff) | |
Merge branch 'fix/subcategoryux' of https://github.com/ScottieKim/nextcloud-notes into ScottieKim-fix/subcategoryux
Diffstat (limited to 'app/src/main')
3 files changed, 9 insertions, 1 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java index b52fdc79..f55daaff 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java @@ -351,7 +351,7 @@ public class MainViewModel extends AndroidViewModel { lastSecondaryCategory.icon = NavigationAdapter.ICON_SUB_MULTIPLE; } else if (belongsToLastPrimaryCategory) { if (isCategoryOpen) { - item.label = currentPrimaryCategory + "/" + currentSecondaryCategory; + item.label = currentSecondaryCategory; item.id = "category:" + item.label; item.icon = NavigationAdapter.ICON_SUB_FOLDER; items.add(item); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java index 3cd2a205..1af734d2 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java @@ -1,6 +1,7 @@ package it.niedermann.owncloud.notes.main.navigation; import android.view.View; +import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; @@ -59,5 +60,9 @@ class NavigationViewHolder extends RecyclerView.ViewHolder { icon.setColorFilter(isSelected ? textColor : 0); view.setSelected(isSelected); + + ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) view.getLayoutParams(); + params.leftMargin = item.icon == NavigationAdapter.ICON_SUB_FOLDER ? view.getResources().getDimensionPixelSize(R.dimen.margin_25) : 0; + view.requestLayout(); } }
\ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 4624e017..09c59517 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -37,4 +37,7 @@ <dimen name="widget_note_list_inner_padding">4dp</dimen> <dimen name="widget_note_list_fav_icon_width">26dp</dimen> <dimen name="widget_note_list_fav_icon_height">20dp</dimen> + + <dimen name="margin_25">25dp</dimen> + </resources> |