From bfd8d13dcd694d143eb54e01d0ac0df85d6aad1f Mon Sep 17 00:00:00 2001 From: DrKLO Date: Thu, 13 Nov 2014 23:10:14 +0300 Subject: [PATCH] More Android L design --- .../ui/{Views => }/ActionBar/ActionBar.java | 67 ++- .../ActionBar/ActionBarLayout.java | 2 +- .../{Views => }/ActionBar/ActionBarMenu.java | 2 +- .../ActionBar/ActionBarMenuItem.java | 2 +- .../ActionBar/ActionBarPopupWindow.java | 2 +- .../{Views => }/ActionBar/BaseFragment.java | 2 +- .../ActionBar/DrawerLayoutContainer.java | 2 +- .../{Views => }/ActionBar/MenuDrawable.java | 2 +- .../ui/Adapters/BaseFragmentAdapter.java | 6 - .../ui/Adapters/BaseSectionsAdapter.java | 4 +- ...ivityAdapter.java => ContactsAdapter.java} | 4 +- ...dapter.java => ContactsSearchAdapter.java} | 34 +- .../telegram/ui/Adapters/CountryAdapter.java | 165 +++++++ .../ui/Adapters/CountrySearchAdapter.java | 165 +++++++ ...tivityAdapter.java => DialogsAdapter.java} | 4 +- ...Adapter.java => DialogsSearchAdapter.java} | 4 +- .../ui/Animation/ObjectAnimator10.java | 2 - ...ctivity.java => BlockedUsersActivity.java} | 10 +- .../org/telegram/ui/Cells/DialogCell.java | 2 +- .../telegram/ui/Cells/LetterSectionCell.java | 4 + .../telegram/ui/Cells/ProfileSearchCell.java | 2 +- .../telegram/ui/Cells/TextSettingsCell.java | 17 +- .../java/org/telegram/ui/Cells/UserCell.java | 4 +- ...ivity.java => ChangeChatNameActivity.java} | 51 +-- ...eActivity.java => ChangeNameActivity.java} | 41 +- ...ivity.java => ChangeUsernameActivity.java} | 36 +- .../java/org/telegram/ui/ChatActivity.java | 10 +- .../org/telegram/ui/ContactAddActivity.java | 56 ++- .../org/telegram/ui/ContactsActivity.java | 19 +- .../telegram/ui/CountrySelectActivity.java | 409 +++--------------- .../telegram/ui/DocumentSelectActivity.java | 8 +- .../org/telegram/ui/GroupCreateActivity.java | 159 +++---- .../telegram/ui/GroupCreateFinalActivity.java | 88 +--- .../org/telegram/ui/IdenticonActivity.java | 4 +- .../telegram/ui/LanguageSelectActivity.java | 83 ++-- .../java/org/telegram/ui/LaunchActivity.java | 10 +- .../org/telegram/ui/LocationActivity.java | 8 +- .../java/org/telegram/ui/LoginActivity.java | 288 +++++++++++- .../telegram/ui/LoginActivityPhoneView.java | 2 +- .../java/org/telegram/ui/MediaActivity.java | 4 +- .../org/telegram/ui/MessagesActivity.java | 74 ++-- ...ava => NotificationsSettingsActivity.java} | 6 +- .../org/telegram/ui/PhotoCropActivity.java | 47 +- .../org/telegram/ui/PhotoPickerActivity.java | 6 +- .../java/org/telegram/ui/PhotoViewer.java | 6 +- .../ui/PopupNotificationActivity.java | 4 +- .../java/org/telegram/ui/ProfileActivity.java | 10 +- .../ui/ProfileNotificationsActivity.java | 4 +- .../org/telegram/ui/SettingsActivity.java | 18 +- .../org/telegram/ui/VideoEditorActivity.java | 6 +- .../org/telegram/ui/Views/AvatarUpdater.java | 2 +- .../ui/Views/PinnedHeaderListView.java | 270 ------------ .../ui/Views/SectionedBaseAdapter.java | 225 ---------- .../telegram/ui/Views/SectionsListView.java | 13 - .../java/org/telegram/ui/Views/Switch.java | 1 - ...sActivity.java => WallpapersActivity.java} | 104 ++--- .../src/main/res/drawable-hdpi/addmember.png | Bin 928 -> 0 bytes .../btn_check_off_holo_light.png | Bin 1121 -> 0 bytes .../drawable-hdpi/btn_check_on_holo_light.png | Bin 1413 -> 0 bytes .../src/main/res/drawable-hdpi/btn_down.9.png | Bin 232 -> 0 bytes .../src/main/res/drawable-hdpi/btn_up.9.png | Bin 214 -> 0 bytes .../main/res/drawable-hdpi/ic_ab_share.png | Bin 755 -> 0 bytes .../main/res/drawable-hdpi/ic_auth_next.png | Bin 1431 -> 0 bytes .../src/main/res/drawable-hdpi/ic_done.png | Bin 417 -> 309 bytes .../src/main/res/drawable-hdpi/ic_edit.png | Bin 1337 -> 0 bytes .../main/res/drawable-hdpi/ic_lock_blue.png | Bin 278 -> 0 bytes .../res/drawable-hdpi/ic_msg_in_cross.png | Bin 1239 -> 0 bytes .../res/drawable-hdpi/ic_profile_cross.png | Bin 1213 -> 0 bytes .../res/drawable-hdpi/photo_edit_spinner.png | Bin 1126 -> 0 bytes .../drawable-hdpi/photo_spinner_normal.9.png | Bin 189 -> 0 bytes .../drawable-hdpi/photo_spinner_pressed.9.png | Bin 208 -> 0 bytes .../main/res/drawable-hdpi/search_light.9.png | Bin 105 -> 0 bytes .../search_light_activated.9.png | Bin 0 -> 971 bytes .../drawable-hdpi/search_light_selected.9.png | Bin 978 -> 0 bytes .../main/res/drawable-hdpi/switch_off1.png | Bin 728 -> 0 bytes .../res/drawable-hdpi/switch_off1_pressed.png | Bin 1531 -> 0 bytes .../src/main/res/drawable-hdpi/switch_on1.png | Bin 839 -> 0 bytes .../res/drawable-hdpi/switch_on1_pressed.png | Bin 1650 -> 0 bytes .../drawable-hdpi/textfield_activated.9.png | Bin 231 -> 0 bytes .../res/drawable-hdpi/textfield_default.9.png | Bin 164 -> 0 bytes .../drawable-hdpi/textfield_disabled.9.png | Bin 201 -> 0 bytes .../drawable-hdpi/textfield_disabled2.9.png | Bin 144 -> 0 bytes .../res/drawable-hdpi/textfield_focused.9.png | Bin 320 -> 0 bytes .../res/drawable-hdpi/user_placeholder.png | Bin 3641 -> 0 bytes .../src/main/res/drawable-hdpi/viewbtn.9.png | Bin 631 -> 0 bytes .../res/drawable-hdpi/viewbtn_pressed.9.png | Bin 638 -> 0 bytes .../src/main/res/drawable-mdpi/addmember.png | Bin 619 -> 0 bytes .../btn_check_off_holo_light.png | Bin 1075 -> 0 bytes .../drawable-mdpi/btn_check_on_holo_light.png | Bin 1282 -> 0 bytes .../src/main/res/drawable-mdpi/btn_down.9.png | Bin 186 -> 0 bytes .../src/main/res/drawable-mdpi/btn_up.9.png | Bin 164 -> 0 bytes .../main/res/drawable-mdpi/ic_ab_share.png | Bin 443 -> 0 bytes .../main/res/drawable-mdpi/ic_auth_next.png | Bin 1300 -> 0 bytes .../src/main/res/drawable-mdpi/ic_done.png | Bin 346 -> 243 bytes .../src/main/res/drawable-mdpi/ic_edit.png | Bin 1212 -> 0 bytes .../main/res/drawable-mdpi/ic_lock_blue.png | Bin 228 -> 0 bytes .../res/drawable-mdpi/ic_msg_in_cross.png | Bin 1169 -> 0 bytes .../res/drawable-mdpi/ic_profile_cross.png | Bin 1117 -> 0 bytes .../res/drawable-mdpi/photo_edit_spinner.png | Bin 1091 -> 0 bytes .../drawable-mdpi/photo_spinner_normal.9.png | Bin 155 -> 0 bytes .../drawable-mdpi/photo_spinner_pressed.9.png | Bin 171 -> 0 bytes .../main/res/drawable-mdpi/search_light.9.png | Bin 100 -> 0 bytes .../search_light_activated.9.png | Bin 0 -> 959 bytes .../drawable-mdpi/search_light_selected.9.png | Bin 987 -> 0 bytes .../main/res/drawable-mdpi/switch_off1.png | Bin 511 -> 0 bytes .../res/drawable-mdpi/switch_off1_pressed.png | Bin 1329 -> 0 bytes .../src/main/res/drawable-mdpi/switch_on1.png | Bin 579 -> 0 bytes .../res/drawable-mdpi/switch_on1_pressed.png | Bin 1383 -> 0 bytes .../drawable-mdpi/textfield_activated.9.png | Bin 178 -> 0 bytes .../res/drawable-mdpi/textfield_default.9.png | Bin 129 -> 0 bytes .../drawable-mdpi/textfield_disabled.9.png | Bin 162 -> 0 bytes .../drawable-mdpi/textfield_disabled2.9.png | Bin 166 -> 0 bytes .../res/drawable-mdpi/textfield_focused.9.png | Bin 267 -> 0 bytes .../res/drawable-mdpi/user_placeholder.png | Bin 2733 -> 0 bytes .../src/main/res/drawable-mdpi/viewbtn.9.png | Bin 319 -> 0 bytes .../res/drawable-mdpi/viewbtn_pressed.9.png | Bin 318 -> 0 bytes .../src/main/res/drawable-xhdpi/addmember.png | Bin 1242 -> 0 bytes .../btn_check_off_holo_light.png | Bin 1148 -> 0 bytes .../btn_check_on_holo_light.png | Bin 1554 -> 0 bytes .../main/res/drawable-xhdpi/btn_down.9.png | Bin 277 -> 0 bytes .../src/main/res/drawable-xhdpi/btn_up.9.png | Bin 259 -> 0 bytes .../main/res/drawable-xhdpi/ic_ab_share.png | Bin 988 -> 0 bytes .../main/res/drawable-xhdpi/ic_auth_next.png | Bin 1502 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_done.png | Bin 487 -> 363 bytes .../src/main/res/drawable-xhdpi/ic_edit.png | Bin 1363 -> 0 bytes .../main/res/drawable-xhdpi/ic_lock_blue.png | Bin 304 -> 0 bytes .../res/drawable-xhdpi/ic_msg_in_cross.png | Bin 1308 -> 0 bytes .../res/drawable-xhdpi/ic_profile_cross.png | Bin 1279 -> 0 bytes .../res/drawable-xhdpi/photo_edit_spinner.png | Bin 1144 -> 0 bytes .../drawable-xhdpi/photo_spinner_normal.9.png | Bin 205 -> 0 bytes .../photo_spinner_pressed.9.png | Bin 229 -> 0 bytes .../res/drawable-xhdpi/search_light.9.png | Bin 126 -> 969 bytes .../search_light_activated.9.png | Bin 0 -> 975 bytes .../search_light_selected.9.png | Bin 998 -> 0 bytes .../res/drawable-xhdpi/spenner_pressed.9.png | Bin 1357 -> 0 bytes .../main/res/drawable-xhdpi/switch_off1.png | Bin 866 -> 0 bytes .../drawable-xhdpi/switch_off1_pressed.png | Bin 1683 -> 0 bytes .../main/res/drawable-xhdpi/switch_on1.png | Bin 1018 -> 0 bytes .../res/drawable-xhdpi/switch_on1_pressed.png | Bin 1831 -> 0 bytes .../drawable-xhdpi/textfield_activated.9.png | Bin 263 -> 0 bytes .../drawable-xhdpi/textfield_default.9.png | Bin 192 -> 0 bytes .../drawable-xhdpi/textfield_disabled.9.png | Bin 323 -> 0 bytes .../drawable-xhdpi/textfield_disabled2.9.png | Bin 157 -> 0 bytes .../drawable-xhdpi/textfield_focused.9.png | Bin 441 -> 0 bytes .../res/drawable-xhdpi/user_placeholder.png | Bin 4519 -> 0 bytes .../src/main/res/drawable-xhdpi/viewbtn.9.png | Bin 702 -> 0 bytes .../res/drawable-xhdpi/viewbtn_pressed.9.png | Bin 706 -> 0 bytes .../main/res/drawable-xxhdpi/addmember.png | Bin 1791 -> 0 bytes .../btn_check_off_holo_light.png | Bin 1213 -> 0 bytes .../btn_check_on_holo_light.png | Bin 1801 -> 0 bytes .../main/res/drawable-xxhdpi/btn_down.9.png | Bin 439 -> 0 bytes .../src/main/res/drawable-xxhdpi/btn_up.9.png | Bin 393 -> 0 bytes .../main/res/drawable-xxhdpi/ic_ab_share.png | Bin 1468 -> 0 bytes .../main/res/drawable-xxhdpi/ic_auth_next.png | Bin 1868 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_done.png | Bin 620 -> 476 bytes .../src/main/res/drawable-xxhdpi/ic_edit.png | Bin 1609 -> 0 bytes .../main/res/drawable-xxhdpi/ic_lock_blue.png | Bin 443 -> 0 bytes .../res/drawable-xxhdpi/ic_msg_in_cross.png | Bin 1428 -> 0 bytes .../res/drawable-xxhdpi/ic_profile_cross.png | Bin 1301 -> 0 bytes .../drawable-xxhdpi/photo_edit_spinner.png | Bin 1206 -> 0 bytes .../photo_spinner_normal.9.png | Bin 271 -> 0 bytes .../photo_spinner_pressed.9.png | Bin 296 -> 0 bytes .../res/drawable-xxhdpi/search_dark.9.png | Bin 0 -> 100 bytes .../search_dark_activated.9.png | Bin 0 -> 101 bytes .../res/drawable-xxhdpi/search_light.9.png | Bin 0 -> 97 bytes .../search_light_activated.9.png | Bin 0 -> 101 bytes .../main/res/drawable-xxhdpi/spinner.9.png | Bin 503 -> 1112 bytes .../main/res/drawable-xxhdpi/switch_off1.png | Bin 1226 -> 0 bytes .../drawable-xxhdpi/switch_off1_pressed.png | Bin 2036 -> 0 bytes .../main/res/drawable-xxhdpi/switch_on1.png | Bin 1480 -> 0 bytes .../drawable-xxhdpi/switch_on1_pressed.png | Bin 2307 -> 0 bytes .../res/drawable-xxhdpi/user_placeholder.png | Bin 6546 -> 0 bytes .../main/res/drawable-xxhdpi/viewbtn.9.png | Bin 1283 -> 0 bytes .../res/drawable-xxhdpi/viewbtn_pressed.9.png | Bin 1279 -> 0 bytes .../src/main/res/drawable/btn_check_off.xml | 8 - .../src/main/res/drawable/btn_check_on.xml | 8 - .../drawable/chat_incoming_media_states.xml | 7 - .../src/main/res/drawable/edit_text.xml | 11 +- .../src/main/res/drawable/list_selector.xml | 3 +- .../res/drawable/logout_button_states.xml | 6 - .../src/main/res/drawable/photo_spinner.xml | 8 - .../main/res/drawable/search_dark_states.xml | 7 + .../main/res/drawable/search_light_states.xml | 9 +- .../src/main/res/drawable/spinner_states.xml | 6 +- .../res/layout-ar/country_select_layout.xml | 34 -- .../layout-ar/group_create_final_layout.xml | 6 - .../res/layout-ar/group_create_row_layout.xml | 60 --- .../layout-ar/settings_row_button_layout.xml | 33 -- .../main/res/layout/chat_profile_layout.xml | 23 - .../main/res/layout/country_select_layout.xml | 35 -- .../res/layout/group_create_final_layout.xml | 6 - .../res/layout/group_create_row_layout.xml | 58 --- .../group_profile_add_member_layout.xml | 20 - .../src/main/res/layout/login_layout.xml | 20 - .../res/layout/settings_do_action_layout.xml | 50 --- .../res/layout/settings_row_button_layout.xml | 33 -- TMessagesProj/src/main/res/values/strings.xml | 3 +- 197 files changed, 1215 insertions(+), 1819 deletions(-) rename TMessagesProj/src/main/java/org/telegram/ui/{Views => }/ActionBar/ActionBar.java (95%) rename TMessagesProj/src/main/java/org/telegram/ui/{Views => }/ActionBar/ActionBarLayout.java (99%) rename TMessagesProj/src/main/java/org/telegram/ui/{Views => }/ActionBar/ActionBarMenu.java (99%) rename TMessagesProj/src/main/java/org/telegram/ui/{Views => }/ActionBar/ActionBarMenuItem.java (99%) rename TMessagesProj/src/main/java/org/telegram/ui/{Views => }/ActionBar/ActionBarPopupWindow.java (99%) rename TMessagesProj/src/main/java/org/telegram/ui/{Views => }/ActionBar/BaseFragment.java (99%) rename TMessagesProj/src/main/java/org/telegram/ui/{Views => }/ActionBar/DrawerLayoutContainer.java (99%) rename TMessagesProj/src/main/java/org/telegram/ui/{Views => }/ActionBar/MenuDrawable.java (98%) rename TMessagesProj/src/main/java/org/telegram/ui/Adapters/{ContactsActivityAdapter.java => ContactsAdapter.java} (98%) rename TMessagesProj/src/main/java/org/telegram/ui/Adapters/{ContactsActivitySearchAdapter.java => ContactsSearchAdapter.java} (88%) create mode 100644 TMessagesProj/src/main/java/org/telegram/ui/Adapters/CountryAdapter.java create mode 100644 TMessagesProj/src/main/java/org/telegram/ui/Adapters/CountrySearchAdapter.java rename TMessagesProj/src/main/java/org/telegram/ui/Adapters/{MessagesActivityAdapter.java => DialogsAdapter.java} (96%) rename TMessagesProj/src/main/java/org/telegram/ui/Adapters/{MessagesActivitySearchAdapter.java => DialogsSearchAdapter.java} (99%) rename TMessagesProj/src/main/java/org/telegram/ui/{SettingsBlockedUsersActivity.java => BlockedUsersActivity.java} (96%) rename TMessagesProj/src/main/java/org/telegram/ui/{ChatProfileChangeNameActivity.java => ChangeChatNameActivity.java} (74%) rename TMessagesProj/src/main/java/org/telegram/ui/{SettingsChangeNameActivity.java => ChangeNameActivity.java} (88%) rename TMessagesProj/src/main/java/org/telegram/ui/{SettingsChangeUsernameActivity.java => ChangeUsernameActivity.java} (94%) rename TMessagesProj/src/main/java/org/telegram/ui/{SettingsNotificationsActivity.java => NotificationsSettingsActivity.java} (99%) delete mode 100755 TMessagesProj/src/main/java/org/telegram/ui/Views/PinnedHeaderListView.java delete mode 100755 TMessagesProj/src/main/java/org/telegram/ui/Views/SectionedBaseAdapter.java rename TMessagesProj/src/main/java/org/telegram/ui/{SettingsWallpapersActivity.java => WallpapersActivity.java} (86%) delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/addmember.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/btn_check_off_holo_light.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/btn_check_on_holo_light.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/btn_down.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/btn_up.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/ic_ab_share.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/ic_auth_next.png mode change 100644 => 100755 TMessagesProj/src/main/res/drawable-hdpi/ic_done.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/ic_edit.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/ic_lock_blue.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/ic_msg_in_cross.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/ic_profile_cross.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/photo_edit_spinner.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/photo_spinner_normal.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/photo_spinner_pressed.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/search_light.9.png create mode 100644 TMessagesProj/src/main/res/drawable-hdpi/search_light_activated.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/search_light_selected.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/switch_off1.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/switch_off1_pressed.png delete mode 100755 TMessagesProj/src/main/res/drawable-hdpi/switch_on1.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/switch_on1_pressed.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/textfield_activated.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/textfield_default.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/textfield_disabled.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/textfield_disabled2.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/textfield_focused.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/user_placeholder.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/viewbtn.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-hdpi/viewbtn_pressed.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/addmember.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/btn_check_off_holo_light.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/btn_check_on_holo_light.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/btn_down.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/btn_up.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/ic_ab_share.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/ic_auth_next.png mode change 100644 => 100755 TMessagesProj/src/main/res/drawable-mdpi/ic_done.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/ic_edit.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/ic_lock_blue.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/ic_msg_in_cross.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/ic_profile_cross.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/photo_edit_spinner.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/photo_spinner_normal.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/photo_spinner_pressed.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/search_light.9.png create mode 100644 TMessagesProj/src/main/res/drawable-mdpi/search_light_activated.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/search_light_selected.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/switch_off1.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/switch_off1_pressed.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/switch_on1.png delete mode 100755 TMessagesProj/src/main/res/drawable-mdpi/switch_on1_pressed.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/textfield_activated.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/textfield_default.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/textfield_disabled.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/textfield_disabled2.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/textfield_focused.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/user_placeholder.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/viewbtn.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-mdpi/viewbtn_pressed.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/addmember.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/btn_check_off_holo_light.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/btn_check_on_holo_light.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/btn_down.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/btn_up.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/ic_ab_share.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/ic_auth_next.png mode change 100644 => 100755 TMessagesProj/src/main/res/drawable-xhdpi/ic_done.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/ic_edit.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/ic_lock_blue.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/ic_msg_in_cross.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/ic_profile_cross.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/photo_edit_spinner.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/photo_spinner_normal.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/photo_spinner_pressed.9.png mode change 100755 => 100644 TMessagesProj/src/main/res/drawable-xhdpi/search_light.9.png create mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/search_light_activated.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/search_light_selected.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/spenner_pressed.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/switch_off1.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/switch_off1_pressed.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/switch_on1.png delete mode 100755 TMessagesProj/src/main/res/drawable-xhdpi/switch_on1_pressed.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/textfield_activated.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/textfield_default.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/textfield_disabled.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/textfield_disabled2.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/textfield_focused.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/user_placeholder.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/viewbtn.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xhdpi/viewbtn_pressed.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/addmember.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/btn_check_off_holo_light.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/btn_check_on_holo_light.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/btn_down.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/btn_up.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/ic_ab_share.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/ic_auth_next.png mode change 100644 => 100755 TMessagesProj/src/main/res/drawable-xxhdpi/ic_done.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/ic_edit.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/ic_lock_blue.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/ic_msg_in_cross.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/ic_profile_cross.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/photo_edit_spinner.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/photo_spinner_normal.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/photo_spinner_pressed.9.png create mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/search_dark.9.png create mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/search_dark_activated.9.png create mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/search_light.9.png create mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/search_light_activated.9.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/switch_off1.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/switch_off1_pressed.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/switch_on1.png delete mode 100755 TMessagesProj/src/main/res/drawable-xxhdpi/switch_on1_pressed.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/user_placeholder.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/viewbtn.9.png delete mode 100644 TMessagesProj/src/main/res/drawable-xxhdpi/viewbtn_pressed.9.png delete mode 100644 TMessagesProj/src/main/res/drawable/btn_check_off.xml delete mode 100644 TMessagesProj/src/main/res/drawable/btn_check_on.xml delete mode 100644 TMessagesProj/src/main/res/drawable/chat_incoming_media_states.xml delete mode 100644 TMessagesProj/src/main/res/drawable/logout_button_states.xml delete mode 100644 TMessagesProj/src/main/res/drawable/photo_spinner.xml create mode 100644 TMessagesProj/src/main/res/drawable/search_dark_states.xml mode change 100755 => 100644 TMessagesProj/src/main/res/drawable/search_light_states.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/country_select_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/group_create_row_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout-ar/settings_row_button_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/chat_profile_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/country_select_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/group_create_row_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/group_profile_add_member_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/settings_do_action_layout.xml delete mode 100644 TMessagesProj/src/main/res/layout/settings_row_button_layout.xml diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBar.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java similarity index 95% rename from TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBar.java rename to TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java index 1c18c4efc..8e510f045 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBar.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java @@ -6,7 +6,7 @@ * Copyright Nikolai Kudashov, 2013-2014. */ -package org.telegram.ui.Views.ActionBar; +package org.telegram.ui.ActionBar; import android.content.Context; import android.content.res.Configuration; @@ -47,6 +47,7 @@ public class ActionBar extends FrameLayout { private ActionBarMenu menu; private ActionBarMenu actionMode; private View actionOverlay; + protected boolean isSearchFieldVisible; protected int itemsBackgroundResourceId; private boolean isBackOverlayVisible; @@ -69,23 +70,6 @@ public class ActionBar extends FrameLayout { titleFrameLayout.setLayoutParams(layoutParams); titleFrameLayout.setPadding(0, 0, AndroidUtilities.dp(4), 0); titleFrameLayout.setEnabled(false); - - backButtonImageView = new ImageView(getContext()); - titleFrameLayout.addView(backButtonImageView); - backButtonImageView.setVisibility(VISIBLE); - backButtonImageView.setScaleType(ImageView.ScaleType.CENTER); - backButtonImageView.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - if (isSearchFieldVisible) { - closeSearchField(); - return; - } - if (actionBarMenuOnItemClick != null) { - actionBarMenuOnItemClick.onItemClick(-1); - } - } - }); } private void positionBackImage(int height) { @@ -139,13 +123,20 @@ public class ActionBar extends FrameLayout { } int x = 0; - if (AndroidUtilities.isTablet()) { - x = AndroidUtilities.dp(80); + if (backButtonImageView != null) { + if (AndroidUtilities.isTablet()) { + x = AndroidUtilities.dp(80); + } else { + x = AndroidUtilities.dp(72); + } } else { - x = AndroidUtilities.dp(72); + if (AndroidUtilities.isTablet()) { + x = AndroidUtilities.dp(26); + } else { + x = AndroidUtilities.dp(18); + } } - if (menu != null) { maxTextWidth = Math.min(maxTextWidth, width - menu.getMeasuredWidth() - AndroidUtilities.dp(16)); } @@ -191,11 +182,39 @@ public class ActionBar extends FrameLayout { menu.measure(width, height); } + private void createBackButtonImage() { + if (backButtonImageView != null) { + return; + } + backButtonImageView = new ImageView(getContext()); + titleFrameLayout.addView(backButtonImageView); + backButtonImageView.setVisibility(VISIBLE); + backButtonImageView.setScaleType(ImageView.ScaleType.CENTER); + backButtonImageView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (isSearchFieldVisible) { + closeSearchField(); + return; + } + if (actionBarMenuOnItemClick != null) { + actionBarMenuOnItemClick.onItemClick(-1); + } + } + }); + } + public void setBackButtonDrawable(Drawable drawable) { + if (backButtonImageView == null) { + createBackButtonImage(); + } backButtonImageView.setImageDrawable(drawable); } public void setBackButtonImage(int resource) { + if (backButtonImageView == null) { + createBackButtonImage(); + } backButtonImageView.setImageResource(resource); } @@ -485,7 +504,9 @@ public class ActionBar extends FrameLayout { public void setItemsBackground(int resourceId) { itemsBackgroundResourceId = resourceId; - backButtonImageView.setBackgroundResource(resourceId); + if (backButtonImageView != null) { + backButtonImageView.setBackgroundResource(resourceId); + } } @Override diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java similarity index 99% rename from TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarLayout.java rename to TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java index ca2ccad09..6a9bb5b03 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarLayout.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java @@ -6,7 +6,7 @@ * Copyright Nikolai Kudashov, 2013-2014. */ -package org.telegram.ui.Views.ActionBar; +package org.telegram.ui.ActionBar; import android.app.Activity; import android.content.Context; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarMenu.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenu.java similarity index 99% rename from TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarMenu.java rename to TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenu.java index fb2fd1cef..52ab4e381 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarMenu.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenu.java @@ -6,7 +6,7 @@ * Copyright Nikolai Kudashov, 2013-2014. */ -package org.telegram.ui.Views.ActionBar; +package org.telegram.ui.ActionBar; import android.content.Context; import android.util.AttributeSet; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarMenuItem.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java similarity index 99% rename from TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarMenuItem.java rename to TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java index 071366658..e1fe066fd 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarMenuItem.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java @@ -6,7 +6,7 @@ * Copyright Nikolai Kudashov, 2013-2014. */ -package org.telegram.ui.Views.ActionBar; +package org.telegram.ui.ActionBar; import android.content.Context; import android.graphics.Rect; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarPopupWindow.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java similarity index 99% rename from TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarPopupWindow.java rename to TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java index 698ab7c39..5e5a302bb 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/ActionBarPopupWindow.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java @@ -8,7 +8,7 @@ //Thanks to https://github.com/JakeWharton/ActionBarSherlock/ -package org.telegram.ui.Views.ActionBar; +package org.telegram.ui.ActionBar; import android.content.Context; import android.util.AttributeSet; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/BaseFragment.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java similarity index 99% rename from TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/BaseFragment.java rename to TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java index 811f6488d..072ef79cc 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/BaseFragment.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java @@ -6,7 +6,7 @@ * Copyright Nikolai Kudashov, 2013. */ -package org.telegram.ui.Views.ActionBar; +package org.telegram.ui.ActionBar; import android.app.Activity; import android.app.AlertDialog; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/DrawerLayoutContainer.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java similarity index 99% rename from TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/DrawerLayoutContainer.java rename to TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java index d55b67c7e..d67db6c35 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/DrawerLayoutContainer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java @@ -6,7 +6,7 @@ * Copyright Nikolai Kudashov, 2013-2014. */ -package org.telegram.ui.Views.ActionBar; +package org.telegram.ui.ActionBar; import android.app.Activity; import android.content.Context; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/MenuDrawable.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/MenuDrawable.java similarity index 98% rename from TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/MenuDrawable.java rename to TMessagesProj/src/main/java/org/telegram/ui/ActionBar/MenuDrawable.java index 221b1fd2b..46f601702 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/ActionBar/MenuDrawable.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/MenuDrawable.java @@ -6,7 +6,7 @@ * Copyright Nikolai Kudashov, 2013-2014. */ -package org.telegram.ui.Views.ActionBar; +package org.telegram.ui.ActionBar; import android.graphics.Canvas; import android.graphics.ColorFilter; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseFragmentAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseFragmentAdapter.java index 184e06a1e..131961344 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseFragmentAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseFragmentAdapter.java @@ -15,12 +15,6 @@ import android.widget.BaseAdapter; public class BaseFragmentAdapter extends BaseAdapter { - public void onFragmentCreate() { - } - - public void onFragmentDestroy() { - } - @Override public int getCount() { return 0; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseSectionsAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseSectionsAdapter.java index 0023f3baf..3b6023c7a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseSectionsAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/BaseSectionsAdapter.java @@ -120,7 +120,7 @@ public abstract class BaseSectionsAdapter extends BaseFragmentAdapter { } sectionStart = sectionEnd; } - return 0; + return -1; } public int getPositionInSectionForPosition(int position) { @@ -139,7 +139,7 @@ public abstract class BaseSectionsAdapter extends BaseFragmentAdapter { } sectionStart = sectionEnd; } - return 0; + return -1; } public abstract int getSectionCount(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivityAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java similarity index 98% rename from TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivityAdapter.java rename to TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java index b995cf24b..5a6995070 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivityAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java @@ -28,14 +28,14 @@ import org.telegram.ui.Cells.UserCell; import java.util.ArrayList; import java.util.HashMap; -public class ContactsActivityAdapter extends BaseSectionsAdapter { +public class ContactsAdapter extends BaseSectionsAdapter { private Context mContext; private boolean onlyUsers; private boolean needPhonebook; private HashMap ignoreUsers; - public ContactsActivityAdapter(Context context, boolean arg1, boolean arg2, HashMap arg3) { + public ContactsAdapter(Context context, boolean arg1, boolean arg2, HashMap arg3) { mContext = context; onlyUsers = arg1; needPhonebook = arg2; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivitySearchAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsSearchAdapter.java similarity index 88% rename from TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivitySearchAdapter.java rename to TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsSearchAdapter.java index 16f87e897..ab1b45f60 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsActivitySearchAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsSearchAdapter.java @@ -24,26 +24,32 @@ import org.telegram.messenger.UserConfig; import org.telegram.messenger.Utilities; import org.telegram.ui.Cells.GreySectionCell; import org.telegram.ui.Cells.ProfileSearchCell; +import org.telegram.ui.Cells.UserCell; import java.util.ArrayList; import java.util.HashMap; import java.util.Timer; import java.util.TimerTask; -public class ContactsActivitySearchAdapter extends BaseContactsSearchAdapter { +public class ContactsSearchAdapter extends BaseContactsSearchAdapter { private Context mContext; private HashMap ignoreUsers; private ArrayList searchResult = new ArrayList(); private ArrayList searchResultNames = new ArrayList(); private Timer searchTimer; private boolean allowUsernameSearch; + private boolean useUserCell; - public ContactsActivitySearchAdapter(Context context, HashMap arg1, boolean usernameSearch) { + public ContactsSearchAdapter(Context context, HashMap arg1, boolean usernameSearch) { mContext = context; ignoreUsers = arg1; allowUsernameSearch = usernameSearch; } + public void setUseUserCell(boolean value) { + useUserCell = value; + } + public void searchDialogs(final String query) { try { if (searchTimer != null) { @@ -202,10 +208,13 @@ public class ContactsActivitySearchAdapter extends BaseContactsSearchAdapter { } } else { if (view == null) { - view = new ProfileSearchCell(mContext); + if (useUserCell) { + view = new UserCell(mContext, 1); + } else { + view = new ProfileSearchCell(mContext); + } } - ((ProfileSearchCell) view).useSeparator = (i != getCount() - 1 && i != searchResult.size() - 1); TLRPC.User user = getItem(i); if (user != null) { CharSequence username = null; @@ -227,13 +236,16 @@ public class ContactsActivitySearchAdapter extends BaseContactsSearchAdapter { } } - ((ProfileSearchCell) view).setData(user, null, null, name, username); - - if (ignoreUsers != null) { - if (ignoreUsers.containsKey(user.id)) { - ((ProfileSearchCell) view).drawAlpha = 0.5f; - } else { - ((ProfileSearchCell) view).drawAlpha = 1.0f; + if (useUserCell) { + ((UserCell) view).setData(user, name, username, 0); + } else { + ((ProfileSearchCell) view).useSeparator = (i != getCount() - 1 && i != searchResult.size() - 1); + if (ignoreUsers != null) { + if (ignoreUsers.containsKey(user.id)) { + ((ProfileSearchCell) view).drawAlpha = 0.5f; + } else { + ((ProfileSearchCell) view).drawAlpha = 1.0f; + } } } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/CountryAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/CountryAdapter.java new file mode 100644 index 000000000..389d17b80 --- /dev/null +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/CountryAdapter.java @@ -0,0 +1,165 @@ +/* + * This is the source code of Telegram for Android v. 1.7.x. + * It is licensed under GNU GPL v. 2 or later. + * You should have received a copy of the license in this archive (see LICENSE). + * + * Copyright Nikolai Kudashov, 2013-2014. + */ + +package org.telegram.ui.Adapters; + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; + +import org.telegram.android.AndroidUtilities; +import org.telegram.android.LocaleController; +import org.telegram.messenger.FileLog; +import org.telegram.ui.ApplicationLoader; +import org.telegram.ui.Cells.DividerCell; +import org.telegram.ui.Cells.LetterSectionCell; +import org.telegram.ui.Cells.TextSettingsCell; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; + +public class CountryAdapter extends BaseSectionsAdapter { + + public static class Country { + public String name; + public String code; + public String shortname; + } + + private Context mContext; + private HashMap> countries = new HashMap>(); + private ArrayList sortedCountries = new ArrayList(); + + public CountryAdapter(Context context) { + mContext = context; + + try { + InputStream stream = ApplicationLoader.applicationContext.getResources().getAssets().open("countries.txt"); + BufferedReader reader = new BufferedReader(new InputStreamReader(stream)); + String line; + while ((line = reader.readLine()) != null) { + String[] args = line.split(";"); + Country c = new Country(); + c.name = args[2]; + c.code = args[0]; + c.shortname = args[1]; + String n = c.name.substring(0, 1).toUpperCase(); + ArrayList arr = countries.get(n); + if (arr == null) { + arr = new ArrayList(); + countries.put(n, arr); + sortedCountries.add(n); + } + arr.add(c); + } + reader.close(); + stream.close(); + } catch (Exception e) { + FileLog.e("tmessages", e); + } + + Collections.sort(sortedCountries, new Comparator() { + @Override + public int compare(String lhs, String rhs) { + return lhs.compareTo(rhs); + } + }); + + for (ArrayList arr : countries.values()) { + Collections.sort(arr, new Comparator() { + @Override + public int compare(Country country, Country country2) { + return country.name.compareTo(country2.name); + } + }); + } + } + + public HashMap> getCountries() { + return countries; + } + + @Override + public Country getItem(int section, int position) { + if (section < 0 || section >= sortedCountries.size()) { + return null; + } + ArrayList arr = countries.get(sortedCountries.get(section)); + if (position < 0 || position >= arr.size()) { + return null; + } + return arr.get(position); + } + + @Override + public boolean isRowEnabled(int section, int row) { + ArrayList arr = countries.get(sortedCountries.get(section)); + return row < arr.size(); + } + + @Override + public int getSectionCount() { + return sortedCountries.size(); + } + + @Override + public int getCountForSection(int section) { + int count = countries.get(sortedCountries.get(section)).size(); + if (section != sortedCountries.size() - 1) { + count++; + } + return count; + } + + @Override + public View getSectionHeaderView(int section, View convertView, ViewGroup parent) { + if (convertView == null) { + convertView = new LetterSectionCell(mContext); + ((LetterSectionCell) convertView).setCellHeight(AndroidUtilities.dp(48)); + } + ((LetterSectionCell) convertView).setLetter(sortedCountries.get(section).toUpperCase()); + return convertView; + } + + @Override + public View getItemView(int section, int position, View convertView, ViewGroup parent) { + int type = getItemViewType(section, position); + if (type == 1) { + if (convertView == null) { + convertView = new DividerCell(mContext); + convertView.setPadding(AndroidUtilities.dp(LocaleController.isRTL ? 24 : 72), 0, AndroidUtilities.dp(LocaleController.isRTL ? 72 : 24), 0); + } + } else if (type == 0) { + if (convertView == null) { + convertView = new TextSettingsCell(mContext); + convertView.setPadding(AndroidUtilities.dp(LocaleController.isRTL ? 16 : 54), 0, AndroidUtilities.dp(LocaleController.isRTL ? 54 : 16), 0); + } + + ArrayList arr = countries.get(sortedCountries.get(section)); + Country c = arr.get(position); + ((TextSettingsCell) convertView).setTextAndValue(c.name, "+" + c.code, false); + } + return convertView; + } + + @Override + public int getItemViewType(int section, int position) { + ArrayList arr = countries.get(sortedCountries.get(section)); + return position < arr.size() ? 0 : 1; + } + + @Override + public int getViewTypeCount() { + return 2; + } +} diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/CountrySearchAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/CountrySearchAdapter.java new file mode 100644 index 000000000..8414dd5bd --- /dev/null +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/CountrySearchAdapter.java @@ -0,0 +1,165 @@ +/* + * This is the source code of Telegram for Android v. 1.7.x. + * It is licensed under GNU GPL v. 2 or later. + * You should have received a copy of the license in this archive (see LICENSE). + * + * Copyright Nikolai Kudashov, 2013-2014. + */ + +package org.telegram.ui.Adapters; + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; + +import org.telegram.android.AndroidUtilities; +import org.telegram.messenger.FileLog; +import org.telegram.messenger.Utilities; +import org.telegram.ui.Adapters.CountryAdapter.Country; +import org.telegram.ui.Cells.TextSettingsCell; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Timer; +import java.util.TimerTask; + +public class CountrySearchAdapter extends BaseFragmentAdapter { + + private Context mContext; + private Timer searchTimer; + private ArrayList searchResult; + private HashMap> countries; + + public CountrySearchAdapter(Context context, HashMap> countries) { + mContext = context; + this.countries = countries; + } + + public void search(final String query) { + if (query == null) { + searchResult = null; + } else { + try { + if (searchTimer != null) { + searchTimer.cancel(); + } + } catch (Exception e) { + FileLog.e("tmessages", e); + } + searchTimer = new Timer(); + searchTimer.schedule(new TimerTask() { + @Override + public void run() { + try { + searchTimer.cancel(); + searchTimer = null; + } catch (Exception e) { + FileLog.e("tmessages", e); + } + processSearch(query); + } + }, 100, 300); + } + } + + private void processSearch(final String query) { + Utilities.searchQueue.postRunnable(new Runnable() { + @Override + public void run() { + + String q = query.trim().toLowerCase(); + if (q.length() == 0) { + updateSearchResults(new ArrayList()); + return; + } + long time = System.currentTimeMillis(); + ArrayList resultArray = new ArrayList(); + + String n = query.substring(0, 1); + ArrayList arr = countries.get(n.toUpperCase()); + if (arr != null) { + for (Country c : arr) { + if (c.name.toLowerCase().startsWith(query)) { + resultArray.add(c); + } + } + } + + updateSearchResults(resultArray); + } + }); + } + + private void updateSearchResults(final ArrayList arrCounties) { + AndroidUtilities.runOnUIThread(new Runnable() { + @Override + public void run() { + searchResult = arrCounties; + notifyDataSetChanged(); + } + }); + } + + @Override + public boolean areAllItemsEnabled() { + return true; + } + + @Override + public boolean isEnabled(int i) { + return true; + } + + @Override + public int getCount() { + if (searchResult == null) { + return 0; + } + return searchResult.size(); + } + + @Override + public Country getItem(int i) { + if (i < 0 || i >= searchResult.size()) { + return null; + } + return searchResult.get(i); + } + + @Override + public long getItemId(int i) { + return i; + } + + @Override + public boolean hasStableIds() { + return true; + } + + @Override + public View getView(int i, View view, ViewGroup viewGroup) { + if (view == null) { + view = new TextSettingsCell(mContext); + } + + Country c = searchResult.get(i); + ((TextSettingsCell) view).setTextAndValue(c.name, "+" + c.code, i != searchResult.size() - 1); + + return view; + } + + @Override + public int getItemViewType(int i) { + return 0; + } + + @Override + public int getViewTypeCount() { + return 1; + } + + @Override + public boolean isEmpty() { + return searchResult == null || searchResult.size() == 0; + } +} diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MessagesActivityAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java similarity index 96% rename from TMessagesProj/src/main/java/org/telegram/ui/Adapters/MessagesActivityAdapter.java rename to TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java index 9533d38c1..afa3db16b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MessagesActivityAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java @@ -20,13 +20,13 @@ import org.telegram.messenger.R; import org.telegram.messenger.TLRPC; import org.telegram.ui.Cells.DialogCell; -public class MessagesActivityAdapter extends BaseFragmentAdapter { +public class DialogsAdapter extends BaseFragmentAdapter { private Context mContext; private boolean serverOnly; private long openedDialogId; - public MessagesActivityAdapter(Context context, boolean onlyFromServer) { + public DialogsAdapter(Context context, boolean onlyFromServer) { mContext = context; serverOnly = onlyFromServer; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MessagesActivitySearchAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java similarity index 99% rename from TMessagesProj/src/main/java/org/telegram/ui/Adapters/MessagesActivitySearchAdapter.java rename to TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java index 348cb493e..2a680d840 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MessagesActivitySearchAdapter.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java @@ -38,7 +38,7 @@ import java.util.ArrayList; import java.util.Timer; import java.util.TimerTask; -public class MessagesActivitySearchAdapter extends BaseContactsSearchAdapter { +public class DialogsSearchAdapter extends BaseContactsSearchAdapter { private Context mContext; private Timer searchTimer; private ArrayList searchResult = new ArrayList(); @@ -53,7 +53,7 @@ public class MessagesActivitySearchAdapter extends BaseContactsSearchAdapter { public abstract void searchStateChanged(boolean searching); } - public MessagesActivitySearchAdapter(Context context) { + public DialogsSearchAdapter(Context context) { mContext = context; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Animation/ObjectAnimator10.java b/TMessagesProj/src/main/java/org/telegram/ui/Animation/ObjectAnimator10.java index 6aa87d569..9f7ea7369 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Animation/ObjectAnimator10.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Animation/ObjectAnimator10.java @@ -18,8 +18,6 @@ package org.telegram.ui.Animation; import android.view.View; -import org.telegram.ui.Views.ActionBar.ActionBarLayout; - import java.util.HashMap; public final class ObjectAnimator10 extends ValueAnimator { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java similarity index 96% rename from TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsersActivity.java rename to TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java index b7504f7b0..5d361b094 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java @@ -33,11 +33,11 @@ import org.telegram.messenger.R; import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Cells.TextInfoCell; import org.telegram.ui.Cells.UserCell; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.BaseFragment; -public class SettingsBlockedUsersActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, ContactsActivity.ContactsActivityDelegate { +public class BlockedUsersActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, ContactsActivity.ContactsActivityDelegate { private ListView listView; private ListAdapter listViewAdapter; private FrameLayout progressView; @@ -79,7 +79,7 @@ public class SettingsBlockedUsersActivity extends BaseFragment implements Notifi args.putBoolean("destroyAfterSelect", true); args.putBoolean("returnAsResult", true); ContactsActivity fragment = new ContactsActivity(args); - fragment.setDelegate(SettingsBlockedUsersActivity.this); + fragment.setDelegate(BlockedUsersActivity.this); presentFragment(fragment); } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java index 9c385265f..3f04768af 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java @@ -109,7 +109,7 @@ public class DialogCell extends BaseCell { if (namePaint == null) { namePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG); namePaint.setTextSize(AndroidUtilities.dp(17)); - namePaint.setColor(0xff222222); + namePaint.setColor(0xff212121); namePaint.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); nameEncryptedPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/LetterSectionCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/LetterSectionCell.java index ad385f981..40e5b3a1f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/LetterSectionCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/LetterSectionCell.java @@ -40,4 +40,8 @@ public class LetterSectionCell extends FrameLayout { public void setLetter(String letter) { textView.setText(letter.toUpperCase()); } + + public void setCellHeight(int height) { + setLayoutParams(new ViewGroup.LayoutParams(AndroidUtilities.dp(54), height)); + } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java index b8d5ac16f..40ac40264 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ProfileSearchCell.java @@ -79,7 +79,7 @@ public class ProfileSearchCell extends BaseCell { if (namePaint == null) { namePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG); namePaint.setTextSize(AndroidUtilities.dp(17)); - namePaint.setColor(0xff222222); + namePaint.setColor(0xff212121); namePaint.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); nameEncryptedPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSettingsCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSettingsCell.java index 4d56c03e5..5a3baf8ce 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSettingsCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSettingsCell.java @@ -11,6 +11,7 @@ package org.telegram.ui.Cells; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; +import android.text.TextUtils; import android.util.TypedValue; import android.view.Gravity; import android.widget.FrameLayout; @@ -41,10 +42,11 @@ public class TextSettingsCell extends FrameLayout { textView.setLines(1); textView.setMaxLines(1); textView.setSingleLine(true); + textView.setEllipsize(TextUtils.TruncateAt.END); textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL); addView(textView); LayoutParams layoutParams = (LayoutParams) textView.getLayoutParams(); - layoutParams.width = LayoutParams.MATCH_PARENT; + layoutParams.width = LayoutParams.WRAP_CONTENT; layoutParams.height = LayoutParams.MATCH_PARENT; layoutParams.leftMargin = AndroidUtilities.dp(17); layoutParams.rightMargin = AndroidUtilities.dp(17); @@ -57,6 +59,7 @@ public class TextSettingsCell extends FrameLayout { valueTextView.setLines(1); valueTextView.setMaxLines(1); valueTextView.setSingleLine(true); + valueTextView.setEllipsize(TextUtils.TruncateAt.END); valueTextView.setGravity((LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT) | Gravity.CENTER_VERTICAL); addView(valueTextView); layoutParams = (LayoutParams) valueTextView.getLayoutParams(); @@ -70,7 +73,17 @@ public class TextSettingsCell extends FrameLayout { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(48) + (needDivider ? 1 : 0), MeasureSpec.EXACTLY)); + setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), AndroidUtilities.dp(48) + (needDivider ? 1 : 0)); + + int availableWidth = getMeasuredWidth() - getPaddingLeft() - getPaddingRight() - AndroidUtilities.dp(34); + int width = availableWidth / 2; + if (valueTextView.getVisibility() == VISIBLE) { + valueTextView.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(getMeasuredHeight(), MeasureSpec.EXACTLY)); + width = availableWidth - valueTextView.getMeasuredWidth() - AndroidUtilities.dp(8); + } else { + width = availableWidth; + } + textView.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(getMeasuredHeight(), MeasureSpec.EXACTLY)); } public void setTextColor(int color) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java index 795e80d1b..e17397a8c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java @@ -12,6 +12,7 @@ import android.content.Context; import android.text.TextUtils; import android.util.TypedValue; import android.view.Gravity; +import android.widget.CheckBox; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; @@ -33,6 +34,7 @@ public class UserCell extends FrameLayout { private TextView nameTextView; private TextView statusTextView; private ImageView imageView; + private CheckBox checkBox; private AvatarDrawable avatarDrawable; private TLRPC.User currentUser = null; @@ -65,7 +67,7 @@ public class UserCell extends FrameLayout { avatarDrawable = new AvatarDrawable(); nameTextView = new TextView(context); - nameTextView.setTextColor(0xff000000); + nameTextView.setTextColor(0xff212121); nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 17); nameTextView.setLines(1); nameTextView.setMaxLines(1); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChangeChatNameActivity.java similarity index 74% rename from TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java rename to TMessagesProj/src/main/java/org/telegram/ui/ChangeChatNameActivity.java index 461672d57..210dbf57c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChangeChatNameActivity.java @@ -19,7 +19,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; -import android.widget.Button; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; @@ -29,16 +28,20 @@ import org.telegram.android.LocaleController; import org.telegram.messenger.TLRPC; import org.telegram.android.MessagesController; import org.telegram.messenger.R; -import org.telegram.ui.Views.ActionBar.BaseFragment; -import org.telegram.ui.Views.SettingsSectionLayout; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.BaseFragment; + +public class ChangeChatNameActivity extends BaseFragment { -public class ChatProfileChangeNameActivity extends BaseFragment { private EditText firstNameField; private View headerLabelView; private int chat_id; private View doneButton; - public ChatProfileChangeNameActivity(Bundle args) { + private final static int done_button = 1; + + public ChangeChatNameActivity(Bundle args) { super(args); } @@ -52,40 +55,34 @@ public class ChatProfileChangeNameActivity extends BaseFragment { @Override public View createView(LayoutInflater inflater, ViewGroup container) { if (fragmentView == null) { - actionBar.setCustomView(R.layout.settings_do_action_layout); - Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button); - cancelButton.setOnClickListener(new View.OnClickListener() { + actionBar.setBackButtonImage(R.drawable.ic_ab_back); + actionBar.setBackOverlay(R.layout.updating_state_layout); + actionBar.setTitle(LocaleController.getString("EditName", R.string.EditName)); + actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { @Override - public void onClick(View view) { - finishFragment(); - } - }); - doneButton = actionBar.findViewById(R.id.done_button); - doneButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - if (firstNameField.getText().length() != 0) { - saveName(); + public void onItemClick(int id) { + if (id == -1) { finishFragment(); + } else if (id == done_button) { + if (firstNameField.getText().length() != 0) { + saveName(); + finishFragment(); + } } } }); - cancelButton.setText(LocaleController.getString("Cancel", R.string.Cancel).toUpperCase()); - TextView textView = (TextView)doneButton.findViewById(R.id.done_button_text); - textView.setText(LocaleController.getString("Done", R.string.Done).toUpperCase()); + ActionBarMenu menu = actionBar.createMenu(); + doneButton = menu.addItem(done_button, R.drawable.ic_done); TLRPC.Chat currentChat = MessagesController.getInstance().getChat(chat_id); fragmentView = new LinearLayout(inflater.getContext()); fragmentView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); - fragmentView.setPadding(AndroidUtilities.dp(16), AndroidUtilities.dp(8), AndroidUtilities.dp(16), 0); + fragmentView.setPadding(0, AndroidUtilities.dp(8), 0, 0); ((LinearLayout) fragmentView).setOrientation(LinearLayout.VERTICAL); - SettingsSectionLayout settingsSectionLayout = new SettingsSectionLayout(inflater.getContext()); - ((LinearLayout) fragmentView).addView(settingsSectionLayout); - firstNameField = new EditText(inflater.getContext()); firstNameField.setText(currentChat.title); firstNameField.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 19); @@ -114,15 +111,15 @@ public class ChatProfileChangeNameActivity extends BaseFragment { ((LinearLayout) fragmentView).addView(firstNameField); LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams)firstNameField.getLayoutParams(); layoutParams.topMargin = AndroidUtilities.dp(15); + layoutParams.leftMargin = AndroidUtilities.dp(16); + layoutParams.rightMargin = AndroidUtilities.dp(16); layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT; layoutParams.height = LinearLayout.LayoutParams.WRAP_CONTENT; firstNameField.setLayoutParams(layoutParams); if (chat_id > 0) { - settingsSectionLayout.setText(LocaleController.getString("EnterGroupNameTitle", R.string.EnterGroupNameTitle)); firstNameField.setHint(LocaleController.getString("GroupName", R.string.GroupName)); } else { - settingsSectionLayout.setText(LocaleController.getString("EnterListName", R.string.EnterListName).toUpperCase()); firstNameField.setHint(LocaleController.getString("EnterListName", R.string.EnterListName)); } firstNameField.setSelection(firstNameField.length()); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChangeNameActivity.java similarity index 88% rename from TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java rename to TMessagesProj/src/main/java/org/telegram/ui/ChangeNameActivity.java index bc3c78b40..90967404e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChangeNameActivity.java @@ -18,7 +18,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; -import android.widget.Button; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; @@ -33,40 +32,44 @@ import org.telegram.android.NotificationCenter; import org.telegram.messenger.R; import org.telegram.messenger.RPCRequest; import org.telegram.messenger.UserConfig; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.SettingsSectionLayout; -public class SettingsChangeNameActivity extends BaseFragment { +public class ChangeNameActivity extends BaseFragment { + private EditText firstNameField; private EditText lastNameField; private View headerLabelView; private View doneButton; + private final static int done_button = 1; + @Override public View createView(LayoutInflater inflater, ViewGroup container) { if (fragmentView == null) { - actionBar.setCustomView(R.layout.settings_do_action_layout); - Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button); - cancelButton.setOnClickListener(new View.OnClickListener() { + actionBar.setBackButtonImage(R.drawable.ic_ab_back); + actionBar.setBackOverlay(R.layout.updating_state_layout); + actionBar.setTitle(LocaleController.getString("EditName", R.string.EditName)); + actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { @Override - public void onClick(View view) { - finishFragment(); - } - }); - doneButton = actionBar.findViewById(R.id.done_button); - doneButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - if (firstNameField.getText().length() != 0) { - saveName(); + public void onItemClick(int id) { + if (id == -1) { finishFragment(); + } else if (id == done_button) { + if (firstNameField.getText().length() != 0) { + saveName(); + finishFragment(); + } } } }); - cancelButton.setText(LocaleController.getString("Cancel", R.string.Cancel).toUpperCase()); - TextView textView = (TextView)doneButton.findViewById(R.id.done_button_text); - textView.setText(LocaleController.getString("Done", R.string.Done).toUpperCase()); + ActionBarMenu menu = actionBar.createMenu(); + doneButton = menu.addItem(done_button, R.drawable.ic_done); + + fragmentView = inflater.inflate(R.layout.contact_add_layout, container, false); TLRPC.User user = MessagesController.getInstance().getUser(UserConfig.getClientUserId()); if (user == null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeUsernameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java similarity index 94% rename from TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeUsernameActivity.java rename to TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java index 3941c4225..3f78310a1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeUsernameActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java @@ -24,7 +24,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; -import android.widget.Button; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; @@ -41,12 +40,14 @@ import org.telegram.messenger.RPCRequest; import org.telegram.messenger.TLObject; import org.telegram.messenger.TLRPC; import org.telegram.messenger.UserConfig; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.SettingsSectionLayout; import java.util.ArrayList; -public class SettingsChangeUsernameActivity extends BaseFragment { +public class ChangeUsernameActivity extends BaseFragment { private EditText firstNameField; private View doneButton; @@ -56,28 +57,27 @@ public class SettingsChangeUsernameActivity extends BaseFragment { private Runnable checkRunnable = null; private boolean lastNameAvailable = false; + private final static int done_button = 1; + @Override public View createView(LayoutInflater inflater, ViewGroup container) { if (fragmentView == null) { - actionBar.setCustomView(R.layout.settings_do_action_layout); - Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button); - cancelButton.setOnClickListener(new View.OnClickListener() { + actionBar.setBackButtonImage(R.drawable.ic_ab_back); + actionBar.setBackOverlay(R.layout.updating_state_layout); + actionBar.setTitle(LocaleController.getString("Username", R.string.Username)); + actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { @Override - public void onClick(View view) { - finishFragment(); - } - }); - doneButton = actionBar.findViewById(R.id.done_button); - doneButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - saveName(); + public void onItemClick(int id) { + if (id == -1) { + finishFragment(); + } else if (id == done_button) { + saveName(); + } } }); - cancelButton.setText(LocaleController.getString("Cancel", R.string.Cancel).toUpperCase()); - TextView textView = (TextView)doneButton.findViewById(R.id.done_button_text); - textView.setText(LocaleController.getString("Done", R.string.Done).toUpperCase()); + ActionBarMenu menu = actionBar.createMenu(); + doneButton = menu.addItem(done_button, R.drawable.ic_done); TLRPC.User user = MessagesController.getInstance().getUser(UserConfig.getClientUserId()); if (user == null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index f6286ab7c..527d3cb80 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -71,12 +71,12 @@ import org.telegram.ui.Cells.ChatBaseCell; import org.telegram.ui.Cells.ChatContactCell; import org.telegram.ui.Cells.ChatMediaCell; import org.telegram.ui.Cells.ChatMessageCell; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.BackupImageView; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.ChatActivityEnterView; import org.telegram.android.ImageReceiver; import org.telegram.ui.Views.LayoutListView; @@ -2364,6 +2364,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not public void onClick(View v) { Bundle args = new Bundle(); args.putInt("user_id", currentUser.id); + args.putBoolean("addContact", true); presentFragment(new ContactAddActivity(args)); } }); @@ -3292,6 +3293,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not Bundle args = new Bundle(); args.putInt("user_id", messageObject.messageOwner.media.user_id); args.putString("phone", messageObject.messageOwner.media.phone_number); + args.putBoolean("addContact", true); presentFragment(new ContactAddActivity(args)); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java index d4c2f7ef4..670eee6c1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java @@ -17,7 +17,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; -import android.widget.Button; import android.widget.EditText; import android.widget.TextView; @@ -29,13 +28,14 @@ import org.telegram.messenger.TLRPC; import org.telegram.android.MessagesController; import org.telegram.android.NotificationCenter; import org.telegram.messenger.R; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.BackupImageView; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; public class ContactAddActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { - private int user_id; - private String phone = null; + private View doneButton; private EditText firstNameField; private EditText lastNameField; @@ -43,6 +43,12 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent private TextView onlineText; private TextView phoneText; + private int user_id; + private boolean addContact; + private String phone = null; + + private final static int done_button = 1; + public ContactAddActivity(Bundle args) { super(args); } @@ -52,6 +58,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent NotificationCenter.getInstance().addObserver(this, NotificationCenter.updateInterfaces); user_id = getArguments().getInt("user_id", 0); phone = getArguments().getString("phone"); + addContact = getArguments().getBoolean("addContact", false); TLRPC.User user = MessagesController.getInstance().getUser(user_id); return user != null && super.onFragmentCreate(); } @@ -65,32 +72,33 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent @Override public View createView(LayoutInflater inflater, ViewGroup container) { if (fragmentView == null) { - actionBar.setCustomView(R.layout.settings_do_action_layout); - Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button); - cancelButton.setOnClickListener(new View.OnClickListener() { + actionBar.setBackButtonImage(R.drawable.ic_ab_back); + actionBar.setBackOverlay(R.layout.updating_state_layout); + if (addContact) { + actionBar.setTitle(LocaleController.getString("AddContactTitle", R.string.AddContactTitle)); + } else { + actionBar.setTitle(LocaleController.getString("EditName", R.string.EditName)); + } + actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { @Override - public void onClick(View view) { - finishFragment(); - } - }); - doneButton = actionBar.findViewById(R.id.done_button); - doneButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - if (firstNameField.getText().length() != 0) { - TLRPC.User user = MessagesController.getInstance().getUser(user_id); - user.first_name = firstNameField.getText().toString(); - user.last_name = lastNameField.getText().toString(); - ContactsController.getInstance().addContact(user); + public void onItemClick(int id) { + if (id == -1) { finishFragment(); - NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, MessagesController.UPDATE_MASK_NAME); + } else if (id == done_button) { + if (firstNameField.getText().length() != 0) { + TLRPC.User user = MessagesController.getInstance().getUser(user_id); + user.first_name = firstNameField.getText().toString(); + user.last_name = lastNameField.getText().toString(); + ContactsController.getInstance().addContact(user); + finishFragment(); + NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, MessagesController.UPDATE_MASK_NAME); + } } } }); - cancelButton.setText(LocaleController.getString("Cancel", R.string.Cancel).toUpperCase()); - TextView textView = (TextView)doneButton.findViewById(R.id.done_button_text); - textView.setText(LocaleController.getString("Done", R.string.Done).toUpperCase()); + ActionBarMenu menu = actionBar.createMenu(); + doneButton = menu.addItem(done_button, R.drawable.ic_done); fragmentView = inflater.inflate(R.layout.contact_add_layout, container, false); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java index 5e4154909..f6716a91b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java @@ -39,13 +39,13 @@ import org.telegram.android.NotificationCenter; import org.telegram.messenger.R; import org.telegram.messenger.UserConfig; import org.telegram.ui.Adapters.BaseSectionsAdapter; -import org.telegram.ui.Adapters.ContactsActivityAdapter; -import org.telegram.ui.Adapters.ContactsActivitySearchAdapter; +import org.telegram.ui.Adapters.ContactsAdapter; +import org.telegram.ui.Adapters.ContactsSearchAdapter; import org.telegram.ui.Cells.UserCell; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.SectionsListView; import java.util.ArrayList; @@ -56,7 +56,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter private BaseSectionsAdapter listViewAdapter; private TextView emptyTextView; private SectionsListView listView; - private ContactsActivitySearchAdapter searchListViewAdapter; + private ContactsSearchAdapter searchListViewAdapter; private boolean searchWas; private boolean searching; @@ -150,7 +150,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter } listView.setFastScrollEnabled(true); listView.setVerticalScrollBarEnabled(false); - emptyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts)); } @@ -179,8 +178,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter } }); - searchListViewAdapter = new ContactsActivitySearchAdapter(getParentActivity(), ignoreUsers, allowUsernameSearch); - listViewAdapter = new ContactsActivityAdapter(getParentActivity(), onlyUsers, needPhonebook, ignoreUsers); + searchListViewAdapter = new ContactsSearchAdapter(getParentActivity(), ignoreUsers, allowUsernameSearch); + listViewAdapter = new ContactsAdapter(getParentActivity(), onlyUsers, needPhonebook, ignoreUsers); fragmentView = new FrameLayout(getParentActivity()); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/CountrySelectActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/CountrySelectActivity.java index c687be750..890ff6600 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/CountrySelectActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/CountrySelectActivity.java @@ -8,40 +8,30 @@ package org.telegram.ui; -import android.content.Context; +import android.os.Build; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.AdapterView; -import android.widget.BaseAdapter; import android.widget.EditText; +import android.widget.FrameLayout; +import android.widget.ListView; import android.widget.TextView; import org.telegram.android.AndroidUtilities; -import org.telegram.messenger.FileLog; import org.telegram.android.LocaleController; import org.telegram.messenger.R; -import org.telegram.messenger.Utilities; -import org.telegram.ui.Adapters.BaseFragmentAdapter; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; -import org.telegram.ui.Views.ActionBar.BaseFragment; -import org.telegram.ui.Views.PinnedHeaderListView; -import org.telegram.ui.Views.SectionedBaseAdapter; -import org.telegram.ui.Views.SettingsSectionLayout; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Timer; -import java.util.TimerTask; +import org.telegram.ui.Adapters.CountryAdapter; +import org.telegram.ui.Adapters.CountryAdapter.Country; +import org.telegram.ui.Adapters.CountrySearchAdapter; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.BaseFragment; +import org.telegram.ui.Views.SectionsListView; public class CountrySelectActivity extends BaseFragment { @@ -49,68 +39,18 @@ public class CountrySelectActivity extends BaseFragment { public abstract void didSelectCountry(String name); } - private SectionedBaseAdapter listViewAdapter; - private PinnedHeaderListView listView; + private SectionsListView listView; + private TextView emptyTextView; + private CountryAdapter listViewAdapter; + private CountrySearchAdapter searchListViewAdapter; + private boolean searchWas; private boolean searching; - private BaseAdapter searchListViewAdapter; - private TextView emptyTextView; - private HashMap> countries = new HashMap>(); - private ArrayList sortedCountries = new ArrayList(); + private CountrySelectActivityDelegate delegate; - private Timer searchTimer; - public ArrayList searchResult; - - public static class Country { - public String name; - public String code; - public String shortname; - } - @Override public boolean onFragmentCreate() { - try { - InputStream stream = ApplicationLoader.applicationContext.getResources().getAssets().open("countries.txt"); - BufferedReader reader = new BufferedReader(new InputStreamReader(stream)); - String line; - while ((line = reader.readLine()) != null) { - String[] args = line.split(";"); - Country c = new Country(); - c.name = args[2]; - c.code = args[0]; - c.shortname = args[1]; - String n = c.name.substring(0, 1).toUpperCase(); - ArrayList arr = countries.get(n); - if (arr == null) { - arr = new ArrayList(); - countries.put(n, arr); - sortedCountries.add(n); - } - arr.add(c); - } - reader.close(); - stream.close(); - } catch (Exception e) { - FileLog.e("tmessages", e); - } - - Collections.sort(sortedCountries, new Comparator() { - @Override - public int compare(String lhs, String rhs) { - return lhs.compareTo(rhs); - } - }); - - for (ArrayList arr : countries.values()) { - Collections.sort(arr, new Comparator() { - @Override - public int compare(Country country, Country country2) { - return country.name.compareTo(country2.name); - } - }); - } - return super.onFragmentCreate(); } @@ -120,7 +60,7 @@ public class CountrySelectActivity extends BaseFragment { } @Override - public View createView(LayoutInflater inflater, ViewGroup container) { + public View createView(LayoutInflater inflater, final ViewGroup container) { if (fragmentView == null) { actionBar.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackOverlay(R.layout.updating_state_layout); @@ -144,16 +84,11 @@ public class CountrySelectActivity extends BaseFragment { @Override public void onSearchCollapse() { - search(null); + searchListViewAdapter.search(null); searching = false; searchWas = false; ViewGroup group = (ViewGroup) listView.getParent(); listView.setAdapter(listViewAdapter); - if (!LocaleController.isRTL) { - listView.setPadding(AndroidUtilities.dp(16), listView.getPaddingTop(), AndroidUtilities.dp(30), listView.getPaddingBottom()); - } else { - listView.setPadding(AndroidUtilities.dp(30), listView.getPaddingTop(), AndroidUtilities.dp(16), listView.getPaddingBottom()); - } if (android.os.Build.VERSION.SDK_INT >= 11) { listView.setFastScrollAlwaysVisible(true); } @@ -166,11 +101,10 @@ public class CountrySelectActivity extends BaseFragment { @Override public void onTextChanged(EditText editText) { String text = editText.getText().toString(); - search(text); + searchListViewAdapter.search(text); if (text.length() != 0) { searchWas = true; if (listView != null) { - listView.setPadding(AndroidUtilities.dp(16), listView.getPaddingTop(), AndroidUtilities.dp(16), listView.getPaddingBottom()); listView.setAdapter(searchListViewAdapter); if(android.os.Build.VERSION.SDK_INT >= 11) { listView.setFastScrollAlwaysVisible(false); @@ -179,7 +113,7 @@ public class CountrySelectActivity extends BaseFragment { listView.setVerticalScrollBarEnabled(true); } if (emptyTextView != null) { - emptyTextView.setText(LocaleController.getString("NoResult", R.string.NoResult)); + } } } @@ -188,51 +122,69 @@ public class CountrySelectActivity extends BaseFragment { searching = false; searchWas = false; - fragmentView = inflater.inflate(R.layout.country_select_layout, container, false); + listViewAdapter = new CountryAdapter(getParentActivity()); + searchListViewAdapter = new CountrySearchAdapter(getParentActivity(), listViewAdapter.getCountries()); - emptyTextView = (TextView)fragmentView.findViewById(R.id.searchEmptyView); - searchListViewAdapter = new SearchAdapter(getParentActivity()); + fragmentView = new FrameLayout(getParentActivity()); - listView = (PinnedHeaderListView)fragmentView.findViewById(R.id.listView); - listView.setEmptyView(emptyTextView); + emptyTextView = new TextView(getParentActivity()); + emptyTextView.setTextColor(0xff808080); + emptyTextView.setTextSize(24); + emptyTextView.setGravity(Gravity.CENTER); + emptyTextView.setVisibility(View.INVISIBLE); + emptyTextView.setText(LocaleController.getString("NoResult", R.string.NoResult)); + ((FrameLayout) fragmentView).addView(emptyTextView); + FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) emptyTextView.getLayoutParams(); + layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; + layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT; + layoutParams.gravity = Gravity.TOP; + emptyTextView.setLayoutParams(layoutParams); emptyTextView.setOnTouchListener(new View.OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { return true; } }); - listView.setVerticalScrollBarEnabled(false); - listView.setAdapter(listViewAdapter = new ListAdapter(getParentActivity())); + listView = new SectionsListView(getParentActivity()); + listView.setEmptyView(emptyTextView); + listView.setVerticalScrollBarEnabled(false); + listView.setDivider(null); + listView.setDividerHeight(0); + listView.setFastScrollEnabled(true); + listView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY); + listView.setAdapter(listViewAdapter); + if (Build.VERSION.SDK_INT >= 11) { + listView.setFastScrollAlwaysVisible(true); + listView.setVerticalScrollbarPosition(LocaleController.isRTL ? ListView.SCROLLBAR_POSITION_LEFT : ListView.SCROLLBAR_POSITION_RIGHT); + } + ((FrameLayout) fragmentView).addView(listView); + layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams(); + layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; + layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT; + listView.setLayoutParams(layoutParams); + listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { - if (i < 0) { - return; - } + Country country = null; if (searching && searchWas) { - if (i >= 0 && i < searchResult.size()) { - Country c = searchResult.get(i); - if (delegate != null) { - delegate.didSelectCountry(c.name); - } - finishFragment(); - } + country = searchListViewAdapter.getItem(i); } else { int section = listViewAdapter.getSectionForPosition(i); int row = listViewAdapter.getPositionInSectionForPosition(i); - if (section >= 0 && section < sortedCountries.size()) { - String n = sortedCountries.get(section); - ArrayList arr = countries.get(n); - if (row >= 0 && row < arr.size()) { - Country c = arr.get(row); - if (delegate != null) { - delegate.didSelectCountry(c.name); - } - finishFragment(); - } + if (row < 0 || section < 0) { + return; } + country = listViewAdapter.getItem(section, row); } + if (i < 0) { + return; + } + if (country != null && delegate != null) { + delegate.didSelectCountry(country.name); + } + finishFragment(); } }); @@ -265,234 +217,7 @@ public class CountrySelectActivity extends BaseFragment { } } - public void search(final String query) { - if (query == null) { - searchResult = null; - } else { - try { - if (searchTimer != null) { - searchTimer.cancel(); - } - } catch (Exception e) { - FileLog.e("tmessages", e); - } - searchTimer = new Timer(); - searchTimer.schedule(new TimerTask() { - @Override - public void run() { - try { - searchTimer.cancel(); - searchTimer = null; - } catch (Exception e) { - FileLog.e("tmessages", e); - } - processSearch(query); - } - }, 100, 300); - } - } - - private void processSearch(final String query) { - Utilities.searchQueue.postRunnable(new Runnable() { - @Override - public void run() { - - String q = query.trim().toLowerCase(); - if (q.length() == 0) { - updateSearchResults(new ArrayList()); - return; - } - long time = System.currentTimeMillis(); - ArrayList resultArray = new ArrayList(); - - String n = query.substring(0, 1); - ArrayList arr = countries.get(n.toUpperCase()); - if (arr != null) { - for (Country c : arr) { - if (c.name.toLowerCase().startsWith(query)) { - resultArray.add(c); - } - } - } - - updateSearchResults(resultArray); - } - }); - } - public void setCountrySelectActivityDelegate(CountrySelectActivityDelegate delegate) { this.delegate = delegate; } - - private void updateSearchResults(final ArrayList arrCounties) { - AndroidUtilities.runOnUIThread(new Runnable() { - @Override - public void run() { - searchResult = arrCounties; - searchListViewAdapter.notifyDataSetChanged(); - } - }); - } - - private class SearchAdapter extends BaseFragmentAdapter { - private Context mContext; - - public SearchAdapter(Context context) { - mContext = context; - } - - @Override - public boolean areAllItemsEnabled() { - return true; - } - - @Override - public boolean isEnabled(int i) { - return true; - } - - @Override - public int getCount() { - if (searchResult == null) { - return 0; - } - return searchResult.size(); - } - - @Override - public Object getItem(int i) { - return null; - } - - @Override - public long getItemId(int i) { - return i; - } - - @Override - public boolean hasStableIds() { - return false; - } - - @Override - public View getView(int i, View view, ViewGroup viewGroup) { - if (view == null) { - LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - view = li.inflate(R.layout.country_row_layout, viewGroup, false); - } - TextView textView = (TextView)view.findViewById(R.id.settings_row_text); - TextView detailTextView = (TextView)view.findViewById(R.id.settings_row_text_detail); - View divider = view.findViewById(R.id.settings_row_divider); - - Country c = searchResult.get(i); - textView.setText(c.name); - detailTextView.setText("+" + c.code); - if (i == searchResult.size() - 1) { - divider.setVisibility(View.GONE); - } else { - divider.setVisibility(View.VISIBLE); - } - - return view; - } - - @Override - public int getItemViewType(int i) { - return 0; - } - - @Override - public int getViewTypeCount() { - return 1; - } - - @Override - public boolean isEmpty() { - return searchResult == null || searchResult.size() == 0; - } - } - - private class ListAdapter extends SectionedBaseAdapter { - private Context mContext; - - public ListAdapter(Context context) { - mContext = context; - } - - @Override - public Object getItem(int section, int position) { - return null; - } - - @Override - public long getItemId(int section, int position) { - return 0; - } - - @Override - public int getSectionCount() { - return sortedCountries.size(); - } - - @Override - public int getCountForSection(int section) { - String n = sortedCountries.get(section); - ArrayList arr = countries.get(n); - return arr.size(); - } - - @Override - public View getItemView(int section, int position, View convertView, ViewGroup parent) { - if (convertView == null) { - LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - convertView = li.inflate(R.layout.country_row_layout, parent, false); - } - TextView textView = (TextView)convertView.findViewById(R.id.settings_row_text); - TextView detailTextView = (TextView)convertView.findViewById(R.id.settings_row_text_detail); - View divider = convertView.findViewById(R.id.settings_row_divider); - - String n = sortedCountries.get(section); - ArrayList arr = countries.get(n); - Country c = arr.get(position); - textView.setText(c.name); - detailTextView.setText("+" + c.code); - if (position == arr.size() - 1) { - divider.setVisibility(View.GONE); - } else { - divider.setVisibility(View.VISIBLE); - } - - return convertView; - } - - @Override - public int getItemViewType(int section, int position) { - return 0; - } - - @Override - public int getItemViewTypeCount() { - return 1; - } - - @Override - public int getSectionHeaderViewType(int section) { - return 0; - } - - @Override - public int getSectionHeaderViewTypeCount() { - return 1; - } - - @Override - public View getSectionHeaderView(int section, View convertView, ViewGroup parent) { - if (convertView == null) { - convertView = new SettingsSectionLayout(mContext); - convertView.setBackgroundColor(0xfffafafa); - } - ((SettingsSectionLayout) convertView).setText(sortedCountries.get(section).toUpperCase()); - return convertView; - } - } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java index d3788938b..ca5d47f5a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/DocumentSelectActivity.java @@ -29,11 +29,11 @@ import org.telegram.android.LocaleController; import org.telegram.messenger.R; import org.telegram.messenger.Utilities; import org.telegram.ui.Adapters.BaseFragmentAdapter; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.BackupImageView; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; import java.io.BufferedReader; import java.io.File; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java index 71b3f184e..32c49b260 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java @@ -17,6 +17,7 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; import android.text.Editable; +import android.text.InputType; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; @@ -28,6 +29,7 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.EditorInfo; import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.EditText; @@ -46,11 +48,11 @@ import org.telegram.android.MessagesController; import org.telegram.android.NotificationCenter; import org.telegram.messenger.R; import org.telegram.ui.Adapters.BaseSectionsAdapter; -import org.telegram.ui.Adapters.ContactsActivityAdapter; -import org.telegram.ui.Adapters.ContactsActivitySearchAdapter; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.Adapters.ContactsAdapter; +import org.telegram.ui.Adapters.ContactsSearchAdapter; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.SectionsListView; import java.util.ArrayList; @@ -87,7 +89,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen private TextView emptyTextView; private EditText userSelectEditText; private SectionsListView listView; - private ContactsActivitySearchAdapter searchListViewAdapter; + private ContactsSearchAdapter searchListViewAdapter; private int beforeChangeIndex; private int maxCount = 200; @@ -160,85 +162,17 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen TextView doneTextView = (TextView)doneItem.findViewById(R.id.done_button); doneTextView.setText(LocaleController.getString("Next", R.string.Next)); - searchListViewAdapter = new ContactsActivitySearchAdapter(getParentActivity(), null, false); - listViewAdapter = new ContactsActivityAdapter(getParentActivity(), true, false, null); - - /* - - - - - - - - - - ------------RTL---------- END - - - - - - */ + searchListViewAdapter = new ContactsSearchAdapter(getParentActivity(), null, false); + listViewAdapter = new ContactsAdapter(getParentActivity(), true, false, null); + searchListViewAdapter.setUseUserCell(true); fragmentView = new LinearLayout(getParentActivity()); LinearLayout linearLayout = (LinearLayout) fragmentView; linearLayout.setOrientation(LinearLayout.VERTICAL); - emptyTextView = new TextView(getParentActivity()); - emptyTextView.setTextColor(0xff808080); - emptyTextView.setTextSize(24); - emptyTextView.setGravity(Gravity.CENTER); - emptyTextView.setVisibility(View.INVISIBLE); - emptyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts)); - linearLayout.addView(emptyTextView); - LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) emptyTextView.getLayoutParams(); - layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT; - layoutParams.height = LinearLayout.LayoutParams.MATCH_PARENT; - layoutParams.gravity = Gravity.TOP; - emptyTextView.setLayoutParams(layoutParams); - emptyTextView.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - return true; - } - }); - FrameLayout frameLayout = new FrameLayout(getParentActivity()); linearLayout.addView(frameLayout); - layoutParams = (LinearLayout.LayoutParams) frameLayout.getLayoutParams(); + LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) frameLayout.getLayoutParams(); layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT; layoutParams.height = LinearLayout.LayoutParams.WRAP_CONTENT; layoutParams.gravity = Gravity.TOP; @@ -246,7 +180,23 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen userSelectEditText = new EditText(getParentActivity()); userSelectEditText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); + userSelectEditText.setHintTextColor(0xffa6a6a6); + userSelectEditText.setTextColor(0xff000000); + userSelectEditText.setMinimumHeight(AndroidUtilities.dp(52)); + userSelectEditText.setMaxLines(2); + userSelectEditText.setPadding(userSelectEditText.getPaddingLeft(), AndroidUtilities.dp(3), userSelectEditText.getPaddingRight(), userSelectEditText.getPaddingBottom()); + userSelectEditText.setInputType(InputType.TYPE_TEXT_VARIATION_FILTER | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_FLAG_MULTI_LINE); + userSelectEditText.setImeOptions(EditorInfo.IME_ACTION_DONE); + userSelectEditText.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL); + AndroidUtilities.clearCursorDrawable(userSelectEditText); frameLayout.addView(userSelectEditText); + FrameLayout.LayoutParams layoutParams1 = (FrameLayout.LayoutParams) userSelectEditText.getLayoutParams(); + layoutParams1.width = FrameLayout.LayoutParams.MATCH_PARENT; + layoutParams1.height = FrameLayout.LayoutParams.WRAP_CONTENT; + layoutParams1.leftMargin = AndroidUtilities.dp(5); + layoutParams1.rightMargin = AndroidUtilities.dp(5); + layoutParams1.gravity = Gravity.TOP; + userSelectEditText.setLayoutParams(layoutParams1); userSelectEditText.setHint(LocaleController.getString("SendMessageTo", R.string.SendMessageTo)); if (Build.VERSION.SDK_INT >= 11) { @@ -301,24 +251,59 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen if (search) { String text = userSelectEditText.getText().toString().replace("<", ""); if (text.length() != 0) { - searchDialogs(text); searching = true; searchWas = true; - emptyTextView.setText(LocaleController.getString("NoResult", R.string.NoResult)); - listViewAdapter.notifyDataSetChanged(); + if (listView != null) { + listView.setAdapter(searchListViewAdapter); + searchListViewAdapter.notifyDataSetChanged(); + if(android.os.Build.VERSION.SDK_INT >= 11) { + listView.setFastScrollAlwaysVisible(false); + } + listView.setFastScrollEnabled(false); + listView.setVerticalScrollBarEnabled(true); + } + if (emptyTextView != null) { + emptyTextView.setText(LocaleController.getString("NoResult", R.string.NoResult)); + } + searchListViewAdapter.searchDialogs(text); } else { - searchResult = null; - searchResultNames = null; + searchListViewAdapter.searchDialogs(null); searching = false; searchWas = false; - emptyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts)); + ViewGroup group = (ViewGroup) listView.getParent(); + listView.setAdapter(listViewAdapter); listViewAdapter.notifyDataSetChanged(); + if (android.os.Build.VERSION.SDK_INT >= 11) { + listView.setFastScrollAlwaysVisible(true); + } + listView.setFastScrollEnabled(true); + listView.setVerticalScrollBarEnabled(false); + emptyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts)); } } } } }); + emptyTextView = new TextView(getParentActivity()); + emptyTextView.setTextColor(0xff808080); + emptyTextView.setTextSize(24); + emptyTextView.setGravity(Gravity.CENTER); + emptyTextView.setVisibility(View.INVISIBLE); + emptyTextView.setText(LocaleController.getString("NoContacts", R.string.NoContacts)); + linearLayout.addView(emptyTextView); + layoutParams = (LinearLayout.LayoutParams) emptyTextView.getLayoutParams(); + layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT; + layoutParams.height = LinearLayout.LayoutParams.MATCH_PARENT; + layoutParams.gravity = Gravity.TOP; + emptyTextView.setLayoutParams(layoutParams); + emptyTextView.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + return true; + } + }); + listView = new SectionsListView(getParentActivity()); listView.setEmptyView(emptyTextView); listView.setVerticalScrollBarEnabled(false); @@ -331,7 +316,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen listView.setFastScrollAlwaysVisible(true); listView.setVerticalScrollbarPosition(LocaleController.isRTL ? ListView.SCROLLBAR_POSITION_LEFT : ListView.SCROLLBAR_POSITION_RIGHT); } - ((FrameLayout) fragmentView).addView(listView); + linearLayout.addView(listView); layoutParams = (LinearLayout.LayoutParams) listView.getLayoutParams(); layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT; layoutParams.height = LinearLayout.LayoutParams.MATCH_PARENT; @@ -339,7 +324,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { - TLRPC.User user; + /*TLRPC.User user; int section = listViewAdapter.getSectionForPosition(i); int row = listViewAdapter.getPositionInSectionForPosition(i); if (searching && searchWas) { @@ -387,7 +372,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen listViewAdapter.notifyDataSetChanged(); } else { listView.invalidateViews(); - } + }*/ } }); listView.setOnScrollListener(new AbsListView.OnScrollListener() { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java index 8187925c0..336dbadf4 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java @@ -8,7 +8,6 @@ package org.telegram.ui; -import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; @@ -18,7 +17,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.EditText; -import android.widget.ImageButton; +import android.widget.ListView; import android.widget.TextView; import org.telegram.android.AndroidUtilities; @@ -30,22 +29,20 @@ import org.telegram.messenger.FileLog; import org.telegram.android.MessagesController; import org.telegram.android.NotificationCenter; import org.telegram.messenger.R; +import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Cells.UserCell; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarUpdater; import org.telegram.ui.Views.BackupImageView; -import org.telegram.ui.Views.ActionBar.BaseFragment; -import org.telegram.ui.Views.PinnedHeaderListView; -import org.telegram.ui.Views.SectionedBaseAdapter; -import org.telegram.ui.Views.SettingsSectionLayout; +import org.telegram.ui.ActionBar.BaseFragment; import java.util.ArrayList; import java.util.concurrent.Semaphore; public class GroupCreateFinalActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, AvatarUpdater.AvatarUpdaterDelegate { - private PinnedHeaderListView listView; + private ListView listView; private EditText nameTextView; private TLRPC.FileLocation avatar; private TLRPC.InputFile uploadedAvatar; @@ -185,11 +182,8 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati fragmentView = inflater.inflate(R.layout.group_create_final_layout, container, false); - final ImageButton button2 = (ImageButton)fragmentView.findViewById(R.id.settings_change_avatar_button); - if (isBroadcast) { - button2.setVisibility(View.GONE); - } else { - button2.setOnClickListener(new View.OnClickListener() { + if (!isBroadcast) { + /*button2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (getParentActivity() == null) { @@ -221,7 +215,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati }); showAlertDialog(builder); } - }); + });*/ } avatarImage = (BackupImageView)fragmentView.findViewById(R.id.settings_avatar_image); @@ -238,7 +232,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati nameTextView.setText(nameToSet); nameToSet = null; } - listView = (PinnedHeaderListView)fragmentView.findViewById(R.id.listView); + listView = (ListView)fragmentView.findViewById(R.id.listView); listView.setAdapter(new ListAdapter(getParentActivity())); } else { ViewGroup parent = (ViewGroup)fragmentView.getParent(); @@ -346,18 +340,13 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati } } - private class ListAdapter extends SectionedBaseAdapter { + private class ListAdapter extends BaseFragmentAdapter { private Context mContext; public ListAdapter(Context context) { mContext = context; } - @Override - public Object getItem(int section, int position) { - return null; - } - @Override public boolean areAllItemsEnabled() { return false; @@ -369,61 +358,22 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati } @Override - public long getItemId(int section, int position) { - return 0; - } - - @Override - public int getSectionCount() { - return 1; - } - - @Override - public int getCountForSection(int section) { - if (selectedContacts == null) { - return 0; + public View getView(int i, View view, ViewGroup viewGroup) { + TLRPC.User user = MessagesController.getInstance().getUser(selectedContacts.get(i)); + if (view == null) { + view = new UserCell(mContext, 1); } - return selectedContacts.size(); - } + ((UserCell) view).setData(user, null, null, 0); + return view; - @Override - public View getItemView(int section, int position, View convertView, ViewGroup parent) { - TLRPC.User user = MessagesController.getInstance().getUser(selectedContacts.get(position)); - if (convertView == null) { - convertView = new UserCell(mContext, 1); - } - ((UserCell) convertView).setData(user, null, null, 0); - return convertView; - } - - @Override - public int getItemViewType(int section, int position) { - return 0; - } - - @Override - public int getItemViewTypeCount() { - return 1; - } - - @Override - public int getSectionHeaderViewType(int section) { - return 0; - } - - @Override - public int getSectionHeaderViewTypeCount() { - return 1; - } - - @Override - public View getSectionHeaderView(int section, View convertView, ViewGroup parent) { + /* if (convertView == null) { convertView = new SettingsSectionLayout(mContext); convertView.setBackgroundColor(0xffffffff); } ((SettingsSectionLayout) convertView).setText(LocaleController.formatPluralString("Members", selectedContacts.size()).toUpperCase()); return convertView; + */ } } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java index ab4360982..fdfc54f01 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java @@ -26,8 +26,8 @@ import org.telegram.android.LocaleController; import org.telegram.messenger.TLRPC; import org.telegram.android.MessagesController; import org.telegram.messenger.R; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.IdenticonDrawable; public class IdenticonActivity extends BaseFragment { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java index f5365d32f..a0fa16ec2 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LanguageSelectActivity.java @@ -11,6 +11,7 @@ package org.telegram.ui; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -18,6 +19,7 @@ import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ListView; import android.widget.TextView; @@ -27,10 +29,11 @@ import org.telegram.android.LocaleController; import org.telegram.messenger.R; import org.telegram.messenger.Utilities; import org.telegram.ui.Adapters.BaseFragmentAdapter; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.Cells.TextSettingsCell; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.BaseFragment; import java.util.ArrayList; import java.util.Timer; @@ -50,6 +53,9 @@ public class LanguageSelectActivity extends BaseFragment { @Override public View createView(LayoutInflater inflater, ViewGroup container) { if (fragmentView == null) { + searching = false; + searchWas = false; + actionBar.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setBackOverlay(R.layout.updating_state_layout); actionBar.setTitle(LocaleController.getString("Language", R.string.Language)); @@ -90,32 +96,46 @@ public class LanguageSelectActivity extends BaseFragment { if (listView != null) { listView.setPadding(AndroidUtilities.dp(16), listView.getPaddingTop(), AndroidUtilities.dp(16), listView.getPaddingBottom()); listView.setAdapter(searchListViewAdapter); - if(android.os.Build.VERSION.SDK_INT >= 11) { - listView.setFastScrollAlwaysVisible(false); - } - listView.setFastScrollEnabled(false); - listView.setVerticalScrollBarEnabled(true); - } - if (emptyTextView != null) { - emptyTextView.setText(LocaleController.getString("NoResult", R.string.NoResult)); } } } }); - fragmentView = inflater.inflate(R.layout.language_select_layout, container, false); listAdapter = new ListAdapter(getParentActivity()); - listView = (ListView)fragmentView.findViewById(R.id.listView); - listView.setAdapter(listAdapter); - emptyTextView = (TextView)fragmentView.findViewById(R.id.searchEmptyView); - listView.setEmptyView(emptyTextView); + searchListViewAdapter = new SearchAdapter(getParentActivity()); + + fragmentView = new FrameLayout(getParentActivity()); + + emptyTextView = new TextView(getParentActivity()); + emptyTextView.setTextColor(0xff808080); + emptyTextView.setTextSize(24); + emptyTextView.setGravity(Gravity.CENTER); + emptyTextView.setVisibility(View.INVISIBLE); + emptyTextView.setText(LocaleController.getString("NoResult", R.string.NoResult)); + ((FrameLayout) fragmentView).addView(emptyTextView); + FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) emptyTextView.getLayoutParams(); + layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; + layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT; + layoutParams.gravity = Gravity.TOP; + emptyTextView.setLayoutParams(layoutParams); emptyTextView.setOnTouchListener(new View.OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { return true; } }); - searchListViewAdapter = new SearchAdapter(getParentActivity()); + + listView = new ListView(getParentActivity()); + listView.setEmptyView(emptyTextView); + listView.setVerticalScrollBarEnabled(false); + listView.setDivider(null); + listView.setDividerHeight(0); + listView.setAdapter(listAdapter); + ((FrameLayout) fragmentView).addView(listView); + layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams(); + layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT; + layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT; + listView.setLayoutParams(layoutParams); listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override @@ -192,9 +212,6 @@ public class LanguageSelectActivity extends BaseFragment { public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) { } }); - - searching = false; - searchWas = false; } else { ViewGroup parent = (ViewGroup)fragmentView.getParent(); if (parent != null) { @@ -316,19 +333,11 @@ public class LanguageSelectActivity extends BaseFragment { @Override public View getView(int i, View view, ViewGroup viewGroup) { if (view == null) { - LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - view = li.inflate(R.layout.settings_row_button_layout, viewGroup, false); + view = new TextSettingsCell(mContext); } - TextView textView = (TextView)view.findViewById(R.id.settings_row_text); - View divider = view.findViewById(R.id.settings_row_divider); LocaleController.LocaleInfo c = searchResult.get(i); - textView.setText(c.name); - if (i == searchResult.size() - 1) { - divider.setVisibility(View.GONE); - } else { - divider.setVisibility(View.VISIBLE); - } + ((TextSettingsCell) view).setText(c.name, i != searchResult.size() - 1); return view; } @@ -392,19 +401,11 @@ public class LanguageSelectActivity extends BaseFragment { @Override public View getView(int i, View view, ViewGroup viewGroup) { if (view == null) { - LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - view = li.inflate(R.layout.settings_row_button_layout, viewGroup, false); + view = new TextSettingsCell(mContext); } - TextView textView = (TextView)view.findViewById(R.id.settings_row_text); - View divider = view.findViewById(R.id.settings_row_divider); LocaleController.LocaleInfo localeInfo = LocaleController.getInstance().sortedLanguages.get(i); - textView.setText(localeInfo.name); - if (i == LocaleController.getInstance().sortedLanguages.size() - 1) { - divider.setVisibility(View.GONE); - } else { - divider.setVisibility(View.VISIBLE); - } + ((TextSettingsCell) view).setText(localeInfo.name, i != LocaleController.getInstance().sortedLanguages.size() - 1); return view; } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java index f10eabec5..4b00db4ef 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java @@ -50,9 +50,9 @@ import org.telegram.messenger.TLRPC; import org.telegram.messenger.UserConfig; import org.telegram.messenger.Utilities; import org.telegram.ui.Adapters.DrawerLayoutAdapter; -import org.telegram.ui.Views.ActionBar.ActionBarLayout; -import org.telegram.ui.Views.ActionBar.BaseFragment; -import org.telegram.ui.Views.ActionBar.DrawerLayoutContainer; +import org.telegram.ui.ActionBar.ActionBarLayout; +import org.telegram.ui.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.DrawerLayoutContainer; import java.io.BufferedReader; import java.io.InputStream; @@ -361,7 +361,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa } } } else if (fragmentName.equals("wallpapers")) { - SettingsWallpapersActivity settings = new SettingsWallpapersActivity(); + WallpapersActivity settings = new WallpapersActivity(); actionBarLayout.addFragmentToStack(settings); settings.restoreSelfArgs(savedInstanceState); } @@ -1007,7 +1007,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa } else if (lastFragment instanceof GroupCreateFinalActivity && args != null) { outState.putBundle("args", args); outState.putString("fragment", "group"); - } else if (lastFragment instanceof SettingsWallpapersActivity) { + } else if (lastFragment instanceof WallpapersActivity) { outState.putString("fragment", "wallpapers"); } else if (lastFragment instanceof ProfileActivity && ((ProfileActivity) lastFragment).isChat() && args != null) { outState.putBundle("args", args); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java index 653b14718..8839b1841 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java @@ -35,12 +35,12 @@ import org.telegram.android.MessageObject; import org.telegram.android.MessagesController; import org.telegram.android.NotificationCenter; import org.telegram.messenger.R; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.BackupImageView; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; import java.util.List; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java index 6db5174cd..a9cf6b42a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java @@ -27,9 +27,9 @@ import org.telegram.android.AndroidUtilities; import org.telegram.messenger.FileLog; import org.telegram.android.LocaleController; import org.telegram.messenger.R; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.SlideView; import java.util.Map; @@ -42,10 +42,284 @@ public class LoginActivity extends BaseFragment implements SlideView.SlideViewDe private final static int done_button = 1; - @Override - public boolean onFragmentCreate() { - return super.onFragmentCreate(); - } + /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @Override public void onFragmentDestroy() { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivityPhoneView.java b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivityPhoneView.java index a038fba8f..2c504e4b4 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivityPhoneView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivityPhoneView.java @@ -31,7 +31,7 @@ import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.FileLog; import org.telegram.messenger.R; import org.telegram.messenger.RPCRequest; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.SlideView; import java.io.BufferedReader; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java index 69df42d5d..de8e586ca 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java @@ -33,9 +33,9 @@ import org.telegram.android.MessagesController; import org.telegram.android.NotificationCenter; import org.telegram.messenger.R; import org.telegram.ui.Adapters.BaseFragmentAdapter; -import org.telegram.ui.Views.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBar; import org.telegram.ui.Views.BackupImageView; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; import java.util.ArrayList; import java.util.HashMap; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java index d0d0933c0..96536d39a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java @@ -40,24 +40,24 @@ import org.telegram.android.NotificationCenter; import org.telegram.messenger.R; import org.telegram.messenger.UserConfig; import org.telegram.ui.Adapters.BaseFragmentAdapter; -import org.telegram.ui.Adapters.MessagesActivityAdapter; -import org.telegram.ui.Adapters.MessagesActivitySearchAdapter; +import org.telegram.ui.Adapters.DialogsAdapter; +import org.telegram.ui.Adapters.DialogsSearchAdapter; import org.telegram.ui.AnimationCompat.ObjectAnimatorProxy; import org.telegram.ui.AnimationCompat.ViewProxy; import org.telegram.ui.Cells.UserCell; import org.telegram.ui.Cells.DialogCell; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; -import org.telegram.ui.Views.ActionBar.BaseFragment; -import org.telegram.ui.Views.ActionBar.MenuDrawable; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.MenuDrawable; import java.util.ArrayList; public class MessagesActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { private ListView messagesListView; - private MessagesActivityAdapter messagesActivityAdapter; - private MessagesActivitySearchAdapter messagesActivitySearchAdapter; + private DialogsAdapter dialogsAdapter; + private DialogsSearchAdapter dialogsSearchAdapter; private TextView searchEmptyView; private View progressView; private View emptyView; @@ -158,13 +158,13 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter ViewProxy.setTranslationY(floatingButton, AndroidUtilities.dp(100)); hideFloatingButton(false); } - if (messagesListView.getAdapter() != messagesActivityAdapter) { - messagesListView.setAdapter(messagesActivityAdapter); - messagesActivityAdapter.notifyDataSetChanged(); + if (messagesListView.getAdapter() != dialogsAdapter) { + messagesListView.setAdapter(dialogsAdapter); + dialogsAdapter.notifyDataSetChanged(); } } - if (messagesActivitySearchAdapter != null) { - messagesActivitySearchAdapter.searchDialogs(null, false); + if (dialogsSearchAdapter != null) { + dialogsSearchAdapter.searchDialogs(null, false); } } @@ -173,9 +173,9 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter String text = editText.getText().toString(); if (text.length() != 0) { searchWas = true; - if (messagesActivitySearchAdapter != null) { - messagesListView.setAdapter(messagesActivitySearchAdapter); - messagesActivitySearchAdapter.notifyDataSetChanged(); + if (dialogsSearchAdapter != null) { + messagesListView.setAdapter(dialogsSearchAdapter); + dialogsSearchAdapter.notifyDataSetChanged(); } if (searchEmptyView != null && messagesListView.getEmptyView() == emptyView) { messagesListView.setEmptyView(searchEmptyView); @@ -183,8 +183,8 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter progressView.setVisibility(View.GONE); } } - if (messagesActivitySearchAdapter != null) { - messagesActivitySearchAdapter.searchDialogs(text, serverOnly); + if (dialogsSearchAdapter != null) { + dialogsSearchAdapter.searchDialogs(text, serverOnly); } } }); @@ -215,9 +215,9 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter fragmentView = inflater.inflate(R.layout.messages_list, container, false); - messagesActivityAdapter = new MessagesActivityAdapter(getParentActivity(), serverOnly); - messagesActivitySearchAdapter = new MessagesActivitySearchAdapter(getParentActivity()); - messagesActivitySearchAdapter.setDelegate(new MessagesActivitySearchAdapter.MessagesActivitySearchAdapterDelegate() { + dialogsAdapter = new DialogsAdapter(getParentActivity(), serverOnly); + dialogsSearchAdapter = new DialogsSearchAdapter(getParentActivity()); + dialogsSearchAdapter.setDelegate(new DialogsSearchAdapter.MessagesActivitySearchAdapterDelegate() { @Override public void searchStateChanged(boolean search) { if (searching && searchWas && messagesListView != null) { @@ -229,13 +229,13 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter }); messagesListView = (ListView)fragmentView.findViewById(R.id.messages_list_view); - messagesListView.setAdapter(messagesActivityAdapter); + messagesListView.setAdapter(dialogsAdapter); if (Build.VERSION.SDK_INT >= 11) { messagesListView.setVerticalScrollbarPosition(LocaleController.isRTL ? ListView.SCROLLBAR_POSITION_LEFT : ListView.SCROLLBAR_POSITION_RIGHT); } progressView = fragmentView.findViewById(R.id.progressLayout); - messagesActivityAdapter.notifyDataSetChanged(); + dialogsAdapter.notifyDataSetChanged(); searchEmptyView = (TextView)fragmentView.findViewById(R.id.searchEmptyView); searchEmptyView.setOnTouchListener(new View.OnTouchListener() { @Override @@ -295,17 +295,17 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter long dialog_id = 0; int message_id = 0; BaseFragmentAdapter adapter = (BaseFragmentAdapter)messagesListView.getAdapter(); - if (adapter == messagesActivityAdapter) { - TLRPC.TL_dialog dialog = messagesActivityAdapter.getItem(i); + if (adapter == dialogsAdapter) { + TLRPC.TL_dialog dialog = dialogsAdapter.getItem(i); if (dialog == null) { return; } dialog_id = dialog.id; - } else if (adapter == messagesActivitySearchAdapter) { - Object obj = messagesActivitySearchAdapter.getItem(i); + } else if (adapter == dialogsSearchAdapter) { + Object obj = dialogsSearchAdapter.getItem(i); if (obj instanceof TLRPC.User) { dialog_id = ((TLRPC.User) obj).id; - if (messagesActivitySearchAdapter.isGlobalSearch(i)) { + if (dialogsSearchAdapter.isGlobalSearch(i)) { ArrayList users = new ArrayList(); users.add((TLRPC.User)obj); MessagesController.getInstance().putUsers(users, false); @@ -356,7 +356,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter if (openedDialogId == dialog_id) { return; } - messagesActivityAdapter.setOpenedDialogId(openedDialogId = dialog_id); + dialogsAdapter.setOpenedDialogId(openedDialogId = dialog_id); updateVisibleRows(MessagesController.UPDATE_MASK_SELECT_DIALOG); } presentFragment(new ChatActivity(args)); @@ -501,11 +501,11 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter @Override public void onResume() { super.onResume(); - if (messagesActivityAdapter != null) { - messagesActivityAdapter.notifyDataSetChanged(); + if (dialogsAdapter != null) { + dialogsAdapter.notifyDataSetChanged(); } - if (messagesActivitySearchAdapter != null) { - messagesActivitySearchAdapter.notifyDataSetChanged(); + if (dialogsSearchAdapter != null) { + dialogsSearchAdapter.notifyDataSetChanged(); } } @@ -533,8 +533,8 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter @SuppressWarnings("unchecked") public void didReceivedNotification(int id, Object... args) { if (id == NotificationCenter.dialogsNeedReload) { - if (messagesActivityAdapter != null) { - messagesActivityAdapter.notifyDataSetChanged(); + if (dialogsAdapter != null) { + dialogsAdapter.notifyDataSetChanged(); } if (messagesListView != null) { if (MessagesController.getInstance().loadingDialogs && MessagesController.getInstance().dialogs.isEmpty()) { @@ -577,7 +577,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter } else { openedDialogId = dialog_id; } - messagesActivityAdapter.setOpenedDialogId(openedDialogId); + dialogsAdapter.setOpenedDialogId(openedDialogId); updateVisibleRows(MessagesController.UPDATE_MASK_SELECT_DIALOG); } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/NotificationsSettingsActivity.java similarity index 99% rename from TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java rename to TMessagesProj/src/main/java/org/telegram/ui/NotificationsSettingsActivity.java index 7ac173018..d9dceac94 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/NotificationsSettingsActivity.java @@ -43,12 +43,12 @@ import org.telegram.ui.Cells.ShadowSectionCell; import org.telegram.ui.Cells.TextCheckCell; import org.telegram.ui.Cells.TextColorCell; import org.telegram.ui.Cells.TextDetailSettingsCell; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.ColorPickerView; -public class SettingsNotificationsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { +public class NotificationsSettingsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { private ListView listView; private boolean reseting = false; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoCropActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoCropActivity.java index df1518974..6fcad48ac 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoCropActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoCropActivity.java @@ -20,16 +20,16 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.FrameLayout; -import android.widget.TextView; import org.telegram.android.AndroidUtilities; import org.telegram.android.ImageLoader; import org.telegram.messenger.FileLog; import org.telegram.android.LocaleController; import org.telegram.messenger.R; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.BaseFragment; import java.io.File; @@ -282,6 +282,8 @@ public class PhotoCropActivity extends BaseFragment { private boolean sameBitmap = false; private boolean doneButtonPressed = false; + private final static int done_button = 1; + public PhotoCropActivity(Bundle args) { super(args); } @@ -328,33 +330,30 @@ public class PhotoCropActivity extends BaseFragment { @Override public View createView(LayoutInflater inflater, ViewGroup container) { if (fragmentView == null) { - actionBar.setCustomView(R.layout.settings_do_action_layout); - Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button); - cancelButton.setOnClickListener(new View.OnClickListener() { + actionBar.setBackButtonImage(R.drawable.ic_ab_back); + actionBar.setBackOverlay(R.layout.updating_state_layout); + actionBar.setTitle(LocaleController.getString("AddContact", R.string.AddContact)); + actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { @Override - public void onClick(View view) { - finishFragment(); - } - }); - View doneButton = actionBar.findViewById(R.id.done_button); - doneButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (delegate != null && !doneButtonPressed) { - Bitmap bitmap = view.getBitmap(); - if (bitmap == imageToCrop) { - sameBitmap = true; + public void onItemClick(int id) { + if (id == -1) { + finishFragment(); + } else if (id == done_button) { + if (delegate != null && !doneButtonPressed) { + Bitmap bitmap = view.getBitmap(); + if (bitmap == imageToCrop) { + sameBitmap = true; + } + delegate.didFinishCrop(bitmap); + doneButtonPressed = true; } - delegate.didFinishCrop(bitmap); - doneButtonPressed = true; + finishFragment(); } - finishFragment(); } }); - cancelButton.setText(LocaleController.getString("Cancel", R.string.Cancel).toUpperCase()); - TextView textView = (TextView)doneButton.findViewById(R.id.done_button_text); - textView.setText(LocaleController.getString("Done", R.string.Done).toUpperCase()); + ActionBarMenu menu = actionBar.createMenu(); + menu.addItem(done_button, R.drawable.ic_done); fragmentView = view = new PhotoCropView(getParentActivity()); fragmentView.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java index 56da3ea19..1d28303ba 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoPickerActivity.java @@ -32,9 +32,9 @@ import org.telegram.messenger.R; import org.telegram.messenger.TLRPC; import org.telegram.android.MessageObject; import org.telegram.ui.Adapters.BaseFragmentAdapter; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.BackupImageView; import java.util.ArrayList; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java index 1e22d13b6..7235b98a6 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java @@ -63,9 +63,9 @@ import org.telegram.ui.AnimationCompat.AnimatorListenerAdapterProxy; import org.telegram.ui.AnimationCompat.AnimatorSetProxy; import org.telegram.ui.AnimationCompat.ObjectAnimatorProxy; import org.telegram.ui.AnimationCompat.ViewProxy; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.ClippingImageView; import org.telegram.android.ImageReceiver; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PopupNotificationActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PopupNotificationActivity.java index 90201f2d2..0d40b8db5 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PopupNotificationActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PopupNotificationActivity.java @@ -44,8 +44,8 @@ import org.telegram.messenger.R; import org.telegram.messenger.TLRPC; import org.telegram.android.MessageObject; import org.telegram.android.PhotoObject; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.BackupImageView; import org.telegram.ui.Views.ChatActivityEnterView; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java index 223eb1105..2f4d945b6 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java @@ -54,13 +54,13 @@ import org.telegram.ui.Cells.ShadowSectionCell; import org.telegram.ui.Cells.TextCell; import org.telegram.ui.Cells.TextDetailCell; import org.telegram.ui.Cells.UserCell; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarUpdater; import org.telegram.ui.Views.BackupImageView; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.IdenticonDrawable; import java.util.ArrayList; @@ -325,7 +325,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. } else if (id == edit_name) { Bundle args = new Bundle(); args.putInt("chat_id", chat_id); - presentFragment(new ChatProfileChangeNameActivity(args)); + presentFragment(new ChangeChatNameActivity(args)); } } }); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java index cda48c603..22e09d191 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java @@ -40,8 +40,8 @@ import org.telegram.messenger.TLRPC; import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Cells.TextColorCell; import org.telegram.ui.Cells.TextDetailSettingsCell; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.ColorPickerView; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index 9b573d9f8..070e3e86c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java @@ -69,13 +69,13 @@ import org.telegram.ui.Cells.ShadowSectionCell; import org.telegram.ui.Cells.TextCheckCell; import org.telegram.ui.Cells.TextDetailSettingsCell; import org.telegram.ui.Cells.TextSettingsCell; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.ActionBarMenuItem; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.ActionBarMenuItem; import org.telegram.ui.Views.AvatarDrawable; import org.telegram.ui.Views.AvatarUpdater; import org.telegram.ui.Views.BackupImageView; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.NumberPicker; import java.io.File; @@ -274,7 +274,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter if (id == -1) { finishFragment(); } else if (id == edit_name) { - presentFragment(new SettingsChangeNameActivity()); + presentFragment(new ChangeNameActivity()); } else if (id == logout) { if (getParentActivity() == null) { return; @@ -424,11 +424,11 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter listView.invalidateViews(); } } else if (i == notificationRow) { - presentFragment(new SettingsNotificationsActivity()); + presentFragment(new NotificationsSettingsActivity()); } else if (i == blockedRow) { - presentFragment(new SettingsBlockedUsersActivity()); + presentFragment(new BlockedUsersActivity()); } else if (i == backgroundRow) { - presentFragment(new SettingsWallpapersActivity()); + presentFragment(new WallpapersActivity()); } else if (i == askQuestionRow) { if (getParentActivity() == null) { return; @@ -627,7 +627,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter builder.setNegativeButton(LocaleController.getString("OK", R.string.OK), null); showAlertDialog(builder); } else if (i == usernameRow) { - presentFragment(new SettingsChangeUsernameActivity()); + presentFragment(new ChangeUsernameActivity()); } } }); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/VideoEditorActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/VideoEditorActivity.java index c1cac76cf..35a5cd43b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/VideoEditorActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/VideoEditorActivity.java @@ -46,9 +46,9 @@ import org.telegram.android.MediaController; import org.telegram.messenger.FileLog; import org.telegram.messenger.R; import org.telegram.messenger.Utilities; -import org.telegram.ui.Views.ActionBar.ActionBar; -import org.telegram.ui.Views.ActionBar.ActionBarMenu; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.VideoSeekBarView; import org.telegram.ui.Views.VideoTimelineView; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java index 7eafab4c0..9f7e5ccfe 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java @@ -25,7 +25,7 @@ import org.telegram.messenger.UserConfig; import org.telegram.messenger.Utilities; import org.telegram.ui.LaunchActivity; import org.telegram.ui.PhotoCropActivity; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; import java.io.File; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/PinnedHeaderListView.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/PinnedHeaderListView.java deleted file mode 100755 index 6d31c0b40..000000000 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/PinnedHeaderListView.java +++ /dev/null @@ -1,270 +0,0 @@ -/* - * This is the source code of Telegram for Android v. 1.3.2. - * It is licensed under GNU GPL v. 2 or later. - * You should have received a copy of the license in this archive (see LICENSE). - * - * Copyright Nikolai Kudashov, 2013. - */ - -package org.telegram.ui.Views; - -import android.content.Context; -import android.graphics.Canvas; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewGroup; -import android.widget.*; -import android.widget.AbsListView.OnScrollListener; - -import org.telegram.messenger.FileLog; - -public class PinnedHeaderListView extends ListView implements OnScrollListener, View.OnTouchListener { - - private OnScrollListener mOnScrollListener; - - public static interface PinnedSectionedHeaderAdapter { - public boolean isSectionHeader(int position); - - public int getSectionForPosition(int position); - - public View getSectionHeaderView(int section, View convertView, ViewGroup parent); - - public int getSectionHeaderViewType(int section); - - public int getCount(); - - } - - private PinnedSectionedHeaderAdapter mAdapter; - private OnTouchListener mForwardingTouchListener = null; - private float mLastUpEventY = -1; - private View mCurrentHeader; - private int mCurrentHeaderViewType = 0; - private float mHeaderOffset; - private boolean mShouldPin = true; - private int mCurrentSection = 0; - private int mWidthMode; - public int exHeaderRightPadding = 0; - - public PinnedHeaderListView(Context context) { - super(context); - super.setOnScrollListener(this); - super.setOnTouchListener(this); - } - - public PinnedHeaderListView(Context context, AttributeSet attrs) { - super(context, attrs); - super.setOnScrollListener(this); - super.setOnTouchListener(this); - } - - public PinnedHeaderListView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - super.setOnScrollListener(this); - super.setOnTouchListener(this); - } - - public void setPinHeaders(boolean shouldPin) { - mShouldPin = shouldPin; - } - - @Override - public void setAdapter(ListAdapter adapter) { - if (mAdapter == adapter) { - return; - } - mCurrentHeader = null; - if (adapter instanceof PinnedSectionedHeaderAdapter) { - mAdapter = (PinnedSectionedHeaderAdapter) adapter; - } else { - mAdapter = null; - } - super.setAdapter(adapter); - } - - @Override - public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { - if (mOnScrollListener != null) { - mOnScrollListener.onScroll(view, firstVisibleItem, visibleItemCount, totalItemCount); - } - if (mAdapter == null) { - return; - } - - if (mAdapter.getCount() == 0 || !mShouldPin || (firstVisibleItem < getHeaderViewsCount())) { - mCurrentHeader = null; - mHeaderOffset = 0.0f; - for (int i = firstVisibleItem; i < firstVisibleItem + visibleItemCount; i++) { - View header = getChildAt(i); - if (header != null) { - header.setVisibility(VISIBLE); - } - } - return; - } - - firstVisibleItem -= getHeaderViewsCount(); - - int section = mAdapter.getSectionForPosition(firstVisibleItem); - int viewType = mAdapter.getSectionHeaderViewType(section); - mCurrentHeader = getSectionHeaderView(section, mCurrentHeaderViewType != viewType ? null : mCurrentHeader); - if (mCurrentHeader != null && mCurrentHeader.getPaddingLeft() != getPaddingLeft()) { - mCurrentHeader.setPadding(getPaddingLeft(), mCurrentHeader.getPaddingTop(), getPaddingRight() + (int)(getResources().getDisplayMetrics().density * exHeaderRightPadding), 0); - } - ensurePinnedHeaderLayout(mCurrentHeader, false); - mCurrentHeaderViewType = viewType; - - mHeaderOffset = 0.0f; - - for (int i = firstVisibleItem; i < firstVisibleItem + visibleItemCount; i++) { - if (mAdapter.isSectionHeader(i)) { - View header = getChildAt(i - firstVisibleItem); - float headerTop = header.getTop(); - float pinnedHeaderHeight = mCurrentHeader.getMeasuredHeight(); - header.setVisibility(VISIBLE); - if (pinnedHeaderHeight >= headerTop && headerTop > -1) { - mHeaderOffset = headerTop - header.getHeight(); - } else if (headerTop <= 0) { - header.setVisibility(INVISIBLE); - } - } - } - - invalidate(); - } - - @Override - public void onScrollStateChanged(AbsListView view, int scrollState) { - if (mOnScrollListener != null) { - mOnScrollListener.onScrollStateChanged(view, scrollState); - } - } - - private View getSectionHeaderView(int section, View oldView) { - boolean shouldLayout = section != mCurrentSection || oldView == null; - - View view = mAdapter.getSectionHeaderView(section, oldView, this); - if (shouldLayout) { - // a new section, thus a new header. We should lay it out again - ensurePinnedHeaderLayout(view, false); - mCurrentSection = section; - } - return view; - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - if (mAdapter == null) { - return; - } - if (mCurrentHeader != null) { - ensurePinnedHeaderLayout(mCurrentHeader, true); - } - } - - private void ensurePinnedHeaderLayout(View header, boolean forceLayout) { - if (header.isLayoutRequested() || forceLayout) { - int widthSpec = MeasureSpec.makeMeasureSpec(getMeasuredWidth(), mWidthMode); - - int heightSpec; - ViewGroup.LayoutParams layoutParams = header.getLayoutParams(); - if (layoutParams != null && layoutParams.height > 0) { - heightSpec = MeasureSpec.makeMeasureSpec(layoutParams.height, MeasureSpec.EXACTLY); - } else { - heightSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); - } - try { - header.measure(widthSpec, heightSpec); - } catch (Exception e) { - FileLog.e("tmessages", e); - } - header.layout(0, 0, header.getMeasuredWidth(), header.getMeasuredHeight()); - } - } - - @Override - protected void dispatchDraw(Canvas canvas) { - super.dispatchDraw(canvas); - if (mAdapter == null || !mShouldPin || mCurrentHeader == null) { - return; - } - int saveCount = canvas.save(); - canvas.translate(0, mHeaderOffset); - canvas.clipRect(0, 0, getWidth(), mCurrentHeader.getMeasuredHeight()); // needed for < HONEYCOMB - mCurrentHeader.draw(canvas); - canvas.restoreToCount(saveCount); - } - - @Override - public boolean performItemClick(View view, int position, long id) { - if (mAdapter != null && mLastUpEventY > 0 && mCurrentHeader != null && mLastUpEventY < mCurrentHeader.getBottom()) { - mCurrentHeader.performClick(); - mLastUpEventY = -1; - return true; - } - return super.performItemClick(view, position, id); - } - - @Override - public void setOnTouchListener(OnTouchListener l) { - mForwardingTouchListener = l; - } - - @Override - public boolean onTouch(View v, MotionEvent event) { - if (mForwardingTouchListener != null) { - mForwardingTouchListener.onTouch(v, event); - } - - if (mCurrentHeader != null && event.getY() < mCurrentHeader.getHeight()) { - if (event.getAction() == MotionEvent.ACTION_UP) { - mLastUpEventY = event.getY(); - } - } - return false; - } - - @Override - public void setOnScrollListener(OnScrollListener l) { - mOnScrollListener = l; - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - - mWidthMode = MeasureSpec.getMode(widthMeasureSpec); - } - - public void setOnItemClickListener(PinnedHeaderListView.OnItemClickListener listener) { - super.setOnItemClickListener(listener); - } - - public static abstract class OnItemClickListener implements AdapterView.OnItemClickListener { - @Override - public void onItemClick(AdapterView adapterView, View view, int rawPosition, long id) { - SectionedBaseAdapter adapter; - if (adapterView.getAdapter() instanceof HeaderViewListAdapter) { - HeaderViewListAdapter wrapperAdapter = (HeaderViewListAdapter) adapterView.getAdapter(); - adapter = (SectionedBaseAdapter) wrapperAdapter.getWrappedAdapter(); - } else { - adapter = (SectionedBaseAdapter) adapterView.getAdapter(); - } - int section = adapter.getSectionForPosition(rawPosition); - int position = adapter.getPositionInSectionForPosition(rawPosition); - - if (position == -1) { - onSectionClick(adapterView, view, section, id); - } else { - onItemClick(adapterView, view, section, position, id); - } - } - - public abstract void onItemClick(AdapterView adapterView, View view, int section, int position, long id); - - public abstract void onSectionClick(AdapterView adapterView, View view, int section, long id); - - } -} diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/SectionedBaseAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/SectionedBaseAdapter.java deleted file mode 100755 index 5cfa5f3e0..000000000 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/SectionedBaseAdapter.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * This is the source code of Telegram for Android v. 1.3.2. - * It is licensed under GNU GPL v. 2 or later. - * You should have received a copy of the license in this archive (see LICENSE). - * - * Copyright Nikolai Kudashov, 2013. - */ - -package org.telegram.ui.Views; - -import android.util.SparseArray; -import android.view.View; -import android.view.ViewGroup; - -import org.telegram.ui.Adapters.BaseFragmentAdapter; - -public abstract class SectionedBaseAdapter extends BaseFragmentAdapter implements PinnedHeaderListView.PinnedSectionedHeaderAdapter { - - /** - * Holds the calculated values of @{link getPositionInSectionForPosition} - */ - private SparseArray mSectionPositionCache; - /** - * Holds the calculated values of @{link getSectionForPosition} - */ - private SparseArray mSectionCache; - /** - * Holds the calculated values of @{link getCountForSection} - */ - private SparseArray mSectionCountCache; - - /** - * Caches the item count - */ - private int mCount; - /** - * Caches the section count - */ - private int mSectionCount; - - public SectionedBaseAdapter() { - super(); - mSectionCache = new SparseArray(); - mSectionPositionCache = new SparseArray(); - mSectionCountCache = new SparseArray(); - mCount = -1; - mSectionCount = -1; - } - - @Override - public void notifyDataSetChanged() { - mSectionCache.clear(); - mSectionPositionCache.clear(); - mSectionCountCache.clear(); - mCount = -1; - mSectionCount = -1; - super.notifyDataSetChanged(); - } - - @Override - public void notifyDataSetInvalidated() { - mSectionCache.clear(); - mSectionPositionCache.clear(); - mSectionCountCache.clear(); - mCount = -1; - mSectionCount = -1; - super.notifyDataSetInvalidated(); - } - - @Override - public boolean areAllItemsEnabled() { - return false; - } - - @Override - public boolean isEnabled(int position) { - return !isSectionHeader(position); - } - - @Override - public final int getCount() { - if (mCount >= 0) { - return mCount; - } - int count = 0; - for (int i = 0; i < internalGetSectionCount(); i++) { - count += internalGetCountForSection(i); - count++; - } - mCount = count; - return count; - } - - @Override - public final Object getItem(int position) { - return getItem(getSectionForPosition(position), getPositionInSectionForPosition(position)); - } - - @Override - public final long getItemId(int position) { - return getItemId(getSectionForPosition(position), getPositionInSectionForPosition(position)); - } - - @Override - public final View getView(int position, View convertView, ViewGroup parent) { - if (isSectionHeader(position)) { - return getSectionHeaderView(getSectionForPosition(position), convertView, parent); - } - return getItemView(getSectionForPosition(position), getPositionInSectionForPosition(position), convertView, parent); - } - - @Override - public final int getItemViewType(int position) { - if (isSectionHeader(position)) { - return getItemViewTypeCount() + getSectionHeaderViewType(getSectionForPosition(position)); - } - return getItemViewType(getSectionForPosition(position), getPositionInSectionForPosition(position)); - } - - @Override - public final int getViewTypeCount() { - return getItemViewTypeCount() + getSectionHeaderViewTypeCount(); - } - - public final int getSectionForPosition(int position) { - // first try to retrieve values from cache - Integer cachedSection = mSectionCache.get(position); - if (cachedSection != null) { - return cachedSection; - } - int sectionStart = 0; - for (int i = 0; i < internalGetSectionCount(); i++) { - int sectionCount = internalGetCountForSection(i); - int sectionEnd = sectionStart + sectionCount + 1; - if (position >= sectionStart && position < sectionEnd) { - mSectionCache.put(position, i); - return i; - } - sectionStart = sectionEnd; - } - return 0; - } - - public int getPositionInSectionForPosition(int position) { - if (position == 0) { - position = 1; - } - // first try to retrieve values from cache - Integer cachedPosition = mSectionPositionCache.get(position); - if (cachedPosition != null) { - return cachedPosition; - } - int sectionStart = 0; - for (int i = 0; i < internalGetSectionCount(); i++) { - int sectionCount = internalGetCountForSection(i); - int sectionEnd = sectionStart + sectionCount + 1; - if (position >= sectionStart && position < sectionEnd) { - int positionInSection = position - sectionStart - 1; - mSectionPositionCache.put(position, positionInSection); - return positionInSection; - } - sectionStart = sectionEnd; - } - return 0; - } - - public final boolean isSectionHeader(int position) { - int sectionStart = 0; - for (int i = 0; i < internalGetSectionCount(); i++) { - if (position == sectionStart) { - return true; - } else if (position < sectionStart) { - return false; - } - sectionStart += internalGetCountForSection(i) + 1; - } - return false; - } - - public int getItemViewType(int section, int position) { - return 0; - } - - public int getItemViewTypeCount() { - return 1; - } - - public int getSectionHeaderViewType(int section) { - return 0; - } - - public int getSectionHeaderViewTypeCount() { - return 1; - } - - public abstract Object getItem(int section, int position); - - public abstract long getItemId(int section, int position); - - public abstract int getSectionCount(); - - public abstract int getCountForSection(int section); - - public abstract View getItemView(int section, int position, View convertView, ViewGroup parent); - - public abstract View getSectionHeaderView(int section, View convertView, ViewGroup parent); - - private int internalGetCountForSection(int section) { - Integer cachedSectionCount = mSectionCountCache.get(section); - if (cachedSectionCount != null) { - return cachedSectionCount; - } - int sectionCount = getCountForSection(section); - mSectionCountCache.put(section, sectionCount); - return sectionCount; - } - - private int internalGetSectionCount() { - if (mSectionCount >= 0) { - return mSectionCount; - } - mSectionCount = getSectionCount(); - return mSectionCount; - } -} diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/SectionsListView.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/SectionsListView.java index d2ee0169c..ea1d11407 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/SectionsListView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Views/SectionsListView.java @@ -14,7 +14,6 @@ import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.widget.AbsListView; -import android.widget.AdapterView; import android.widget.ListAdapter; import android.widget.ListView; @@ -200,16 +199,4 @@ public class SectionsListView extends ListView implements AbsListView.OnScrollLi public void setOnItemClickListener(SectionsListView.OnItemClickListener listener) { super.setOnItemClickListener(listener); } - - public static abstract class OnItemClickListener implements AdapterView.OnItemClickListener { - @Override - public void onItemClick(AdapterView adapterView, View view, int rawPosition, long id) { - SectionedBaseAdapter adapter = (SectionedBaseAdapter) adapterView.getAdapter(); - int section = adapter.getSectionForPosition(rawPosition); - int position = adapter.getPositionInSectionForPosition(rawPosition); - onItemClick(adapterView, view, section, position, id); - } - - public abstract void onItemClick(AdapterView adapterView, View view, int section, int position, long id); - } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/Switch.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/Switch.java index 0cf3ead5a..7e1f1a56a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/Switch.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Views/Switch.java @@ -360,7 +360,6 @@ public class Switch extends CompoundButton { final float targetPosition = newCheckedState ? 1 : 0; mPositionAnimator = ObjectAnimatorProxy.ofFloatProxy(this, "thumbPosition", targetPosition); mPositionAnimator.setDuration(THUMB_ANIMATION_DURATION); - mPositionAnimator.setAutoCancel(true); mPositionAnimator.start(); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/WallpapersActivity.java similarity index 86% rename from TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java rename to TMessagesProj/src/main/java/org/telegram/ui/WallpapersActivity.java index e3a80113e..eae6cd107 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/WallpapersActivity.java @@ -26,10 +26,8 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.AdapterView; -import android.widget.Button; import android.widget.ImageView; import android.widget.ProgressBar; -import android.widget.TextView; import org.telegram.android.AndroidUtilities; import org.telegram.android.ImageLoader; @@ -45,8 +43,10 @@ import org.telegram.messenger.R; import org.telegram.messenger.RPCRequest; import org.telegram.messenger.Utilities; import org.telegram.ui.Adapters.BaseFragmentAdapter; +import org.telegram.ui.ActionBar.ActionBar; +import org.telegram.ui.ActionBar.ActionBarMenu; import org.telegram.ui.Views.BackupImageView; -import org.telegram.ui.Views.ActionBar.BaseFragment; +import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Views.HorizontalListView; import java.io.File; @@ -54,7 +54,8 @@ import java.io.FileOutputStream; import java.util.ArrayList; import java.util.HashMap; -public class SettingsWallpapersActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { +public class WallpapersActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { + private HorizontalListView listView; private ListAdapter listAdapter; private ImageView backgroundImage; @@ -69,6 +70,8 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica private TLRPC.PhotoSize loadingSize = null; private String currentPicturePath; + private final static int done_button = 1; + @Override public boolean onFragmentCreate() { super.onFragmentCreate(); @@ -99,63 +102,60 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica @Override public View createView(LayoutInflater inflater, ViewGroup container) { if (fragmentView == null) { - actionBar.setCustomView(R.layout.settings_do_action_layout); - Button cancelButton = (Button) actionBar.findViewById(R.id.cancel_button); - cancelButton.setOnClickListener(new View.OnClickListener() { + actionBar.setBackButtonImage(R.drawable.ic_ab_back); + actionBar.setBackOverlay(R.layout.updating_state_layout); + actionBar.setTitle(LocaleController.getString("ChatBackground", R.string.ChatBackground)); + actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { @Override - public void onClick(View view) { - finishFragment(); - } - }); - doneButton = actionBar.findViewById(R.id.done_button); - doneButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - boolean done; - TLRPC.WallPaper wallPaper = wallpappersByIds.get(selectedBackground); - if (wallPaper != null && wallPaper.id != 1000001 && wallPaper instanceof TLRPC.TL_wallPaper) { - int width = AndroidUtilities.displaySize.x; - int height = AndroidUtilities.displaySize.y; - if (width > height) { - int temp = width; - width = height; - height = temp; - } - TLRPC.PhotoSize size = FileLoader.getClosestPhotoSizeWithSize(wallPaper.sizes, Math.min(width, height)); - String fileName = size.location.volume_id + "_" + size.location.local_id + ".jpg"; - File f = new File(FileLoader.getInstance().getDirectory(FileLoader.MEDIA_DIR_CACHE), fileName); - File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg"); - try { - done = Utilities.copyFile(f, toFile); - } catch (Exception e) { - done = false; - FileLog.e("tmessages", e); - } - } else { - if (selectedBackground == -1) { - File fromFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper-temp.jpg"); + public void onItemClick(int id) { + if (id == -1) { + finishFragment(); + } else if (id == done_button) { + boolean done; + TLRPC.WallPaper wallPaper = wallpappersByIds.get(selectedBackground); + if (wallPaper != null && wallPaper.id != 1000001 && wallPaper instanceof TLRPC.TL_wallPaper) { + int width = AndroidUtilities.displaySize.x; + int height = AndroidUtilities.displaySize.y; + if (width > height) { + int temp = width; + width = height; + height = temp; + } + TLRPC.PhotoSize size = FileLoader.getClosestPhotoSizeWithSize(wallPaper.sizes, Math.min(width, height)); + String fileName = size.location.volume_id + "_" + size.location.local_id + ".jpg"; + File f = new File(FileLoader.getInstance().getDirectory(FileLoader.MEDIA_DIR_CACHE), fileName); File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg"); - done = fromFile.renameTo(toFile); + try { + done = Utilities.copyFile(f, toFile); + } catch (Exception e) { + done = false; + FileLog.e("tmessages", e); + } } else { - done = true; + if (selectedBackground == -1) { + File fromFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper-temp.jpg"); + File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg"); + done = fromFile.renameTo(toFile); + } else { + done = true; + } } - } - if (done) { - SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); - SharedPreferences.Editor editor = preferences.edit(); - editor.putInt("selectedBackground", selectedBackground); - editor.putInt("selectedColor", selectedColor); - editor.commit(); - ApplicationLoader.cachedWallpaper = null; + if (done) { + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); + SharedPreferences.Editor editor = preferences.edit(); + editor.putInt("selectedBackground", selectedBackground); + editor.putInt("selectedColor", selectedColor); + editor.commit(); + ApplicationLoader.cachedWallpaper = null; + } + finishFragment(); } - finishFragment(); } }); - cancelButton.setText(LocaleController.getString("Cancel", R.string.Cancel).toUpperCase()); - TextView textView = (TextView)doneButton.findViewById(R.id.done_button_text); - textView.setText(LocaleController.getString("Set", R.string.Set).toUpperCase()); + ActionBarMenu menu = actionBar.createMenu(); + doneButton = menu.addItem(done_button, R.drawable.ic_done); fragmentView = inflater.inflate(R.layout.settings_wallpapers_layout, container, false); listAdapter = new ListAdapter(getParentActivity()); diff --git a/TMessagesProj/src/main/res/drawable-hdpi/addmember.png b/TMessagesProj/src/main/res/drawable-hdpi/addmember.png deleted file mode 100755 index 73dbd9db1ab50aa003cfb646f2ef9eb55fde00df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 928 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 diff --git a/TMessagesProj/src/main/res/drawable-hdpi/ic_ab_share.png b/TMessagesProj/src/main/res/drawable-hdpi/ic_ab_share.png deleted file mode 100644 index 961fa545878d6cc0b5e5742c6a9de7d430b66d77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 755 zcmVi&_K;LhlE(Da2X@isVKRdO)=Z-KYh+iVzBlsD+DMNNKAAt3}j= zW%QbU2afPDT%GSa%-l0{5BzYr_uPBW|31F+|2`Axbh@ONV@XMoM=T%~5DO^sSeokz z66as!dIQ(N3it~%>7Kfof(pnXcEcqo%eW!qvK=AsEx$tba5b}djcsrfAxWzOX`0APW&7y!hIP01F+|n>wqlMRc=Kq3Q76fd8)3Dds zHVM~Y7aR;Y<_BD+4@^ZVU_Bgz1I}wY4L9I{cHO5i3QbU@cl{*{Q2fWdbYhx|wEPY7 zA##x~0V!+X2pm>>AR&3TVMvQ~V~q2R<=qQWxV#GIpkeM9w!M*#36Eeo9Ma~qRu7wn zez*(YBQtXpTCIddXz%7MFC>G-g-LBKInkWW(3e=WZkh{=Bf*% z$uK(CIU8Y6Kj?B3-vA=y<80A}^~c#IjqCzkQOnQ+DIM9QsSU%)5Cg&D78SxQ?gm+j zj8%#Gtb{nrdjVELZcyO_gjiM)Gj|;JFJR^*wmW9-Cya+RbNLeB+UYZ}XAyS#u>}F{ zghtHZjt~=?7N0pmp&Ho)oYJT9+9Q7%9JSbq<#F|T=I*p=C6bu`_RRZWRltO& zh*7Hoqz804yv4 zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL` zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTcwn`Gu2HtFf>sxx70H< zH8im>)KM@pFf`UTFxEFT)-^P;GO)BVG*y5CC7^9ZDQQ+gE^bh}fIM5JjFOT9D}DX) z@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal z@=Hr>m4GgVcpk{1iHq`zbF$JDTz5Q`N^fZsd*)yF1AWQ8NHOu6f28V z!?dKdL_=Kz6N@xmlfzNFuk66#U+V($*C~AGeLGk^t$5JYvo*&npl!w6q28x14{(~ z8Tlpo#Toep3eL_78or6inRy_-CMb>|UUo?>$}CGwaVyHtRR9OFRVFqE5aoG@{uFWp zPao(geNak4N;xngU~&X8;rRf_f#;;uJYe=I0_KxmTaIZA42-)xT^vIyZY`O5Uc0$a z=J@{eW_;ege|EiTiqb2dIIa81@c^l!2P)$1sw(wtTf1j#@YPLG6G?q^jPKLxSQU1c zhY69^Jx6~hzrR|1C;i^ntm^gO-u<*Y|NL{Ej&W(40(Z+n(Fh~1zb(x5^YwmN8gLpZ zuwLs8;tSwndoeeG^^2&`7e=cC!u8rrvlUkG3f*lk``{JNqqM+PT4mSMse3Q)KFG(B z(d=TrKw9O6ZGyZBko|lCyUNSc4kA~wn_ZSG90?Q%ZE_A+&MPF_>^NcBccU|_fy@TQ z53cddeGXI2Jht$Ki>_kE8v6QVZ{?^Qr%bk!R>2u@ItON5*WsB3d+wJ}< zb+(~$_Vna$R%iaJcE2mp{BLsZ)Je}iVJG#aCgCPrVi8S?xFgkDR7}mI(=soL39-j+ zn|nrkh5VXNaUJg*)GIEZnP_s5?X=$)hFb@^(>6sP6!Z4`a^_R@l{ZnwH&S;>$|;{n ze!BN>ugrg;Uo6g#X4!ozeq3z*<>d0>m6;y$zn3-H9WCn4wAww*HrRK5+RC{Z@e=~0 zKi4)V$_4&y>bZ~}ktF!`*|TY7)9$Z77^NusLHhv1D#w`92N;59fr?5`S3j3^P6C6Z diff --git a/TMessagesProj/src/main/res/drawable-hdpi/ic_done.png b/TMessagesProj/src/main/res/drawable-hdpi/ic_done.png old mode 100644 new mode 100755 index a62a06db87cbba4533c8e2d24ef2a232f274fd5a..f42a0e2d236299ac453b61d023977273397b5a51 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?*3dSx!+o4)i+%gQu&X%Q~loCIC4@ BZ2tfN literal 417 zcmV;S0bc%zP)mSgi_lk zY5x3ycQAuIMjK3mBuN?!#~6LlMNWiFkvp_SBRLr`TTzMZrmvr9j;b%xB_jwCkL z#5zU(+cyPvseyHlEZX3!Vo8wdK3arrD7aABXKz%V^rku<`~(;PWUq#$_dSr{00000 LNkvXXu0mjf)o7`w diff --git a/TMessagesProj/src/main/res/drawable-hdpi/ic_edit.png b/TMessagesProj/src/main/res/drawable-hdpi/ic_edit.png deleted file mode 100644 index df231b32a967129849e44b60c5e1796bdf919b6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1337 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n2R$*B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvr|54@xOWDF-G5OpYKXJRbl#@SK#I2h2W2zzcgWL}%{ zZsPt37er5iQ*$dXT z{n9OJ>DiF~t$ZQVT;7F>eD(0G;SZKl)=D7V})(f==QQfAy>06|ml{Qb3Ur?`ZUn0zB#N+cMDT8C5)2$Qc zXO|Z9PB~n9MAuu7yTEYDVexw=CqMFgPC0+PcFDn8$4@BBrk~b%vHj~0m4;o$^QxKs zwxrz4J$G9DQ_miS_$cmwJyo@BHiAE!bQxU8mMFFf+{doO3NdGUN%U OF!OZvb6Mw<&;$Uz_}^>* diff --git a/TMessagesProj/src/main/res/drawable-hdpi/ic_lock_blue.png b/TMessagesProj/src/main/res/drawable-hdpi/ic_lock_blue.png deleted file mode 100644 index 9d181e148c7ba4863777e7c042573d807ee8daa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmV+x0qOpUP)a0E_9nk zk=UovoO=qJI%Lg^Fa~<4qVbuqX(kyAoMuLb{1YpHv7W&3DPv cdk-MM01tCBn1y4L!2kdN07*qoM6N<$f_SHCJ^%m! diff --git a/TMessagesProj/src/main/res/drawable-hdpi/ic_msg_in_cross.png b/TMessagesProj/src/main/res/drawable-hdpi/ic_msg_in_cross.png deleted file mode 100644 index cf625a21b275a2cc793975742f04ab99773fea71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1239 zcmbVMTWB0r7#`SmO^fl?hQ?Uh>C{RE=W-@Ho0)0Gy1SEYH#*y}yW$cg=IqSbWZ29l zGZS|ceQ3Kh5`-uwNJJmRTCrH#R3D58tyZN*L{t={zQhMjiGuo4(SUd+*^NGgJ~%LQ z&VSDTegA!?`m#q_w|8tO2%T}0gk5%JAJF(_(}$hu=OFw|jcmW$B@(S5k)LcM|lvV?|ATcLh^|1w3I zhC)3iXq@Jz(6D)Q!bACqY(bx>=#oJlevs_0$(X=G0VHeIi0#WYg<9j4@jg6eDRNCE zs3_FBQ$?+hOgSDR1xBEC4#dbVi2(wLiQoZ}=RhaRb+Vw72E5EkG7!kdLt$&4QI>OR zx?u}T3N;)AuFSI4YL%&WGLARI0!flsj%RtE#u~IgZU?YN+y4G0gNl6JGu^;+Y%*ko zC1)&9DD3Ha2$rj98^pHXNEA*PTZ1kO7>>29Fs?OiKggkf-PlyyFO0j0%^}|z^K@K~ z^8O|m=kDf)LPhM2e9SX(QQ(N`=wlYLgN&+B_=Yh|Llz~_r2`SrA_8$brt>8l8lpgR z&?uMUF`nz<<4vB;@E|576A4L5^SlT^51-%@@uZqg#^W5oLb{2~*nR+Q9W`y6*meUe z-V`gRJOl&BD>%+bvkUr$oxt&j9hXd{$b%ZxO*@qD4{Nj@vWh(ONo1rw$0FB~ESsA+ zP%`wGVF-xkBtgKz0VW<43bDBrE9mDO$9AIH% zl8}wZ$HQ~-RsWSyJY#=l)I_0n?e%Xj-gc6^Bf8{`{w}OsKR=6GXrhn_0o*3#)GG~?iir zd(-oaT>kSdGnK(x_HeNeZ=FBOIn@)0=%+j=VtE61k} zz1u(Qe5UnZCAXNZd%u>W`-*=&dTRAX{mr&nZRg~PS6iZ6+fOC7MPV|3;Jd%G;wyLc j4-RyE8JWpHy|tZCzMs_IS=sSv_^ZkEWYzP@!IS?0iA0_f diff --git a/TMessagesProj/src/main/res/drawable-hdpi/ic_profile_cross.png b/TMessagesProj/src/main/res/drawable-hdpi/ic_profile_cross.png deleted file mode 100644 index 5bf2732bba76463d5832cb7ea129b06d4564e214..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1213 zcmbVMU2NM#9JgRl+O+~yF}6`L<7v_+;n?TIiETBEG)}fiBy?#eA|6mK_N6hceXf0N z(!M~4rm;P&60AdrhYd|d`{<^PB7w9{6YB$75wM2>1MyLb2R=4!k|wGeklDt=QEQ%A z(eiq_VT(#}u1bij2|}$_3)R9Q?DY#kRaHTh1WDql2JeqL1lD=S-`Zr*k#BgGODycL z0V6EqVG`%4rz;`YZZ^A0?D&mD(Ub{w=n5bt3bq}@wXE%vJo?v-HMRZ1sEdR=^6{`| z(0Ww1Ho-J^_cs(MQg5^uJ&P6v4(iw#wvj_JdYq#-A=5H7MFlYfD1cWGi1HCbD)Z1( zWL|`3r5ue&VoZuQdDg-w^^^o6x{{Wp7yv0LAtjD;T33Lq9v~5w_ z4Q%YbSS{%xNU&GHc(B<8y;V%GU&St)OtRav(6F39-VxMjC1f3W)(A4w9=6%#Bx}|h z4wOwJVwy7IMOBt*@N}m_B=SHlLs1bcO2kyT2HyO?$rGqkLeMGy>73>fZO34{ItNr( zoh0PY@$u-K%-?zx(-~XL=!ru8`{}R0XuBe|x7>-`oL=mF^WxIqU+uyBK74x@jIWm` zr;l8p_-OOpi3<~3-v2zxynfL8;AZLg>|e+3-23$1_S;?Cg+o)Hyt1&dGcn(3&4|jv z1?G(zwpM9@tuO!a!!yUa#%D^(_|;V0ef-GD4M!KZJ>*x{e>r~R+qoOXnWs=LF+U$Z zo!&OPciqS8BvGawKzmW}}<<1Vx9hNV>`s>EYQgQCU$l*P$=ca~!sa-zw z&GXl;TyH&H>SEqIziHi>E$>|W{m+)i?iz26bj>PHFTHl}#7_^jGq?KoA4lIU{T%#I MGO3(?uBWu`AFrLCr2qf` diff --git a/TMessagesProj/src/main/res/drawable-hdpi/photo_edit_spinner.png b/TMessagesProj/src/main/res/drawable-hdpi/photo_edit_spinner.png deleted file mode 100644 index 160a1d3ad0730eb606cf6ab14446bd5c8fd380b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1126 zcmbVLO-vI(6yB(yK`?4m1TW*l0S)`xZnxb~v2>|4TEx;sq6XRSPU!~r$K8PzP6VR~ z2E7>ZC!P!#jc7cm36TgMF)`{v6Fe9__;-<*c*Mk6Xwd`V;3m5>Z}$7%d-LA=M%r2r zRg_hi5d={YZ;_LD-RZrXO7Zt@<-{0Xs!($WYPT{dr#O&^XjU46xS@2zBviD4Gjp(k zAlAEjssnW-j!3Fy(29ql^M;Mt1kuo#w-vPqB9MmNx)~-Hp3aa!*TUp+A;Bi>D9q|D zgAQyTY)z?yJ!(iJ8xMenyo4PX5Gf#U^qQ`e50guNCA{~J84@f(P*0d#PO2l(2BMY& zfj|qC%5r`nhGI%}^dLi5b#xo)mI*wMO4{l}VG?J$dMc$|Th>CBo3(5Zje@#_qUxq+@AG=Jd}SFrdOy@+j%9$QB1`%z31osHRm%t>1v6rR z@ty!# zkNsFr?pAPq2%+Lz#nq+=`Sn!|p2S=aG?tQfJ!m%xN zO;cdcm7)4nS^t}D4@WKy&)g|plplZG+&m=iDCw-*USC%|esf(paeaRB%dNS2*;9VJ LxmAA9)HVDEB@Awc diff --git a/TMessagesProj/src/main/res/drawable-hdpi/photo_spinner_normal.9.png b/TMessagesProj/src/main/res/drawable-hdpi/photo_spinner_normal.9.png deleted file mode 100644 index fedd827582e507f71e43eaa3bc779b9ab42afb40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEuJopAr-f_UOUU%pup4i@Z6D> zH5X^kwvZAsbqQQhA3s@c#~%NFf!JUUi=}*u+hptP_k@3&J;7ns?!^tpeN0hvW^T_| z(Er>ZL7<;et_cgP|U?%tzA)J?9%6en@b1{bz3c ns4pN>&)iT^_b-eq<0Zo`H;L=9St{B<_b_<6`njxgN@xNA8$Ct; diff --git a/TMessagesProj/src/main/res/drawable-hdpi/photo_spinner_pressed.9.png b/TMessagesProj/src/main/res/drawable-hdpi/photo_spinner_pressed.9.png deleted file mode 100644 index 91099f3d5c4912951f5e401104a186e238f9c277..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj(>+}rLn>}1Cp0wt=P_aV-@Dyz zrYAQ~xrHvzdE2j5x@UD5Bf+&Xuw+O+F;e0P1D%boFyt=akR{ E0I7Z;-v9sr diff --git a/TMessagesProj/src/main/res/drawable-hdpi/search_light_activated.9.png b/TMessagesProj/src/main/res/drawable-hdpi/search_light_activated.9.png new file mode 100644 index 0000000000000000000000000000000000000000..b8d54c877c2764cb2c3a2230e8af40948e053e34 GIT binary patch literal 971 zcmaJ=J#5oJ7_|g~swDzd2&qh0mjR^4j-BKhTQMb#V`>RkRT_y5487Xd#H98a`$C*f zhz&Lt)QKI0kSYO7kvdR@0vj7El@MY;urk0oO;Uyi%l6%UdhdO|_h5PHdTRXQILC1* zb5XCd^*sAdkDX%wu@7E>EmO2orz>Qgc2J19l0()oFg?`3Rg9eOoqb&7xD%J$TAkLd z8>&q_0VNnA_5#M{xZ->qAiISrSi=q1*Z3bhyF73mjlY?(%b-j`4Dv!YZD%A2KqyGL zJcQCLkTa4jX4nhUQclf7Rh|R=hiBeGXI-u8M&B1ZX?&B?Ko!MKrz3Q-0tp+Uq$ouSmx&cjj8Py;LMBOR z0JNNbq*{+`$uJjm|rJ8<3k#A#D*LbEOxUQobrAirQ4FzU%h9p&TO5Vs8U`~RtEN5~s zKj7-bZhP3L1Fmz#Esf+R!{7zXvyMaeE_RHNc%YZG>K+rzTtU)}N>(1J*XKH;V=0W} ziYyp0Y3)C)9+=qtB-`QOvcqunvCrl`WP|;4=U{j6EL4Y}=on2{hKAL>_W>?Z)G6Ao z)^JTac0M3Vn3&ng+I|&})L8)IAlp?8250D_f;Nvfu=0u}iX2uvzrCOHm> zBEzKxQRHp{KFRTHlDuMqOUr^N^9!K=&?K5~HRQ6E@5dr5g>GT&$t>IHbeK+xL4K3v zBuR=ics@Z8iJ9pEzjlkY!;gKF1F=u8u2KUC#ya*F!HMiZ49co+Cmrw zE#v{UB7$pcwrinIaJ`4ub-CyU*l|4Y>=+k=)1%jz=PE(6{eHEAJx*^o}gsqjS+l>h-zS$XvwS zNG?l~VWY0o{E0Hg1nQC}gU*GROjLrOI?VcX!9nfBQH#wK6rg`(R<`^wZA;YH#jfCziPU>*|HK$7ACc XsV|lJCx`B{=g}=I=1SVj?E3C+kPR>x diff --git a/TMessagesProj/src/main/res/drawable-hdpi/switch_off1.png b/TMessagesProj/src/main/res/drawable-hdpi/switch_off1.png deleted file mode 100755 index c7188b842e380fef2187fb72ad9362e9d3c4190f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 728 zcmV;}0w?{6P)+Hzb}Y%paCH?zxTv)xugzzv>^L{n4u7aLJ$f;C6Ah|LI}uEsZ?a35VXNyU}OYjjBGY5#i-S4qSb22 zk$Z}EyKVbD^ZESXGlD%DjV!OjL9GFBN@z9ud%d19g*ci2iA#l0YXpd3H(D{8kwMJ&5DyBWb`!_*yWNz) zmrq!SFtP}R@L3(=8tV1B<=>jk=E?1<)%FwX8SHk5i-q{lE@Qo3+h!x;Vj<4eA&x;E zf?426*ASsl=8;uUrmkiqVt zi+EtlP*q5*_)kfJLX?wgCh^Fk64M5xD3waGK??KXmRdVt0m#!wpX@RaXiOc*5)iDSr z1<%~X^wgl##FWaylc_cg49qH-ArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC z!8&|>tvvIJOA_;vQ$1a5m4IgGWoD*WnOhh+8yZ`fn>rht85+78JDQuiSeTocSy~vn zS{S=p!t}c2Czs}?=9R$orXciM;M5CB47mkBn_W_iGRsm^+=}vZ6~Lah%Eav!Q=H~O z^`_uIz3|G(IcejJ6HkkjggQCSX3E{VefiTOrM zn^X?BPnu2nY^Z{aP+_N}wdKD+sH)!i?`KY7xuj~sT2 zu}*e~+jKWicCp~c4Fc0&2`pdm;)uov|Kg4WgNj0V)4OxdrtP^@C+gH%Sz?wYc5qML$Qj7Q6mebKFWjNCoI|4RW9@6t3EC}(6MxEl6Yr`}|Jj*nFt^1I>~ m|Gb=WTfDu7Pp0ChU;=~1*T3ltS|6)|iepb#KbLh*2~7Z5ODV1Z diff --git a/TMessagesProj/src/main/res/drawable-hdpi/switch_on1.png b/TMessagesProj/src/main/res/drawable-hdpi/switch_on1.png deleted file mode 100755 index f5b18f145884b8cd7a54cec5dda61c385c4e7695..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 zcmV-N1GxN&P)L`rr0rO$E3zJjMR7Z9gMlKX487^ii#tn&T|Iak^DN%SJd0l42k;AYhaD|L zgh8jWfim2o9$LFHlP2ch>fy0YJNq#uLF+|?tphuV2#6SuZ)AF+yuCLePj*hF6|&|Sv*L~Y@T1EbBFR){vw;k2 zwLg970iWZp|JZPXC^8I0fvFse%0x#8mD}HZu|x0vjXgVv0+44ANCUW@N(~euft08H zX@v-g0%2gW5kZs`!=za`OEDB8ft2!UH{pyNtAx33XrbSKf6(nKASuLu%x~L|5G5o0 z{TN$^e%e7=QK^VRq!`Gsv1bLv>M(gIL`uNU1P2Pt^`$I@Al{B;-%lMVF44=N5Q*D< zjt=b$1%C-@zeX3J*p;B30P9P+Sb7r_A_mmX0Y%`bMN|EUmUXdfW5=NyTBs)|L;^r> zK|NPM{~!$P7*HTWhU)RfThnNEsq-mBLQoAQ^bQ6|fjU6l;lsL_VZtdXqJ|H*VoV#5 z0y_d6c$l?)76l&6WP((I6mXdbS2zdPjCu=7Az}oJhSY&50Ra{Z*}l8{{1ed2^(JiD zG^4F7@uz$)mrmr-PP`pJ+{vn?eRSeR^46PME-aWZrbSr-a7yyBY5>0NH RqapwR002ovPDHLkV1id}bK?L2 diff --git a/TMessagesProj/src/main/res/drawable-hdpi/switch_on1_pressed.png b/TMessagesProj/src/main/res/drawable-hdpi/switch_on1_pressed.png deleted file mode 100644 index c2f9c5b2997459253fd92384d5ed6f35bc97bcdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1650 zcmeAS@N?(olHy`uVBq!ia0vp^EkLZs!3HE*Cm1^cDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49qH-ArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC z!8&|>tvvIJOA_;vQ$1a5m4IgGWoD*WIhq=~x>>lHnK~Pr85+78JDQuiSeTocSy~vn zS{S=p!t}c2Czs}?=9R$orXcj1eVlC`#-H)bYxC?sPjIP zUW@z=&f^oWbDmnzv6*MqdiP150jxz*T#gzn3k6!71Rx9*7au>zA9rT@c_>bwP!nak zU#m2HRjIodyWa!b^7ZQ0_r34Su9V&R-=@#0hvDXw6OW}eHJ|NbE;MXk?-}{=NX4g% z?{-e$PrG_aWSLB){_V#7&i$*eClGRhG-mQr`=g-grYz0>3c1q`RHQ?XuT6Du>h z-TL??j)>x($ZyB;>a#bubr@+IFVjC<_0vDR>Ol6JU*GLz?Yq7(2P(`?3Y2{LVnOlm z)BbA@+}*$P_NT=RPhPsd-F~~$ey)^;3yY@T%FI@d4kky1=gLhPnpIxOnwiu5gLqmy z6n+-g&MIK*yLu?bOS;j%e)IKrS_+y+>dz!byLQxA{rD^q{afp;!rB)hE{aJ!DL3wH z{hPFPzKw{I+Jls!Ukm+Iv$@q;74CH|T@}RM<^9D-!{tfe{ATChF=4unKd(Pv5?L;E zMK~c>QPeBH$*HBm&T;{V%$AH@|1WGf|LvYd;fpr0SDajej2EIEoIStuHy!9yoNs7l zG==Zny;*LXz3=-gDmCS4EG)m^&2@#bs{Q-xG&auVOC`)|c8Dh3a>$laXNswq@%5Vu z*PVHOzg9A7KCt0mS8)DPs%WByi_3vU3k6)JG%$RgoOWH${x8dyn7y3(T)84`(UDTq zQg_B!O{}(lSjKSC=aTN*sLQga(#2;ODegTe~DWM4f5_4!! diff --git a/TMessagesProj/src/main/res/drawable-hdpi/textfield_activated.9.png b/TMessagesProj/src/main/res/drawable-hdpi/textfield_activated.9.png deleted file mode 100644 index 98ba91f8a08545b628b849a4c34455cf843bd12b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^nm}yC!3HD`7Jga>q}F-5IEG|2zP)*nv&BH9<>ARB z@o5u{)|jV8xV<_NXLCaCkhPClenQ;`g|50i&MgsHuMFC1u7&PbRldMw6z(B_vOt@(7bUasTbEo=l%2pcb}CTT}NK z^?LfP>wW&i{c`!z`6;=3m$)-AO=fYK;QnCV+xfmfJ(op3QB})S(dJA^;pE!>YWW{= Y`8g8*&zbF-0(3cpr>mdKI;Vst0MdzGRsaA1 diff --git a/TMessagesProj/src/main/res/drawable-hdpi/textfield_default.9.png b/TMessagesProj/src/main/res/drawable-hdpi/textfield_default.9.png deleted file mode 100644 index 5841e05b6051d7bbb7d10c1cc76fb27b0091e663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^nm}yC!3HD`7Jga>q_RC-978f1-`+IjYfuniIN1Ed z=Kp`$jD?FM8oRBhwoc^bY>nXzlb*-@C)ab5$l7^&5s4~CJ-Q}}C~LX}^(>L_G@O*A zvh-L@Z23|XYt4rJTW;?$Uo$yLy?4oyjvBFhH%lv2{_@#c{7=!i&se*eO+jVS_N_o` O89ZJ6T-G@yGywn#&pR9d diff --git a/TMessagesProj/src/main/res/drawable-hdpi/textfield_disabled.9.png b/TMessagesProj/src/main/res/drawable-hdpi/textfield_disabled.9.png deleted file mode 100644 index d7f78ab7026cf7fca8d19bad13466e03a9b309d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^nm}yC!3HD`7Jga>q$YT}IEG~0dwbK7tHFTB9<}SiY)@)H9RILI5x3x3aNk?dJ3W`OhJ!xL-t yY!|$3$lIT?Ick3$Zy#fy^{miOyIcND+0WSKtk-AqIbRCsHU>{uKbLh*2~7a(1x%Cx diff --git a/TMessagesProj/src/main/res/drawable-hdpi/textfield_disabled2.9.png b/TMessagesProj/src/main/res/drawable-hdpi/textfield_disabled2.9.png deleted file mode 100644 index 312a0f48cd53a4f790f40cb843deaff0ba613cec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^nm}yC!3HD`7Jga>q{2O2978hhy}jwk#ULQy5covr zUA^$)TxSt+0u44$rjF6*2UngER5HNXG> diff --git a/TMessagesProj/src/main/res/drawable-hdpi/textfield_focused.9.png b/TMessagesProj/src/main/res/drawable-hdpi/textfield_focused.9.png deleted file mode 100644 index 5fb8f7ee0af74674c194287f4526d9b31dc84b38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 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 Ppcp(|{an^LB{Ts506Q?G diff --git a/TMessagesProj/src/main/res/drawable-hdpi/viewbtn_pressed.9.png b/TMessagesProj/src/main/res/drawable-hdpi/viewbtn_pressed.9.png deleted file mode 100644 index 95e1173018f33806676a88d7f049a78886a571c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 638 zcmV-^0)hRBP)}csLnnHR7oc#J5$P`T3$0IXlYh`n%Co!Ft~Jra=U!(EH=p%cAkx4CLIlvqNs ztoOomO~A+q`PTr4ZgX4awxWfCvSs+r-u~A$e9%aXUqehHCGVgQo#=hHf4qTyYqczt zf3OP6c>LqckR5Xw4&4;gJf@?7!p$abz+~$8A18tGgB9x=TW-s3!8{5t#6OD@LHQY5 zS`Sd@MNJ-+Ed|u*t2L$MP$LVgK}Io(QH){~qZq{~Mlp&}jA9g{7{w??F^W-)Vicno z#VAHGic!~yDv4*lqp$6cM+;Bqos5c3E(>9Czm68o_){-*yRd75w%2))|;>QL@}x_CAT$I4W- z!V{Tn?a~&XV#PiiKMk2NqVF3z(d+J=@>}PU%8JkXDSGAoa9r_3rn?(@V&VGUiO2Ol z9p5p<&0x|c3H?`Oeu-Q`tdzUJt3z^l%7HAiP2$u_wz^u>JWy#TVIvL!V1 Y7jSCp11Fm@u>b%707*qoM6N<$g6O_A>i_@% diff --git a/TMessagesProj/src/main/res/drawable-mdpi/addmember.png b/TMessagesProj/src/main/res/drawable-mdpi/addmember.png deleted file mode 100755 index c23e2ff07452e9c8b5bf94d3e970ba0675ad6dc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 619 zcmV-x0+juUP)M1cJ~ZilBoK1pb3gLKK3+f~TNMP$1aR zs~{Li<|*j1eGk5YWm(;wbz?6+_;~C%Gw+)>@6CG}wrwZkl$AuxvLp~YfmNN!tyU`q zRRZ$BE|BF*1jzyzUWYmZ&Vfyz=~JKv)IsEDVFECo76lw|s4b@i z`oIUr_JIt&Q{>n?01oCTGyxbFH@^aVKo__IET2OafNLNJ41gn$7-|P0jITj8Y24zy z`x%!bJLk&UCil|Lf(qR(CqD(o9&>EMO=8S7UG7oQA^^q`XjOiS+b6o|1rigk6{&L1 zz#fo$Owo;2*c|6|Slp|uL!d-$Mex=%sPj4mGStrz5O|@^>AZw#>Q7g|%@W%YKg#_E zhg9%x#Z?Pb3jXSNV8kbP8~9d_)|`_Yj=*!z*`Xflc%V;x9DxUNt~~=0c%m*wKtQEm zM~6V0RjojT5(K1LKXs&|KLOmMDybruKr)2!B-e`6xTjVY+&SLzdtk$>ntBB%jBjv_ zswMSB%JCb!AKB<))?GS8Uc4IypG5xQymB0*A(4{$=xRtBjOrf8vV1+uu7>0U#s^Wg zWEED(AT8OgTwx?FnMYGv_GwBRkvFBwKPF28|0#b03;>6psUZtJpd|nR002ovPDHLk FV1l;801yBG diff --git a/TMessagesProj/src/main/res/drawable-mdpi/btn_check_off_holo_light.png b/TMessagesProj/src/main/res/drawable-mdpi/btn_check_off_holo_light.png deleted file mode 100644 index 34ebe308207b18362c3370ea160a5e42a1c9b70a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1075 zcmbVLJ8aWH79xdz9)zys_`Xw($|5L|2m@Wz1xJP&Fia8Z zP|Lz|K#`#;$*KfZ0V+p=nQX<&;b_})~Fw{jU(?Sc1scQK`+Ucw~qr_E0cw83kppPS@4SM3R%~11&1$fC+n(gabA{5u20jp+`^Hj9o6<`FisD+pCwy*zj(C z6z@I!{W+Y7Zx#6M55F#bnt5OSzI%3_A+sY>FHTI{MLX{n-oC-@uUor!j-*q{*7ldt kD-Wi+-2LO+#w>S!V}#qes$1L7u5G5T<+-Z;xN!aU9|37m$p8QV diff --git a/TMessagesProj/src/main/res/drawable-mdpi/btn_check_on_holo_light.png b/TMessagesProj/src/main/res/drawable-mdpi/btn_check_on_holo_light.png deleted file mode 100644 index f3257c8f40108b881bf483edf8ef8e2b0988f2f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1282 zcmbVMTWB0r7@o~0F(f4VkcT9+@i3bfEt#Fm&R%AkHG7$CcGZo^X4PmbWOn9kc1Y&Z znOS$U3MSE(7Bon;p#@QFwM3Dkwx&oQ3{9YxR#35sDF_x8AN4_tg@2WVIPLMEhRfCLFB{Wu?lb#L0O7W1z3hBLyn7MNn3!G>b2X@lCxv+B?T24mKh7 zWEkIaYAihr;<^ce-|HtNie^EO^U{8r4bi=Tp=cjT`AFJF&Lk5%}A_s$hAK?oID1yxeSR%(k zAHhl?hLWH!806TRp56G25R64*fiSfz3x*52ty=}%0P#3@BrQsc=E#paHQEYUfTr>yloO_|g3ToJ z$}SGD`9O%4^E8ozGzy-PWg;X8WrCF{$kKUH^0O%TEx!DJlSd+_NT*Z&(>b*x)Q-+} zXAY3CGf7ZG<71*Z>3I03Pch83FC|2?<+a@U#zy~2q;CH)SL3<1j^gsn!I_5ldOV(U z-Q2Odi+A^R9QxqTdHou`gck%(TB!f9JY=WX8Cmp00k9T)0yA>IVDG-pI#QnZpXH&_jbGE9S|) z*rlHCB++o^USz4|!-corZk=67)_wF+)* z@{JbvZ1?QpU)-zb|GL?5X7lS=Z@}6QjX3y0f^v=x$td cVXj8(>1*G6>%YEr)%h!>28M(SvGKWo0QWJf8~^|S diff --git a/TMessagesProj/src/main/res/drawable-mdpi/btn_down.9.png b/TMessagesProj/src/main/res/drawable-mdpi/btn_down.9.png deleted file mode 100644 index 96c7adcd31c6fadd7ade40eaa698916b46008c16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^VnA%f!3HEFI<=*NRHLVhV@SoVw>J#A8Wbej68&Wb zMdvQq>RiFwd}x{9gyw|y4fZl72X%X=y>BnContTQ-5)pY-j?|_H+tSKSvY6T!!;iQ z^v_Q1K337-z0i(dIN?A8BQqP1gaL%{NBhssC#h!_b@zTLyL#S3{(AHE&6}nMObOPV gQX2NB-mx{=oG~`@n~a79Gte;%p00i_>zopr05j4@H~;_u diff --git a/TMessagesProj/src/main/res/drawable-mdpi/btn_up.9.png b/TMessagesProj/src/main/res/drawable-mdpi/btn_up.9.png deleted file mode 100644 index 2fb6b6678031c45d5175e20b9ad31f9733c58f25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^VnA%f!3HEFI<=*NRJNy!V@SoVw>K2|4k++AT#TC+ zoRocVv(C#d3FU*mddB-tns*ZITh;evPVuK%>9b|;&ib#fW3iKAwcngLmRvg(ptTI1u6{1-oD!M< Dr!F~n diff --git a/TMessagesProj/src/main/res/drawable-mdpi/ic_ab_share.png b/TMessagesProj/src/main/res/drawable-mdpi/ic_ab_share.png deleted file mode 100644 index 8b198726731967bb3d5038088207eafe7123270f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmV;s0Yv_ZP)Kq?c6Wr6q=5HI*Y!F&}?_0-G-K+ElcR4*2(E?kbFb`&I#C{A?;NZ=3` zqqzfs!EX(u*l|cdq*)>aTC4-4@_^U~h(7@FA1vlhrFtR+TC4!1vVqtUh`$5zVjx}u z#413X0>mKs=Rmv=m;jHF>;RwzAYXujRSJmj1Mw-KLH~f_p!iG&VqYNs2gK`ucn(nR z9a$d1<^Z52!a!;o5Gx}Ip9kX0KpX+YtU$aIh^GTBeoBjis2t655HN(|6F@u}Xz@*2 zmV`Dq#Ge8!&KVJv(GeWt(!lgF8Hm-XR(=e0BE**sL6%q%kqy@Z@m#8A!$DCHQBV}~ zV98x&Ku7GOX?p-#88rhjAGXQ}=zw6FW<#I_M}gE&9MbaiDhFQR5PwB42P_~_oVsno l0dJI!c1%VcKn?&1FaQ-dmikrQ9y$O3002ovPDHLkV1g@%sPzB< diff --git a/TMessagesProj/src/main/res/drawable-mdpi/ic_auth_next.png b/TMessagesProj/src/main/res/drawable-mdpi/ic_auth_next.png deleted file mode 100644 index 33c7f7da0c6639213a6c73fa6849f5770d940f2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1300 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eM!3HFEez+qDq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1FfbQqhD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo~drKfuV_lxuu?= zsiBF5p^k!)fuXU!fw8`!v96(!m4T&|p{W8CC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW zlwVq6s|0i@#0$9vzP@mS^NOJX1q?F%io^naLp=li++2{qz^aQ&f>IIAz^b}9q_QAY zKPa_0zqBYB7$0fMFwMZQ!*3BtA<#8e{zaLP;hou(C|%6&ddYxH9>I%@v=*5QD#|cid#{Bt^zoatunDWfGE#H^rw&; zc=|v`>4Q=VQp$k|0h1$$3C{;W4m>BN<^i)$5ip-*9Z}iMz`$tk>EaktacjzCTW@AZ zfwt#i8$R$y9$j#ZgV!aTyr+5LCeMzC%xNAald7H4_VehzXlE9h(xiSvbJhap%^&zg{dRqmI&;PS zMzhwQgA&W4*B|t$TI)QcL0sZk$#c^bpI;x0Y#bRcH(yU!#&}3mWFfn=-@om1xKplc z%SL`nul}=`yW{)U=!c?S9q;SK^nS11ZIF83s&B{a@J!Kc`>hMpT4%e=d9tmobGAYH zUz6S+T35WKH)K50dSsmcd1CERtFOVoIX-Uu{#{~0;G>5e*1 a1BOXYHtQeG`~DnMPIO=~G=WkL6 z?djqeVsZNE<(-@d40s#@#Us@px5&h~olfyS=r7punEB+o-do=f3RwsoQ}Yp7lkDg+ z@t?w?3-T#<__^M(if(Ua^FMg#?7Pn*ISoY>fBvg5PPzQ-CtrS1zqO?&j77u@O1TaS?83{1OTdXQaAtr literal 346 zcmV-g0j2(lP)`6pHRCwCF z)jtZtFcimeQ!I*O5f9)6Jc0+%LA-;f5W!6sJBquL4!wvD9>L8UIJm^$lN3T}(pU4R z@EI!9Z(j(hkWzL6Um48d46+*`c7ibsAx|R3Xc?dMV-hL0gCbPW7z+`!#(W1GV?Kkd zn6Dr^rU(15f;438cj2Vz!4d9ofRs)jh77Lixf?7w&(VY*c&Yvr_KZo}Po_;s1Z>pX zlH4-sUz3&e8&1?IRt+{qonv)DQ*`7bMug#eC}0f>b^nGz>kU%($CeK;MYk|3_m^u- s-=!uATwIrtv!vBYC-Crb=zawl0KIxg49j>qU;qFB07*qoM6N<$g6qhKSpWb4 diff --git a/TMessagesProj/src/main/res/drawable-mdpi/ic_edit.png b/TMessagesProj/src/main/res/drawable-mdpi/ic_edit.png deleted file mode 100644 index 652c748c1900e58f47af0f18393a746eb4a4d6e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1212 zcmbVMU1$_n6dr%^FSJTDC@AA-#fY;rvpX|8Gh~&`PByM|V%)5_AT+%@bCVsi^V69d zcN1cac@Pzf6#7t*mKqfU75_j2Mp}#!YC#)mEfNAoA4IWO+6P}$^iDP#`w&DNn7Q}d zd%pAYopa`Bb5mp0k~K>Rf~ZREP}6v=4&Frz@%QVaYpd|G8Z~55i_?aRz=K5GaB`4L zS)d)JAuzhWx&`Y9VxDhivM8&4uIP>x0)bAbWVskk5Ov#2F3>w5B6G0av}4pi!@p3Z zX~d|#g2rlY0_M#f-5zY|Zp!H09lC5#+qaQ*B?TL>AOd8`D%ieKicwQ`6}%6Q8H$`z zK^-xw98^|oCKHYaNg*WAI?M57R1R?h$4lH+GR$%jhK(>>gyzBuD=VBpPCpd(<{52D zT1`&-!cvUNBjhR!Q!Exk#Yo8U+8IukWrhti;V_LgXur!wphVmLhKdCh`nqSj$aHKn zun2NaCyG%x(sBxxt7$WaZGW05Oc_%GF2jXb#(M?D*c?z_)+j z-8}Tymex(9V*czEv3K{}JKy|!u`%-4Sa9{nc8MOlcBAL^XP2M!B?phMd)~;;i(DUH zz9)b9&i(427JPT`g=^QI`0tb9mMyCaHzts{s&F%}XO{gs(tD_IZgDlxChPm}UBC3w zAE>EW8ZXWt${+iU&_*WyIP-h|m~eo3D($JwN)Icrv#0=M`?WC-|SF8k*Ge^Z^O z!aivoej~wEE4bSeLmiIpp0Qw#h=#3f$J&JzQXx8$E(b)koL(MvxNGkyaUzaIbh3Nc z2`;4uuDXM7m^b}b_}$#u=;5%%$*t{=FnfauKVxb9jE(>nCYvke%AQ>N1s1;Jc4%N^ YSW~FVs>!FX3Um>Jr>mdKI;Vst05i)>i2wiq diff --git a/TMessagesProj/src/main/res/drawable-mdpi/ic_msg_in_cross.png b/TMessagesProj/src/main/res/drawable-mdpi/ic_msg_in_cross.png deleted file mode 100644 index ad7694f7564fa41f488e50013a36463b56e08baf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1169 zcmbVMO=uKX93N`fXf%O}G|@uyoRp}g^YLc(Yo^(T-JPsi$foIL!NrqrXWnMV?0h)$ zlHCLZBSQ6Jpp0)N_fn)6YSE>TP!e*1bZNo z6LW4FSIog_506d{7xd|IT`}1HFF{{jr3x%e5U5*K+gIxec2%!R_rbBif>j6^Pq1rF z6>}pX?RXeO_z0(qFbrY}4CJIqW!{@i-kP)oe58;^(gl=$uxKG zHWUDkc(p&<-)pD;*b%Ka3V6wrD#|Z zV^XxKXCuBW!ibnoNf}9sLpUHMrDQavWm3_o2&s^1a>L!B?O)FR_8R2Xgdbm^*Nxz`XphSj*my@ zb8T&T0RQx_U_(sxgWoN(SPdW^WXmZhy44UL$^Bq z{sjIr*KyRlTsyotd2e#GGgZ8LHni~JVs)!9-%}H3SH593G3U3>Tv~qh+wI^dksTP; JuB8qge+~K*fdc>l diff --git a/TMessagesProj/src/main/res/drawable-mdpi/ic_profile_cross.png b/TMessagesProj/src/main/res/drawable-mdpi/ic_profile_cross.png deleted file mode 100644 index 9f1346e1789fb28c939c40ba45d3c48ae6ba1fb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1117 zcmbVLPiWIn9F7W8r&FAGn4k;spn_@glBR9Kve7oJE3R|aqE!%lOop2=T^GKqTIjd4mw!o@4w5O6{kTGE&__(t!ezwf95{#y2wG#urcoEe ztO)F4iInnvnu(nV3^9?q<54!lboJCdXbvI5meHW?>fE;nk2u!0bnc*%7xP{kRqft} zkM=kEi)LfUR4uNjo9(J=)PaKtWb4kb8)$W%oAs;FeRwQz>@0)~>D*jWrThS!#y(<| zh{Bs9h_Z1t0u&HUfL*L40$C7c0mwX%G*Q)n!p=V&jpkbwtzcy5V^K@zs)Tr&Ak=EL zNKKAle^3CbstTecND@yGd@$w`Sm)hfThoJq0@JrWVq=#LJ;E{`Av#Ahoh!ld^7#eF zZZO{{+A^UIJpn{S!EwU6X3+sDpucG>iVlin9uf*Dz$3m%@1wGJWjV?NC?P%y zfyJw`9OuNEYjFuTAc09T(Rc8^0X*@o@b8@5IdVuQQBte!!UA@b>YG7tc=}e`Z|B+^yce z-`-kzV{STf*=gy#+Ww?P5#H&iADwGVUj8(7ar>1!Pquy+pN`-BP&>4)Z{M1quhwTy z?0wzw@%m`n_RZ?y-Klfgd!MI-8`Bf)%5J=@g*m$eZ#lVojUEa#?=H?D~b{(uSI4m0S2u&_yc@45ZHbIv{Ie0Sz%FAnyf z?#D1}ur#BV(RwU>dk>@UnHlmsT880t70w3^Y#I^36gw~hUh<3uPzHwGTKodWFsvtb zD^*z4FUeNmQAUcP5-&t-3>%wBLc^*9h?`)+^$W!Ihff6V+6CgOpfh?{1T}YNIRf*` zvlVN(Zb>#VF^-QVGIHPnXyA$0@MAeC5N*FQ+NZ}ffwv*BULbaps_JuiF^B*zPy%T& zY!(+KiWS&wo;{Cq49n9DPqRG9axx>ytblhO0!52#M=q;cCl;~_L=D1Frs-z0Ni}&Y zh!$v8k|dhpXpSQhf{a@}G!oK}N4g$V5L=NOLO1a7)T3brORzwoOn0x~g}T1y*pEAf zLM5XUBcxf1p*=6XR~sF}GWeUuzUa8p3ISaPaj+Cws2|QqmyBw6aG(^3vXL)GE^3O= zPy=hp13oON1p@t{Y}b|zMzqWv5J*Sh@?=)z0Ga1ZmK1;^uq?;rc;4vx*^e(Mil``g zMdLVxpXL-!$xW%+R4&J`$k4jnk{?6Ew?H?xi(+@U(t%vL7y$zYQ6&f(-6@!>1u%$f zL5LTN_*vbsTtBtXr9IlcvI-*iCa|?A@bGq#Wp|$hoV;Y&jv$i25p!e~h&E~Rz#s+2 zW-K0XrkH1l4&VOY;?XE6I-Qh%CZ~IZ#xdRQ=>QpfN&-HTPlR-mxpL$#(wI|Hl}hr% z{Jpa?(K9@`@^IjOX7cH0^})+)@0?*~r7=2m6kFW*`j|h33F3)gmG}DA*4FXK%w}!# zn|e=MU+Z-@U-v!JKCXrC=&Qab+KcS-`snqOZ?)CzMs{_*?+}(5zb%7 diff --git a/TMessagesProj/src/main/res/drawable-mdpi/photo_spinner_normal.9.png b/TMessagesProj/src/main/res/drawable-mdpi/photo_spinner_normal.9.png deleted file mode 100644 index 9d75da73a179d59c01f2ba500f3536b026abe7c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2e8Bu^K|kcwMNubk#&P~>TOsCh6* z_n=wPZNJT%noj)kGGhM!Re3o>E>}@hd&XY|CQqG7Su-8&99-sU7%{0f{b4lU#1wOa z&p=uIK+By5?Igy&4$&J*atWOkjhvkfsWr-8E#h&V(zjmOxT*qeWAJqKb6Mw<&;$St C+cGQw diff --git a/TMessagesProj/src/main/res/drawable-mdpi/photo_spinner_pressed.9.png b/TMessagesProj/src/main/res/drawable-mdpi/photo_spinner_pressed.9.png deleted file mode 100644 index c50e26cc018e50d4b3667bfcd787b94798f1d53d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2e8B2O2`kcwN$2@MVZc|@B2AB&!U zMn(Lvtiw9Sch&RGE7V#cTX9#Q)Fltz!ctoP%xo44D}YSn+(Q Txb|=t&~^q-S3j3^P6Et`mrVp3OWu(*tYT>W@HfhtG!C@Uj!>q8-u5-pUXO@geCyVL>!s` diff --git a/TMessagesProj/src/main/res/drawable-mdpi/search_light_activated.9.png b/TMessagesProj/src/main/res/drawable-mdpi/search_light_activated.9.png new file mode 100644 index 0000000000000000000000000000000000000000..8d7b83f7efbf0a62556cad98f25ff0120df9c00f GIT binary patch literal 959 zcmaJ=O^ee&7|ybEk%e7hZ+aRN1qGXA(lombjb&{T8!)A`1$#72rfujZ6O*Y;dlAHo zg6#egJ&NeTvnP+jf+r8+$v+^wPP$FkgEb_XnV08z-p_g2YChQ6zP`;c%#PL2+jQNf zU*XCY{ZEd+?a}2LF?ytf2W0BRh&l9d9|0?HhNz7kZ}#Lfsxr*xO~2bCJ^P{R;(&KD z44(!OWiw2*mPU>{Mg;WH&<{2C*T+vR@I8%vRJKJss-uzLn8&CyZ+6}J*sXYM?H;J6 zDisJ2aX=azg^8MK>_S(i`^+q`U;!axjlBq}XSYBd#|V`9QqdJ51d75#xvVJgE|5eh z2_k)!B9zs#qDuQ<`LNVm>zWtnKfgw%-y$ctG@IncKM4-JA9 zIw5Uz8Sg)ZlkO}+LK`J`61%i<11@tFsr48+1jk*BkMb(EMwsAagdnQf0BF~I*02WEB{@Pe1W3Aqj>#dDNGS_ki8jO&&_ODjwCOSXa zb~U*4uo`_7(s_^RU>88+lwJyG>4)9)wEz43ytc`4-=A&mF|Df{_u}kJ>hmjD0& literal 0 HcmV?d00001 diff --git a/TMessagesProj/src/main/res/drawable-mdpi/search_light_selected.9.png b/TMessagesProj/src/main/res/drawable-mdpi/search_light_selected.9.png deleted file mode 100755 index 27a384723e1377037088c76aa66314026ab1b55d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 987 zcmaJ=&ui0A98XvLH8w9IIz@P7A__LYnq=*xac)hw1(rG5!s=~l^45kec`RnLm-Bwl4OU%IyQU=2y$4?dsI_xrxz&)ZsDm>nHHGt4l| zs4=IP={Q2aBS#O@f8q7Z^K=*^r5dT=71Fjs#7sH3j)37=4OB*!vwq_vDlkl%b*nW} zGv}d=J@HeU1J3?gI;4M`M>1Q!s-fYPxe9A*yUFRPBvb zJMXZQS3n_#RKP>T0)y4@;wk&I&B+Gu>EprLj#y0?702cAINwIUF{4F`v&T z8j_Tuh)lHZ6D!X6(RfcmN0A-60dcVp5=EZB`i=2=g zsRuO8|3f{mkB&$g9pw8@;i$SEAij(u+zM^lxRvoFQ~--1vIq{V7_arJxY)!5M@<}n zVnqcPmt5b$?dVbmZ<^5XBVzeBGIWil3Y_aYP|k_dx*|)mJWZ=!lBaTdF*l*i2&J5w z&8ljTt7E(6A)oZP&H*<&kegV+3ut5=h3-w{%!Jqjog+hca4y0?y)M@ooQpV+%hP1| zq_KZBy0=B$lT7=zrHj7tkx$(oQd{Rv{&+~Q#5F^os>WaIyL)?+X}Ih-_l`+Vx3fdP zZf`znoF2QM+PScI{pth!`}yvy#GGZeU!=to>8(459vivTXXV?MC-1)>AOBQ&GruXO ZhDI20?o{el@a%1J-Hg(L{%U&p?jM6KGS&b9 diff --git a/TMessagesProj/src/main/res/drawable-mdpi/switch_off1.png b/TMessagesProj/src/main/res/drawable-mdpi/switch_off1.png deleted file mode 100755 index b160afb0c8704856a1e71fbbfa61923e88440ff4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 511 zcmVX1^@s6wUO!l00004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzkx4{BRCwC# zn6Zk&KoEu}A|^$^fS`y)3X4Fh)OjzfYwud$Xj|XFbSW%SBp?__VI+{de_>@kqj+)_ zYvuzLGYKpov;U4-LWoZy`XB?C&1N*8&&eRZ20w2rQ&w9P1sTQ)f=8yTwryL}1dj&9 zyc8D9f>|(ghv8pt9*@W5y6*Y=e!r*V@p!YYQ&kn!bxo7Wq_f^M4dr>>U%|`eQqG|e z3Q>^h`#z;SbB>S1`ol1pyE$9~=%T3_~d%a`aAy%q+_~cYu<) z-EKL9b-{WUsx7S~syg$eU~GMK9i-|YgH@gRhePgBkh6N${*DAhMI6T$&ulgu7W^m> zdN>>|;zS2|{f-CP(}E$$w(YCyj^lI+gxsz}PJt=pUcGl2jI4!BH3cZtOsjV*^F#-u z+aNOt0y#-wi+i3&i^W3zfauG1f02zwE;Ptlv0|3G0tOx$002ovPDHLkV1m7? B*F^vT diff --git a/TMessagesProj/src/main/res/drawable-mdpi/switch_off1_pressed.png b/TMessagesProj/src/main/res/drawable-mdpi/switch_off1_pressed.png deleted file mode 100755 index 59f8c82db5353efa4a6d027c62c4d2523c7c65cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1329 zcmeAS@N?(olHy`uVBq!ia0vp^5kM@-!3HF^PJHXQ2>tmIipR1P$QlnRqTL9F}z+huvQIMFNom!%h zl$xHIXRGvn_kJaX%oJOta8q9c-vZ~}1OnC3`ysn+hwS0lBFq zi3%0DIeEoa6}C!XbFF}Ekg&dz0$52&wyhGxQ4ziY3eNdOsS2ig#=6M{hK34eW_pGu zre*7iAWdWaj57fJ{tG$}cUk zRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg%7Rq= zpw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u$h8}Z(?$09!NkF zti#vW$}_LHBrz{J)zigR32261W@d_&DG)fD8oHV~8=Dy#x*9v0o4Qz-o0(Z!7`j>* zyIR8Zy5uL9=BDPA!1Sgd^t$2H3rY;R1wfl!Qj0RnQd8WD@^clyp0>)w?G|U8=0WwQ z;C71(PQCg-$LNEi7AdM>LcsI`V!{(HkONQpsd>QkUIa|otM9J=#lXP0*we)^q~g|_ z8Rxs20z}&T1%+5zFUm);usY4Ywl{M1&2u@`BJxYrPfT@mT$B{SqUC68-!5$xX>xYQ zj>>(mf$9%GmA-#36UuYALVc0>qz1p`&U@qfRUR$=^wnr`>ehMBC#IZHh?ttX_4(&W zvx8Z!Gn^6+>das@E?@EQ+3{Yt=2u^TJ^h@weX#*g{;KZAh6L<2q?^Jg<5u-PK&OxRVth3Lm6)$OZ`NMcdp5^h2 zmp+r9b!V|c`sK*q#zF$3mtUF`pH14BaIl|gp`$>`BNg6HzeJ^PU2anJ2wg89c_nLW zOyh*v*PpP=aC&#ud-}l>Q71%#8ywDTd3pDg&Bo^3+sndMyY5=2t{fradL_qf<^A{S z<^rjf?^-$C(q=82X`**#FVmT$FE94)bTi~}Ue&&4^2sM(jb=c?q?NO8>B|#cO0(}v nG(F$6X4~Do(`ps}G!HObJGlCkTH>Q3P$A~&>gTe~DWM4fF(~S6 diff --git a/TMessagesProj/src/main/res/drawable-mdpi/switch_on1.png b/TMessagesProj/src/main/res/drawable-mdpi/switch_on1.png deleted file mode 100755 index 27c093e81e82dae1470aa8ec91c00a3238ddf307..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcmV-J0=)f+P)X1^@s6wUO!l00004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz)k#D_RCwC# znY&H`K@^71ULes#8ww5DSP&BmD;_{P6EBU8i4Q*g=xL0TWbs0jYqm&@K8SoVJ<{lS|H_AjME4M#S11kCG6H~ggMBJns zUMK*UT<;24hiegG*Sa297Y$a;^TERe-&+|m0esNt363CJH3d-ratBzybsHr-lZs7t ztBVVFscu*|E;Xqpmt6z{X22{4{J(%rnFg#YQt=i4Di>rL@$QmTrl;^JzyLJYrlyWA RAQ%7u002ovPDHLkV1nTG^Be#G diff --git a/TMessagesProj/src/main/res/drawable-mdpi/switch_on1_pressed.png b/TMessagesProj/src/main/res/drawable-mdpi/switch_on1_pressed.png deleted file mode 100755 index db0e34717cab7cac7aac85fb548ff265f20fdb0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1383 zcmeAS@N?(olHy`uVBq!ia0vp^5kM@-!3HF^PJHXQ2>tmIipR1P$QlnRqTL9F}z+huvQIMFNom!%h zl$xHIXRGvn_kJaX%oJOta8q9c-vZ~}1OnC3`ysn+hwS0lBFq zi3%0DIeEoa6}C!XbFF}Ekg&dz0$52&wyhGxQ4ziY3eNdOsS2ig#=6M{hK34eW_pGu zre*7iAWdWaj57fJ{tG$}cUk zRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg%7Rq= zpw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u$h8}Z(?$09!NkF zti#vW$}_LHBrz{J)zigR32261W@d_&DG)fD8akRf8=Dy#x*9v0o4Qz-o0(Z!7`j>* zyIR8Zy5uL9=BDPA!1Sgd^g7|x3rY;R1wfl!Qj0RnQd8WD@^clyp0>)w?G_81=0WwQ z;C728PQCg-$LNEi7AdM>LcsI`V!{(HkONQpsd>QkUIa|os+S$485kIEdb&7HE-p_ON>Vs6>1V>p$9ajL@4k8S#?8>TSe&8ELFn81P>Vf*DU$Ez zJ>puoJKrru^5e6WY=2)zn3N-iaKm0-`%;mwZ|4~_|x+BEyFk5`}?k`I?70mbV)aHMCdJ>i-OPy3H5wqcl zo6RSp$8zMDNW|>R5g!x|yfAy08};RoDj!my15m(-%0iQ z3dzK63A%jm`KQTuKOPiW&+_$k`9W!}gRa}lTqAFH3u;~8BNef{ZE4hMzC8A8dv`c| z@>|EfBl`3-U7=U=-)UTn-&M-=-qY>3_0^-yIrf6e;3@q$k6*~nL(4LtO=;-^K|udS?83{1OP&g_d@^x diff --git a/TMessagesProj/src/main/res/drawable-mdpi/textfield_activated.9.png b/TMessagesProj/src/main/res/drawable-mdpi/textfield_activated.9.png deleted file mode 100644 index 633bcbddc20afd04d4493870966e447ac0528296..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^GC-`v!3HFKYIk}9sY*{5#}JRsWRrWprZk2WT#No? z-;=xNtERGMmE_5d6NC=9gx_}4mDyTwA-V!6`TxVWhbvkai}giWWGT+oamf?7c+{yX z%FIA)(yet%ZaC>A{a-jEsNt&2F1D2)uPyH>>30^hDKa^!*LtY7J c6YnN4F>vkYV42_>3$ld4)78&qol`;+0OA@ew*UYD diff --git a/TMessagesProj/src/main/res/drawable-mdpi/textfield_disabled.9.png b/TMessagesProj/src/main/res/drawable-mdpi/textfield_disabled.9.png deleted file mode 100644 index 3b928944874b0058a846e85da6db7ab3e7ffbe5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^GC-`v!3HFKYIk}9sZ387#}JR>Z?7NZYB1nozHs5N z-O>O54_ACND3}(t%U7lGjtYO90o#*9tGkNbo_ygFnZc+Tu)v{_`(WtxcVZLvv;UT8 zxOP=&@x5cbInDcew}0f2V@=3N{!+N@KD)LQ+iK~5OSQ8C((F9^Z`7SwmUcepJkU}G MPgg&ebxsLQ0K%_6ng9R* diff --git a/TMessagesProj/src/main/res/drawable-mdpi/textfield_disabled2.9.png b/TMessagesProj/src/main/res/drawable-mdpi/textfield_disabled2.9.png deleted file mode 100644 index 09b5616424b9c21202d8557192c1d13fa4dc06dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^GC-`v!3HFKYIk}9DVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9s&X4^J1z5RcB}1O@&-?T-QtxZDn2VE#YzMegGjt&7F_qAao=8f=}g zu2*r_?+N!B{#_N;Ti~W`+*ZFW;h?g6Z-OlAVg|kw?e9Jc0W_1r)78&q Iol`;+03mBM%K!iX diff --git a/TMessagesProj/src/main/res/drawable-mdpi/textfield_focused.9.png b/TMessagesProj/src/main/res/drawable-mdpi/textfield_focused.9.png deleted file mode 100644 index 45cd1046da0bd28faba6a7b3dc3931c419c18e01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmV+m0rdWfP)Z-HE*qoWKw_t&B8D~%e+3!lzX1XPRn{%8 zYN}#1?Xqr_ORm}j^idL&7J(7?^T4Jm#{ZsS1V&&4MqnV|^g$E^7!n3>n(61dkSEaX z^v!`37_>)k0*QE68W=hu+X2gTF4`-f2IZ2P{?!uSqD2q6q*5txaRjEeKv}nH4VVCD zN8qAtzyi2=de3f$1P*%O-4iA~tyOe#zyYwgqa|n91CIlNANu-Dvq?T5(iec3BH#l+ R!VLfb002ovPDHLkV1h~HXVCxv diff --git a/TMessagesProj/src/main/res/drawable-mdpi/user_placeholder.png b/TMessagesProj/src/main/res/drawable-mdpi/user_placeholder.png deleted file mode 100644 index 57af7911257c6092f82b075e373249384ef04f2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2733 zcmbVOX;f3!7ETqxGT1OEg-30Of+8d#6C^Rn6p)}Ggs323$Z!J@NJ0`MOj06f?5ioX zs8B={L=+T6pA14pWDo(xXpup20IC5|0f90E?2VPa_ruj6@2+*vIs4rGeS2Q(9`Wdj~*xq^w~~g3!;%sjSf;8E!2=e$j(wBlN||2U@Rb<$9ICitF4E_cpNAA zZoH4ZkI)^6;CUs8fPe&FIy)hfP2|9xx4_6!5=amYNSH8bbQE7qk~+aZ@{+)_<{AZu zeN>S|I>G;PD$vId<}MHcFgy~EVB4c{Fh?R1jYs1MXge6j9*srWV^L@<0*xWr6G>=1 z?9&4Wt%*2X5{=^d$rdO%!6PIRAqjfUT6b6F;H4x%>zJw`7 z@Wtzv7$|_4E#e6!JOLl3VPvudu@WaZ=;>b}L<@a<{wC&&KP3uG8A{3&qR>ctRCKf^ zu8-Pc2@UwK8=ut{)8mBziUx=Uu_88D5AM1pFqpf4Hl$Gmy&>%o@xY=mqbLG)Y&5`^ zP$^Du@C%Z|oF!^j?$uUnARSYV=pg6hOq=4{$t1f@s*sB$IfbaRA_OIUKel z6Tu}AmA%=oCuRDgVqC~yHo?|r`9SZ_*RK}bT1_#`I{5nZ zs~pMdSZ~X;q1Wq=E-YsM^1w_*o_+N6L3nt$O{q|1w@gpz_8;gaJId#G2c3e!^~o7I zL;6;EzVE90o<6E>tG!(>r3(5%cY8A{Mj#Nx z#dSBTT6YWqfzsoyXxmQ0_%U*(TDY=E7qSutP zg>ixY-NvcZ`$NmWTD8iBXt8RYrx~7ds&a36=Yl_Z1+#B{eqLyC)H6+KkR~q*L#5_* zJGbq-wrA6^gkRUrhKs!|jBbsOqdU*#J`XuN!>`&_{RFygC?4i@$0+$OMFpFfo=?71 zc4?uZ)$-CV+ZLHwy)~2(8tTtAAHJ7`>IoY~=(O|r}5;NHWyODDGLggJcu82k*d$J=8L9QK}naMVhN8rrk z)s?$Sn>X*s?0l6{rWk;~NDeZB7mjgnm0(k^9lr2cm4U2nzn!UIj~-QNo7#cyU$ z0y?&;6_a_7x@woFdCQz>VF&2ex}Z-x^%x3pcf%(YHF0%*PAu(T`xSDpC52#mb&ip)3_od6Fxzl9$%uD zD?e+Jd*If_59tLvOI#IZthT&)O+wU$QwznJKa}2l=2c|XbG+%R7`|y5IkqPK5h_8r zy0=VrzG{upAPR|;1A#>|Yl6p|oSX~}H_A=#4fN&{V|H#dY5V<3t07-@?z*kr@z~o0 z#~R;I|H82B-;R8dWU+tb5oz&<7=+zo-mM;mE|as@8}J)=8MNDZoAb36pSE3pY_R4$ zbCFdB+g_b>csyE7bM&*`zm8)9J=VwqvL9csd_TOYXS-IjwWm*sGE}8X_c~i>nOnTd zoj)Sf?FQp@R^G8ejNTFY-P?Cew0CnI?CQhllaZj>!+EU1q&es@F3W6MF5ozjvZ zvO3^VRA3p(Y55ccR%y{+VqRtq~VjwB$VJ@;WzL~)+yMb!YCUg??_MRWj^K7 zUijjGb7B~OWUY>@<@(P z-`x^6SQDa1`Ib9%tdr-EyRQXXN99uVGrl--ax9l|?HeCn!M;Od?@gHDm0u3^^Shs5 zf65lu_OFVM+_!Pt#jbs+p#&nW>KscawfizAwZ2*zVfW+|^ZaFP_&~oN~LQ3V4lN}{}!MZH_9(jDb&v840+Ok_LHg0$HyY_yDMg8UKjCm@KXB* zW#^W*t`BZ%^Wdu|`*xTI8Yr`B_fPF4+hRL(Ns_EXPmwk~LFIP;$~%_M9O>4>PE32; x-faGTh=g|?rn=h@)SD43FDag$d6TkCAF`(Tei^hf^PT1glIr10DRT>x{RzsAot6Lq diff --git a/TMessagesProj/src/main/res/drawable-mdpi/viewbtn.9.png b/TMessagesProj/src/main/res/drawable-mdpi/viewbtn.9.png deleted file mode 100644 index 61f930ab15a81e366df7e4e5347a6beea9a5af52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$UKzz{uw5;uunKD>*@d@6U1}HP#j* zV~O8IhA*nPjaK~Zy1?4}hUq5fCh3QT9m#i+ULVb~sjz$dcl!MP{r~>_o-ZenB7VYe z!rcIOM_HDVr(3K2m)HFJ`2GL!_g{`GSUZ+EJ8?ZzNVu@~|EJfsdu5pq=iB|SVC}Qp z(cJLSGN7+9v0#=|>4kvO3;zSzd#y6AI4evw$(p=c02bQfYx_z;%9`UwZ|&!o z&)XSadojOtd+Wt){mWhdUbJBVpH#G00JZ@cO$pUfO zio=Eq4;~y)dN^T$LZ)oCQmS~eD?iUB?iBSCd0QB@SMlBqw0XkL(EHu=oK~)405D(} NJYD@<);T3K0RVIuiRJ(R diff --git a/TMessagesProj/src/main/res/drawable-mdpi/viewbtn_pressed.9.png b/TMessagesProj/src/main/res/drawable-mdpi/viewbtn_pressed.9.png deleted file mode 100644 index d603c67b240e988a22bd2b63c12013cb7d4b7b5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmV-E0m1%>P);l;dvK!%Xh-2Jh>%~r8c{J_8%TJG=zWw%} z9vEa7$WD;mP)9)>1a#$zD-WhTe)H}B!`Jl1AUi>JLqZDXAYjnlfBE@6y&VI?cVB#b z1&%(rgMjflP>z9NaGDx*&`@>I|4|2xI%w2EqYfH%(5Qn(9W?5oQ3s7WXtYf|>L40B z2-uCi^Ze6?fpQGUZq%+cu%o}@_>C0<<)ED>uCGQNY+wjw*7q&c-gWZ&y4%k`zN42z zKz4!b1lf%`90LLl4lEKD2?~6h@5z0I6;^3(I%=UfGS|jfWtG!ZNC@Q zr=UYhmJrZA5kkkb(e;R`C%_Rmygl^&2p>)S^)C^FXGUDJ04PAa{R2_eV`}g=gd7!? zK+BG)97Btb-*NjS>Kc$+zFmU*~~)9th}e0)Mz1WF3uJK%*#MXA;tV9)bal)EHi+`P z2Q6UUMpsu3MAocinP%8U(X!BF_JCOxJMyA6HfMLnpt7x_U|f{zJV-#DjjoOnAaiw;w8;0$$l)jCt5_msfpvA30Bl6m@Stwk zX;`E#gRH9&KR||^XT0z_#OzZ(qD?nUPl^CAOIg}a;=Oyq1G9fx#SUo0tfMkz0VExw zd=1!@#@Vl69W3cI=?Pj^K>NUusG|Hpb{Ym>f{#8?H3Z%IjT69fQpFA;w*gNz+6crU zS-B5v=JFitq+B5YOjCZoSyUYa9=kaElp5Q~UnwWiz&a_nEPzPpRna`YC5M4`K#57S z2dIxGQQfMW7fd-EM#mS_(j#e_l~+K8p$+f3n0b=h(BZCI;jo>w^ZK*WW1H9$>vAY) zD#YNsxXmrX?5WRIH_rnS3C+UZxDc6~lPMKVSLwLTdHma{I7f&2*w1|`uMl9x3OiKv zB9j!#CH??D0_RmUxe~OA=BoJ_diJMUnujC_aUYIdn{)b>812NAu`S~zAkXJZ)zX_^ z$;db_wF#&97E@<}r08xHz0%UF^lp4Eur*b2TN5S}HGNZbm|>->tgEsG%Pa$Ve{fX& zCs$?VY`$Q4N&^1B&1Jaw1o#B_1o#B_1o#AGu>2EX0I8c7%*o;A3jhEB07*qoM6N<$ Ef}cAqV*mgE diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/btn_check_off_holo_light.png b/TMessagesProj/src/main/res/drawable-xhdpi/btn_check_off_holo_light.png deleted file mode 100644 index b843c827faee28dfd569469336448cc60e8871df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1148 zcmbVLOK8+U7*1OseOM6mp!O0|1VyuX?JJ?NyWKSIg4>quqALhGn@qd0n@pO_x@oCm z^(2CN5Dy{cULdGU&&EmLJq$MSsM&A^J4o%P`O z>`2j=oib#T89Yu81PW1LLk#G^t~$OFs7ynzLeAke$IuN3o>G}Lr%L%TI)gk&$09M- z;DsoikRw7&h$e+&w8#q*$4i_bv4W`ZvLeLj=Eo3go;jfuG`(qyNGemo*i|^LUav>$ zQUrOEoFL0G$BUdOvIN2UGY$p;>-haG4I1>xvz} znJAJnE&whkM0n1&!?+q~9~a<;8=Ip2;*1Nq0`yVMGe|uq`deg@yR8j{K;n%u>RF^H zpsFFGWsm(F zbxG4jffs~fF)gO!Lz+GmkMjZ%^cFYg_!u|_Y}vMm?It&~C0EIK5MbmL5vsPjV61{L z@+-)tGa34D9vGGr%16Q)t%a;X&$9vg=Km&-BTjK)r~K17tt--w;c`dFkvVxrrTfT?J;-V4 zV({h1*ZHn1^zQ9r+`YG}%kIIWm1{jWpa0%@d+ySmtg)gh%lqDUG={RVq(0wYYGWSa z_N7~LZ}#Qt8FhYPzTR_pM{%(Yo%-~1p|8@nZ3Di^DRpD+S3S7!dUVf{6#vj!JJ<2& j^7l9K&JAelpj}iUTGC*sn%I_JSOu2TST?6d5_~Y3QCM8!gJ5I!ATGoGiq!27;~%@^?)Urt ze&5gM`@WA?E?+!(!kZHS0F&KIoOx)?iofGuLEod|hTCX)L&+^t@+F@V;baK11<4CB zcYrH{d5{yTHv9-}0BFNvL6K7AS!U&>fS!x%=+!_7p#iWhQbQbH4i(G`%fz4^fAnn| zj){UDUuE)8o{$6j#U-0$n7?Ux0l%r7X9axGLd>RG5kUYd9Hs^;f?=y_$47XrXdgc& zaco3IDYxU#oGS9H#2k_gF_Ydz@Dy#t%&eX^(MAis0AncHKvD*hHV`yprC2L%!bTq) zS(62yHP7i9wS^=*?pKtMl_VpPh(2P_OL7@Wvn)$e49PGA(jdZBL4{L^U^p$o;Dljb z7DI|C1+h3I=aniIJB~bk7D6E8@jNFEhDQ^HQbwv=h@|xt83@GV8qp3bdGKF1UZ@=| zs0u+c4~C^mnMd{Tr6s^9cP}>-S47@eSI8nN3RmHj_{snbDsHD8M>l#w6s$bUvCwQX z5C(GwMHsyqM#9TN17YMX48=o(*~}UfJTJn#oDP@EWu#pUP0@5Nlg(sjPW@F~e)Dy|(K~0A&8OCZl&qvB;8jeci;k%UDW(3|YDxRa1;@ad zPuK_G%2!Q=wmao_d(OUdwy@#*6T4fsw7_$_9z?JC_MNY<&AmI7>E5;i@7jFfx(0e; zb1xh!H#98P9E{Dn|C(Rhwew)DLFotyW0k0MW6a59w`O7A2M5!d>!yIA^rl$uTJ3|n zl)m3vg%zgRQWnEE=nJ(ya&A8h>HC0CQ`t=Q5rz*l2GjAssQWx$q; z6NkfFTdribofd|wCjD>$>=E!2L>f3ZFRAz_XkWlvvYxDK*iq{knAyMmX|k#7v`(Gb zsqgObnjc2f-uiSZX!>>Cp1C?x`{c(pyH4HgIzILznIU=YMAUzAV;K{hJqeCiI>$SQn0WpBs)l1Z9@8+Ea6@1OhDt3-2l{q~*@W2e@uflFNU z{k4ds{BIj*9}qXBrr)bBo7TH%m$4^lVBCz0pFfNir=uE8BHwEoCmhk{tWJFtskoP! tbGSs?F-)43nYz)^CFQWua0RDe=cCVE#wT;*O7DFs&)RxE_@Bl6^c{9rf8Rd6 zWwT}c?bXFIoev2u+pyICj=b7VhIr!}v2L8RF00+oHFGR>wPT7B-NM337Py+UhV532 z%x2d%UB~FphfUpcW*nNf;I6A-<{7@!zL&b+AG7pkRg_2iIM3%c&`GRXwf6tQ5C6Y5 aHb{S*wBD`NpM4k5pA4R^elF{r5}E)}OjyYP diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/btn_up.9.png b/TMessagesProj/src/main/res/drawable-xhdpi/btn_up.9.png deleted file mode 100644 index 6f17635decd4e36166f6539bc6319b03ec89c559..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 259 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 diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/ic_msg_in_cross.png b/TMessagesProj/src/main/res/drawable-xhdpi/ic_msg_in_cross.png deleted file mode 100644 index c008a308d0e47272c3a5ee679765c2a228084d3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1308 zcmbVMYitx%6rMg>g; z%+%c$LqcnVRZMC^3F$h9E!Gs8mf1jfMnDTeT%2AqIZ{MvW%E?zG+NkA@#k zGIQ^__k8E^opWZiv!lJjS>wbotRlKA97pTJ_IsZLeT|C6qiES|wI!`?J#FO#17ZPL z7a<;1g&r7(f;_PQE7*)-Wu}ryTFKaMUeZ;UVC%T@Y8Ig}thqIx6{KEh;Uer&G(U0s z!%qlYk^RIIY>bX&LolQ48Z=<{U`Ik4?3Fl~Xl=op^E@)3LQBB&YM*BEc|Wmamq&a1 zm?H2c6|2`zEC-d0b>bo2fH>=7Nr?s?yoqxG7I=K15oc)Nrf4?>+$3Oln&SbBuRH|u zX2@wi9*(T|LXw}zSXP#&s9Y}R%DG*-(L(`_<0zV;7=}a|q&c8jLY~yj+M zlVH)ef_$%FJ@>@&Ap;7QZX|TQuh<2h8Qs#&jGo0qA-paoNQ!35kJvR@PB{z>_mlkC=ClV`o`Tvqfp`a+cQ~uLA z#Us>?_I7m+kgz&QP($NmpgGxlAv1wtC9TnLAd#Oh%&1Rad~}oJx;4GE@%i>2951M6 zdhS#Wecf_%}Zai^h`^K}U-YGpi^^tUtz7_<( zE^fR0%Z0Q3qpjvNweLXbm#-Y_nJ(?FiVVNM?)Jx@&zGDk1nL{EOx3^k#-Q`rEqfNu z&tR_D>c0q%*IZ3KIqujifX<<}LCx^x zON}%4|9z}1ePr`b-_>5LBxiCLXQNx&N1}mk{`E7i`0g_AjUBIEa-4ANKXiWQ!OEkL zr{3B^z5DHtZ`N&3UBQ2z*|)ytO!Y{4;pUE8w-)N0qshgmPFIdRQ270H*Xv`$6XRnq zDqWMGdg_uw{K4O9ua;Mio29vhn{&zXiNW^kFIWFnn8Y4Cpij0eta}I>!@i#L{6XEd O|5wqrj_`ZI)X+au6vAx) diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/ic_profile_cross.png b/TMessagesProj/src/main/res/drawable-xhdpi/ic_profile_cross.png deleted file mode 100644 index bd3de23bebda5154a9e244a73551548646470828..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1279 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n2R$*B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvTGJ{=IG>RZUWQmnO9trn3tRivpW-LH&m|?UcFY%MX8A;`9&f5`8lvu z5Rj2yl3$#WU!dUZtf1kWn4Fmh;%kE92;yaz)S}F?)D*X({9FZaAX{Z(aR70ihv-is zH}Ldf83@ z$sO76-=%pp^F+8!GCEFJ>WkP~Uy-j&_@MPVwJE!&R$KN*>Y^EYcV5k4U^Y}!KW)Cv zN%)4x{)eA@Z?K$A+~673IxRuKBgM(va6+;`*8a_pdu^57mq|R{);%|!(NBb3^6~e@ zJ?q7ESf?#maWu$#R`k7_yM?+p#K@egON@4bp)LS4u^il-T9d)e-k!WD%-gEEy&iT&Y%q06y zd1?;V5Cq|g_lhaJHo0$g75-YDkF$6=gnBY)(8!^pWI-aL7+DD7nluViP*Nr@yoMbF zQDLj;49X<>1liEMlB?r&G!vrI5B*fDLF6Nx;zxx-B?ia>K5G_wF%Gf(;ck7A7}IWfDmcH7p2t zFHgw~>j#05m*rW1kUar7hV{{mk7j)o%Lz8II;S3TsgIq>dzq((UH51rge^rJ6`Jbl_T)vc@;C{jT*3UXPN;$e`J}R) zo$wqR;+d!@#+X2iWqY`gFBXXed!jrSi*&~V{xUYM+ep%7SoW=A-&@$|u2>;zK?xaF z+As>`E=cALWY~Gb1kosHO-Qn;yK-XsHuWiCKmQHj*r;I}rG{;5YHg|0a*d zq-eKO{_33a5pG9!yFCY3*q$V)=Vwt zZM$^P)z~)UYw($-b*%4x@F76^=_;wGqk?oG3enAz6S-9p|9nvxH zs}A-#JN4lbKcr}esca^p?F#Wi;zulWMRCURk78_1jl_Gg4(tW zuA8>w1*zf26k(dG5yZp}9AxMkOF1~tbJdM9)EjlNEElB)gmpm8aUV+8udAXlQhooEaFu)>JVsC;_i|1;&qn1z`CMwWxmD@8>XG@5j{z4 Z4Ch(42+t_Fa};PGgQu&X%Q~loCICWDCD8x? diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/search_light_activated.9.png b/TMessagesProj/src/main/res/drawable-xhdpi/search_light_activated.9.png new file mode 100644 index 0000000000000000000000000000000000000000..8413643c0259162d4917cc124c88c7bc693378c4 GIT binary patch literal 975 zcmaJ=J#W)M7&fA+szQgV5~7_BmjNW=uh>^&#gsHoNF*FZi6tTigkxV4E49zq7vf|< zX$3<&A$|eBfPs|(iH#q?0%IkZP&e2b&S{b|5G>nw_v(3`_w$abl?Q99TdNGitd&c8 zjjmhtTUlAA{~zY*6S{1YLW9(Ci}bA!F*ye}5h#0B8`Y5I44!>PS%$fM(={8UVLViA z>~U6t;bJeKY=+71#(`yb5dlrqc72UK{qT_muA{M!6hknAJnFcmVTkI(ifIqKcE(|M z?}2QrQUMPU3&h^OAE~j%PIOhePs}_ECJ@rq*z=$oMiu07h=9VSQ??+A076cb6$r&U zKoUfW7w8L9qO2-Vm3F}NVX3#!X{j~6IQ2zO8rvZxP26W-^&XLy}Sy zk%|UBvEq~;ZO;^R6xpF05EuI(QM8)4M>Lj3dY*z8%w_#(S|(aBKDGj0_*xz6HPXf6x#;At>?(%QdT zJu}hyNw)LBrHA?GBcINDNC*41vUx%;MXs#p%=l~58I8tQ<)!g>+;(0*{!}`+vGhfd zq_cMO?Z)*N*A7m;|N8lD+;NYNk5@OYyniMCUf162+#g+HcxHY1>@eykSFBv9=btKbr<;n46Qm9ws7j^)rST~ei@-gyNU~S zgi%mO9#BgX7+bPk3x&buCSKR&f*WANHDN(hXrjQ_wj~ScJg-U`FN!my>Nzo;Rdcz# zsPb7Zn@LTmZLWsQRR_Ab&9#oWLRW5V1;-i zyx4fMHF8l*q`%}o96wLp!23TR9@Klc`o91Ax^rS^d#FxrZ=5PUP3&x5vyHL-x6_wS ra|4OJ2lU8jIQVRsd-JFDSr z1<%~X^wgl##FWaylc_cg49qH-ArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp< z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC z!8&|>tvvIJOA_;vQ$1a5m4IgGWoD)T1JlUd(8SHf%+S!y(9qS`(#*-+(#_Pu&A`ya z#L~b8rq?AuximL5uLPzy1)F! zZ*JZ7I+P&6{^9#o$-W6I4o~!ma=M}_a@X~V=(^h;yIA@+?etZ(dbOgtcGJ9@OD?kK zzWdwqywU!!INScevVFNhLAjgq=W9;1k#5MnEqf!zX`Mpy3Aw;*r4zzW1dVpj_EAz^ z|LLD_Ew^RJ!n5&e`k$DRa>aX+s(CGyviNm-c23>WbyV_>!yTu_vAk*7$C0qXT%&eDe=8r7iRnIG5C%i|tE%AQg z9K$CIE(K~``m*u$uE$riu6j>evXr^zvdMz;HTT~i{2BX`#~>tg7hjZG>ichont) zx$o`Blq^v5?QS#9j#8PEd3n);Gqc4QpI?gF~~^7^hz<3ErW&`lZ_kjV>LB`8v~2*Y0pX6TfnK)Pd)pEo0YTf8W5jCNkme=<>-otazz*M9!u+`!0?ebU6F TzCrjRsDSfy^>bP0l+XkKE+Ftv diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/switch_off1.png b/TMessagesProj/src/main/res/drawable-xhdpi/switch_off1.png deleted file mode 100755 index 20fd785179c69185eaab2037e13a137b820fb97a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 866 zcmV-o1D*VdP)p8)Qy6IVhAbHCHpX+{s>nLZ-IMFg-AR&hUH4om^+U%O9SsEs<2a70R4S@gtEo&TLqd{g zrsGz}@2tN0rQ<6(NsiTOrRMXw_qblKlaS<*Li~bRlUy=tq ztk-LjV3*4?asbB+0s{gAATR&|0|EmeFaQDrATS^>00INpAZz;#ip8QTl}f5yF8j|t zK0bO8WwT485r2oLjJsSe6CDFiOkfeW)oOY2ZepGjL8jB`PLXAdxX2GjP`)I_fD;l} zJ}F-6dA zRaoSeS6xMM0(zW?>~&m}vy0ItPxs+Bee; zLoS!&tU&q#$ANw;>`V5TKJ3-iRp_EHte>337=XZgvF)l}8e;$g??qT;jPiFFk{AOJ zcrU{G%5OCWoWLS3PCG2vegjBN;9xhQP$)!xU9fc)r~L+ysKCLC7g4LKEUHYkMqWr& zV7V-87C~}ZShh@t(QG#T$BV^+GXm+(frG33cDwEGOxs4M)A8F{QhlTDp8&8Xut;b` zlnUJM_q}RtrU@dnZ2FN43TE?;RPE7d#Myw@SZSk8CKG=eA;LkH_?1;r$3~ zB$hd?{GW*6Hp`&6!D1ux+~Jw2UF#l611#MH#Vb@MPNQ65P_z!uoL#0w733j=a67f^VxsJ~|YUJc_ s9LMo~Bc)!ilMFlj)A3iw_ZI;M0DHs}s+Vc5JOBUy07*qoM6N<$f^BMn3IG5A diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/switch_off1_pressed.png b/TMessagesProj/src/main/res/drawable-xhdpi/switch_off1_pressed.png deleted file mode 100755 index 55184f89799ee03886048658dbe36ac458d50e68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1683 zcmeAS@N?(olHy`uVBq!ia0vp^8-Un|gAGXjIUm>yq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Kep0RGSfuW&-nVFuU ziK&^Hp^k!)fuWJU0T7w#8k$&{npqi{D?ot~(6*wKG^-#NH>h1eo~=?wNlAf~zJ7Um zxn8-kUVc%!zM-Y1CCCgTBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~`lk!VT zY?Xj6g?J&i0B&qvF*KNf0j6J(SfFpHX8`gNOrftYexnUy@&(kzb(T9Bihb;hUJ8nFkWk z1ncniwerj>E=kNwPW5!LRRWr!mzkMjWnkfIU}r;;_7T};O1gv zZ0urS0@Le~pIn-onpXnTn}X2mic>ErG2|8iZFWg5$}CGwaVyHtRRDY1DigO`oN$^4 z)tiFbEzUUg>H{644~kl(sD=pv(+`LVPq;u1Jn5(A0n>XCFky4us@@08FRY#}jv*Dd z-psj}bt^!kp+8n>QNrb>v{EiEr@fyV%S>N*^O%`!`!4Y%YkKVjJ4aU5gM95l+)my{ z#irR8I0@WVnYH=Gui65YB_AdH_Wk?!{Cwxm?(XhAL9b?Cx2t^H+_ZLMZnS0J;#F5y zoqAftxCFbgjh&qlN7_mm1GW#d91|Q87+BaGU=)xI;xPzEEVEw_qP4PU=NdkK z{^nX>eyN*%Hf`d2drM2tKQlLVJbU<1@v2?Ic^0uk>E1T|_gYo+If`m)|1LUl$vx=F zd}W<@soDc_oI0Q8&6}rndJ|LN^Uph@bj1GI2}bm3ig2yEo45L7#TvK8fhqehxyt|* z^?YN@k4Ttkq_e(5vuR!TA*J;)>hT|ycE+*%lL-$GkDd=QPLd~2-v8Wn>Z!@W}r zCx|%tuTkNe?B=k{vf$FqeSYR9KWpZ#X1d8ehedNeV@}i8S$^9tzjX2ATKwu{<`+he zJ%X>_y-K~vuJFOl#r2rQ{=*a8^A@Nasuy)gA;ipbU|-5dLM?tIwgu+6fd zV%q&2v*xLpuP5w(?V)?o{M|23hGeGhmdPiN+@HpA=WW?vS1T)DfrY6@XWa>yprPw= z<=yw+F}xl<6OC>aSnyop5Zrb(Ywrwmem3S;>o-_4Wp_S}G@lr;UNBBHT*)+(`OT68 zR_m`$Z7m3W^zWZt*^#|__T2epbLj>1w}1zsGa1Y3gxDJnFmUj2@PMg?13=1J-Qar> z@5f7CHXf}jIsSAP8ZY%Q~loCIAklg*pHL diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/switch_on1.png b/TMessagesProj/src/main/res/drawable-xhdpi/switch_on1.png deleted file mode 100755 index 80a262bc6cf3d7247bb0a89ba47031c61e3fad3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1018 zcmVv@uoDMeB)H&U*cnt7h_1M~lz~AL z8FVlK28lrtNn=D4Vq2*1JMzjCihdYr#s@@Pr!uHo_H>-T-{9d(MuVw+OxfgZQ@ zIIW>tjD+>4;?M=h<`XHJb>LPEvAaAU6xXb|@WDpn-7yy9*5Eu{`0D%Dz7yy9*fdLR0AP%xj zK{~l`%u!cPx+;HSJ4Vf|Rn`33rYfv#2A(hH$~DY+Z;Qd_oI32No-Q}iIS359#2q-F z^#t54rF_k(f%U2yo3HqaY_22xEGu<$=C}9gD{%YvIb#bIEie%nBFa0OZ&OEeTi<_K z--?3E`teBCsYO+Zl*5;Es{7-HCt474JrVQqhf3mpW&}_h&iDJwHaI3N)3iD z<-Fr=oy&M~Pc3Z(Ucc{5MosI8y&q`-McjYLKzG(xUV{iYI9sZv0}@$9{xICVn7nw0 zz$uBoJ)LeXZP-g*yO^6?tklwj>pHsnVPu!rk*JNp&{Rz2FT4zq4hVMI&=(-E99vJs zMqmiV&Q@6%L`aj*N)+~!@>iv*3%GJ3Qwao48BvNXNjGX~NV|VjEm#Gd6oNrf8-XEq zme;G1j+Zu?ol2OZ5rN@AAQ9Ux{>-8U0>gnpIvgg?mNepDD}D$JiN;>NYjr_~z))AA zXnM`9?hPYw%81gVwcBq|kz66Q9-nAyGIRxEBHa4I_kIp0MF zdAm35FNvU2A@@)0mA;tXFewBy6ork55`mvzJ>*41lO~AJvSV#DpQ}YmiJU|48~^{W zc5isUVMBY0Fn3IdpdzeaVI{&1y(j$0z|gS7gR|v5?{^b%<(NCKOMi7Q z8pZAn?B0LlYciU6@CK>z>%07*qoM6N<$f_N^*g8%>k diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/switch_on1_pressed.png b/TMessagesProj/src/main/res/drawable-xhdpi/switch_on1_pressed.png deleted file mode 100755 index 434376d7ddd6a75254920bac3625e23ee8e98436..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1831 zcmeAS@N?(olHy`uVBq!ia0vp^8-Un|gAGXjIUm>yq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Kep0RGSfuW&-nVFuU ziK&^Hp^k!)fuWJU0T7w#8k$&{npqi{D?ot~(6*wKG^-#NH>h1eo~=?wNlAf~zJ7Um zxn8-kUVc%!zM-Y1CCCgTBVC{h-Qvo;lEez#ykcdT2`;I{$wiq3C7Jno3Lp~`lk!VT zY?Xj6g?J&i0B&qvF*KNf0j6J(SfFpHX8`gNOrftYexnUy@&(kzb(T9Bihb;hUJ8nFkWk z1ncniwerj>E=kNwPW5!LRRWr!mzkMjWnkfIU}r;;_7T};O1gv zZ0urS0@Le~pIn-onpXnTn}X2mh*K{pG2|8iZFWg5$}CGwaVyHtRRDY1DigO`%yF6r z)tiFbEfzTS>H{644~kl(sD=pv(+`LVPq;u1Jn5(A0n>XCFk%0T%xnYZmzka}jv*Dd z-po0jEgUG)e%{CE;xDI`j9SHrjS5b8b{c4#zl{ql2wu43m3+WK@mrz)8N!uJq{V{{ zF1`C=S!7ALBa3siK&~%mlwp_Q`j7Lb%#I13>u$7tX3u{9JTJv^h3)a@=M=x2E3q?1 z&(Wp)=nlPOflQ4-n>*9OeXBwZG8XrI<>&}COgmB`Ag=%Y=#Ea)i-#}wtJ%gIZxA?m zsPWr03B%w$J;}CTK5k;DG&MTMq`r~w*N?D+QW+|lNxTmB%#DmJYz$1y3<$d60EBygMLRFX06P)T(r^ebL+0xHS=a{1kii#@BFnb~~jZOwR5yH;_Qbd9ap=ZCwqUf3D4^l{Yu4tttv znBKZTYv$CmR}wz;T&=kORCr_C9sO%r>#ob&3N2pKapU$xu>~E!`6Z>htWRktGQQuV zXMUNnZ;j4=aW%ho{d5rC z5j$R*i(Wt8^5+iYkNM0@&FfU3%_)0Qu%^;&N9-L-)hPDXH@x}f{x?oMEi(J}=GTs0 z7j6efzY2RFv{5eN2rqZX0YUYg^BWd+Fawhu2M+@{DZ=On;SZRmIm-XmS<~porSld8*xN%C!adTOIpXwKwK^Lc+o9jjt-iR)2My7N!>07H4T Vm*XiPMMF^4<>~6@vd$@?2>{7yxefpT diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/textfield_activated.9.png b/TMessagesProj/src/main/res/drawable-xhdpi/textfield_activated.9.png deleted file mode 100644 index 2806417df8994145d033c9d9a6a4cf963ce4c723..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^Wc^ozUKEAbIX-UBA+fcENgwXnEsJbC1{6=Dkkdb|!gSeM{(#RpJwl zCYtaqE|lm!oFU`(*g)#!hR-+jPj2A2*y(D~a~xH!{h~$BF_6$j-rwH}JDKiwhUzPH zAI{kJX8na#FZ|Y2F-FF5|Gx9S`0DbvpQ2RMuN}{slqk4JxVu2&{Hf57e4o`6tPO8& wm>RtC*RnqyZ;pU1ytyHMzKz_-97jemUZ$B^@?(y>8*Dw%%LkUuPeFtzm5lQhig-?tlB-LXVrBj1HS3*{>{<@3Ch1 X*w1!m+A4lmpbZS3u6{1-oD!M<21!Zy diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/textfield_disabled.9.png b/TMessagesProj/src/main/res/drawable-xhdpi/textfield_disabled.9.png deleted file mode 100644 index ddd05596cc4894eb6245f09f736ec9e221d534e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^W;M1uU}2A0S?xKCl|SBjvM2L0^X6&n%TB6CI&vts2sm*l*3avaNa|2*!$!;yI1QA! zvEiYibj9-=`JdO55|dkEeC2b{~yRnulxE-!y`ctg4jD+J2MX-*^-!a%fK*q#tbtbAL+=hT%fXPNfR=U9ysy^ zSw?LcukhtIBn?lr#j19yuzy+`@rq&NiLf<$E{vKUoxqoVp@5}3xiu7v!^ImFkUwB$B zxoyFDtAll(Yi|GJ%dz^KoOAr0mGu0j)@l}p)~l+*_iUQ$_2mA;fIrsvwUdnh&s2%b zb3GC9X6D)-Y&A!?E=~5or9QviCU~P}$oB7Ny;emW-s#p*jH5xp2t~^F22iHux zA!l*qw2=h+tu^KzNxW|_KIsT}b;RV4?EI#m@9v69KhSns5jf+}Ts azB7x88dn}+?mGmG5(ZCKKbLh*2~7YNqsfv0 diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/user_placeholder.png b/TMessagesProj/src/main/res/drawable-xhdpi/user_placeholder.png deleted file mode 100644 index b6b7e7b8b06659cba6f8a6f35c506a6b0137a9ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4519 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 Hl+XkK3$i|> diff --git a/TMessagesProj/src/main/res/drawable-xhdpi/viewbtn_pressed.9.png b/TMessagesProj/src/main/res/drawable-xhdpi/viewbtn_pressed.9.png deleted file mode 100644 index d3a8cff939ecc9d9d26f9cbdd850b6c2ba50e263..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 706 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1|$ph9*LyXsDg{L zI8&A^&WM_q@p^w!-Oik{bLP85I`;hi^Y^+}O8NZ_msz>zX33o3VA)#d$|O8xP9g zse1ULd*!mHUtd)3PLwgva5cWA>Zf()HFre)Ra<{8=KE!}KOAq&IV)S7^xN%3TC>`g zR#m=P7xQeJ6DBq^hTOfYv|j&%k&>g6p()$ijBn@G?`>+_ldaMdy}xDaHnD#@R|t7& z@!eYcoL5K4prY0E{_c&E-SVs2icF;KA5|M{0E$LLKU?i{bhql)bsOWJUn_nlFA*Bp z*JjXSDc$2JaYz8jQshbGa3+hn<75+9`#D~>Jh8hs`u+!srq))!S18`R;!fP3m)<3z zp%Pot^Yo9Yo?t&zx8vK6c;eOfc!n#>ngv@ zdiXrQE##1+Hc;&81@20puATd|cDY5}Wj_CF!y2*X=+kAakz8(nGhDQ1J>9JO{6=%> zoLerAXXhT*y}tXH^(kxjs#CY*zfLRT%Px~LSqO{`*Uz5puT}J8&#!$ir@j8tJTr?e wozYwOKHmP;1QhKTt1bolu&Mvuuzvr9`6sshocgK~m^K+aUHx3vIVCg!0CAB+_5c6? diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/addmember.png b/TMessagesProj/src/main/res/drawable-xxhdpi/addmember.png deleted file mode 100755 index 80dc6e1c49379e691ec7fee5df06cf0a47bad897..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1791 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 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/ic_lock_blue.png b/TMessagesProj/src/main/res/drawable-xxhdpi/ic_lock_blue.png deleted file mode 100644 index d4b04dbfef4c8d3582a58028effba542982cbf22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 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 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/photo_spinner_pressed.9.png b/TMessagesProj/src/main/res/drawable-xxhdpi/photo_spinner_pressed.9.png deleted file mode 100644 index 73bea53518a8278e1f4c8d172b7d11efdf9912c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmV+@0oVSCP)vyg#-J$?+VbA38z zEM0zWN-O;iyrXyYw3qr>nL>ZS_s6R>gC4biP5O=fK&azWo5x_xc6tFiM u3G9VN18<@c!K-Lg@FE%+JV6hKmAW@#3mDED$ka>#0000-G2coZBG}+kcwN$2@MVZMG|%}PHFhR xxUEOZX^mnt$DMt(zwLL<*wx0P$h$B!NgQu&X%Q~loCIAr|9k2iZ literal 0 HcmV?d00001 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/search_dark_activated.9.png b/TMessagesProj/src/main/res/drawable-xxhdpi/search_dark_activated.9.png new file mode 100644 index 0000000000000000000000000000000000000000..3a49d9baaaa0047038f8d3dd811fb994a257deee GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2co9Zwg>kcwN$2@MVZMG|%}PHFhR yxUEOZX^kS!Gj01n>f(ocrA%Ag+5)2HF)+Mk)LG_ubW0&nAA_f>pUXO@geCwM>mDHh literal 0 HcmV?d00001 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/search_light.9.png b/TMessagesProj/src/main/res/drawable-xxhdpi/search_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..f2f7727f8e8d2893e4c23584a10dc7f9feb3582c GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2co4Nn)xkcwN$2@MVZMG|%}PHFhR vxUEOZX^mnt$Did40oNxS6xEqBMV(>u?&Xn(KkB*y^)Pt4`njxgN@xNA!weoT literal 0 HcmV?d00001 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/search_light_activated.9.png b/TMessagesProj/src/main/res/drawable-xxhdpi/search_light_activated.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d7852f277424b0a167db77dcd6b22ccd8d9d5a51 GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2co9Zwg>kcwN$2@MVZMG|%}PHFhR yxUEOZX^kS!X}PiWIn7!Q>VH#P;CjLm~@nc#Fbf7&Kn5BF+&@6dd! zC@_UEgPd8Gk4B@uMko{{h@e}vu<8XZx4Wt!LsxSQ8ym<1zM?vf7I2Ivk?y5n+BI3r ztsE0MFxFFTmS;FWr7BQS{tq?H8rsDfxF7GK!fv)`LpB3lwBTr@a5LS$D_e>?P{qi} zA~at;#dIEFvCBV4C|NnK&h)sques@S?e|_41f_xP3Q}S@u+x+>Z z>)0KxW$4ob`)}{VhP9>*Fj~C!4SZi+>gs$HJ)d~({J3@Heq-X~in*hmZu`7EbT`n@ z+}4vO#>R12*!;6w{5ZCHdwHmMYUKkf_f|Ip4fhUWebVqg^^j@LVokVgEC#kxO>f2y vaJJ4q{{4d6F7-X%b+xJ9oweq9x6V7ztf$|?L@Z*~vY9-bf4GxHsA+e zfCD3|2#i>2H)Y-BcPq{}uMxS#E)tNm_)3sd%F+fVE{z2c!l{AjRKDTc`eNmYo6?Wn zu@_H7mSyTXd13KMo+>S@M@pqYUZz;37g7@6KoGqLVs~kFcAIYh*cD%NA zbquqL-C1#(;gOK4X~*s_ffKg+iJ!BZ>3CF1 z&okOKZ|fRRc&Oeom(>8X;K3v5xu@HQ`BzN2sFKFnt%b6e_DA189NfUj@H^0$d;fv} QEe0U)boFyt=akR{0F||_FaQ7m diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/switch_off1.png b/TMessagesProj/src/main/res/drawable-xxhdpi/switch_off1.png deleted file mode 100755 index 4af7844c018eb26f4bd5f9612ae18fb6736f8cbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1226 zcmeAS@N?(olHy`uVBq!ia0y~yU}OTay*b!`>=-85V6+<*4q4J#tuo}E6ElJ@B8>(a-sKc5!gU-QlT?bmFJ1u=TFy_P1asjK%s zuMFw1uKS&OTmSy*tFOABvo}iZz4So2^zpij7Xvr%*x@0u<9U0$-PAwz+c+5S+`BjH z^l5LcL$+DJqq&-VUojPxmb$9$$P9KgaJO}sH*ekw7W1>395W&fIlN zIe=r$x^@4I`4#y2`OmJ~-^S42-+%Vq{}U%XHa~o=YxAnAeP#NB`-L?%b6ym$2%i|T z+?ZJPnF;Gu^M3dezd%j$n^`f&N~+Bxq&0R!KAd!#KZ z11kqpby7gD<;fp*SsDUs>=`C}R=BX?z&l=*xdOrZhyLAE@mF9-kzm;seY^b4>({T3 z?DtnpSg$N0FaLZ!=Mzf~Hg@*tfBJ8m6sj*>sN2J#knWgZuleGbanV`P8*h$JVkk0m z7g*-&vUdTi2LqQ73&W?QH}`Fsrg3~}C8uuAsmrDeO$x0lv!`tlvGP+s`$&qxnVI1W z$0d)V>%G6XD0gQwusCu>&iQwk(>Wmn7_}M8!_WV&-fG9Fz_IH<9P5o<(T2d?ypr+E zmV8YstV?h0W&E}&RckGjfdzt1s&uH8G*5YiQTZ6)hj=i@7cr9NFC|c~;a`!#^ zgu@CO`c=5^Wlu=SI}o>Pb)w^yJQoH_?xq#W$F68^@Yl<7f4Fhao;#PMJ*t*iHuN+* zh_HNXRC*;^vdL1tLcYn?bH&!5U)UN-jAA2K9IsYaSJ&0IxcE%wD^HX792R|BUOv^U zhADyRLa%;TmNNuwP!KTv(%jrU&7i~T-Ji9V>}@O#jO}a>4Q|}L>A6Sq`G*e^1Q@#R zD07%+^Cw#wD!*!T0Pdg;S$ zMLT6)%L-SR*J(0~uzauk`C$6`x|>Vm?iktFmdKI;Vst0I=!~P5=M^ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/switch_off1_pressed.png b/TMessagesProj/src/main/res/drawable-xxhdpi/switch_off1_pressed.png deleted file mode 100755 index e015ee738a84f9abf0caef12d6667fb28d624941..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2036 zcmaJ?Yg7|w8vYUjMktcDT98`K5b%_qnj0Yri9{2U0I`NkL||1)LNbt9NG2o$gn+vN z_jswj*lt&C;UJ~0g4MDttv4#E(nYCUa@fe0tI%vsL{M-MvC3g5Dt3Qp=ggV;<~{H8 zywCf+&v#~DYI0(rf2cnIAW)tpRRTaD;_J7_e)zK*-6z6dt1(#?wgt_@O4TM9h_z@g z49WHCd{_yqwPi(}a2x0L57ZIDsC<)R0AAXfO*bLh2)4 z0lxNz8C2*|3RWPbJ{FawNQES*35GayHci81u^=v&&Who1xvX_iG?Nw0VB$BI#)=Ve zxPoXN^yH%A)lAwvfl`|Aq!#`qr0OutC}1#3OH1jcY&vSnXR!EuzLz69nucf4%w+~l zZJ`;=5lakG*sL)jMhrm>ke5-Nixy)-Dz5Z#3wq;IT7&t?HsKq_u&9j;7M^m z`2AG9{%N)uQ^LRLeI~Ivz03$Rl&~2sHfiv|j zHA0dtTqsJR)*uFN;EhKJg+d@Vm@&0M1IwjCD$YSi5UoJQ6!X}8Sv*I==CD{YwwT9} z#`3saek@BC%a-w%uu@c0tcMNQ5?1>gR`Oh|*9>|iURes8kP=v%U_$lKqoxJOGqmtn zdn-TJ95B;moTSxc(cj0^TE4imyx)|)gcK-0@p(`Dk(^p=%SIl0i zK6Y)~mfNiJ^YiO+I1bFjec)eoiD5tS>n{b3>DJkYQ0nK4*ALxuzSn9kFYk6bSE|Qq zZ~y7Okr|9vE2tx3QzJ?}f;_;H=$#?4{wDMo5)Q zsoeBs{Ms{(j)d0$L zxic7%O780IU1SGAJRa}*{CsQ(ad>3JcVw})wpP`nvRGn0*2KpA)TotRqoZ%v_cq(@ zN9Gr&`#zJ0x`8Q}G;aKU1%Y$8y}kWYmo`llMaE88N#WhJ;nC6lxH-Q3{m!5Hw&B3Q zgoK2uFtPL2ty}v;-;GymG!Y(_6xmA&Tn1LJAaXLwcQh^Em_6mf4waUa96#4R@dmgo zro6CXMFwXg(pBEQ_9r1Z@Kw($z$X&}113jBeal&Qsgs(iI>Lcw$Z>VBEqBk$mGUUk zWHD)BVWFa0bZ}Q)OH0edwa{#eHYIfMbTC1?jy$>ExBE=u*F(Fx4^Bne-tB%-dLz6( z!$FJ${N+S2@N;3#wzocZ^?fI;k@v*(5GbU;q&tp}4#r9j#130b$)b8sI5P$xu=8KXA1s{Qb_5^3Le)ep?C=*&?f79n^l}=-c}~guwa|9H z@RRKZQO7P(Ik`c)cHqo6qcd)|8yDN}CeLmlwuZm{8ddkt+MOpB?h&+1@+7VE;(ME2 zeQkboec5=|VaseU_=!)_I-GC*y_9}Dah$b&{r0P`CY}3|Z~J(cXeDWGH+6hyf9=a{ zK^JNxor4utACX3x{f7`k)*tO-(ja$3KBa9evf>6ZuT0lVG73y-x8wgaLJ;*-iJXqp zr%oNeSl3_Tz8ggfc?s~>gi700J9i3aB>bVFp}&9w?lAE;;+vn<#5T!-a`s;IkFPuX zo$2h3&L8(Ica!QRyFE38ZD>)^hnwmWr~ll%ImD=Y|M$)R_)KWmlfxSQ_PWc`tE$6R zk?f7jk`fb_;b-icf7R9rLcJn){EMx=7lQ2%>*&K7>t5MKbB)y;`4RYD_%>(s{x2;# z{SCpVb@x2Y%`7&X-M*%Bdw=cV!y#oOwvcEefWp2HzZGnq-S7Pm%Vo*Zuj5r!{{wC6 B8<+q9 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/switch_on1.png b/TMessagesProj/src/main/res/drawable-xxhdpi/switch_on1.png deleted file mode 100755 index 5c3d2497e283d02a499902956f13a384489c12b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1480 zcmZuxeK-?%9RKaLHK}=0G0NO=uFbR#tC`K#O_`Swsb~q0k!D_w9z%_Z)4S_UC0*ir zF`BoX3F~;A)a7L&L>5PhGbJ{04*Q7*m=ST|JRDmP z7RB@Dg+-(!Jms+md>Pk-GxsSkR81@XmojN8SP@si3=uu$1D;PD5P_~Q0;Ka$4S1h zI5HQJcB0y;y4buQr!4#k-;)Plmuipc)2G!f= zI`Jq@g2R%w*)#h}hH~q&)6}Tz!gyz32ZXE+z$ndTWqUx3Suq_Rih=?-1Y`oh1Q|HM zzyKTyVBp|u@=i$s^lE#~`VHESn#LHbFPeGLO1&UAFQw+G&KgB}c`7|sbK~Z~Q2psZ z99PuibdJ#e=iNfhb~lRZQ`-2nbDOO`CHlmo>V|HLF^-`wj^dfX=3eQ_&F0Z^;|%3p zIW+M@{HwMBrf@~njNC=&p6_FD*5hYU83jlE()C@vPkzLC2IQ2}&2kT4>W1&_?F>Bz zB2Z%8bK>TcAV^dhvdBkQEcp()@@48fhc)Jw)#AG|Dq`nnbNr|7{K|mKr8QNxL2)MV z#)=29SX9B6dtnYs*gNGpuziUsh$eHYvmc4IYQ~Dps9PQqO*s0#6;i4K;P;W=TN-l% z;d|?f<{f|8fW}rx%-%c}Ia$8+cAnJ~?E!1V$O5X}f#z-O@sI=RZE@u-QdONK>TddV z3qLr71On3VmCTdVAv395MOOA(7d>=j@sv$n;6}qRw40;5{jT@61U0XzV`^O{y=udX zkTy)PCO&vLq>^v$@)-?5uzSWjBHU&sDYc3-ua{ph8p9z<0!npyowUp-bDDZjk(O3z zl^@O`oIAibTDyNWG!*k@H+PGCvWF1=SZ=E?v42C)-blF@^nrx|t0%0Bn&6xntF*xH zVviR|aM2GjaK`hA*V#v}7170u2smW;QmowO_$q6kw_+Ud^iIa?P7pv0*BT?QeKlsU zAAn{8504Gvdga3@z7YzFLp%yTugd49hgW%G06pl)Auo(OB`RkNWB%J?`rsR3*F~B|y!~kEO3Bde#JPd)rRzk#Kx{!eX89z@*kI*COY5V4 z28Zg7+To!7tke0JU@Nz>Z(?)c5cIpMYTKaNOVRnN483KBbYSS$-EF1$34I%{mPC7C z3gf$B$=_mV)3?SZC6I^7*jm{37kTfOIVQ*rPH;#=@%vkYJ9`T1@9-K%^q4maR*G_I5S4FEX1|jc6JFU>S(hk!!{=-qHDKKjIrk1cgfJC7gXcRC^?xhSiQ>N zgAF?=o%>-Ua;S!?aknN-mCEo~AKnKOK*?@;{!eMi^m2}dyx`{fS$3!*zy#2cuebtY z7r(1q>Qo=gqk9LZx(Z-r_D1J2Qx&TBt?h1h((Cg&U4F&t=jH2>B(J}KAn^V+S=_4vTBJH5D{(X@uU)K3U)T2cl}1+~r@PTnPL70Wy&S3e bU(h6gFaHo>WrQj;ykfw1=dh%^LNosb93YR6 diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/switch_on1_pressed.png b/TMessagesProj/src/main/res/drawable-xxhdpi/switch_on1_pressed.png deleted file mode 100755 index 1b9ecf28c058e5c47f46c46eed79e324de966973..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2307 zcmaJ@Yg7~079Jqjh&PhfM->sq_&~)Z1V|u}2qB3;H311K7PW>jK!9XICYX>2gorIz z74OvwDhj?3@B!MYREUZ%!~y{nDhP;z@=#!12_S;yPORAbqjc7+nZ5V=zHje+&OU3M zv;e*j&dSCL005kyFDDQH%*;`H4R#9pJqo9Jp})BbZm>cChbxpqIRvo6;7|zklL#ZA zKu8!CA6o%=0D#3JaZs=#n75W8f+ZxO2}4pzWGEW|JUmr0p(q+sfT2)?Sjr^ym)s

=_b|#_-A`&lE2vtNW zvT#Cy10f>0Sf&ueQqZI*429zqOafZzpDjpapJk=Ur)5GHjI0vM$P|*3sig@ZkN3|| ziR3dHQ3OJN)%&-?NKm{CA_qbU948l{8yCLNluE{6%ORlxmIuLb%)}}NM8XOfiG*b! zTR;Ps@`NI>)D&3uk-_6J{G^CNC>23|93}zPAc@6c3^xj$O{Gz|RJIG1LgBiw+^8IP zHyVxZPT{({aOo3V4lIh3KvKm7H|#I&>Pfk#VUWns%p6EA-VTMWmctV8W77=rA#{FB=I6mhozJ5WNzr+iql0aCIy@WzEaUt*tRPj> zn->2_TgdkQf0aZ2_2072)E3NHOq`m!zZFyRqKvIqUDAPO*7pR{UvM?uCuUpQF*`c) zGqPsFq1J&ZGxKZyqs`fJKGO2&FI>)=M@t&#KXa(KdsumBd*^qVjU$QMtZ-FJ)($5O z4gc}#n6gxQE&6;ev-Mi}$|3jC56V66&)im9w8uL4^sdyDHWVdgfta4obJ2DSfS;K|{!6j@5K>QP z^WYQ*v*dQQ+aAQOr}LFfC$RGVER5@v=+yh5_mRgx0RLhES`hHU10WW_V*so52LK+bhOO)9B(ad&QbvZBA`?dHN0UwK~mJzIKY;Ogbz zv2*@-poB3$GpgLXt+H_5s~?}W4-9V8Mv)4^%wsW<4VdT2rSfw7cltYZ(TTEHN!VHJ zT3i6brnmrm+nBbh(rd%g$Xf-Wvd;GfHg$nTUBf4RfH&s24NCqEnLaxYDfI94PuiTG zpf>O!N9~~IS2HdiuzPNwuR@?7$=RAKHib%@JX0w2qWs15*f?=3NA0SkAM{CcdskKC|e z0YRA;!96dU%yoe81Bq=x#iqe4C}jWs<>ty0>*{}>jgqaty^cFgLp4#B;(Fa@9xB(`xWWbm`Lbp1+>pf0 zW#_Oc;f{XA*9V_&vQ-=+cIsO)y>D#^$?0a*H<(!dTv>U#Yg>o!{lT$gm%6eNy8Fj6 zh|!Ydc}`7DZ=UD+-~n+lBE@z5B1qZRUiaX2;Y?&)S3-}fze-z(4Okv=j98)Tv^m|4 zD;_rM5@>2#QsdXV^fl?0Q*l$x4@%W-Qq0Ma!~;97M*%&Dr}TMMUOqEYB)}-6*mz)B z{>UrZ^ee#;nNVrj0KQp|Gm5taQSnoc_N`uQpc|-O-I#gF#n$e%5WQDC$D?hLs!Lq7 ztlKEso9xf6TYhVW!PS@Wr0IOrupQdVVw~~7n&?YT0W(Myaq3-OwE`V$*4|uaBUYPr zyG=h$DcCYb<@ANBeNDi*hqnoZPkY~& zw)AxNPOH}^t?HVZvZh~V0D>@i$?FoAQ<(pB#wU(`z!9)3)+XwmeShrqqElzV;)n5h z*&j6SUp$Fj&vG)LPIcnYsj_|XmSqk@?~Wtu$ndI1ZU;uO7Mb=3&8&3mHKn2H*1eY= z#OMETHKMYdY^^lJ)~0KTAD7R$=)Fz% EKQm;i`v3p{ diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/user_placeholder.png b/TMessagesProj/src/main/res/drawable-xxhdpi/user_placeholder.png deleted file mode 100644 index bf04c8e2f80e3a856844d82b7ad6e611678c3fba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6546 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 F|33#-3?u*m diff --git a/TMessagesProj/src/main/res/drawable-xxhdpi/viewbtn.9.png b/TMessagesProj/src/main/res/drawable-xxhdpi/viewbtn.9.png deleted file mode 100644 index 819b7d81a6225877114e33bb439b89162e7a310a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1283 zcmeAS@N?(olHy`uVBq!ia0vp^86eET1|(%=wk~8~U^(UK;uunK>+M}%AK^-wV;}27 z1zHtEj%?fWno)P(10@gcS4T3E7pr&}b?PsW5ElBHcIU|K>Q8BRx;xozD+>6lZ=Ky_ zs5iU9$k0uHcNcqa=OT&t6;a);N3K-Xy}h8RyGB2{?S=EFBLZ96-yi>f=7RUsUuFA} zCVx9yZ#l)v&^_~(&D9&T7l#z=TXpf%luP0#q;88B%{SaU+r%Vlk>;&M8@J5+WPjJh zAkH>C?#gO$jr0uxYj4G^c~!bx>wcut=PlEV<{NAlzqL>?YEkB%+;=7c8_!r=Xf=sr z(chsHuuN-v)s<5YOIO{EnY(?@Vz)5y6;JIFJL59cc`pk2UKH!S7_}}a(*vkwLhLI2 zN#c=rBQMt1KDe;>`TAe+`)mJaJ-OR1@%^c@^OikDpRWmSnR+ZkcYCjiiuMH7k zRGMC&8UO#@HyfF~hd11mytT+M%KLN35)p;=81}*|3o`#S?_c-t@@F+GyF(Lh%1SNX zs<6p$YF^>4%0cOLFA zHWuc5tL``PPPdPOjHb=(^)E{J?YRFs%2ZFdAjj5ue{#`ehaH9wH4jz1;dWj0y)tt1 z^CI!C9==nH&2^s0ws*F(Jf78lzi6-ZsvhZU8qGI1n=gKx{OPog&Xcu@+5tb$3H{l2 zdbw%!{C7`e+4ty9VQMk|?4!`OsZ`kE6I(W$g4-s^6?y^Ik{W9FD{gszbatD?>QKQx z$ARS$$Cp|LO(ww(Wr0Qura~4a0e1x;^@zhoq0a%x0}6uVz=BEw&QNuN9Uz?`B{Gd1 zM}WK@uyT+Pno&SGs1jU8H-gQ%FDYREqU;;P(psU7PdD$8JejtjM_$x-!A7;zwl z>BQ>iTA)PvqU64W#G7QD>b7qN0^BoH=0B<`zB0*SUlFVL{Czjddp5qgd0zbAA3?Sx zM&Z-88S5%%7Ms1^SM7ZGztN2|d}mM3D*O5LliGLr!z!F5NqsV!>*F3oZQlLwgMa$> zkBN!T+OB2veKY8YzsECKWkS)6t}lG!{%X~Kj3MuNTl0)lw&`Uryq(c=Ekkd*+0O4LUItEXP)Pf8 z;0O27-d~GWZTs6hkGDEHHaGUx%y>Qd{guxjE^YUZzn^+zy|mOK)mgiucA1#CWt(h& zU}40#R6+DtN&3!fmmhq3n|Z8z$KT)Pk669`+?{>;+S{8=me=3jJN5VbnYfJhwv5hY zqPllqUzAvD{2+zJOX;E2ikGZQ*T$A!mFD{suro7Xc*C?c?=v;??>#pT-&Qz%{_Lu2 zVGw;8-N!yw`$?Uf;*c3&8s&fSlJ4HnWAjhj?rYB8sV^_37A5A(Jef`8aoW=>?(ttA V=;{mdC;+M}%pV_4h$3NN^ zJ6~zt=v29qW3DoDkZG1~bCY-SvJ*a{e7XM zPrJMB_j;-1zI@}2H_C+h-W$X!o6k;Ib8d@z-bU`@`Ki|pw$GMYwRG01wNkgQh5uQ4 zn?Y^Limm!mUT;d`w%oh(_eP$u)VG=QHoEPu{is$ZT3o$yE=YOW?Q3}qQ&;vV$9leY z{nAu@e3tL`$Bdi5cUt?rUwCfUyo(EB%WL>|cRj6IIX5>W+RFE>{+`PbYp?E+(F~S! z-&8JlCpCUa_L9F(rr)=zF0=dl(y8j{r}NXV8NIph&wKULm+fv@@6}sMEBEreu{}9&k@<}RqGcumMr;_bI{zRv)j1s$)`L z^QJF1&7c47O}xyP^o2qSe+|#GDot5_n)&1sA%TfDY_Iy>NAgeE`2U7@{w4FyEvyY+ z#0wf2k{IqvIIt-+NH{PULI|LcAxNB&MZkdvBmpKE1i2L0zyb_R9Y85&Fu|dq#CQZE z0Md`46=VoA2T&uJa9}`IoM)h5_oD1I!_-=#!i(vZ!Y7j#bjgeIUbx1r^>ah%UuBaw z#tSQs-??;(YvG=oe=fa>H`*Yk>Tob(E@z+FjCB*gy%*D)t31v8x8m2=`amh8lgzC` zThE!l@_k=$Tl}(posUlbvTq;>O`D^waIT%T~^os|8e1T{@(9@{JZz-3vbvJ{5bsHzXvmBt*-s{ z@W8xzvyv9P(d;_9?RCXgm;QT8q)3BM<%CzH(vIs+G4^ZH!u7Dd^{` zx{uKbLh*2~7Zx##=W4 diff --git a/TMessagesProj/src/main/res/drawable/btn_check_off.xml b/TMessagesProj/src/main/res/drawable/btn_check_off.xml deleted file mode 100644 index 5e1ee0acb..000000000 --- a/TMessagesProj/src/main/res/drawable/btn_check_off.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/drawable/btn_check_on.xml b/TMessagesProj/src/main/res/drawable/btn_check_on.xml deleted file mode 100644 index beba706cd..000000000 --- a/TMessagesProj/src/main/res/drawable/btn_check_on.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/drawable/chat_incoming_media_states.xml b/TMessagesProj/src/main/res/drawable/chat_incoming_media_states.xml deleted file mode 100644 index 671c4fcbd..000000000 --- a/TMessagesProj/src/main/res/drawable/chat_incoming_media_states.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/drawable/edit_text.xml b/TMessagesProj/src/main/res/drawable/edit_text.xml index 492bc906a..287901e71 100644 --- a/TMessagesProj/src/main/res/drawable/edit_text.xml +++ b/TMessagesProj/src/main/res/drawable/edit_text.xml @@ -1,11 +1,8 @@ - - - - - - - + + + + \ No newline at end of file diff --git a/TMessagesProj/src/main/res/drawable/list_selector.xml b/TMessagesProj/src/main/res/drawable/list_selector.xml index fff3038ca..f311824b8 100644 --- a/TMessagesProj/src/main/res/drawable/list_selector.xml +++ b/TMessagesProj/src/main/res/drawable/list_selector.xml @@ -1,6 +1,5 @@ - + diff --git a/TMessagesProj/src/main/res/drawable/logout_button_states.xml b/TMessagesProj/src/main/res/drawable/logout_button_states.xml deleted file mode 100644 index 56694e45c..000000000 --- a/TMessagesProj/src/main/res/drawable/logout_button_states.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/drawable/photo_spinner.xml b/TMessagesProj/src/main/res/drawable/photo_spinner.xml deleted file mode 100644 index d09b405a6..000000000 --- a/TMessagesProj/src/main/res/drawable/photo_spinner.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/drawable/search_dark_states.xml b/TMessagesProj/src/main/res/drawable/search_dark_states.xml new file mode 100644 index 000000000..d1d4b4594 --- /dev/null +++ b/TMessagesProj/src/main/res/drawable/search_dark_states.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/TMessagesProj/src/main/res/drawable/search_light_states.xml b/TMessagesProj/src/main/res/drawable/search_light_states.xml old mode 100755 new mode 100644 index 11282d4c0..d1d4b4594 --- a/TMessagesProj/src/main/res/drawable/search_light_states.xml +++ b/TMessagesProj/src/main/res/drawable/search_light_states.xml @@ -1,8 +1,7 @@ - - - + + + + - diff --git a/TMessagesProj/src/main/res/drawable/spinner_states.xml b/TMessagesProj/src/main/res/drawable/spinner_states.xml index 649376f36..92fb773c1 100644 --- a/TMessagesProj/src/main/res/drawable/spinner_states.xml +++ b/TMessagesProj/src/main/res/drawable/spinner_states.xml @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout-ar/country_select_layout.xml b/TMessagesProj/src/main/res/layout-ar/country_select_layout.xml deleted file mode 100644 index 45a52826a..000000000 --- a/TMessagesProj/src/main/res/layout-ar/country_select_layout.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - diff --git a/TMessagesProj/src/main/res/layout-ar/group_create_final_layout.xml b/TMessagesProj/src/main/res/layout-ar/group_create_final_layout.xml index f821e53ec..c4e674df2 100644 --- a/TMessagesProj/src/main/res/layout-ar/group_create_final_layout.xml +++ b/TMessagesProj/src/main/res/layout-ar/group_create_final_layout.xml @@ -23,12 +23,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"/> - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout-ar/settings_row_button_layout.xml b/TMessagesProj/src/main/res/layout-ar/settings_row_button_layout.xml deleted file mode 100644 index 587eb212d..000000000 --- a/TMessagesProj/src/main/res/layout-ar/settings_row_button_layout.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/chat_profile_layout.xml b/TMessagesProj/src/main/res/layout/chat_profile_layout.xml deleted file mode 100644 index 57fd376dc..000000000 --- a/TMessagesProj/src/main/res/layout/chat_profile_layout.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/TMessagesProj/src/main/res/layout/country_select_layout.xml b/TMessagesProj/src/main/res/layout/country_select_layout.xml deleted file mode 100644 index 2ce0b92bd..000000000 --- a/TMessagesProj/src/main/res/layout/country_select_layout.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - diff --git a/TMessagesProj/src/main/res/layout/group_create_final_layout.xml b/TMessagesProj/src/main/res/layout/group_create_final_layout.xml index ba3f3ce36..8f2b40899 100644 --- a/TMessagesProj/src/main/res/layout/group_create_final_layout.xml +++ b/TMessagesProj/src/main/res/layout/group_create_final_layout.xml @@ -23,12 +23,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"/> - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/group_profile_add_member_layout.xml b/TMessagesProj/src/main/res/layout/group_profile_add_member_layout.xml deleted file mode 100644 index 60c5e3e7d..000000000 --- a/TMessagesProj/src/main/res/layout/group_profile_add_member_layout.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - \ No newline at end of file diff --git a/TMessagesProj/src/main/res/layout/login_layout.xml b/TMessagesProj/src/main/res/layout/login_layout.xml index 70818ccca..5404684d4 100644 --- a/TMessagesProj/src/main/res/layout/login_layout.xml +++ b/TMessagesProj/src/main/res/layout/login_layout.xml @@ -248,26 +248,6 @@ android:textColorHint="#979797" android:layout_marginTop="10dp"/> - - - - - - - - - - - - - - - - - - - - - - -