Update: subcategory enhancement #1154 solved

2 files changed, 6 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 92790bc4..3dd079e9 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
@@ -350,7 +350,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 eaf40dbc..adb01a8a 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 ? 70 : 0;
+        view.requestLayout();
     }
 }
\ No newline at end of file