Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stick info header when selecting subscriptions in the feed group dialog

Browse source 
- Avoid creating plural translation by using a different wording
This commit is contained in:
Mauricio Colli 2020-01-29 23:23:10 -03:00
parent 3f32573638
commit 2c783ff911
No known key found for this signature in database
GPG key ID: F200BFD6F29DDD85
4 changed files with 55 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

56
app/src/main/res/layout/dialog_feed_group_create.xml
View file

@ -15,8 +15,7 @@
android:minHeight="150dp"
android:orientation="vertical"
android:padding="8dp"
android:visibility="gone"
tools:visibility="visible">
android:visibility="gone">
<ImageButton
android:id="@+id/icon_preview"
@ -34,10 +33,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:gravity="center_vertical"
android:hint="@string/feed_group_dialog_name_input"
android:paddingTop="6dp"
android:paddingBottom="6dp"
app:errorEnabled="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon_preview"
@ -93,19 +92,56 @@
android:paddingBottom="16dp"
android:visibility="gone"
tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
tools:listItem="@layout/item_icon_picker"
tools:listitem="@layout/picker_icon_item"
tools:spanCount="7" />
<androidx.recyclerview.widget.RecyclerView
<LinearLayout
android:id="@+id/subscriptions_selector"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:visibility="gone"
tools:itemCount="200"
tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
tools:listItem="@layout/item_icon_picker"
tools:spanCount="4" />
tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingTop="12dp"
android:paddingRight="16dp"
android:paddingBottom="12dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start|center_vertical"
android:text="@string/tab_subscriptions"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/subscriptions_selector_header_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:textColor="?android:attr/textColorPrimary"
android:textSize="12sp"
tools:text="1 selected" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/subscriptions_selector_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:itemCount="200"
tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
tools:listitem="@layout/picker_subscription_item"
tools:spanCount="4" />
</LinearLayout>
<View
android:id="@+id/separator"

2
app/src/main/res/values/strings.xml
View file

@ -606,7 +606,7 @@
<string name="feed_notification_loading">Loading feed…</string>
<string name="feed_processing_message">Processing feed…</string>
<string name="feed_group_dialog_select_subscriptions">Select subscriptions</string>
<string name="feed_group_dialog_selection_count">%d selected</string>
<string name="feed_group_dialog_selection_count">Selected: %d</string>
<string name="feed_group_dialog_empty_selection">No subscription selected</string>
<string name="feed_group_dialog_empty_name">Empty group name</string>
<string name="feed_group_dialog_name_input">Name</string>