gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve settings screen for dark theme and use accent color for category titles

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-04-08 23:46:30 +02:00
parent dc8774f5c9
commit 9771161a0f
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/res/layout/controller_conversation_info.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -21,6 +23,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:apc="http://schemas.android.com/apk/res-auto" xmlns:apc="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:card_view="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
@ -51,7 +54,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:visibility="gone"> android:visibility="gone"
apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -80,7 +85,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/conversation_info_name" android:layout_below="@id/conversation_info_name"
android:visibility="gone"> android:visibility="gone"
apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp">
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/favoriteConversationAction" android:id="@+id/favoriteConversationAction"
@ -100,8 +107,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/webinar_settings" android:layout_below="@+id/webinar_settings"
android:visibility="gone" android:visibility="gone"
apc:mpc_title="@string/nc_participants" apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp"
apc:mpc_action="@string/nc_add" apc:mpc_action="@string/nc_add"
apc:mpc_title="@string/nc_participants"
apc:mpc_title_color="@color/textColorMaxContrast" apc:mpc_title_color="@color/textColorMaxContrast"
tools:ignore="UnknownIdInLayout"> tools:ignore="UnknownIdInLayout">
@ -118,7 +127,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/participants_list_category" android:layout_below="@id/participants_list_category"
android:visibility="gone"> android:visibility="gone"
apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp">
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/leaveConversationAction" android:id="@+id/leaveConversationAction"

43
app/src/main/res/layout/controller_settings.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017 Mario Danic ~ Copyright (C) 2017 Mario Danic
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -28,7 +30,9 @@
android:id="@+id/message_view" android:id="@+id/message_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true"> android:animateLayoutChanges="true"
apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp">
<TextView <TextView
android:id="@+id/message_text" android:id="@+id/message_text"
@ -40,7 +44,9 @@
<com.yarolegovich.mp.MaterialPreferenceCategory <com.yarolegovich.mp.MaterialPreferenceCategory
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true"> android:animateLayoutChanges="true"
apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp">
<RelativeLayout <RelativeLayout
android:id="@+id/avatarContainer" android:id="@+id/avatarContainer"
@ -118,8 +124,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_appearance" apc:cardBackgroundColor="@color/bg_default"
apc:mpc_title_color="@color/textColorMaxContrast"> apc:cardElevation="0dp"
apc:mpc_title="@string/nc_settings_appearance">
<com.yarolegovich.mp.MaterialChoicePreference <com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_theme" android:id="@+id/settings_theme"
@ -138,8 +145,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_notification_sounds" apc:cardBackgroundColor="@color/bg_default"
apc:mpc_title_color="@color/textColorMaxContrast"> apc:cardElevation="0dp"
apc:mpc_title="@string/nc_settings_notification_sounds">
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_call_sound" android:id="@+id/settings_call_sound"
@ -170,8 +178,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_privacy" apc:cardBackgroundColor="@color/bg_default"
apc:mpc_title_color="@color/textColorMaxContrast"> apc:cardElevation="0dp"
apc:mpc_title="@string/nc_settings_privacy">
<com.yarolegovich.mp.MaterialChoicePreference <com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_screen_lock_timeout" android:id="@+id/settings_screen_lock_timeout"
@ -241,8 +250,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_proxy_title" apc:cardBackgroundColor="@color/bg_default"
apc:mpc_title_color="@color/textColorMaxContrast"> apc:cardElevation="0dp"
apc:mpc_title="@string/nc_settings_proxy_title">
<com.yarolegovich.mp.MaterialChoicePreference <com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_proxy_choice" android:id="@+id/settings_proxy_choice"
@ -252,7 +262,7 @@
apc:mp_entry_descriptions="@array/proxy_type_descriptions" apc:mp_entry_descriptions="@array/proxy_type_descriptions"
apc:mp_key="@string/nc_settings_proxy_type_key" apc:mp_key="@string/nc_settings_proxy_type_key"
apc:mp_show_value="onRight" apc:mp_show_value="onRight"
apc:mp_title="@string/nc_settings_proxy_type_title"></com.yarolegovich.mp.MaterialChoicePreference> apc:mp_title="@string/nc_settings_proxy_type_title" />
<com.yarolegovich.mp.MaterialEditTextPreference <com.yarolegovich.mp.MaterialEditTextPreference
android:id="@+id/settings_proxy_host_edit" android:id="@+id/settings_proxy_host_edit"
@ -302,8 +312,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_about" apc:cardBackgroundColor="@color/bg_default"
apc:mpc_title_color="@color/textColorMaxContrast"> apc:cardElevation="0dp"
apc:mpc_title="@string/nc_about">
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_privacy" android:id="@+id/settings_privacy"
@ -315,21 +326,21 @@
android:id="@+id/settings_source_code" android:id="@+id/settings_source_code"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_title="@string/nc_get_source_code"></com.yarolegovich.mp.MaterialStandardPreference> apc:mp_title="@string/nc_get_source_code" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_licence" android:id="@+id/settings_licence"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_summary="@string/nc_license_summary" apc:mp_summary="@string/nc_license_summary"
apc:mp_title="@string/nc_license_title"></com.yarolegovich.mp.MaterialStandardPreference> apc:mp_title="@string/nc_license_title" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_version" android:id="@+id/settings_version"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_summary="v0.1" apc:mp_summary="v0.1"
apc:mp_title="@string/nc_app_name"></com.yarolegovich.mp.MaterialStandardPreference> apc:mp_title="@string/nc_app_name" />
</com.yarolegovich.mp.MaterialPreferenceCategory> </com.yarolegovich.mp.MaterialPreferenceCategory>

11
app/src/main/res/layout/notification_settings_item.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -20,17 +22,18 @@
<com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:apc="http://schemas.android.com/apk/res-auto" xmlns:apc="http://schemas.android.com/apk/res-auto"
xmlns:card_view="http://schemas.android.com/tools"
android:id="@+id/notification_settings" android:id="@+id/notification_settings"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.yarolegovich.mp.MaterialPreferenceCategory <com.yarolegovich.mp.MaterialPreferenceCategory
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_notification_settings" apc:cardBackgroundColor="@color/bg_default"
apc:mpc_title_color="@color/textColorMaxContrast"> apc:cardElevation="0dp"
apc:mpc_title="@string/nc_notification_settings">
<com.yarolegovich.mp.MaterialSwitchPreference <com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/conversation_info_priority_conversation" android:id="@+id/conversation_info_priority_conversation"
@ -49,7 +52,7 @@
apc:mp_entry_values="@array/message_notification_levels_entry_values" apc:mp_entry_values="@array/message_notification_levels_entry_values"
apc:mp_key="message_notification_level" apc:mp_key="message_notification_level"
apc:mp_show_value="onBottom" apc:mp_show_value="onBottom"
apc:mp_title="@string/nc_plain_old_messages"></com.yarolegovich.mp.MaterialChoicePreference> apc:mp_title="@string/nc_plain_old_messages" />
<com.yarolegovich.mp.MaterialSwitchPreference <com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/muteCalls" android:id="@+id/muteCalls"