Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e03866f4 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge branch 'fix/subcategoryux' of... 

Merge branch 'fix/subcategoryux' of https://github.com/ScottieKim/nextcloud-notes into ScottieKim-fix/subcategoryux
parents 6dbafb0a 8141a952

app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java

+5 −0
Original line number Diff line number Diff line 
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

app/src/main/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>