Skip to content

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

4 new account colors added with icons and message balloons. 

Chat message balloons now have borders.
parent 9d995fdf
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 12 deletions
app/src/main/java/com/xabber/android/data/account/AccountManager.java
View file @ 58f5b669
......@@ -120,9 +120,7 @@ public class AccountManager implements OnLoadListener, OnWipeListener {
authorizationErrorProvider = new BaseAccountNotificationProvider<>(R.drawable.ic_stat_error);
passwordRequestProvider = new BaseAccountNotificationProvider<>(R.drawable.ic_stat_ic_add_circle);
TypedArray accountAvatars = application.getResources().obtainTypedArray(R.array.account_avatars);
colors = accountAvatars.length();
accountAvatars.recycle();
colors = application.getResources().getIntArray(R.array.account_color_names).length;
TypedArray types = application.getResources().obtainTypedArray(R.array.account_types);
accountTypes = new ArrayList<>();
......
app/src/main/res/drawable/ic_button_send.xml
View file @ 58f5b669
......@@ -4,4 +4,8 @@
<item android:drawable="@drawable/ic_button_send_orange_24dp" android:minLevel="1" android:maxLevel="1" />
<item android:drawable="@drawable/ic_button_send_red_24dp" android:minLevel="2" android:maxLevel="2" />
<item android:drawable="@drawable/ic_button_send_blue_24dp" android:minLevel="3" android:maxLevel="3" />
<item android:drawable="@drawable/ic_button_send_indigo_24dp" android:minLevel="4" android:maxLevel="4" />
<item android:drawable="@drawable/ic_button_send_blue_grey_24dp" android:minLevel="5" android:maxLevel="5" />
<item android:drawable="@drawable/ic_button_send_cyan_24dp" android:minLevel="6" android:maxLevel="6" />
<item android:drawable="@drawable/ic_button_send_teal_24dp" android:minLevel="7" android:maxLevel="7" />
</level-list>
\ No newline at end of file
app/src/main/res/drawable/message_incoming.xml
View file @ 58f5b669
......@@ -4,4 +4,8 @@
<item android:drawable="@drawable/message_incoming_states_orange" android:minLevel="1" android:maxLevel="1" />
<item android:drawable="@drawable/message_incoming_states_red" android:minLevel="2" android:maxLevel="2" />
<item android:drawable="@drawable/message_incoming_states_blue" android:minLevel="3" android:maxLevel="3" />
<item android:drawable="@drawable/message_incoming_states_indigo" android:minLevel="4" android:maxLevel="4" />
<item android:drawable="@drawable/message_incoming_states_blue_grey" android:minLevel="5" android:maxLevel="5" />
<item android:drawable="@drawable/message_incoming_states_cyan" android:minLevel="6" android:maxLevel="6" />
<item android:drawable="@drawable/message_incoming_states_teal" android:minLevel="7" android:maxLevel="7" />
</level-list>
\ No newline at end of file
app/src/main/res/drawable/message_incoming_states_blue_grey.xml 0 → 100644
View file @ 58f5b669
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/message_incoming_selected_blue_grey" />
<item android:drawable="@drawable/message_incoming_blue_grey" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/message_incoming_states_cyan.xml 0 → 100644
View file @ 58f5b669
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/message_incoming_selected_cyan" />
<item android:drawable="@drawable/message_incoming_cyan" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/message_incoming_states_indigo.xml 0 → 100644
View file @ 58f5b669
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/message_incoming_selected_indigo" />
<item android:drawable="@drawable/message_incoming_indigo" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/message_incoming_states_teal.xml 0 → 100644
View file @ 58f5b669
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/message_incoming_selected_teal" />
<item android:drawable="@drawable/message_incoming_teal" />
</selector>
\ No newline at end of file
app/src/main/res/values-ru/account_editor.xml
View file @ 58f5b669
......@@ -162,10 +162,15 @@
<string name="orbot_required_message">Для использования TOR необходимо установить приложение Orbot и активировать в нём передачу данных. Вы хотите установить его из Google Play?</string>
<string name="orbot_required_title">Установить Orbot?</string>
<string name="ACCOUNT_REGISTER_FAILED">Не удалось зарегистрировать аккаунт на сервере.</string>
<string name="account_color">Цвет учётной записи</string>
<string name="account_color_name_green">Зеленый</string>
<string name="account_color_name_orange">Оранжевый</string>
<string name="account_color_name_red">Красный</string>
<string name="account_color_name_blue">Синий</string>
<string name="account_color">Цвет учётной записи</string>
<string name="account_color_name_indigo">Индиго</string>
<string name="account_color_name_teal">Изумрудный</string>
<string name="account_color_name_blue_grey">Серо-голубой</string>
<string name="account_color_name_cyan">Циан</string>
</resources>
\ No newline at end of file
app/src/main/res/values/account_editor.xml
View file @ 58f5b669
......@@ -162,10 +162,15 @@
<string name="orbot_required_message">In order to process using TOR you must have Orbot installed and activated to proxy traffic through it. Would you like to install it from Google Play?</string>
<string name="orbot_required_title">Install Orbot?</string>
<string name="ACCOUNT_REGISTER_FAILED">Failed to register account on the server.</string>
<string name="account_color">Account color</string>
<string name="account_color_name_green">Green</string>
<string name="account_color_name_orange">Orange</string>
<string name="account_color_name_red">Red</string>
<string name="account_color_name_blue">Blue</string>
<string name="account_color">Account color</string>
<string name="account_color_name_indigo">Indigo</string>
<string name="account_color_name_teal">Teal</string>
<string name="account_color_name_blue_grey">Blue grey</string>
<string name="account_color_name_cyan">Cyan</string>
</resources>
app/src/main/res/values/color_arrays.xml
View file @ 58f5b669
......@@ -6,6 +6,10 @@
<item>@string/account_color_name_orange</item>
<item>@string/account_color_name_red</item>
<item>@string/account_color_name_blue</item>
<item>@string/account_color_name_indigo</item>
<item>@string/account_color_name_blue_grey</item>
<item>@string/account_color_name_cyan</item>
<item>@string/account_color_name_teal</item>
</array>
<array name="account_action_bar">
......@@ -13,6 +17,10 @@
<item>@color/orange_500</item>
<item>@color/red_500</item>
<item>@color/blue_500</item>
<item>@color/indigo_500</item>
<item>@color/blue_grey_500</item>
<item>@color/cyan_500</item>
<item>@color/teal_500</item>
</array>
<array name="account_status_bar">
......@@ -20,13 +28,10 @@
<item>@color/orange_700</item>
<item>@color/red_700</item>
<item>@color/blue_700</item>
</array>
<array name="account_chat_background">
<item>@color/green_50</item>
<item>@color/orange_50</item>
<item>@color/red_50</item>
<item>@color/blue_50</item>
<item>@color/indigo_700</item>
<item>@color/blue_grey_700</item>
<item>@color/cyan_700</item>
<item>@color/teal_700</item>
</array>
<color name="account_disabled">@color/black_dividers</color>
......
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