Loading app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java +1 −1 Original line number Diff line number Diff line Loading @@ -107,7 +107,7 @@ public class NoteListWidgetConfiguration extends AppCompatActivity { public void onIconClick(NavigationAdapter.NavigationItem item) { onItemClick(item); } }, false); }); recyclerView = findViewById(R.id.nlw_config_recyclerv); recyclerView.setHasFixedSize(true); Loading app/src/main/java/it/niedermann/owncloud/notes/model/NavigationAdapter.java +0 −18 Original line number Diff line number Diff line Loading @@ -18,7 +18,6 @@ import butterknife.BindView; import butterknife.ButterKnife; import it.niedermann.owncloud.notes.R; import it.niedermann.owncloud.notes.util.NoteUtil; import it.niedermann.owncloud.notes.util.Notes; public class NavigationAdapter extends RecyclerView.Adapter<NavigationAdapter.ViewHolder> { Loading Loading @@ -101,17 +100,6 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationAdapter.Vi view.setBackgroundColor(isSelected ? view.getResources().getColor(R.color.bg_highlighted) : Color.TRANSPARENT); int textColor = view.getResources().getColor(isSelected ? R.color.primary_dark : R.color.fg_default); if (enableHighlighting && Notes.getAppTheme(view.getContext())) { if((item.label != view.getContext().getString(R.string.action_settings)) && (item.label != view.getContext().getString(R.string.simple_about))) { textColor = view.getResources().getColor(isSelected ? R.color.fg_default : R.color.fg_default_high); view.setBackgroundColor(isSelected ? view.getResources().getColor(R.color.bg_highlighted) : Color.TRANSPARENT); } } name.setTextColor(textColor); count.setTextColor(textColor); icon.setColorFilter(isSelected ? textColor : 0); Loading @@ -129,17 +117,11 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationAdapter.Vi private String selectedItem = null; @NonNull private ClickListener clickListener; private boolean enableHighlighting = true; public NavigationAdapter(@NonNull ClickListener clickListener) { this.clickListener = clickListener; } public NavigationAdapter(@NonNull ClickListener clickListener, boolean enableHighlighting) { this.clickListener = clickListener; this.enableHighlighting = enableHighlighting; } @NonNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { Loading app/src/main/res/values/colors.xml +1 −1 Original line number Diff line number Diff line Loading @@ -19,7 +19,7 @@ <color name="fg_contrast">#ffffff</color> <color name="icon_grey">#757575</color> <color name="widget_background">#E6FFFFFF</color> <color name="widget_background">#FFFFFF</color> <color name="category_background">#FFF</color> <color name="category_border">@color/primary</color> Loading Loading
app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java +1 −1 Original line number Diff line number Diff line Loading @@ -107,7 +107,7 @@ public class NoteListWidgetConfiguration extends AppCompatActivity { public void onIconClick(NavigationAdapter.NavigationItem item) { onItemClick(item); } }, false); }); recyclerView = findViewById(R.id.nlw_config_recyclerv); recyclerView.setHasFixedSize(true); Loading
app/src/main/java/it/niedermann/owncloud/notes/model/NavigationAdapter.java +0 −18 Original line number Diff line number Diff line Loading @@ -18,7 +18,6 @@ import butterknife.BindView; import butterknife.ButterKnife; import it.niedermann.owncloud.notes.R; import it.niedermann.owncloud.notes.util.NoteUtil; import it.niedermann.owncloud.notes.util.Notes; public class NavigationAdapter extends RecyclerView.Adapter<NavigationAdapter.ViewHolder> { Loading Loading @@ -101,17 +100,6 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationAdapter.Vi view.setBackgroundColor(isSelected ? view.getResources().getColor(R.color.bg_highlighted) : Color.TRANSPARENT); int textColor = view.getResources().getColor(isSelected ? R.color.primary_dark : R.color.fg_default); if (enableHighlighting && Notes.getAppTheme(view.getContext())) { if((item.label != view.getContext().getString(R.string.action_settings)) && (item.label != view.getContext().getString(R.string.simple_about))) { textColor = view.getResources().getColor(isSelected ? R.color.fg_default : R.color.fg_default_high); view.setBackgroundColor(isSelected ? view.getResources().getColor(R.color.bg_highlighted) : Color.TRANSPARENT); } } name.setTextColor(textColor); count.setTextColor(textColor); icon.setColorFilter(isSelected ? textColor : 0); Loading @@ -129,17 +117,11 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationAdapter.Vi private String selectedItem = null; @NonNull private ClickListener clickListener; private boolean enableHighlighting = true; public NavigationAdapter(@NonNull ClickListener clickListener) { this.clickListener = clickListener; } public NavigationAdapter(@NonNull ClickListener clickListener, boolean enableHighlighting) { this.clickListener = clickListener; this.enableHighlighting = enableHighlighting; } @NonNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { Loading
app/src/main/res/values/colors.xml +1 −1 Original line number Diff line number Diff line Loading @@ -19,7 +19,7 @@ <color name="fg_contrast">#ffffff</color> <color name="icon_grey">#757575</color> <color name="widget_background">#E6FFFFFF</color> <color name="widget_background">#FFFFFF</color> <color name="category_background">#FFF</color> <color name="category_border">@color/primary</color> Loading