From d7dc1fd04803631e893df3744fefc530d3156006 Mon Sep 17 00:00:00 2001 From: Tariel Hlontsi Date: Sat, 10 Sep 2016 19:15:44 +0300 Subject: [PATCH] Resouces cleanup, added ru locale --- .idea/gradle.xml | 1 - app/build.gradle | 9 +- app/proguard-rules.pro | 32 ++ app/src/main/AndroidManifest.xml | 2 +- app/src/main/assets/jsons/sharing_photos.json | 1 + app/src/main/assets/oauth_consumer.properties | 51 +++ .../com/hikapro/backpack/MainActivity.java | 5 - .../com/hikapro/backpack/StateMaintainer.java | 3 - .../com/hikapro/backpack/model/AddModel.java | 3 +- .../java/com/hikapro/backpack/model/Api.java | 5 +- .../com/hikapro/backpack/model/ItemModel.java | 52 +-- .../com/hikapro/backpack/model/Model.java | 14 +- .../hikapro/backpack/model/NetworkUtil.java | 14 + .../hikapro/backpack/model/PackedModel.java | 10 +- .../com/hikapro/backpack/model/SetModel.java | 29 +- .../hikapro/backpack/model/ShareModel.java | 50 ++- .../hikapro/backpack/model/dao/Command.java | 12 +- .../com/hikapro/backpack/model/dao/DAO.java | 386 +++++++++++------- .../com/hikapro/backpack/model/dao/Db.java | 56 ++- .../hikapro/backpack/model/dao/DbHelper.java | 1 + .../com/hikapro/backpack/model/dao/Event.java | 11 +- .../model/dao/ImageDownloadHelper.java | 25 +- .../com/hikapro/backpack/model/dao/Test.java | 15 - .../hikapro/backpack/model/entities/Item.java | 4 - .../model/entities/SharingPicture.java | 83 ++++ .../backpack/model/entities/Timestamp.java | 2 - .../backpack/presenter/AddPresenter.java | 26 +- .../backpack/presenter/ItemListPresenter.java | 161 ++++++-- .../presenter/PackedListPresenter.java | 3 +- .../hikapro/backpack/presenter/Presenter.java | 3 + .../backpack/presenter/SetListPresenter.java | 20 +- .../backpack/presenter/SharePresenter.java | 289 ++++++++++++- .../presenter/adapters/ItemDetailAdapter.java | 2 +- .../presenter/adapters/ItemListAdapter.java | 2 +- .../presenter/adapters/PackedListAdapter.java | 16 +- .../presenter/adapters/SetListAdapter.java | 6 +- .../presenter/adapters/helper/AppRater.java | 104 +++++ .../helper/items/HeaderViewCache.java | 1 - .../helper/items/ItemSwipeCallback.java | 7 - .../sets/SimpleItemTouchHelperCallback.java | 1 - .../backpack/view/fragments/AddFragment.java | 8 - .../view/fragments/ItemDetailFragment.java | 7 +- .../view/fragments/ItemListFragment.java | 25 +- .../view/fragments/SetListFragment.java | 3 - .../backpack/view/recycler/SetViewHolder.java | 78 +++- .../main/res/animator/slide_in_bottom_y.xml | 6 +- app/src/main/res/animator/slide_in_left_x.xml | 6 +- .../main/res/animator/slide_in_right_x.xml | 6 +- app/src/main/res/animator/slide_in_top_y.xml | 6 +- .../main/res/animator/slide_out_bottom_y.xml | 6 +- .../main/res/animator/slide_out_left_x.xml | 6 +- .../main/res/animator/slide_out_right_x.xml | 6 +- app/src/main/res/animator/slide_out_top_y.xml | 6 +- .../ic_check_box_outline_blank_white_24dp.png | Bin 160 -> 0 bytes .../drawable-hdpi/ic_check_box_white_24dp.png | Bin 260 -> 0 bytes .../res/drawable-hdpi/ic_info_black_24dp.png | Bin 321 -> 0 bytes .../main/res/drawable-hdpi/ic_info_white.png | Bin 579 -> 0 bytes .../main/res/drawable-mdpi/ic_info_white.png | Bin 579 -> 1072 bytes .../res/drawable-xhdpi/ic_info_black_24dp.png | Bin 412 -> 0 bytes .../main/res/drawable-xhdpi/ic_info_white.png | Bin 1253 -> 2745 bytes .../res/drawable-xxhdpi/ic_info_white.png | Bin 1963 -> 6811 bytes app/src/main/res/drawable/facebook_48.png | Bin 327 -> 0 bytes app/src/main/res/drawable/ic_card_1.png | Bin 0 -> 216843 bytes app/src/main/res/drawable/ic_card_10.png | Bin 0 -> 359854 bytes app/src/main/res/drawable/ic_card_14.png | Bin 0 -> 221939 bytes app/src/main/res/drawable/ic_card_2.png | Bin 0 -> 302114 bytes app/src/main/res/drawable/ic_card_3.png | Bin 0 -> 250354 bytes app/src/main/res/drawable/ic_card_4.png | Bin 0 -> 220650 bytes app/src/main/res/drawable/ic_card_5.png | Bin 0 -> 254174 bytes app/src/main/res/drawable/ic_card_6.png | Bin 0 -> 214830 bytes app/src/main/res/drawable/ic_card_8.png | Bin 0 -> 223311 bytes .../main/res/drawable/ic_facebook_icon.png | Bin 0 -> 973 bytes .../main/res/drawable/ic_info_black_24dp.png | Bin 321 -> 0 bytes app/src/main/res/drawable/ic_info_white.png | Bin 579 -> 2221 bytes app/src/main/res/drawable/ic_item_list_1.png | Bin 0 -> 373594 bytes app/src/main/res/drawable/ic_item_list_10.png | Bin 0 -> 381161 bytes app/src/main/res/drawable/ic_item_list_14.png | Bin 0 -> 87459 bytes app/src/main/res/drawable/ic_item_list_2.png | Bin 0 -> 168276 bytes app/src/main/res/drawable/ic_item_list_3.png | Bin 0 -> 867114 bytes app/src/main/res/drawable/ic_item_list_4.png | Bin 0 -> 194214 bytes app/src/main/res/drawable/ic_item_list_5.png | Bin 0 -> 189000 bytes app/src/main/res/drawable/ic_item_list_6.png | Bin 0 -> 133265 bytes app/src/main/res/drawable/ic_item_list_8.png | Bin 0 -> 132754 bytes app/src/main/res/drawable/ic_twitter_icon.png | Bin 0 -> 1085 bytes app/src/main/res/drawable/pic.png | Bin 8171 -> 0 bytes app/src/main/res/drawable/share_btn_bg.xml | 7 + .../main/res/drawable/sharing_pic_default.jpg | Bin 0 -> 30197 bytes .../drawable/sharing_pic_thumb_default.jpg | Bin 0 -> 2297 bytes app/src/main/res/drawable/start_img.png | Bin 0 -> 14960 bytes app/src/main/res/drawable/tweeter_button.xml | 7 + app/src/main/res/drawable/tweeter_button2.xml | 7 + app/src/main/res/drawable/twitter.png | Bin 0 -> 1085 bytes app/src/main/res/drawable/twitter_dlg.xml | 7 + .../main/res/layout/add_cust_actionbar.xml | 24 +- app/src/main/res/layout/dialog_confirm.xml | 84 ++++ app/src/main/res/layout/dialog_rate.xml | 84 ++++ app/src/main/res/layout/dialog_twitter.xml | 97 +++++ app/src/main/res/layout/fragment_add.xml | 47 ++- .../main/res/layout/fragment_item_detail.xml | 2 +- .../main/res/layout/fragment_item_list.xml | 2 +- app/src/main/res/layout/fragment_set_list.xml | 18 +- app/src/main/res/layout/fragment_share.xml | 273 +++++++++---- app/src/main/res/layout/item_element.xml | 14 +- app/src/main/res/layout/set_card.xml | 17 +- .../main/res/layout/share_cust_actionbar.xml | 34 ++ app/src/main/res/layout/test.xml | 94 ----- app/src/main/res/menu/menu_add.xml | 20 - app/src/main/res/menu/menu_main.xml | 10 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 5991 -> 3244 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 3022 -> 2146 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 8821 -> 4983 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 13636 -> 8071 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 14960 -> 12109 bytes app/src/main/res/values-ru/locale.xml | 68 +++ app/src/main/res/values-sw1080dp/dimens.xml | 4 + app/src/main/res/values-sw1080dp/params.xml | 11 + app/src/main/res/values-sw480dp/dimens.xml | 4 + app/src/main/res/values-sw480dp/params.xml | 11 + app/src/main/res/values-sw540dp/dimens.xml | 4 + app/src/main/res/values-sw540dp/params.xml | 11 + app/src/main/res/values-sw720dp/dimens.xml | 4 + app/src/main/res/values-sw720dp/params.xml | 11 + .../dimens.xml | 0 app/src/main/res/values-v21/styles.xml | 15 +- app/src/main/res/values/colors_background.xml | 10 +- app/src/main/res/values/dimens.xml | 3 +- app/src/main/res/values/dimens_text.xml | 26 +- app/src/main/res/values/locale.xml | 68 +++ app/src/main/res/values/params.xml | 11 + app/src/main/res/values/strings.xml | 37 +- app/src/main/res/values/styles.xml | 18 +- build.gradle | 2 +- 132 files changed, 2080 insertions(+), 772 deletions(-) create mode 100644 app/src/main/assets/jsons/sharing_photos.json create mode 100644 app/src/main/assets/oauth_consumer.properties delete mode 100644 app/src/main/java/com/hikapro/backpack/model/dao/Test.java create mode 100644 app/src/main/java/com/hikapro/backpack/model/entities/SharingPicture.java create mode 100644 app/src/main/java/com/hikapro/backpack/presenter/adapters/helper/AppRater.java delete mode 100644 app/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_info_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_info_white.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png delete mode 100644 app/src/main/res/drawable/facebook_48.png create mode 100644 app/src/main/res/drawable/ic_card_1.png create mode 100644 app/src/main/res/drawable/ic_card_10.png create mode 100644 app/src/main/res/drawable/ic_card_14.png create mode 100644 app/src/main/res/drawable/ic_card_2.png create mode 100644 app/src/main/res/drawable/ic_card_3.png create mode 100644 app/src/main/res/drawable/ic_card_4.png create mode 100644 app/src/main/res/drawable/ic_card_5.png create mode 100644 app/src/main/res/drawable/ic_card_6.png create mode 100644 app/src/main/res/drawable/ic_card_8.png create mode 100644 app/src/main/res/drawable/ic_facebook_icon.png delete mode 100644 app/src/main/res/drawable/ic_info_black_24dp.png create mode 100644 app/src/main/res/drawable/ic_item_list_1.png create mode 100644 app/src/main/res/drawable/ic_item_list_10.png create mode 100644 app/src/main/res/drawable/ic_item_list_14.png create mode 100644 app/src/main/res/drawable/ic_item_list_2.png create mode 100644 app/src/main/res/drawable/ic_item_list_3.png create mode 100644 app/src/main/res/drawable/ic_item_list_4.png create mode 100644 app/src/main/res/drawable/ic_item_list_5.png create mode 100644 app/src/main/res/drawable/ic_item_list_6.png create mode 100644 app/src/main/res/drawable/ic_item_list_8.png create mode 100644 app/src/main/res/drawable/ic_twitter_icon.png delete mode 100644 app/src/main/res/drawable/pic.png create mode 100644 app/src/main/res/drawable/share_btn_bg.xml create mode 100755 app/src/main/res/drawable/sharing_pic_default.jpg create mode 100755 app/src/main/res/drawable/sharing_pic_thumb_default.jpg create mode 100644 app/src/main/res/drawable/start_img.png create mode 100644 app/src/main/res/drawable/tweeter_button.xml create mode 100644 app/src/main/res/drawable/tweeter_button2.xml create mode 100644 app/src/main/res/drawable/twitter.png create mode 100644 app/src/main/res/drawable/twitter_dlg.xml create mode 100644 app/src/main/res/layout/dialog_confirm.xml create mode 100644 app/src/main/res/layout/dialog_rate.xml create mode 100644 app/src/main/res/layout/dialog_twitter.xml create mode 100644 app/src/main/res/layout/share_cust_actionbar.xml delete mode 100644 app/src/main/res/layout/test.xml delete mode 100644 app/src/main/res/menu/menu_add.xml create mode 100644 app/src/main/res/values-ru/locale.xml create mode 100644 app/src/main/res/values-sw1080dp/dimens.xml create mode 100644 app/src/main/res/values-sw1080dp/params.xml create mode 100644 app/src/main/res/values-sw480dp/dimens.xml create mode 100644 app/src/main/res/values-sw480dp/params.xml create mode 100644 app/src/main/res/values-sw540dp/dimens.xml create mode 100644 app/src/main/res/values-sw540dp/params.xml create mode 100644 app/src/main/res/values-sw720dp/dimens.xml create mode 100644 app/src/main/res/values-sw720dp/params.xml rename app/src/main/res/{values-w820dp => values-sw820dp}/dimens.xml (100%) create mode 100644 app/src/main/res/values/locale.xml create mode 100644 app/src/main/res/values/params.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index c3bf4f7..508b3d9 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,6 @@