Skip to content

X
xabber-android
Commit f9e25290 authored by Grigory Fedorov's avatar Grigory Fedorov
Browse files
Options

Merge branch 'hotfix/1.0.1'

parents cac564df 20db3abd
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 336 deletions
app/build.gradle
View file @ f9e25290
...@@ -8,8 +8,8 @@ android { ...@@ -8,8 +8,8 @@ android {
applicationId "com.xabber.androiddev" applicationId "com.xabber.androiddev"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 22 targetSdkVersion 22
versionCode 172 versionCode 173
versionName '1.0.0' versionName '1.0.1'
} }
compileOptions { compileOptions {
......
app/src/main/res/xml/preference_editor.xml
View file @ f9e25290
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved. <!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
This file is part of Xabber project; you can redistribute it and/or This file is part of Xabber project; you can redistribute it and/or
modify it under the terms of the GNU General Public License, Version 3. modify it under the terms of the GNU General Public License, Version 3.
Xabber is distributed in the hope that it will be useful, but Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License, You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/. along with this program. If not, see http://www.gnu.org/licenses/.
--> -->
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen <Preference
android:title="@string/preference_accounts"
android:key="@string/preference_accounts_key" android:key="@string/preference_accounts_key"
/> android:title="@string/preference_accounts">
<PreferenceScreen <intent
android:title="@string/preference_interface" android:targetClass="com.xabber.android.ui.preferences.AccountList"
android:key="@string/preference_interface" android:targetPackage="@string/application_package" />
> </Preference>
<ListPreference
android:title="@string/interface_theme" <Preference
android:key="@string/interface_theme_key"
android:entries="@array/interface_theme_entries"
android:entryValues="@array/interface_theme_entryvalues"
android:defaultValue="@string/interface_theme_default"
/>
<ListPreference
android:title="@string/interface_smiles"
android:key="@string/interface_smiles_key"
android:entries="@array/interface_smiles_entries"
android:entryValues="@array/interface_smiles_entryvalues"
android:defaultValue="@string/interface_smiles_default"
/>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/preference_contacts"
android:key="@string/preference_contacts" android:key="@string/preference_contacts"
> android:title="@string/preference_contacts">
<CheckBoxPreference <intent
android:title="@string/contacts_show_panel" android:targetClass="com.xabber.android.ui.preferences.ContactListSettings"
android:key="@string/contacts_show_panel_key" android:targetPackage="@string/application_package" />
android:defaultValue="@bool/contacts_show_panel_default" </Preference>
/> <Preference
<CheckBoxPreference
android:title="@string/contacts_show_avatars"
android:key="@string/contacts_show_avatars_key"
android:defaultValue="@bool/contacts_show_avatars_default"
/>
<CheckBoxPreference
android:title="@string/contacts_show_offline"
android:key="@string/contacts_show_offline_key"
android:defaultValue="@bool/contacts_show_offline_default"
/>
<PreferenceScreen
android:title="@string/contacts_reset_offline"
android:key="@string/contacts_reset_offline_key"
/>
<CheckBoxPreference
android:title="@string/contacts_show_groups"
android:key="@string/contacts_show_groups_key"
android:defaultValue="@bool/contacts_show_groups_default"
/>
<CheckBoxPreference
android:title="@string/contacts_show_accounts"
android:key="@string/contacts_show_accounts_key"
android:defaultValue="@bool/contacts_show_accounts_default"
/>
<CheckBoxPreference
android:title="@string/contacts_show_active_chats"
android:key="@string/contacts_show_active_chats_key"
android:defaultValue="@bool/contacts_show_active_chats_default"
/>
<CheckBoxPreference
android:title="@string/contacts_stay_active_chats"
android:key="@string/contacts_stay_active_chats_key"
android:defaultValue="@bool/contacts_stay_active_chats_default"
android:dependency="@string/contacts_show_active_chats_key"
/>
<CheckBoxPreference
android:title="@string/contacts_show_empty_groups"
android:key="@string/contacts_show_empty_groups_key"
android:defaultValue="@bool/contacts_show_empty_groups_default"
/>
<ListPreference
android:title="@string/contacts_order"
android:key="@string/contacts_order_key"
android:entries="@array/contacts_order_entries"
android:entryValues="@array/contacts_order_entryvalues"
android:defaultValue="@string/contacts_order_default"
/>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/preference_chats"
android:key="@string/preference_chats" android:key="@string/preference_chats"
> android:title="@string/preference_chats">
<CheckBoxPreference <intent
android:title="@string/chats_show_avatars" android:targetClass="com.xabber.android.ui.preferences.ChatSettings"
android:key="@string/chats_show_avatars_key" android:targetPackage="@string/application_package" />
android:defaultValue="@bool/chats_show_avatars_default" </Preference>
/> <Preference
<CheckBoxPreference
android:title="@string/chats_send_by_enter"
android:key="@string/chats_send_by_enter_key"
android:defaultValue="@bool/chats_send_by_enter_default"
/>
<ListPreference
android:title="@string/chats_show_status_change"
android:summary="@string/chats_show_status_change"
android:key="@string/chats_show_status_change_key"
android:entries="@array/chats_show_status_change_entries"
android:entryValues="@array/chats_show_status_change_entryvalues"
android:defaultValue="@string/chats_show_status_change_default"
/>
<ListPreference
android:title="@string/chats_hide_keyboard"
android:key="@string/chats_hide_keyboard_key"
android:entries="@array/chats_hide_keyboard_entries"
android:entryValues="@array/chats_hide_keyboard_entryvalues"
android:defaultValue="@string/chats_hide_keyboard_default"
/>
<ListPreference
android:title="@string/chats_font_size"
android:key="@string/chats_font_size_key"
android:entries="@array/chats_font_size_entries"
android:entryValues="@array/chats_font_size_entryvalues"
android:defaultValue="@string/chats_font_size_default"
/>
<ListPreference
android:title="@string/chats_divide"
android:key="@string/chats_divide_key"
android:entries="@array/chats_divide_entries"
android:entryValues="@array/chats_divide_entryvalues"
android:defaultValue="@string/chats_divide_default"
/>
<CheckBoxPreference
android:title="@string/chats_state_notification"
android:key="@string/chats_state_notification_key"
android:defaultValue="@bool/chats_state_notification_default"
/>
<CheckBoxPreference
android:title="@string/chats_attention"
android:key="@string/chats_attention_key"
android:defaultValue="@bool/chats_attention_default"
/>
<RingtonePreference
android:title="@string/chats_attention_sound"
android:key="@string/chats_attention_sound_key"
android:defaultValue="@string/chats_attention_sound_default"
android:ringtoneType="ringtone"
android:dependency="@string/chats_attention_key"
android:showSilent="true"
android:showDefault="true"
/>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/preference_events"
android:key="@string/preference_events" android:key="@string/preference_events"
> android:title="@string/preference_events">
<RingtonePreference <intent
android:title="@string/events_sound" android:targetClass="com.xabber.android.ui.preferences.NotificationsSettings"
android:key="@string/events_sound_key" android:targetPackage="@string/application_package" />
android:defaultValue="@string/events_sound_default" </Preference>
android:ringtoneType="notification" <Preference
android:showSilent="true"
android:showDefault="true"
/>
<CheckBoxPreference
android:title="@string/events_vibro"
android:key="@string/events_vibro_key"
android:defaultValue="@bool/events_vibro_default"
/>
<CheckBoxPreference
android:title="@string/events_ignore_system_vibro"
android:key="@string/events_ignore_system_vibro_key"
android:defaultValue="@bool/events_ignore_system_vibro_default"
android:dependency="@string/events_vibro_key"
/>
<CheckBoxPreference
android:title="@string/events_lightning"
android:key="@string/events_lightning_key"
android:defaultValue="@bool/events_lightning_default"
/>
<CheckBoxPreference
android:title="@string/events_persistent"
android:key="@string/events_persistent_key"
android:defaultValue="@bool/events_persistent_default"
/>
<CheckBoxPreference
android:title="@string/events_show_text"
android:key="@string/events_show_text_key"
android:defaultValue="@bool/events_show_text_default"
/>
<ListPreference
android:title="@string/events_message"
android:key="@string/events_message_key"
android:entries="@array/events_message_entries"
android:entryValues="@array/events_message_entryvalues"
android:defaultValue="@string/events_message_default"
/>
<CheckBoxPreference
android:title="@string/events_visible_chat"
android:key="@string/events_visible_chat_key"
android:defaultValue="@bool/events_visible_chat_default"
/>
<CheckBoxPreference
android:title="@string/events_first_only"
android:key="@string/events_first_only_key"
android:defaultValue="@bool/events_first_only_default"
/>
<PreferenceScreen
android:title="@string/events_phrases"
android:key="@string/events_phrases"
/>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/preference_connection"
android:key="@string/preference_connection" android:key="@string/preference_connection"
> android:title="@string/preference_connection">
<CheckBoxPreference <intent
android:title="@string/connection_start_at_boot" android:targetClass="com.xabber.android.ui.preferences.ConnectionSettings"
android:key="@string/connection_start_at_boot_key" android:targetPackage="@string/application_package" />
android:defaultValue="@bool/connection_start_at_boot_default" </Preference>
/> <Preference
<ListPreference
android:title="@string/connection_go_away"
android:key="@string/connection_go_away_key"
android:entries="@array/connection_go_away_entries"
android:entryValues="@array/connection_go_away_entryvalues"
android:defaultValue="@string/connection_go_away_default"
/>
<ListPreference
android:title="@string/connection_go_xa"
android:key="@string/connection_go_xa_key"
android:entries="@array/connection_go_xa_entries"
android:entryValues="@array/connection_go_xa_entryvalues"
android:defaultValue="@string/connection_go_xa_default"
/>
<CheckBoxPreference
android:title="@string/connection_wifi_lock"
android:key="@string/connection_wifi_lock_key"
android:defaultValue="@bool/connection_wifi_lock_default"
/>
<CheckBoxPreference
android:title="@string/connection_wake_lock"
android:key="@string/connection_wake_lock_key"
android:defaultValue="@bool/connection_wake_lock_default"
/>
<CheckBoxPreference
android:title="@string/connection_load_vcard"
android:key="@string/connection_load_vcard_key"
android:defaultValue="@bool/connection_load_vcard_default"
/>
<PreferenceCategory
android:title="@string/connection_priority"
>
<CheckBoxPreference
android:title="@string/connection_adjust_priority"
android:key="@string/connection_adjust_priority_key"
android:defaultValue="@bool/connection_adjust_priority_default"
/>
<com.xabber.android.ui.widget.PriorityPreference
android:key="@string/connection_priority_chat_key"
android:defaultValue="@string/connection_priority_chat_default"
android:dependency="@string/connection_adjust_priority_key"
android:title="@string/chat"
android:singleLine="true"
/>
<com.xabber.android.ui.widget.PriorityPreference
android:key="@string/connection_priority_available_key"
android:defaultValue="@string/connection_priority_available_default"
android:dependency="@string/connection_adjust_priority_key"
android:title="@string/available"
android:singleLine="true"
/>
<com.xabber.android.ui.widget.PriorityPreference
android:key="@string/connection_priority_away_key"
android:defaultValue="@string/connection_priority_away_default"
android:dependency="@string/connection_adjust_priority_key"
android:title="@string/away"
android:singleLine="true"
/>
<com.xabber.android.ui.widget.PriorityPreference
android:key="@string/connection_priority_xa_key"
android:defaultValue="@string/connection_priority_xa_default"
android:dependency="@string/connection_adjust_priority_key"
android:title="@string/xa"
android:singleLine="true"
/>
<com.xabber.android.ui.widget.PriorityPreference
android:key="@string/connection_priority_dnd_key"
android:defaultValue="@string/connection_priority_dnd_default"
android:dependency="@string/connection_adjust_priority_key"
android:title="@string/dnd"
android:singleLine="true"
/>
</PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/preference_security"
android:key="@string/preference_security" android:key="@string/preference_security"
> android:title="@string/preference_security">
<CheckBoxPreference <intent
android:title="@string/security_check_certificate" android:targetClass="com.xabber.android.ui.preferences.SecuritySettings"
android:key="@string/security_check_certificate_key" android:targetPackage="@string/application_package" />
android:defaultValue="@bool/security_check_certificate_default" </Preference>
/> <Preference
<PreferenceScreen
android:title="@string/security_clear_certificate"
android:key="@string/security_clear_certificate_key"
/>
<ListPreference
android:title="@string/security_otr_mode"
android:key="@string/security_otr_mode_key"
android:entries="@array/security_otr_mode_entries"
android:entryValues="@array/security_otr_mode_entryvalues"
android:defaultValue="@string/security_otr_mode_default"
/>
<CheckBoxPreference
android:title="@string/security_otr_history"
android:key="@string/security_otr_history_key"
android:defaultValue="@bool/security_otr_history_default"
/>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/preference_debug"
android:key="@string/preference_debug" android:key="@string/preference_debug"
> android:title="@string/preference_debug">
<CheckBoxPreference <intent
android:title="@string/debug_log" android:targetClass="com.xabber.android.ui.preferences.DebugSettings"
android:key="@string/debug_log_key" android:targetPackage="@string/application_package" />
android:defaultValue="@bool/debug_log_default" </Preference>
/> <Preference
<PreferenceScreen
android:title="@string/cache_clear"
android:key="@string/cache_clear_key"
/>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/preference_about"
android:key="@string/preference_about_key" android:key="@string/preference_about_key"
/> android:title="@string/preference_about">
<intent
android:targetClass="com.xabber.android.ui.preferences.AboutViewer"
android:targetPackage="@string/application_package" />
</Preference>
</PreferenceScreen> </PreferenceScreen>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023