Skip to content

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

Merge tag '1.0.0' into develop 

1.0.0
parents 1b0564e6 cac564df
Hide whitespace changes
Inline Side-by-side
Showing with 312 additions and 49 deletions
app/build.gradle
View file @ 09bbbf72
...@@ -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 171 versionCode 172
versionName '0.10.71' versionName '1.0.0'
} }
compileOptions { compileOptions {
......
app/src/main/res/xml/account_editor_oauth.xml
View file @ 09bbbf72
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
<EditTextPreference <EditTextPreference
android:key="@string/account_proxy_port_key" android:key="@string/account_proxy_port_key"
android:title="@string/account_proxy_port" android:title="@string/account_proxy_port"
android:inputType="number"
android:singleLine="true" android:singleLine="true"
/> />
<EditTextPreference <EditTextPreference
......
app/src/main/res/xml/account_editor_xmpp.xml
View file @ 09bbbf72
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
android:key="@string/account_port_key" android:key="@string/account_port_key"
android:title="@string/account_port" android:title="@string/account_port"
android:singleLine="true" android:singleLine="true"
android:inputType="number"
android:dependency="@string/account_custom_key" android:dependency="@string/account_custom_key"
/> />
<EditTextPreference <EditTextPreference
...@@ -77,7 +76,6 @@ ...@@ -77,7 +76,6 @@
<com.xabber.android.ui.widget.PriorityPreference <com.xabber.android.ui.widget.PriorityPreference
android:key="@string/account_priority_key" android:key="@string/account_priority_key"
android:title="@string/account_priority" android:title="@string/account_priority"
android:inputType="numberSigned"
android:singleLine="true" android:singleLine="true"
/> />
<CheckBoxPreference <CheckBoxPreference
...@@ -110,7 +108,6 @@ ...@@ -110,7 +108,6 @@
<EditTextPreference <EditTextPreference
android:key="@string/account_proxy_port_key" android:key="@string/account_proxy_port_key"
android:title="@string/account_proxy_port" android:title="@string/account_proxy_port"
android:inputType="number"
android:singleLine="true" android:singleLine="true"
/> />
<EditTextPreference <EditTextPreference
......
app/src/main/res/xml/preference_editor.xml
View file @ 09bbbf72
...@@ -14,67 +14,334 @@ ...@@ -14,67 +14,334 @@
--> -->
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<Preference <PreferenceScreen
android:title="@string/preference_accounts" android:title="@string/preference_accounts"
android:key="@string/preference_accounts_key"> android:key="@string/preference_accounts_key"
<intent />
android:targetPackage="@string/application_package" <PreferenceScreen
android:targetClass="com.xabber.android.ui.preferences.AccountList"/> android:title="@string/preference_interface"
</Preference> android:key="@string/preference_interface"
>
<Preference <ListPreference
android:title="@string/interface_theme"
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:title="@string/preference_contacts"
android:key="@string/preference_contacts" android:key="@string/preference_contacts"
> >
<intent <CheckBoxPreference
android:targetPackage="@string/application_package" android:title="@string/contacts_show_panel"
android:targetClass="com.xabber.android.ui.preferences.ContactListSettings"/> android:key="@string/contacts_show_panel_key"
</Preference> android:defaultValue="@bool/contacts_show_panel_default"
<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:title="@string/preference_chats"
android:key="@string/preference_chats" android:key="@string/preference_chats"
> >
<intent <CheckBoxPreference
android:targetPackage="@string/application_package" android:title="@string/chats_show_avatars"
android:targetClass="com.xabber.android.ui.preferences.ChatSettings"/> android:key="@string/chats_show_avatars_key"
</Preference> android:defaultValue="@bool/chats_show_avatars_default"
<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:title="@string/preference_events"
android:key="@string/preference_events" android:key="@string/preference_events"
> >
<intent <RingtonePreference
android:targetPackage="@string/application_package" android:title="@string/events_sound"
android:targetClass="com.xabber.android.ui.preferences.NotificationsSettings"/> android:key="@string/events_sound_key"
</Preference> android:defaultValue="@string/events_sound_default"
<Preference android:ringtoneType="notification"
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:title="@string/preference_connection"
android:key="@string/preference_connection" android:key="@string/preference_connection"
> >
<intent <CheckBoxPreference
android:targetPackage="@string/application_package" android:title="@string/connection_start_at_boot"
android:targetClass="com.xabber.android.ui.preferences.ConnectionSettings"/> android:key="@string/connection_start_at_boot_key"
</Preference> android:defaultValue="@bool/connection_start_at_boot_default"
<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:title="@string/preference_security"
android:key="@string/preference_security" android:key="@string/preference_security"
> >
<intent <CheckBoxPreference
android:targetPackage="@string/application_package" android:title="@string/security_check_certificate"
android:targetClass="com.xabber.android.ui.preferences.SecuritySettings"/> android:key="@string/security_check_certificate_key"
</Preference> android:defaultValue="@bool/security_check_certificate_default"
<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:title="@string/preference_debug"
android:key="@string/preference_debug" android:key="@string/preference_debug"
> >
<intent <CheckBoxPreference
android:targetPackage="@string/application_package" android:title="@string/debug_log"
android:targetClass="com.xabber.android.ui.preferences.DebugSettings"/> android:key="@string/debug_log_key"
</Preference> android:defaultValue="@bool/debug_log_default"
<Preference />
<PreferenceScreen
android:title="@string/cache_clear"
android:key="@string/cache_clear_key"
/>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/preference_about" android:title="@string/preference_about"
android:key="@string/preference_about_key"> android:key="@string/preference_about_key"
<intent />
android:targetPackage="@string/application_package"
android:targetClass="com.xabber.android.ui.preferences.AboutViewer"/>
</Preference>
</PreferenceScreen> </PreferenceScreen>
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