diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/dialog_board_share.xml | 18 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_card_edit_tab_activities.xml | 23 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_card_edit_tab_attachments.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_stack.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_access_control.xml | 63 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_activity.xml (renamed from app/src/main/res/layout/fragment_card_edit_tab_activity.xml) | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_attachment.xml (renamed from app/src/main/res/layout/fragment_card_edit_tab_attachment.xml) | 0 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_autocomplete_dropdown.xml (renamed from app/src/main/res/layout/dropdown_item_singleline.xml) | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_card.xml (renamed from app/src/main/res/layout/fragment_card.xml) | 0 |
10 files changed, 108 insertions, 27 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2067b75dc..005a6525c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -22,8 +22,7 @@ android:id="@+id/no_stacks" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone" - tools:visibility="visible"> + android:visibility="gone"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/dialog_board_share.xml b/app/src/main/res/layout/dialog_board_share.xml new file mode 100644 index 000000000..fb99d305b --- /dev/null +++ b/app/src/main/res/layout/dialog_board_share.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<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:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/peopleList" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="@dimen/standard_padding" + android:scrollbarStyle="outsideOverlay" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/item_access_control" /> +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_card_edit_tab_activities.xml b/app/src/main/res/layout/fragment_card_edit_tab_activities.xml index 0196b211a..b1f519bfb 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_activities.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_activities.xml @@ -3,27 +3,22 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical"> - <ScrollView - android:id="@+id/scrollView" + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/activity_list" android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - tools:visibility="gone"> - - <LinearLayout - android:id="@+id/activity_list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> - </ScrollView> + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/item_activity" /> - <RelativeLayout xmlns:app="http://schemas.android.com/apk/res-auto" + <RelativeLayout android:id="@+id/no_activities" android:layout_width="match_parent" android:layout_height="match_parent" - tools:visibility="visible"> + tools:visibility="gone"> <ImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml index 53a023b23..eb708bbed 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml @@ -3,22 +3,26 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" android:layout_marginTop="@dimen/standard_margin" android:orientation="vertical"> - <LinearLayout + <androidx.recyclerview.widget.RecyclerView android:id="@+id/attachments_list" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:visibility="gone"> - </LinearLayout> + android:scrollbars="vertical" + android:visibility="gone" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/item_attachment" + tools:visibility="visible" /> <RelativeLayout android:id="@+id/no_attachments" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone"> + android:visibility="visible" + tools:visibility="gone"> <ImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_stack.xml b/app/src/main/res/layout/fragment_stack.xml index 528bae8f9..d97653352 100644 --- a/app/src/main/res/layout/fragment_stack.xml +++ b/app/src/main/res/layout/fragment_stack.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical"> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout @@ -58,7 +59,8 @@ android:paddingTop="@dimen/standard_half_padding" android:paddingBottom="@dimen/standard_half_padding" android:scrollbarStyle="outsideOverlay" - android:scrollbars="vertical" /> + android:scrollbars="vertical" + tools:listitem="@layout/item_card"/> </LinearLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_access_control.xml b/app/src/main/res/layout/item_access_control.xml new file mode 100644 index 000000000..291037118 --- /dev/null +++ b/app/src/main/res/layout/item_access_control.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<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:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="@dimen/standard_padding"> + + <ImageView + android:layout_width="@dimen/avatar_size" + android:layout_height="match_parent" + android:layout_marginEnd="@dimen/standard_margin" + android:layout_marginRight="@dimen/standard_margin" + android:contentDescription="@null" + app:srcCompat="@drawable/ic_person_grey600_24dp" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:id="@+id/username" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="20sp" + tools:text="Username" /> + + <com.google.android.flexbox.FlexboxLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + app:flexWrap="wrap" + app:justifyContent="space_between"> + + <androidx.appcompat.widget.SwitchCompat + android:id="@+id/permission_edit" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:checked="true" + android:text="@string/edit" + app:switchPadding="@dimen/standard_half_margin" /> + + <androidx.appcompat.widget.SwitchCompat + android:id="@+id/permission_share" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/simple_share" + app:switchPadding="@dimen/standard_half_margin" /> + + <androidx.appcompat.widget.SwitchCompat + android:id="@+id/permission_manage" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:checked="true" + android:text="@string/simple_manage" + app:switchPadding="@dimen/standard_half_margin" /> + + </com.google.android.flexbox.FlexboxLayout> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_card_edit_tab_activity.xml b/app/src/main/res/layout/item_activity.xml index 09e9e6c38..9655f6a24 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_activity.xml +++ b/app/src/main/res/layout/item_activity.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:orientation="vertical" android:padding="@dimen/standard_padding"> @@ -23,8 +23,8 @@ <androidx.appcompat.widget.AppCompatImageView android:id="@+id/type" - android:layout_width="36dp" - android:layout_height="36dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginEnd="@dimen/standard_margin" android:layout_marginRight="@dimen/standard_margin" app:srcCompat="@drawable/type_change_36dp" /> diff --git a/app/src/main/res/layout/fragment_card_edit_tab_attachment.xml b/app/src/main/res/layout/item_attachment.xml index a2a14a9f9..a2a14a9f9 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_attachment.xml +++ b/app/src/main/res/layout/item_attachment.xml diff --git a/app/src/main/res/layout/dropdown_item_singleline.xml b/app/src/main/res/layout/item_autocomplete_dropdown.xml index ea2a589c4..fc3e51a7a 100644 --- a/app/src/main/res/layout/dropdown_item_singleline.xml +++ b/app/src/main/res/layout/item_autocomplete_dropdown.xml @@ -11,7 +11,7 @@ android:layout_height="40dp" android:layout_margin="@dimen/standard_margin" android:contentDescription="@null" - tools:src="@drawable/ic_close_circle_grey600" /> + tools:src="@drawable/ic_label_grey600_24dp" /> <TextView android:id="@+id/label" @@ -25,6 +25,6 @@ android:paddingEnd="@dimen/standard_padding" android:paddingRight="@dimen/standard_padding" android:textSize="18sp" - tools:text="TestUser One" /> + tools:text="Label" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/item_card.xml index 98b37bbce..98b37bbce 100644 --- a/app/src/main/res/layout/fragment_card.xml +++ b/app/src/main/res/layout/item_card.xml |