anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

Set | Fix | Filter last item visibility (#2253)

Browse source 
* fix last child visibility

* update filters list layout

* filter divider fix

Co-authored-by: konstantiniiv <ki@anytype.io>
This commit is contained in:
Konstantin Ivanov 2022-05-11 19:30:52 +03:00 • committed by GitHub
parent 8d13bd9598
commit a52a25a1e2
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 69 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

133
app/src/main/res/layout/fragment_filter.xml
View file

@ -1,89 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical"
android:transitionName="checkoutTransition">
<ImageView
android:id="@+id/sheet_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="6dp"
android:src="@drawable/sheet_top"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:contentDescription="@string/content_description_modal_icon"
android:src="@drawable/sheet_top" />
<TextView
android:id="@+id/title"
style="@style/ViewerModalTitleStyle"
android:layout_width="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/sheet_top"
android:layout_marginTop="18dp"
android:text="@string/filter"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/sheet_top" />
android:layout_marginTop="@dimen/dp_6">
<TextView
android:id="@+id/editBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/ViewerModalStateButtonsStyle"
android:paddingStart="@dimen/dp_16"
android:paddingEnd="32dp"
android:text="@string/edit"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/title"
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/title"
style="@style/ViewerModalTitleStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:text="@string/filter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/doneBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_16"
android:paddingEnd="32dp"
android:text="@string/done"
style="@style/ViewerModalStateButtonsStyle"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@+id/title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/title"
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/editBtn"
style="@style/ViewerModalStateButtonsStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingEnd="@dimen/dp_16"
android:paddingBottom="@dimen/dp_10"
android:text="@string/edit"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="invisible" />
<ImageView
android:id="@+id/addButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:src="@drawable/ic_default_plus"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/doneBtn"
style="@style/ViewerModalStateButtonsStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_16"
android:paddingEnd="16dp"
android:text="@string/done"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:paddingBottom="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title"
android:layout_height="match_parent"
android:paddingBottom="@dimen/dp_16"
tools:listitem="@layout/item_modify_viewer_relation_order"
tools:visibility="invisible" />
<ImageView
android:id="@+id/addButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="14dp"
android:paddingStart="14dp"
android:src="@drawable/ic_default_plus"
app:layout_constraintBottom_toBottomOf="@+id/title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/title" />
<TextView
android:id="@+id/txtEmptyState"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="12dp"
android:fontFamily="@font/inter_regular"
android:gravity="center"
@ -92,8 +97,6 @@
android:text="@string/filter_empty_state"
android:textColor="#CBC9BD"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title" />
android:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

2
core-ui/src/main/res/drawable/divider_filter_list.xml
View file

@ -2,6 +2,6 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/divider_relations"
android:left="60dp"
android:left="80dp"
android:right="20dp" />
</layer-list>