Skip to content

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

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

parent 3ff0488c
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 412 deletions
app/src/main/AndroidManifest.xml
View file @ 6083c4e8
...@@ -220,7 +220,6 @@ ...@@ -220,7 +220,6 @@
<activity <activity
android:label="@string/contact_viewer" android:label="@string/contact_viewer"
android:name="com.xabber.android.ui.preferences.ContactViewer" android:name="com.xabber.android.ui.preferences.ContactViewer"
android:icon="@drawable/ic_information"
android:parentActivityName="com.xabber.android.ui.ContactList" android:parentActivityName="com.xabber.android.ui.ContactList"
> >
<!-- Parent activity meta-data to support 4.0 and lower --> <!-- Parent activity meta-data to support 4.0 and lower -->
...@@ -388,10 +387,6 @@ ...@@ -388,10 +387,6 @@
android:name="android.content.SyncAdapter" android:name="android.content.SyncAdapter"
android:resource="@xml/syncadapter" android:resource="@xml/syncadapter"
/> />
<meta-data
android:name="android.provider.CONTACTS_STRUCTURE"
android:resource="@xml/contacts_structure"
/>
</service> </service>
<service <service
android:name="com.xabber.android.service.AccountAuthenticatorService" android:name="com.xabber.android.service.AccountAuthenticatorService"
......
app/src/main/java/com/xabber/android/ui/adapter/AccountToggleAdapter.java
View file @ 6083c4e8
...@@ -21,7 +21,6 @@ import android.view.View.OnClickListener; ...@@ -21,7 +21,6 @@ import android.view.View.OnClickListener;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.xabber.android.data.SettingsManager;
import com.xabber.android.data.account.AccountManager; import com.xabber.android.data.account.AccountManager;
import com.xabber.android.data.account.StatusMode; import com.xabber.android.data.account.StatusMode;
import com.xabber.android.data.extension.avatar.AvatarManager; import com.xabber.android.data.extension.avatar.AvatarManager;
...@@ -91,7 +90,6 @@ public class AccountToggleAdapter implements UpdatableAdapter { ...@@ -91,7 +90,6 @@ public class AccountToggleAdapter implements UpdatableAdapter {
@Override @Override
public void onChange() { public void onChange() {
boolean contactsShowAccounts = SettingsManager.contactsShowAccounts();
String selected = AccountManager.getInstance().getSelectedAccount(); String selected = AccountManager.getInstance().getSelectedAccount();
for (int index = 0; index < accounts.size(); index++) { for (int index = 0; index < accounts.size(); index++) {
final View view = linearLayout.getChildAt(index); final View view = linearLayout.getChildAt(index);
...@@ -100,17 +98,11 @@ public class AccountToggleAdapter implements UpdatableAdapter { ...@@ -100,17 +98,11 @@ public class AccountToggleAdapter implements UpdatableAdapter {
StatusMode statusMode = AccountManager.getInstance().getAccount(account).getDisplayStatusMode(); StatusMode statusMode = AccountManager.getInstance().getAccount(account).getDisplayStatusMode();
int colorLevel = AccountManager.getInstance().getColorLevel(account); int colorLevel = AccountManager.getInstance().getColorLevel(account);
view.getBackground().setLevel(colorLevel); 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)) { if (selected == null || account.equals(selected)) {
accountViewHolder.disabled.setVisibility(View.GONE); accountViewHolder.disabled.setVisibility(View.GONE);
} else { } else {
accountViewHolder.disabled.setVisibility(View.VISIBLE); accountViewHolder.disabled.setVisibility(View.VISIBLE);
} }
accountViewHolder.statusMode.getBackground().setLevel(colorLevel);
accountViewHolder.statusMode.setImageLevel(statusMode.ordinal()); accountViewHolder.statusMode.setImageLevel(statusMode.ordinal());
accountViewHolder.avatar.setImageDrawable(AvatarManager.getInstance().getAccountAvatar(account)); accountViewHolder.avatar.setImageDrawable(AvatarManager.getInstance().getAccountAvatar(account));
} }
......
app/src/main/res/drawable/account_background.xml
View file @ 6083c4e8
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
--> -->
<level-list xmlns:android="http://schemas.android.com/apk/res/android"> <level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:drawable="@drawable/account_background_1" android:drawable="@color/account_1"
android:minLevel="0" android:minLevel="0"
android:maxLevel="0" /> android:maxLevel="0" />
<item <item
android:drawable="@drawable/account_background_2" android:drawable="@color/account_2"
android:minLevel="1" android:minLevel="1"
android:maxLevel="1" /> android:maxLevel="1" />
<item <item
android:drawable="@drawable/account_background_3" android:drawable="@color/account_3"
android:minLevel="2" android:minLevel="2"
android:maxLevel="2" /> android:maxLevel="2" />
<item <item
android:drawable="@drawable/account_background_4" android:drawable="@color/account_4"
android:minLevel="3" android:minLevel="3"
android:maxLevel="3" /> android:maxLevel="3" />
</level-list> </level-list>
\ No newline at end of file
app/src/main/res/drawable/account_border.xml deleted 100644 → 0
View file @ 3ff0488c
<?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
app/src/main/res/drawable/account_border_1.xml deleted 100644 → 0
View file @ 3ff0488c
<?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>
app/src/main/res/drawable/account_border_2.xml deleted 100644 → 0
View file @ 3ff0488c
<?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>
app/src/main/res/drawable/account_border_3.xml deleted 100644 → 0
View file @ 3ff0488c
<?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>
app/src/main/res/drawable/account_border_4.xml deleted 100644 → 0
View file @ 3ff0488c
<?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>
app/src/main/res/drawable/account_border_persistent.xml deleted 100644 → 0
View file @ 3ff0488c
<?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
app/src/main/res/drawable/account_color.xml
View file @ 6083c4e8
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
--> -->
<level-list xmlns:android="http://schemas.android.com/apk/res/android"> <level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:drawable="@drawable/account_color_1" android:drawable="@color/account_1"
android:minLevel="0" android:minLevel="0"
android:maxLevel="0" /> android:maxLevel="0" />
<item <item
android:drawable="@drawable/account_color_2" android:drawable="@color/account_2"
android:minLevel="1" android:minLevel="1"
android:maxLevel="1" /> android:maxLevel="1" />
<item <item
android:drawable="@drawable/account_color_3" android:drawable="@color/account_3"
android:minLevel="2" android:minLevel="2"
android:maxLevel="2" /> android:maxLevel="2" />
<item <item
android:drawable="@drawable/account_color_4" android:drawable="@color/account_4"
android:minLevel="3" android:minLevel="3"
android:maxLevel="3" /> android:maxLevel="3" />
</level-list> </level-list>
\ No newline at end of file
app/src/main/res/drawable/btn_status_mode.xml deleted 100644 → 0
View file @ 3ff0488c
<?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>
app/src/main/res/drawable/btn_title_back.xml deleted 100644 → 0
View file @ 3ff0488c
<?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>
app/src/main/res/drawable/btn_title_back_dark.xml deleted 100644 → 0
View file @ 3ff0488c
<?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>
app/src/main/res/drawable/expander_account_1_dark.xml
View file @ 6083c4e8
...@@ -14,15 +14,5 @@ ...@@ -14,15 +14,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@color/account_1" />
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" />
</selector> </selector>
app/src/main/res/drawable/expander_account_1_light.xml
View file @ 6083c4e8
...@@ -14,15 +14,5 @@ ...@@ -14,15 +14,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@color/account_1" />
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" />
</selector> </selector>
app/src/main/res/drawable/expander_account_2_dark.xml
View file @ 6083c4e8
...@@ -14,15 +14,5 @@ ...@@ -14,15 +14,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@color/account_2" />
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" />
</selector> </selector>
app/src/main/res/drawable/expander_account_2_light.xml
View file @ 6083c4e8
...@@ -14,15 +14,5 @@ ...@@ -14,15 +14,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@color/account_2" />
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" />
</selector> </selector>
app/src/main/res/drawable/expander_account_3_dark.xml
View file @ 6083c4e8
...@@ -14,15 +14,5 @@ ...@@ -14,15 +14,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@color/account_3" />
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" />
</selector> </selector>
app/src/main/res/drawable/expander_account_3_light.xml
View file @ 6083c4e8
...@@ -14,15 +14,5 @@ ...@@ -14,15 +14,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@color/account_3" />
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" />
</selector> </selector>
app/src/main/res/drawable/expander_account_4_dark.xml
View file @ 6083c4e8
...@@ -14,15 +14,5 @@ ...@@ -14,15 +14,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@color/account_4" />
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" />
</selector> </selector>
app/src/main/res/drawable/expander_account_4_light.xml
View file @ 6083c4e8
...@@ -14,15 +14,5 @@ ...@@ -14,15 +14,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@color/account_4" />
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" />
</selector> </selector>
app/src/main/res/drawable/expander_group_dark.xml
View file @ 6083c4e8
...@@ -14,15 +14,5 @@ ...@@ -14,15 +14,5 @@
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item android:drawable="@color/material_blue_grey_900" />
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" />
</selector> </selector>
app/src/main/res/drawable/expander_group_light.xml
View file @ 6083c4e8
...@@ -15,14 +15,5 @@ ...@@ -15,14 +15,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:state_pressed="true" android:drawable="@color/material_blue_grey_900" />
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" />
</selector> </selector>
app/src/main/res/drawable/title_account_background_dark.xml
View file @ 6083c4e8
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
--> -->
<level-list xmlns:android="http://schemas.android.com/apk/res/android"> <level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:drawable="@drawable/title_account_background_1_dark" android:drawable="@color/account_1"
android:minLevel="0" android:minLevel="0"
android:maxLevel="0" /> android:maxLevel="0" />
<item <item
android:drawable="@drawable/title_account_background_2_dark" android:drawable="@color/account_2"
android:minLevel="1" android:minLevel="1"
android:maxLevel="1" /> android:maxLevel="1" />
<item <item
android:drawable="@drawable/title_account_background_3_dark" android:drawable="@color/account_3"
android:minLevel="2" android:minLevel="2"
android:maxLevel="2" /> android:maxLevel="2" />
<item <item
android:drawable="@drawable/title_account_background_4_dark" android:drawable="@color/account_4"
android:minLevel="3" android:minLevel="3"
android:maxLevel="3" /> android:maxLevel="3" />
</level-list> </level-list>
\ No newline at end of file
app/src/main/res/drawable/title_account_background_light.xml
View file @ 6083c4e8
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
--> -->
<level-list xmlns:android="http://schemas.android.com/apk/res/android"> <level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:drawable="@drawable/title_account_background_1_light" android:drawable="@color/account_1"
android:minLevel="0" android:minLevel="0"
android:maxLevel="0" /> android:maxLevel="0" />
<item <item
android:drawable="@drawable/title_account_background_2_light" android:drawable="@color/account_2"
android:minLevel="1" android:minLevel="1"
android:maxLevel="1" /> android:maxLevel="1" />
<item <item
android:drawable="@drawable/title_account_background_3_light" android:drawable="@color/account_3"
android:minLevel="2" android:minLevel="2"
android:maxLevel="2" /> android:maxLevel="2" />
<item <item
android:drawable="@drawable/title_account_background_4_light" android:drawable="@color/account_4"
android:minLevel="3" android:minLevel="3"
android:maxLevel="3" /> android:maxLevel="3" />
</level-list> </level-list>
\ No newline at end of file
app/src/main/res/layout/account_list_item.xml
View file @ 6083c4e8
...@@ -21,8 +21,13 @@ ...@@ -21,8 +21,13 @@
> >
<ImageView <ImageView
android:id="@+id/color" android:id="@+id/color"
android:layout_width="wrap_content" android:layout_width="4dp"
android:layout_height="@dimen/avatar_size" 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" android:src="@drawable/account_color"
/> />
<ImageView <ImageView
...@@ -34,7 +39,7 @@ ...@@ -34,7 +39,7 @@
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="4dip" android:paddingLeft="4dip"
android:paddingRight="4dip" android:paddingRight="4dip"
......
app/src/main/res/layout/account_toggler_item.xml
View file @ 6083c4e8
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
android:id="@+id/status_mode" android:id="@+id/status_mode"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/account_border"
android:src="@drawable/ic_status_account" android:src="@drawable/ic_status_account"
android:clickable="true" android:clickable="true"
/> />
...@@ -38,6 +37,6 @@ ...@@ -38,6 +37,6 @@
android:id="@+id/disabled" android:id="@+id/disabled"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/account_border_disabled" android:src="@color/account_disabled"
/> />
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/base_contact_item.xml
View file @ 6083c4e8
...@@ -18,11 +18,18 @@ ...@@ -18,11 +18,18 @@
android:layout_height="@dimen/contact_list_item_height" android:layout_height="@dimen/contact_list_item_height"
android:paddingTop="@dimen/contact_list_item_padding_top" android:paddingTop="@dimen/contact_list_item_padding_top"
android:paddingBottom="@dimen/contact_list_item_padding_bottom" android:paddingBottom="@dimen/contact_list_item_padding_bottom"
> >
<ImageView <ImageView
android:id="@+id/color" android:id="@+id/color"
android:layout_width="wrap_content"
android:layout_width="4dp"
android:layout_height="@dimen/avatar_size" 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" android:src="@drawable/account_color"
/> />
<include layout="@layout/base_contact_avatar" /> <include layout="@layout/base_contact_avatar" />
......
app/src/main/res/layout/contact_title.xml
View file @ 6083c4e8
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textStyle="bold" android:textStyle="bold"
android:textColor="?android:attr/textColorPrimary" android:textColor="@color/secondary_text_default_material_light"
android:text="name" android:text="name"
/> />
<TextView <TextView
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
android:gravity="top" android:gravity="top"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textColor="?android:attr/textColorPrimary" android:textColor="@color/secondary_text_default_material_light"
android:text="status" android:text="status"
/> />
</LinearLayout> </LinearLayout>
......
app/src/main/res/values/colors.xml
View file @ 6083c4e8
...@@ -15,4 +15,12 @@ ...@@ -15,4 +15,12 @@
<resources> <resources>
<color name="bright_foreground_dark">#ffffffff</color> <color name="bright_foreground_dark">#ffffffff</color>
<color name="bright_foreground_light">#ff000000</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> </resources>
app/src/main/res/xml/contacts_structure.xml deleted 100644 → 0
View file @ 3ff0488c
<?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

Technounit-GROUP 2023