Skip to content
Snippets Groups Projects
Verified Commit 4bc27eae authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Implement notification settings, fixes #48

parent b9760a0b
Branches
No related tags found
No related merge requests found
Pipeline #
......@@ -73,6 +73,7 @@
<string name="label_nicklist">Benutzerliste</string>
<string name="label_no">Nein</string>
<string name="label_no_away_message">Kein Abwesenheitsgrund verfügbar</string>
<string name="label_no_sound">Ohne</string>
<string name="label_reply">Antworten</string>
<string name="label_reset">Zurücksetzen</string>
<string name="label_open">Öffnen</string>
......
......@@ -46,8 +46,19 @@
<string name="preference_notifications_title">Benachrichtigungen</string>
<string name="preference_notification_query_title">Direktnachrichten</string>
<string name="preference_notification_channel_title">Räume</string>
<string name="preference_notification_other_title">Andere Nachrichten</string>
<string name="preference_notification_sound_title">Benachrichtigungston</string>
<string name="preference_notification_vibration_title">Vibration</string>
<string name="preference_notification_light_title">LED</string>
<string name="preference_notification_configure_title">Benachrichtigungen konfigurieren</string>
<string name="preference_notifications_level_all">Alle Nachrichten</string>
<string name="preference_notifications_level_highlight">Erwähnungen</string>
<string name="preference_notifications_level_none">Niemals</string>
......
......@@ -73,6 +73,7 @@
<string name="label_nicklist">Slapyvardžių Sąrašas</string>
<string name="label_no">Ne</string>
<string name="label_no_away_message">Nėra pasišalinimo žinutės</string>
<string name="label_no_sound">Nėra</string>
<string name="label_reply">Atsakyti</string>
<string name="label_reset">Atstatyti</string>
<string name="label_open">Atverti</string>
......
......@@ -51,6 +51,12 @@
<string name="preference_notification_other_title">Kitos žinutės</string>
<string name="preference_notification_sound_title">Pranešimo garsas</string>
<string name="preference_notification_vibration_title">Vibracija</string>
<string name="preference_notification_light_title">LED Lemputė</string>
<string name="preference_notification_configure_title">Pranešimų nustatymai</string>
<string name="preference_notifications_level_all">Visos žinutės</string>
<string name="preference_notifications_level_highlight">Paminėjimai</string>
<string name="preference_notifications_level_none">Niekada</string>
......
......@@ -22,6 +22,8 @@
<string name="app_description">An Android-based client for the decentralized Quassel IRC client.</string>
<string name="app_description_long">Quassel is a distributed, decentralized IRC client, written using C++ and Qt. Quasseldroid is a pure-kotlin client for the Quassel core, allowing you to connect to your Quassel core using your Android™ phone.</string>
<string name="package_name">com.iskrembilen.quasseldroid</string>
<string name="connection_service_title">Connection Service</string>
<string name="connection_service_description">Keeps a connection to your core to allow for notifications, and to transmit messages.</string>
......@@ -73,6 +75,7 @@
<string name="label_nicklist">Nick List</string>
<string name="label_no">No</string>
<string name="label_no_away_message">No away message available</string>
<string name="label_no_sound">None</string>
<string name="label_reply">Reply</string>
<string name="label_reset">Reset</string>
<string name="label_open">Open</string>
......
......@@ -105,6 +105,18 @@
<string name="preference_notification_other_key" translatable="false">notification_other</string>
<string name="preference_notification_other_title">Other Messages</string>
<string name="preference_notification_sound_key" translatable="false">notification_sound</string>
<string name="preference_notification_sound_title">Notification Sound</string>
<string name="preference_notification_vibration_key" translatable="false">notification_vibration</string>
<string name="preference_notification_vibration_title">Vibration</string>
<string name="preference_notification_light_key" translatable="false">notification_light</string>
<string name="preference_notification_light_title">LED</string>
<string name="preference_notification_configure_key" translatable="false">notification_configure</string>
<string name="preference_notification_configure_title">Configure Notifications</string>
<string name="preference_notifications_level_all">All Messages</string>
<string name="preference_notifications_level_highlight">Mentions</string>
<string name="preference_notifications_level_none">Never</string>
......
......@@ -104,6 +104,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingLeft">0dip</item>
<item name="android:paddingRight">0dip</item>
<item name="android:popupBackground">?colorBackground</item>
</style>
<style name="Widget.CoreSettings.Wrapper" parent="">
......@@ -263,6 +264,14 @@
<item name="android:textColor">?colorTextSecondary</item>
</style>
<style name="Widget.RingtonePreference" parent="">
<item name="android:layout">@layout/preference_vertical</item>
<item name="ringtoneType">ringtone</item>
<item name="showSilent">true</item>
<item name="showDefault">true</item>
</style>
<style name="Widget.Subhead" parent="Widget.RtlConformTextView">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
......@@ -297,4 +306,23 @@
<declare-styleable name="ShadowView">
<attr name="android:gravity" />
</declare-styleable>
<!-- RingtonePreference -->
<declare-styleable name="RingtonePreference">
<!-- Which ringtone type(s) to show in the picker. -->
<attr name="ringtoneType">
<!-- Ringtones. -->
<flag name="ringtone" value="1" />
<!-- Notification sounds. -->
<flag name="notification" value="2" />
<!-- Alarm sounds. -->
<flag name="alarm" value="4" />
<!-- All available ringtone sounds. -->
<flag name="all" value="7" />
</attr>
<!-- Whether to show an item for a default sound. -->
<attr name="showDefault" format="boolean" />
<!-- Whether to show an item for 'Silent'. -->
<attr name="showSilent" format="boolean" />
</declare-styleable>
</resources>
......@@ -72,6 +72,8 @@
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="actionBarPopupTheme">@style/Widget.PopupOverlay</item>
<item name="ringtonePreferenceStyle">@style/Widget.RingtonePreference</item>
<item name="backgroundMenuItem">@drawable/bg_menuitem_dark</item>
<item name="backgroundMenuItemRounded">@drawable/bg_menuitem_rounded_dark</item>
......@@ -106,6 +108,8 @@
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light</item>
<item name="ringtonePreferenceStyle">@style/Widget.RingtonePreference</item>
<item name="backgroundMenuItem">@drawable/bg_menuitem_light</item>
<item name="backgroundMenuItemRounded">@drawable/bg_menuitem_rounded_light</item>
......
......@@ -18,6 +18,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:robobunny="http://robobunny.com">
<PreferenceCategory android:title="@string/preference_appearance_title">
<ListPreference
......@@ -48,6 +49,8 @@
android:title="@string/preference_language_title" />
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/widget_preference_divider" />
<PreferenceCategory android:title="@string/preference_notifications_title">
<DropDownPreference
android:defaultValue="ALL"
......@@ -67,9 +70,41 @@
android:entryValues="@array/preference_notifications_level_entryvalues"
android:key="@string/preference_notification_other_key"
android:title="@string/preference_notification_other_title" />
<!-- TODO: Add Notification ringtone/etc setting links -->
<de.kuschku.quasseldroid.util.ui.settings.RingtonePreference
android:defaultValue="content://settings/system/notification_sound"
android:key="@string/preference_notification_sound_key"
android:title="@string/preference_notification_sound_title"
app:ringtoneType="notification"
app:showDefault="true"
app:showSilent="true" />
<SwitchPreference
android:defaultValue="true"
android:key="@string/preference_notification_vibration_key"
android:title="@string/preference_notification_vibration_title" />
<SwitchPreference
android:defaultValue="true"
android:key="@string/preference_notification_light_key"
android:title="@string/preference_notification_light_title" />
<PreferenceScreen
android:key="@string/preference_notification_configure_key"
android:title="@string/preference_notification_configure_title">
<intent android:action="android.settings.CHANNEL_NOTIFICATION_SETTINGS">
<extra
android:name="android.provider.extra.APP_PACKAGE"
android:value="@string/package_name" />
<extra
android:name="android.provider.extra.CHANNEL_ID"
android:value="@string/notification_channel_highlight" />
</intent>
</PreferenceScreen>
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/widget_preference_divider" />
<PreferenceCategory android:title="@string/preference_messages_title">
<SwitchPreference
......@@ -77,7 +112,7 @@
android:key="@string/preference_monospace_key"
android:title="@string/preference_monospace_title" />
<de.kuschku.quasseldroid.util.ui.SeekBarPreference
<de.kuschku.quasseldroid.util.ui.settings.SeekBarPreference
android:defaultValue="14"
android:key="@string/preference_textsize_key"
android:max="24"
......@@ -171,6 +206,8 @@
-->
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/widget_preference_divider" />
<PreferenceCategory android:title="@string/preference_autocomplete_title">
<SwitchPreference
......@@ -204,6 +241,8 @@
android:title="@string/preference_autocomplete_prefix_title" />
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/widget_preference_divider" />
<PreferenceCategory android:title="@string/preference_backlog_title">
<EditTextPreference
android:defaultValue="150"
......@@ -219,6 +258,8 @@
android:title="@string/preference_initial_amount_title" />
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/widget_preference_divider" />
<PreferenceCategory android:title="@string/preference_connection_title">
<SwitchPreference
android:defaultValue="true"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment