Commit 6083c4e8 authored by Grigory Fedorov's avatar Grigory Fedorov

A lof of PNG resources replaced by simple colors and removed.

parent 3ff0488c
......@@ -220,7 +220,6 @@
<activity
android:label="@string/contact_viewer"
android:name="com.xabber.android.ui.preferences.ContactViewer"
android:icon="@drawable/ic_information"
android:parentActivityName="com.xabber.android.ui.ContactList"
>
<!-- Parent activity meta-data to support 4.0 and lower -->
......@@ -388,10 +387,6 @@
android:name="android.content.SyncAdapter"
android:resource="@xml/syncadapter"
/>
<meta-data
android:name="android.provider.CONTACTS_STRUCTURE"
android:resource="@xml/contacts_structure"
/>
</service>
<service
android:name="com.xabber.android.service.AccountAuthenticatorService"
......
......@@ -21,7 +21,6 @@ import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.xabber.android.data.SettingsManager;
import com.xabber.android.data.account.AccountManager;
import com.xabber.android.data.account.StatusMode;
import com.xabber.android.data.extension.avatar.AvatarManager;
......@@ -91,7 +90,6 @@ public class AccountToggleAdapter implements UpdatableAdapter {
@Override
public void onChange() {
boolean contactsShowAccounts = SettingsManager.contactsShowAccounts();
String selected = AccountManager.getInstance().getSelectedAccount();
for (int index = 0; index < accounts.size(); index++) {
final View view = linearLayout.getChildAt(index);
......@@ -100,17 +98,11 @@ public class AccountToggleAdapter implements UpdatableAdapter {
StatusMode statusMode = AccountManager.getInstance().getAccount(account).getDisplayStatusMode();
int colorLevel = AccountManager.getInstance().getColorLevel(account);
view.getBackground().setLevel(colorLevel);
if (contactsShowAccounts) {
accountViewHolder.statusMode.setBackgroundResource(R.drawable.account_border);
} else {
accountViewHolder.statusMode.setBackgroundResource(R.drawable.account_border_persistent);
}
if (selected == null || account.equals(selected)) {
accountViewHolder.disabled.setVisibility(View.GONE);
} else {
accountViewHolder.disabled.setVisibility(View.VISIBLE);
}
accountViewHolder.statusMode.getBackground().setLevel(colorLevel);
accountViewHolder.statusMode.setImageLevel(statusMode.ordinal());
accountViewHolder.avatar.setImageDrawable(AvatarManager.getInstance().getAccountAvatar(account));
}
......
......@@ -14,19 +14,19 @@
-->
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/account_background_1"
android:drawable="@color/account_1"
android:minLevel="0"
android:maxLevel="0" />
<item
android:drawable="@drawable/account_background_2"
android:drawable="@color/account_2"
android:minLevel="1"
android:maxLevel="1" />
<item
android:drawable="@drawable/account_background_3"
android:drawable="@color/account_3"
android:minLevel="2"
android:maxLevel="2" />
<item
android:drawable="@drawable/account_background_4"
android:drawable="@color/account_4"
android:minLevel="3"
android:maxLevel="3" />
</level-list>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/account_border_1"
android:minLevel="0"
android:maxLevel="0" />
<item
android:drawable="@drawable/account_border_2"
android:minLevel="1"
android:maxLevel="1" />
<item
android:drawable="@drawable/account_border_3"
android:minLevel="2"
android:maxLevel="2" />
<item
android:drawable="@drawable/account_border_4"
android:minLevel="3"
android:maxLevel="3" />
</level-list>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_selected="true"
android:drawable="@drawable/account_border_1_pressed" />
<item
android:state_focused="true"
android:drawable="@drawable/account_border_1_pressed" />
<item
android:state_pressed="true"
android:drawable="@drawable/account_border_1_pressed" />
<item
android:drawable="@drawable/account_border_1_normal" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_selected="true"
android:drawable="@drawable/account_border_2_pressed" />
<item
android:state_focused="true"
android:drawable="@drawable/account_border_2_pressed" />
<item
android:state_pressed="true"
android:drawable="@drawable/account_border_2_pressed" />
<item
android:drawable="@drawable/account_border_2_normal" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_selected="true"
android:drawable="@drawable/account_border_3_pressed" />
<item
android:state_focused="true"
android:drawable="@drawable/account_border_3_pressed" />
<item
android:state_pressed="true"
android:drawable="@drawable/account_border_3_pressed" />
<item
android:drawable="@drawable/account_border_3_normal" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_selected="true"
android:drawable="@drawable/account_border_4_pressed" />
<item
android:state_focused="true"
android:drawable="@drawable/account_border_4_pressed" />
<item
android:state_pressed="true"
android:drawable="@drawable/account_border_4_pressed" />
<item
android:drawable="@drawable/account_border_4_normal" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/account_border_1_normal"
android:minLevel="0"
android:maxLevel="0" />
<item
android:drawable="@drawable/account_border_2_normal"
android:minLevel="1"
android:maxLevel="1" />
<item
android:drawable="@drawable/account_border_3_normal"
android:minLevel="2"
android:maxLevel="2" />
<item
android:drawable="@drawable/account_border_4_normal"
android:minLevel="3"
android:maxLevel="3" />
</level-list>
\ No newline at end of file
......@@ -14,19 +14,19 @@
-->
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/account_color_1"
android:drawable="@color/account_1"
android:minLevel="0"
android:maxLevel="0" />
<item
android:drawable="@drawable/account_color_2"
android:drawable="@color/account_2"
android:minLevel="1"
android:maxLevel="1" />
<item
android:drawable="@drawable/account_color_3"
android:drawable="@color/account_3"
android:minLevel="2"
android:maxLevel="2" />
<item
android:drawable="@drawable/account_color_4"
android:drawable="@color/account_4"
android:minLevel="3"
android:maxLevel="3" />
</level-list>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/btn_status_mode_normal" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_selected="false"
android:state_focused="false"
android:state_pressed="false"
android:drawable="@drawable/btn_title_back_normal" />
<item
android:drawable="@drawable/btn_title_back_pressed" />
</selector>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_selected="false"
android:state_focused="false"
android:state_pressed="false"
android:drawable="@drawable/btn_title_back_pressed" />
<item
android:drawable="@drawable/btn_title_back_normal" />
</selector>
......@@ -14,15 +14,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_account_1_dark_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_account_1_dark_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_account_1_dark_focused" />
<item
android:drawable="@drawable/expander_account_1_dark_normal" />
<item android:drawable="@color/account_1" />
</selector>
......@@ -14,15 +14,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_account_1_light_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_account_1_light_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_account_1_light_focused" />
<item
android:drawable="@drawable/expander_account_1_light_normal" />
<item android:drawable="@color/account_1" />
</selector>
......@@ -14,15 +14,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_account_2_dark_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_account_2_dark_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_account_2_dark_focused" />
<item
android:drawable="@drawable/expander_account_2_dark_normal" />
<item android:drawable="@color/account_2" />
</selector>
......@@ -14,15 +14,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_account_2_light_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_account_2_light_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_account_2_light_focused" />
<item
android:drawable="@drawable/expander_account_2_light_normal" />
<item android:drawable="@color/account_2" />
</selector>
......@@ -14,15 +14,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_account_3_dark_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_account_3_dark_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_account_3_dark_focused" />
<item
android:drawable="@drawable/expander_account_3_dark_normal" />
<item android:drawable="@color/account_3" />
</selector>
......@@ -14,15 +14,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_account_3_light_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_account_3_light_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_account_3_light_focused" />
<item
android:drawable="@drawable/expander_account_3_light_normal" />
<item android:drawable="@color/account_3" />
</selector>
......@@ -14,15 +14,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_account_4_dark_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_account_4_dark_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_account_4_dark_focused" />
<item
android:drawable="@drawable/expander_account_4_dark_normal" />
<item android:drawable="@color/account_4" />
</selector>
......@@ -14,15 +14,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_account_4_light_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_account_4_light_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_account_4_light_focused" />
<item
android:drawable="@drawable/expander_account_4_light_normal" />
<item android:drawable="@color/account_4" />
</selector>
......@@ -14,15 +14,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_group_dark_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_group_dark_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_group_dark_focused" />
<item
android:drawable="@drawable/expander_group_dark_normal" />
<item android:drawable="@color/material_blue_grey_900" />
</selector>
......@@ -15,14 +15,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/expander_group_light_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/expander_group_light_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/expander_group_light_focused" />
<item
android:drawable="@drawable/expander_group_light_normal" />
android:drawable="@color/material_blue_grey_900" />
</selector>
......@@ -14,19 +14,19 @@
-->
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/title_account_background_1_dark"
android:drawable="@color/account_1"
android:minLevel="0"
android:maxLevel="0" />
<item
android:drawable="@drawable/title_account_background_2_dark"
android:drawable="@color/account_2"
android:minLevel="1"
android:maxLevel="1" />
<item
android:drawable="@drawable/title_account_background_3_dark"
android:drawable="@color/account_3"
android:minLevel="2"
android:maxLevel="2" />
<item
android:drawable="@drawable/title_account_background_4_dark"
android:drawable="@color/account_4"
android:minLevel="3"
android:maxLevel="3" />
</level-list>
\ No newline at end of file
......@@ -14,19 +14,19 @@
-->
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/title_account_background_1_light"
android:drawable="@color/account_1"
android:minLevel="0"
android:maxLevel="0" />
<item
android:drawable="@drawable/title_account_background_2_light"
android:drawable="@color/account_2"
android:minLevel="1"
android:maxLevel="1" />
<item
android:drawable="@drawable/title_account_background_3_light"
android:drawable="@color/account_3"
android:minLevel="2"
android:maxLevel="2" />
<item
android:drawable="@drawable/title_account_background_4_light"
android:drawable="@color/account_4"
android:minLevel="3"
android:maxLevel="3" />
</level-list>
\ No newline at end of file
......@@ -21,8 +21,13 @@
>
<ImageView
android:id="@+id/color"
android:layout_width="wrap_content"
android:layout_width="4dp"
android:layout_height="@dimen/avatar_size"
android:layout_marginStart="3dp"
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_marginEnd="3dp"
android:src="@drawable/account_color"
/>
<ImageView
......@@ -34,7 +39,7 @@
<LinearLayout
android:orientation="vertical"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="match_parent"
android:paddingLeft="4dip"
android:paddingRight="4dip"
......
......@@ -30,7 +30,6 @@
android:id="@+id/status_mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/account_border"
android:src="@drawable/ic_status_account"
android:clickable="true"
/>
......@@ -38,6 +37,6 @@
android:id="@+id/disabled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/account_border_disabled"
android:src="@color/account_disabled"
/>
</RelativeLayout>
\ No newline at end of file
......@@ -18,11 +18,18 @@
android:layout_height="@dimen/contact_list_item_height"
android:paddingTop="@dimen/contact_list_item_padding_top"
android:paddingBottom="@dimen/contact_list_item_padding_bottom"
>
<ImageView
android:id="@+id/color"
android:layout_width="wrap_content"
android:layout_width="4dp"
android:layout_height="@dimen/avatar_size"
android:layout_marginStart="3dp"
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_marginEnd="3dp"
android:src="@drawable/account_color"
/>
<include layout="@layout/base_contact_avatar" />
......
......@@ -59,7 +59,7 @@
android:singleLine="true"
android:ellipsize="marquee"
android:textStyle="bold"
android:textColor="?android:attr/textColorPrimary"
android:textColor="@color/secondary_text_default_material_light"
android:text="name"
/>
<TextView
......@@ -70,7 +70,7 @@
android:gravity="top"
android:singleLine="true"
android:ellipsize="marquee"
android:textColor="?android:attr/textColorPrimary"
android:textColor="@color/secondary_text_default_material_light"
android:text="status"
/>
</LinearLayout>
......
......@@ -15,4 +15,12 @@
<resources>
<color name="bright_foreground_dark">#ffffffff</color>
<color name="bright_foreground_light">#ff000000</color>
<color name="account_1" >#FFCCFF90</color>
<color name="account_2" >#FFFFE57F</color>
<color name="account_3" >#FFFF8A80</color>
<color name="account_4" >#FF80D8FF</color>
<color name="account_disabled" >#33000000</color>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
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.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<ContactsSource
xmlns:android="http://schemas.android.com/apk/res/android"
>
<ContactsDataKind
android:mimeType="vnd.android.cursor.item/vnd.com.xabber.view"
android:icon="@drawable/ic_information"
android:summaryColumn="data1"
android:detailColumn="data2"
android:detailSocialSummary="false"
/>
</ContactsSource>
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