Skip to content
This repository was archived by the owner on Sep 2, 2024. It is now read-only.

Hide empty note titles #137

Open
MariusKr wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Hide empty note titles #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dff0441
Hide note title when it is empty
Oct 18, 2021
ff2afb7
Fix wrong margins when note title is hidden
Oct 18, 2021
c0d87a7
Fix bottom margin of card not using the resource value
Oct 18, 2021
b572c02
Simplify check for visible views in the title layout of a note
Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/src/main/java/org/qosp/notes/ui/common/recycler/NoteViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.content.Context
import android.view.ContextThemeWrapper
import android.widget.TextView
import androidx.core.view.ViewCompat
import androidx.core.view.children
import androidx.core.view.doOnPreDraw
import androidx.core.view.isVisible
import androidx.recyclerview.widget.LinearLayoutManager
Expand Down Expand Up @@ -81,16 +82,23 @@ class NoteViewHolder(
}
}

private fun updateTitleLayout() {
binding.layoutNoteTitle.isVisible = binding.layoutNoteTitle.children.any { it.isVisible }
}

private fun updateIndicatorIcons(note: Note, hasReminders: Boolean) = with(binding) {
indicatorNoteHidden.isVisible = note.isHidden && !searchMode
indicatorPinned.isVisible = note.isPinned && !searchMode
indicatorHasReminder.isVisible = hasReminders
indicatorDeleted.isVisible = note.isDeleted && searchMode
indicatorArchived.isVisible = note.isArchived && searchMode
updateTitleLayout()
}

private fun setTitle(note: Note) {
binding.textViewTitle.text = note.title.ifEmpty { context.getString(R.string.indicator_untitled) }
binding.textViewTitle.isVisible = note.title.isNotEmpty()
updateTitleLayout()
}

private fun setContent(note: Note) = with(binding) {
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/drawable/spacer_note.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="6dp"
android:height="6dp" />
<solid android:color="@android:color/transparent" />
</shape>
8 changes: 8 additions & 0 deletions app/src/main/res/drawable/spacer_note_title.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="4dp"
android:height="4dp" />
<solid android:color="@android:color/transparent" />
</shape>
208 changes: 106 additions & 102 deletions app/src/main/res/layout/layout_note.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
android:id="@+id/linear_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:layout_marginBottom="@dimen/card_note_padding"
android:orientation="vertical"
android:background="?attr/colorNoteDefault">

Expand All @@ -28,114 +28,118 @@
android:nestedScrollingEnabled="false"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_note_padding"
android:layout_marginTop="@dimen/card_note_padding"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/card_note_padding"
android:divider="@drawable/spacer_note"
android:showDividers="middle"
android:orientation="vertical">

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_title"
android:textAppearance="@style/TextAppearance.Custom.NoteTitle"
android:layout_marginEnd="4dp"
android:layout_width="0dp"
<LinearLayout
android:id="@+id/layout_note_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="2"
android:ellipsize="end"/>
android:layout_marginHorizontal="@dimen/card_note_padding"
android:divider="@drawable/spacer_note_title"
android:showDividers="middle"
android:orientation="horizontal">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_note_hidden"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_gravity="center_vertical"
android:layout_marginStart="4dp"
android:src="@drawable/ic_hidden"
android:visibility="gone"
style="@style/NoteIcon"/>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_has_reminder"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_marginStart="4dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_bell"
android:visibility="gone"
style="@style/NoteIcon"/>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_pinned"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_marginStart="4dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_pin"
android:visibility="gone"
style="@style/NoteIcon"/>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_deleted"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_marginStart="4dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_bin"
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_title"
android:textAppearance="@style/TextAppearance.Custom.NoteTitle"
android:layout_marginEnd="4dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="2"
android:ellipsize="end"/>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_note_hidden"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_hidden"
android:visibility="gone"
style="@style/NoteIcon"/>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_has_reminder"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_bell"
android:visibility="gone"
style="@style/NoteIcon"/>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_pinned"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_pin"
android:visibility="gone"
style="@style/NoteIcon"/>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_deleted"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_bin"
android:visibility="gone"
style="@style/NoteIcon"/>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_archived"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_archive"
android:visibility="gone"
style="@style/NoteIcon"/>
</LinearLayout>

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_content"
android:textAppearance="@style/TextAppearance.Custom.NoteBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_note_padding"
android:visibility="gone"
style="@style/NoteIcon"/>

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/indicator_archived"
android:layout_width="@dimen/card_note_icon_size"
android:layout_height="@dimen/card_note_icon_size"
android:layout_marginStart="4dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_archive"
android:maxLines="12"/>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_tasks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_note_padding"
android:nestedScrollingEnabled="false"
android:visibility="gone"/>

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/indicator_more_tasks"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
android:gravity="center|start"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_note_padding"
android:visibility="gone"
style="@style/NoteIcon"/>
</LinearLayout>
android:maxLines="1"
android:ellipsize="end"/>

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_content"
android:textAppearance="@style/TextAppearance.Custom.NoteBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_note_padding"
android:layout_marginTop="6dp"
android:visibility="gone"
android:maxLines="12"/>
<com.google.android.material.chip.ChipGroup
android:id="@+id/container_tags"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_note_padding"
android:layout_marginTop="2dp"
app:singleLine="true"
app:chipSpacingHorizontal="4dp"
app:chipSpacingVertical="8dp"/>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_tasks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_note_padding"
android:layout_marginTop="6dp"
android:nestedScrollingEnabled="false"
android:visibility="gone"/>

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/indicator_more_tasks"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
android:gravity="center|start"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_note_padding"
android:layout_marginTop="6dp"
android:visibility="gone"
android:maxLines="1"
android:ellipsize="end"/>

<com.google.android.material.chip.ChipGroup
android:id="@+id/container_tags"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/card_note_padding"
android:layout_marginTop="8dp"
app:singleLine="true"
app:chipSpacingHorizontal="4dp"
app:chipSpacingVertical="8dp"/>
</LinearLayout>

</LinearLayout>

Expand Down