update notification settings design
change the design of the category labels in notification settings fragment to match the settings fragment
This commit is contained in:
parent
fe500fad72
commit
0ac930036a
|
@ -60,11 +60,41 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/settings_category_notif_customize"
|
||||||
|
android:textColor="?colorAccent"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/set_notif_sound"
|
android:id="@+id/set_notif_sound"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
style="@style/Base.Widget.AppCompat.Button.Colored"
|
style="@style/Base.Widget.AppCompat.Button.Colored"
|
||||||
android:tint="@android:color/white"
|
android:tint="@android:color/white"
|
||||||
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
android:layout_marginBottom="@dimen/settings_checkbox_margin"
|
||||||
android:text="@string/set_notif_sound"
|
android:text="@string/set_notif_sound"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"/>
|
android:layout_height="wrap_content"/>
|
||||||
|
@ -72,6 +102,8 @@
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:id="@+id/channels_container"
|
android:id="@+id/channels_container"
|
||||||
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
android:layout_marginBottom="@dimen/settings_checkbox_margin"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
@ -156,68 +188,141 @@
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<!-- NOTIFICATIONS SETTINGS -->
|
<!-- NOTIFICATIONS SETTINGS -->
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:text="@string/settings_title_notifications"
|
|
||||||
style="?attr/shapeBorder"
|
|
||||||
android:paddingBottom="10dp"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/settings_category_notif_categories"
|
||||||
|
android:textColor="?colorAccent"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
</LinearLayout>
|
||||||
<!-- Toots per page -->
|
<!-- Toots per page -->
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/set_notif_follow"
|
android:id="@+id/set_notif_follow"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
android:layout_marginBottom="@dimen/settings_checkbox_margin"
|
||||||
android:text="@string/set_notif_follow"
|
android:text="@string/set_notif_follow"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/set_notif_follow_add"
|
android:id="@+id/set_notif_follow_add"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
android:layout_marginBottom="@dimen/settings_checkbox_margin"
|
||||||
android:text="@string/set_notif_follow_add"
|
android:text="@string/set_notif_follow_add"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/set_notif_follow_ask"
|
android:id="@+id/set_notif_follow_ask"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
android:layout_marginBottom="@dimen/settings_checkbox_margin"
|
||||||
android:text="@string/set_notif_follow_ask"
|
android:text="@string/set_notif_follow_ask"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/set_notif_follow_mention"
|
android:id="@+id/set_notif_follow_mention"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
android:layout_marginBottom="@dimen/settings_checkbox_margin"
|
||||||
android:text="@string/set_notif_follow_mention"
|
android:text="@string/set_notif_follow_mention"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/set_notif_follow_share"
|
android:id="@+id/set_notif_follow_share"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
android:layout_marginBottom="@dimen/settings_checkbox_margin"
|
||||||
android:text="@string/set_notif_follow_share"
|
android:text="@string/set_notif_follow_share"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<!-- END NOTIFICATIONS SETTINGS -->
|
<!-- END NOTIFICATIONS SETTINGS -->
|
||||||
|
|
||||||
<!-- NOTIFICATION CONTENT NEW -->
|
<!-- NOTIFICATION CONTENT NEW -->
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:text="@string/set_title_news"
|
|
||||||
style="?attr/shapeBorder"
|
|
||||||
android:paddingBottom="10dp"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/settings_category_notif_news"
|
||||||
|
android:textColor="?colorAccent"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
</LinearLayout>
|
||||||
<!-- New hometimeline content -->
|
<!-- New hometimeline content -->
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/set_notif_hometimeline"
|
android:id="@+id/set_notif_hometimeline"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
android:layout_marginBottom="@dimen/settings_checkbox_margin"
|
||||||
android:text="@string/set_notification_news"
|
android:text="@string/set_notification_news"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:text="@string/settings_title_hour"
|
|
||||||
style="?attr/shapeBorder"
|
|
||||||
android:paddingBottom="10dp"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/settings_category_notif_time_slot"
|
||||||
|
android:textColor="?colorAccent"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
</LinearLayout>
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/set_enable_time_slot"
|
android:id="@+id/set_enable_time_slot"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:text="@string/set_enable_time_slot"
|
android:text="@string/set_enable_time_slot"
|
||||||
|
android:layout_marginTop="@dimen/settings_checkbox_margin"
|
||||||
|
android:layout_marginBottom="@dimen/settings_checkbox_margin"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
style="?attr/shapeBorder"
|
style="?attr/shapeBorder"
|
||||||
|
@ -254,15 +359,33 @@
|
||||||
android:entries="@array/action_notification"/>
|
android:entries="@array/action_notification"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<!-- MORE OPTIONS SETTINGS -->
|
<!-- MORE OPTIONS SETTINGS -->
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:text="@string/settings_title_more_options"
|
|
||||||
style="?attr/shapeBorder"
|
|
||||||
android:paddingBottom="10dp"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/settings_category_notif_advanced"
|
||||||
|
android:textColor="?colorAccent"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_margin="10dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="?colorAccent" />
|
||||||
|
</LinearLayout>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
|
@ -919,6 +919,11 @@
|
||||||
<string name="vote">Vote</string>
|
<string name="vote">Vote</string>
|
||||||
<string name="poll_not_private">A poll cannot be attached to a direct message!</string>
|
<string name="poll_not_private">A poll cannot be attached to a direct message!</string>
|
||||||
<string name="notif_poll">A poll you have voted in has ended</string>
|
<string name="notif_poll">A poll you have voted in has ended</string>
|
||||||
|
<string name="settings_category_notif_customize">Customize</string>
|
||||||
|
<string name="settings_category_notif_categories">Categories</string>
|
||||||
|
<string name="settings_category_notif_news">News</string>
|
||||||
|
<string name="settings_category_notif_time_slot">Time slot</string>
|
||||||
|
<string name="settings_category_notif_advanced">Advanced</string>
|
||||||
|
|
||||||
<plurals name="number_of_vote">
|
<plurals name="number_of_vote">
|
||||||
<item quantity="one">%d vote</item>
|
<item quantity="one">%d vote</item>
|
||||||
|
|
Loading…
Reference in New Issue