From b6f6fb682411bbc3861b2da12e1058d9bcb1df68 Mon Sep 17 00:00:00 2001 From: jinzhenguo Date: Thu, 1 Jun 2017 16:44:42 +0800 Subject: [PATCH] refactor --- README.md | 8 ++--- app/build.gradle | 6 ++-- app/src/main/res/layout/activity_bitmap.xml | 18 +++++----- app/src/main/res/layout/activity_main.xml | 10 +++--- .../main/res/layout/activity_view_finder.xml | 8 ++--- app/src/main/res/values/strings.xml | 10 +++++- demo/.gitignore | 1 + demo/build.gradle | 33 ++++++++++++++++++ demo/proguard-rules.pro | 25 +++++++++++++ .../demo/ExampleInstrumentedTest.java | 26 ++++++++++++++ demo/src/main/AndroidManifest.xml | 21 +++++++++++ .../java/com/ihongqiqu/demo/MainActivity.java | 13 +++++++ demo/src/main/res/layout/activity_main.xml | 19 ++++++++++ demo/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 4208 bytes demo/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2555 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6114 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10056 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 14696 bytes demo/src/main/res/values/colors.xml | 6 ++++ demo/src/main/res/values/strings.xml | 3 ++ demo/src/main/res/values/styles.xml | 11 ++++++ util/build.gradle | 2 +- .../java/com/ihongqiqu/util/AppUtils.java | 30 ++++++++++++---- 28 files changed, 217 insertions(+), 33 deletions(-) create mode 100644 demo/.gitignore create mode 100644 demo/build.gradle create mode 100644 demo/proguard-rules.pro create mode 100644 demo/src/androidTest/java/com/ihongqiqu/demo/ExampleInstrumentedTest.java create mode 100644 demo/src/main/AndroidManifest.xml create mode 100644 demo/src/main/java/com/ihongqiqu/demo/MainActivity.java create mode 100644 demo/src/main/res/layout/activity_main.xml create mode 100644 demo/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 demo/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 demo/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 demo/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 demo/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 demo/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 demo/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 demo/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 demo/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 demo/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 demo/src/main/res/values/colors.xml create mode 100644 demo/src/main/res/values/strings.xml create mode 100644 demo/src/main/res/values/styles.xml diff --git a/README.md b/README.md index fe31992..ce97cc5 100644 --- a/README.md +++ b/README.md @@ -226,10 +226,10 @@ dependencies { [37]: https://github.com/jingle1267/android-utils/tree/master/util/src/main/java/com/ihongqiqu/util/ViewUtils.java [38]: https://github.com/jingle1267/android-utils/tree/master/util/src/main/java/com/ihongqiqu/util/WindowUtils.java -[39]: https://github.com/jingle1267/android-utils/blob/master/src/com/ihongqiqu/app/BaseApplication.java -[40]: https://github.com/jingle1267/android-utils/blob/master/src/com/ihongqiqu/app/BaseCrashHandler.java -[41]: https://github.com/jingle1267/android-utils/blob/master/src/com/ihongqiqu/app/RebootThreadExceptionHandler.java -[42]: https://github.com/jingle1267/android-utils/blob/master/src/com/ihongqiqu/app/StartAppReceiver.java +[39]: https://github.com/jingle1267/android-utils/tree/master/app/src/com/ihongqiqu/app/BaseApplication.java +[40]: https://github.com/jingle1267/android-utils/tree/master/app/src/com/ihongqiqu/app/BaseCrashHandler.java +[41]: https://github.com/jingle1267/android-utils/tree/master/app/src/com/ihongqiqu/app/RebootThreadExceptionHandler.java +[42]: https://github.com/jingle1267/android-utils/tree/master/app/src/com/ihongqiqu/app/StartAppReceiver.java [43]: http://ihongqiqu.com/2014/10/16/android-log/ [44]: http://ihongqiqu.com [45]: https://github.com/jingle1267/android-utils/tree/master/util/src/main/java/com/ihongqiqu/util/ViewFinder.java diff --git a/app/build.gradle b/app/build.gradle index 7702d96..0646798 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "com.ihongqiqu.demo" minSdkVersion 15 - targetSdkVersion 22 + targetSdkVersion 25 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -29,7 +29,7 @@ dependencies { }) compile 'com.android.support:appcompat-v7:25.1.0' compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4' - compile 'com.ihongqiqu.util:android-utils:1.0.0' + compile 'com.ihongqiqu.util:android-utils:1.0.1' // testCompile 'junit:junit:4.12' - // compile project(path: ':util') +// compile project(path: ':util') } diff --git a/app/src/main/res/layout/activity_bitmap.xml b/app/src/main/res/layout/activity_bitmap.xml index ada7c6b..387ede3 100644 --- a/app/src/main/res/layout/activity_bitmap.xml +++ b/app/src/main/res/layout/activity_bitmap.xml @@ -5,7 +5,7 @@ @@ -14,10 +14,10 @@ android:id="@+id/textView1" android:layout_margin="15dp" android:textSize="20sp" - android:gravity="left" + android:gravity="start" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="圆形图:" /> + android:text="@string/str_circle_title" /> + android:text="@string/str_combine_img" /> @@ -64,7 +64,7 @@