From 6dbdc9a56f2d59a33c1f9fc9c27e6d5d375621c4 Mon Sep 17 00:00:00 2001 From: Gutyn Date: Wed, 22 Jul 2015 15:48:56 -0700 Subject: [PATCH] Test commit --- .idea/workspace.xml | 1308 ++++++++--------- app/build.gradle | 7 +- app/src/main/AndroidManifest.xml | 5 +- .../breadwallet/presenter/BreadWalletApp.java | 43 +- .../presenter/activities/IntroActivity.java | 3 +- .../presenter/activities/MainActivity.java | 319 ++-- .../presenter/fragments/MainFragment.java | 43 +- .../fragments/MainFragmentDecoder.java | 84 +- .../presenter/fragments/MainFragmentQR.java | 31 +- .../fragments/MainFragmentSettingsAll.java | 19 +- .../allsettings/FragmentSettings.java | 52 +- .../settings/FragmentCurrency.java | 81 +- .../tools/adapter/CustomPagerAdapter.java | 8 + .../tools/adapter/ParallaxViewPager.java | 41 +- .../tools/animation/FragmentAnimator.java | 109 +- .../tools/animation/SpringAnimator.java | 16 +- .../tools/others/CurrencyManager.java | 113 ++ .../breadwallet/tools/others/JsonParser.java | 58 + .../tools/others/MyClipboardManager.java | 88 +- .../tools/qrcode/QRCodeEncoder.java | 6 +- .../tools/qrcode/QRCodeReaderView.java | 10 - app/src/main/res/drawable-hdpi/button.xml | 3 +- .../activities/layout/activity_main.xml | 20 +- .../fragments/layout/fragment_about.xml | 167 +-- .../fragments/layout/fragment_decoder.xml | 29 +- .../layout/fragment_local_currency.xml | 123 +- .../fragments/layout/fragment_main.xml | 67 +- .../fragments/layout/fragment_settings.xml | 11 + .../fragments/layout/fragmentqr_main.xml | 1 + .../res/layouts/layout/currency_list_item.xml | 17 +- app/src/main/res/values/colors.xml | 2 + captures/Snapshot_2015.07.15_14.14.21.hprof | Bin 0 -> 84235691 bytes captures/Snapshot_2015.07.15_14.14.39.hprof | Bin 0 -> 84236663 bytes captures/Snapshot_2015.07.15_14.27.28.hprof | Bin 0 -> 84203390 bytes captures/Snapshot_2015.07.15_14.27.43.hprof | Bin 0 -> 84204362 bytes captures/Snapshot_2015.07.15_14.28.00.hprof | Bin 0 -> 84204639 bytes 36 files changed, 1695 insertions(+), 1189 deletions(-) create mode 100644 captures/Snapshot_2015.07.15_14.14.21.hprof create mode 100644 captures/Snapshot_2015.07.15_14.14.39.hprof create mode 100644 captures/Snapshot_2015.07.15_14.27.28.hprof create mode 100644 captures/Snapshot_2015.07.15_14.27.43.hprof create mode 100644 captures/Snapshot_2015.07.15_14.28.00.hprof diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a84a8448..c9cbfd6a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -56,24 +56,36 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -119,27 +131,27 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + @@ -152,8 +164,8 @@ @@ -1195,7 +1207,7 @@ - + @@ -1448,6 +1460,7 @@