Skip to content

Commit 5295d65

Browse files
BlankjBlankj
committed
see o4/15
1 parent c91225b commit 5295d65

30 files changed

+197
-225
lines changed

‎app/build.gradle

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion rootProject.compileSdkVersion
5-
buildToolsVersion rootProject.buildToolsVersion
4+
compileSdkVersion 25
5+
buildToolsVersion "25.0.2"
66

77
defaultConfig {
88
applicationId "com.blankj.androidutilcode"
9-
minSdkVersion rootProject.minSdkVersion
10-
targetSdkVersion rootProject.targetSdkVersion
11-
versionCode rootProject.versionCode
12-
versionName rootProject.versionName
9+
minSdkVersion 16
10+
targetSdkVersion 16
11+
versionCode 20
12+
versionName "1.4.0"
1313
}
1414
buildTypes {
15+
debug {
16+
minifyEnabled true
17+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
}
1519
release {
1620
minifyEnabled true
1721
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -21,13 +25,18 @@ android {
2125

2226
dependencies {
2327
compile fileTree(include: ['*.jar'], dir: 'libs')
24-
compile deps.appcompatv7
25-
compile deps.supportv4
26-
compile deps.design
28+
final SUPPORT_VERSION = '25.3.1'
29+
final LEAKCANARY_VERSION = '1.5';
30+
31+
def leakCanary = "com.squareup.leakcanary:leakcanary-android-no-op:$LEAKCANARY_VERSION"
2732

2833
compile project(':utilcode')
34+
compile "com.android.support:appcompat-v7:$SUPPORT_VERSION"
35+
compile "com.android.support:support-v4:$SUPPORT_VERSION"
36+
compile "com.android.support:design:$SUPPORT_VERSION"
2937

3038
// LeakCanary
31-
debugCompile deps.leakcanaryandroid
32-
releaseCompile deps.leakcanaryandroidnoop
39+
debugCompile "com.squareup.leakcanary:leakcanary-android:$LEAKCANARY_VERSION"
40+
releaseCompile leakCanary
41+
testCompile leakCanary
3342
}

‎app/src/main/res/layout/activity_activity.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
android:layout_height="wrap_content"
99
android:gravity="center_horizontal"
1010
android:orientation="vertical"
11-
android:padding="@dimen/spacing_small">
11+
android:padding="@dimen/spacing_16">
1212

1313
<TextView
1414
android:id="@+id/tv_about_activity"
15-
style="@style/Font"
15+
style="@style/TextStyle"
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
1818
android:gravity="center" />
1919

2020
<Button
2121
android:id="@+id/btn_launch_image_activity"
22-
style="@style/BtnFont"
22+
style="@style/WideBtnStyle"
2323
android:layout_width="match_parent"
2424
android:layout_height="wrap_content"
2525
android:text="@string/activity.start_imageActivity" />

‎app/src/main/res/layout/activity_app.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,59 +9,59 @@
99
android:layout_height="wrap_content"
1010
android:gravity="center_horizontal"
1111
android:orientation="vertical"
12-
android:padding="@dimen/spacing_small">
12+
android:padding="@dimen/spacing_16">
1313

1414
<TextView
1515
android:id="@+id/tv_about_app"
16-
style="@style/Font"
16+
style="@style/TextStyle"
1717
android:layout_width="match_parent"
1818
android:layout_height="wrap_content"
1919
android:gravity="center"
2020
/>
2121

2222
<Button
2323
android:id="@+id/btn_install_app"
24-
style="@style/BtnFont"
24+
style="@style/WideBtnStyle"
2525
android:layout_width="match_parent"
2626
android:layout_height="wrap_content"
2727
android:text="@string/app.install"
2828
/>
2929

3030
<Button
3131
android:id="@+id/btn_install_app_silent"
32-
style="@style/BtnFont"
32+
style="@style/WideBtnStyle"
3333
android:layout_width="match_parent"
3434
android:layout_height="wrap_content"
3535
android:text="@string/app.install_silent"
3636
/>
3737

3838
<Button
3939
android:id="@+id/btn_uninstall_app"
40-
style="@style/BtnFont"
40+
style="@style/WideBtnStyle"
4141
android:layout_width="match_parent"
4242
android:layout_height="wrap_content"
4343
android:text="@string/app.uninstall"
4444
/>
4545

4646
<Button
4747
android:id="@+id/btn_uninstall_app_silent"
48-
style="@style/BtnFont"
48+
style="@style/WideBtnStyle"
4949
android:layout_width="match_parent"
5050
android:layout_height="wrap_content"
5151
android:text="@string/app.uninstall_silent"
5252
/>
5353

5454
<Button
5555
android:id="@+id/btn_launch_app"
56-
style="@style/BtnFont"
56+
style="@style/WideBtnStyle"
5757
android:layout_width="match_parent"
5858
android:layout_height="wrap_content"
5959
android:text="@string/app.launch"
6060
/>
6161

6262
<Button
6363
android:id="@+id/btn_get_app_details_settings"
64-
style="@style/BtnFont"
64+
style="@style/WideBtnStyle"
6565
android:layout_width="match_parent"
6666
android:layout_height="wrap_content"
6767
android:text="@string/app.get_details_settings"

‎app/src/main/res/layout/activity_clean.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@
88
android:layout_height="wrap_content"
99
android:gravity="center_horizontal"
1010
android:orientation="vertical"
11-
android:padding="@dimen/spacing_small">
11+
android:padding="@dimen/spacing_16">
1212

1313
<Button
1414
android:id="@+id/btn_clean_internal_cache"
15-
style="@style/BtnFont"
15+
style="@style/WideBtnStyle"
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
1818
/>
1919

2020
<Button
2121
android:id="@+id/btn_clean_internal_files"
22-
style="@style/BtnFont"
22+
style="@style/WideBtnStyle"
2323
android:layout_width="match_parent"
2424
android:layout_height="wrap_content"
2525
/>
2626

2727
<Button
2828
android:id="@+id/btn_clean_internal_databases"
29-
style="@style/BtnFont"
29+
style="@style/WideBtnStyle"
3030
android:layout_width="match_parent"
3131
android:layout_height="wrap_content"
3232
/>
3333

3434
<Button
3535
android:id="@+id/btn_clean_internal_sp"
36-
style="@style/BtnFont"
36+
style="@style/WideBtnStyle"
3737
android:layout_width="match_parent"
3838
android:layout_height="wrap_content"
3939
/>
4040

4141
<Button
4242
android:id="@+id/btn_clean_external_cache"
43-
style="@style/BtnFont"
43+
style="@style/WideBtnStyle"
4444
android:layout_width="match_parent"
4545
android:layout_height="wrap_content"
4646
/>

‎app/src/main/res/layout/activity_device.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,43 @@
88
android:layout_height="wrap_content"
99
android:gravity="center_horizontal"
1010
android:orientation="vertical"
11-
android:padding="@dimen/spacing_small">
11+
android:padding="@dimen/spacing_16">
1212

1313
<TextView
1414
android:id="@+id/tv_about_device"
15-
style="@style/Font"
15+
style="@style/TextStyle"
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
1818
android:gravity="center"
1919
/>
2020

2121
<Button
2222
android:id="@+id/btn_shutdown"
23-
style="@style/BtnFont"
23+
style="@style/WideBtnStyle"
2424
android:layout_width="match_parent"
2525
android:layout_height="wrap_content"
2626
android:text="@string/device.shutdown"
2727
/>
2828

2929
<Button
3030
android:id="@+id/btn_reboot"
31-
style="@style/BtnFont"
31+
style="@style/WideBtnStyle"
3232
android:layout_width="match_parent"
3333
android:layout_height="wrap_content"
3434
android:text="@string/device.reboot"
3535
/>
3636

3737
<Button
3838
android:id="@+id/btn_reboot_to_recovery"
39-
style="@style/BtnFont"
39+
style="@style/WideBtnStyle"
4040
android:layout_width="match_parent"
4141
android:layout_height="wrap_content"
4242
android:text="@string/device.reboot_to_recovery"
4343
/>
4444

4545
<Button
4646
android:id="@+id/btn_reboot_to_bootloader"
47-
style="@style/BtnFont"
47+
style="@style/WideBtnStyle"
4848
android:layout_width="match_parent"
4949
android:layout_height="wrap_content"
5050
android:text="@string/device.reboot_to_bootloader"

‎app/src/main/res/layout/activity_flashlight.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99
android:layout_height="wrap_content"
1010
android:gravity="center_horizontal"
1111
android:orientation="vertical"
12-
android:padding="@dimen/spacing_small">
12+
android:padding="@dimen/spacing_16">
1313

1414
<TextView
1515
android:id="@+id/tv_about_flashlight"
16-
style="@style/Font"
16+
style="@style/TextStyle"
1717
android:layout_width="match_parent"
1818
android:layout_height="wrap_content"
1919
android:gravity="center"
2020
/>
2121

2222
<Button
2323
android:id="@+id/btn_open_flashlight"
24-
style="@style/BtnFont"
24+
style="@style/WideBtnStyle"
2525
android:layout_width="match_parent"
2626
android:layout_height="wrap_content"
2727
android:text="@string/flashlight.open"
2828
/>
2929

3030
<Button
3131
android:id="@+id/btn_close_flashlight"
32-
style="@style/BtnFont"
32+
style="@style/WideBtnStyle"
3333
android:layout_width="match_parent"
3434
android:layout_height="wrap_content"
3535
android:text="@string/flashlight.close"

‎app/src/main/res/layout/activity_handler.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
android:layout_height="wrap_content"
99
android:gravity="center_horizontal"
1010
android:orientation="vertical"
11-
android:padding="@dimen/spacing_small">
11+
android:padding="@dimen/spacing_16">
1212

1313
<TextView
1414
android:id="@+id/tv_about_handler"
15-
style="@style/Font"
15+
style="@style/TextStyle"
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
1818
android:gravity="center"
1919
/>
2020

2121
<Button
2222
android:id="@+id/btn_send_msg_after_3s"
23-
style="@style/BtnFont"
23+
style="@style/WideBtnStyle"
2424
android:layout_width="match_parent"
2525
android:layout_height="wrap_content"
2626
android:text="@string/handler.send_msg_after_3s"

‎app/src/main/res/layout/activity_image.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:layout_height="wrap_content"
1111
android:gravity="center_horizontal"
1212
android:orientation="vertical"
13-
android:padding="@dimen/spacing_small">
13+
android:padding="@dimen/spacing_16">
1414

1515
<ImageView
1616
android:id="@+id/iv_src"

‎app/src/main/res/layout/activity_keyboard.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
android:layout_height="wrap_content"
1010
android:gravity="center_horizontal"
1111
android:orientation="vertical"
12-
android:padding="@dimen/spacing_small">
12+
android:padding="@dimen/spacing_16">
1313

1414
<TextView
1515
android:id="@+id/tv_about_keyboard"
16-
style="@style/Font"
16+
style="@style/TextStyle"
1717
android:layout_width="match_parent"
1818
android:layout_height="wrap_content"
1919
android:gravity="center"
@@ -26,23 +26,23 @@
2626

2727
<Button
2828
android:id="@+id/btn_hide_soft_input"
29-
style="@style/BtnFont"
29+
style="@style/WideBtnStyle"
3030
android:layout_width="match_parent"
3131
android:layout_height="wrap_content"
3232
android:text="@string/keyboard.hide_soft_input"
3333
/>
3434

3535
<Button
3636
android:id="@+id/btn_show_soft_input"
37-
style="@style/BtnFont"
37+
style="@style/WideBtnStyle"
3838
android:layout_width="match_parent"
3939
android:layout_height="wrap_content"
4040
android:text="@string/keyboard.show_soft_input"
4141
/>
4242

4343
<Button
4444
android:id="@+id/btn_toggle_soft_input"
45-
style="@style/BtnFont"
45+
style="@style/WideBtnStyle"
4646
android:layout_width="match_parent"
4747
android:layout_height="wrap_content"
4848
android:text="@string/keyboard.toggle_soft_input"

‎app/src/main/res/layout/activity_location.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
android:layout_height="wrap_content"
1010
android:gravity="center_horizontal"
1111
android:orientation="vertical"
12-
android:padding="@dimen/spacing_small">
12+
android:padding="@dimen/spacing_16">
1313

1414
<TextView
1515
android:id="@+id/tv_about_location"
16-
style="@style/Font"
16+
style="@style/TextStyle"
1717
android:layout_width="match_parent"
1818
android:layout_height="wrap_content"
1919
android:gravity="center"

0 commit comments

Comments
 (0)