Skip to content

Commit 7b65fb8

Browse files
cheng2016cheng2016
committed
添加依赖库依赖实现分离，优化代码，增加重载方法，优化项目注释，删除多余的代码
1 parent 982e6cb commit 7b65fb8

27 files changed

Lines changed: 786 additions & 1410 deletions

File tree

‎app/build.gradle‎

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

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.3"
4+
compileSdkVersion 28
5+
buildToolsVersion "28.0.3"
66
defaultConfig {
77
applicationId "com.example.chengzj"
8-
minSdkVersion 15
9-
targetSdkVersion 25
8+
minSdkVersion 16
9+
targetSdkVersion 28
1010
versionCode 1
1111
versionName "1.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -20,11 +20,8 @@ android {
2020
}
2121

2222
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
25-
exclude group: 'com.android.support', module: 'support-annotations'
26-
})
27-
compile 'com.android.support:appcompat-v7:25.3.1'
28-
compile 'com.android.support:design:25.3.1'
29-
testCompile 'junit:junit:4.12'
23+
implementation fileTree(dir: 'libs', include: ['*.jar'])
24+
implementation 'com.android.support:appcompat-v7:28.0.0'
25+
implementation 'com.android.support:design:28.0.0'
26+
implementation project(':library')
3027
}

‎app/src/androidTest/java/com/example/chengzj/ExampleInstrumentedTest.java‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎app/src/main/res/values-sw1080dp/dimens.xml‎

Lines changed: 48 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,8 @@
22
<!-- Default screen margins, per the Android Design guidelines. -->
33
<dimen name="activity_horizontal_margin">48dp</dimen>
44
<dimen name="activity_vertical_margin">48dp</dimen>
5-
<dimen name="nav_header_vertical_spacing">24dp</dimen>
6-
<dimen name="nav_header_height">528dp</dimen>
7-
<dimen name="fab_margin">48dp</dimen>
85

96

10-
<dimen name="logo_w_h">300dp</dimen>
11-
12-
<dimen name="login_button_h">135dp</dimen>
13-
14-
<dimen name="list_item_h">180dp</dimen>
15-
16-
<dimen name="text_size_8">24sp</dimen>
17-
<dimen name="text_size_10">30sp</dimen>
18-
<dimen name="text_size_11">33sp</dimen>
19-
<dimen name="text_size_12">36sp</dimen>
20-
<dimen name="text_size_13">39sp</dimen>
21-
<dimen name="text_size_14">42sp</dimen>
22-
<dimen name="text_size_15">45sp</dimen>
23-
<dimen name="text_size_16">48sp</dimen>
24-
<dimen name="text_size_17">51sp</dimen>
25-
<dimen name="text_size_18">54sp</dimen>
26-
<dimen name="text_size_19">57sp</dimen>
27-
<dimen name="text_size_20">60sp</dimen>
28-
<dimen name="text_size_22">66sp</dimen>
29-
<dimen name="text_size_24">72sp</dimen>
30-
31-
<!-- 标题 按钮编剧-->
32-
<dimen name="button_title_padding">24dp</dimen>
33-
<!-- Default screen margins, per the Android Design guidelines. -->
34-
35-
<dimen name="gallery_item_width">270dp</dimen>
36-
37-
<dimen name="s24">45dp</dimen>
38-
<dimen name="s25">47dp</dimen>
39-
<dimen name="s30">51dp</dimen>
40-
<dimen name="action_bar_height">144dp</dimen>
41-
<dimen name="user_info_cell_height">135dp</dimen>
42-
43-
<dimen name="user_left_cell_height">240dp</dimen>
44-
45-
<dimen name="locus_map_bottom_height">198dp</dimen>
46-
47-
<dimen name="input_height">135dp</dimen>
48-
49-
<dimen name="button_height">144dp</dimen>
50-
517
<!-- ******************************Widget******************************* -->
528
<dimen name="widget_min_size_1">3px</dimen>
539
<dimen name="widget_min_size_2">6px</dimen>
@@ -446,53 +402,53 @@
446402
<dimen name="widget_size_358">1074dp</dimen>
447403
<dimen name="widget_size_359">1077dp</dimen>
448404
<dimen name="widget_size_360">1080dp</dimen>
449-
<dimen name="widget_size_361">1095dp</dimen>
450-
<dimen name="widget_size_366">1110dp</dimen>
451-
<dimen name="widget_size_371">1125dp</dimen>
452-
<dimen name="widget_size_376">1140dp</dimen>
453-
<dimen name="widget_size_381">1155dp</dimen>
454-
<dimen name="widget_size_386">1170dp</dimen>
455-
<dimen name="widget_size_391">1185dp</dimen>
456-
<dimen name="widget_size_396">1200dp</dimen>
457-
<dimen name="widget_size_401">1215dp</dimen>
458-
<dimen name="widget_size_406">1230dp</dimen>
459-
<dimen name="widget_size_411">1245dp</dimen>
460-
<dimen name="widget_size_416">1260dp</dimen>
461-
<dimen name="widget_size_421">1275dp</dimen>
462-
<dimen name="widget_size_426">1290dp</dimen>
463-
<dimen name="widget_size_431">1305dp</dimen>
464-
<dimen name="widget_size_436">1320dp</dimen>
465-
<dimen name="widget_size_441">1335dp</dimen>
466-
<dimen name="widget_size_446">1350dp</dimen>
467-
<dimen name="widget_size_451">1365dp</dimen>
468-
<dimen name="widget_size_456">1380dp</dimen>
469-
<dimen name="widget_size_461">1395dp</dimen>
470-
<dimen name="widget_size_466">1410dp</dimen>
471-
<dimen name="widget_size_471">1425dp</dimen>
472-
<dimen name="widget_size_476">1440dp</dimen>
473-
<dimen name="widget_size_481">1455dp</dimen>
474-
<dimen name="widget_size_486">1470dp</dimen>
475-
<dimen name="widget_size_491">1485dp</dimen>
476-
<dimen name="widget_size_496">1500dp</dimen>
477-
<dimen name="widget_size_501">1515dp</dimen>
478-
<dimen name="widget_size_506">1530dp</dimen>
479-
<dimen name="widget_size_511">1545dp</dimen>
480-
<dimen name="widget_size_516">1560dp</dimen>
481-
<dimen name="widget_size_521">1575dp</dimen>
482-
<dimen name="widget_size_526">1590dp</dimen>
483-
<dimen name="widget_size_531">1605dp</dimen>
484-
<dimen name="widget_size_536">1620dp</dimen>
485-
<dimen name="widget_size_541">1635dp</dimen>
486-
<dimen name="widget_size_546">1650dp</dimen>
487-
<dimen name="widget_size_551">1665dp</dimen>
488-
<dimen name="widget_size_556">1680dp</dimen>
489-
<dimen name="widget_size_561">1695dp</dimen>
490-
<dimen name="widget_size_566">1710dp</dimen>
491-
<dimen name="widget_size_571">1725dp</dimen>
492-
<dimen name="widget_size_576">1740dp</dimen>
493-
<dimen name="widget_size_581">1755dp</dimen>
494-
<dimen name="widget_size_586">1770dp</dimen>
495-
<dimen name="widget_size_591">1785dp</dimen>
496-
<dimen name="widget_size_596">1800dp</dimen>
405+
<dimen name="widget_size_365">1095dp</dimen>
406+
<dimen name="widget_size_370">1110dp</dimen>
407+
<dimen name="widget_size_375">1125dp</dimen>
408+
<dimen name="widget_size_380">1140dp</dimen>
409+
<dimen name="widget_size_385">1155dp</dimen>
410+
<dimen name="widget_size_390">1170dp</dimen>
411+
<dimen name="widget_size_395">1185dp</dimen>
412+
<dimen name="widget_size_400">1200dp</dimen>
413+
<dimen name="widget_size_405">1215dp</dimen>
414+
<dimen name="widget_size_410">1230dp</dimen>
415+
<dimen name="widget_size_415">1245dp</dimen>
416+
<dimen name="widget_size_420">1260dp</dimen>
417+
<dimen name="widget_size_425">1275dp</dimen>
418+
<dimen name="widget_size_430">1290dp</dimen>
419+
<dimen name="widget_size_435">1305dp</dimen>
420+
<dimen name="widget_size_440">1320dp</dimen>
421+
<dimen name="widget_size_445">1335dp</dimen>
422+
<dimen name="widget_size_450">1350dp</dimen>
423+
<dimen name="widget_size_455">1365dp</dimen>
424+
<dimen name="widget_size_460">1380dp</dimen>
425+
<dimen name="widget_size_465">1395dp</dimen>
426+
<dimen name="widget_size_470">1410dp</dimen>
427+
<dimen name="widget_size_475">1425dp</dimen>
428+
<dimen name="widget_size_480">1440dp</dimen>
429+
<dimen name="widget_size_485">1455dp</dimen>
430+
<dimen name="widget_size_490">1470dp</dimen>
431+
<dimen name="widget_size_495">1485dp</dimen>
432+
<dimen name="widget_size_500">1500dp</dimen>
433+
<dimen name="widget_size_505">1515dp</dimen>
434+
<dimen name="widget_size_510">1530dp</dimen>
435+
<dimen name="widget_size_515">1545dp</dimen>
436+
<dimen name="widget_size_520">1560dp</dimen>
437+
<dimen name="widget_size_525">1575dp</dimen>
438+
<dimen name="widget_size_530">1590dp</dimen>
439+
<dimen name="widget_size_535">1605dp</dimen>
440+
<dimen name="widget_size_540">1620dp</dimen>
441+
<dimen name="widget_size_545">1635dp</dimen>
442+
<dimen name="widget_size_550">1650dp</dimen>
443+
<dimen name="widget_size_555">1665dp</dimen>
444+
<dimen name="widget_size_560">1680dp</dimen>
445+
<dimen name="widget_size_565">1695dp</dimen>
446+
<dimen name="widget_size_570">1710dp</dimen>
447+
<dimen name="widget_size_575">1725dp</dimen>
448+
<dimen name="widget_size_580">1740dp</dimen>
449+
<dimen name="widget_size_585">1755dp</dimen>
450+
<dimen name="widget_size_590">1770dp</dimen>
451+
<dimen name="widget_size_595">1785dp</dimen>
452+
<dimen name="widget_size_600">1800dp</dimen>
497453
</resources>
498454

‎app/src/main/res/values-sw1200dp/dimens.xml‎

Lines changed: 48 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,8 @@
22
<!-- Default screen margins, per the Android Design guidelines. -->
33
<dimen name="activity_horizontal_margin">53dp</dimen>
44
<dimen name="activity_vertical_margin">53dp</dimen>
5-
<dimen name="nav_header_vertical_spacing">27dp</dimen>
6-
<dimen name="nav_header_height">587dp</dimen>
7-
<dimen name="fab_margin">53dp</dimen>
85

96

10-
<dimen name="logo_w_h">333dp</dimen>
11-
12-
<dimen name="login_button_h">150dp</dimen>
13-
14-
<dimen name="list_item_h">200dp</dimen>
15-
16-
<dimen name="text_size_8">27sp</dimen>
17-
<dimen name="text_size_10">33sp</dimen>
18-
<dimen name="text_size_11">37sp</dimen>
19-
<dimen name="text_size_12">40sp</dimen>
20-
<dimen name="text_size_13">43sp</dimen>
21-
<dimen name="text_size_14">47sp</dimen>
22-
<dimen name="text_size_15">50sp</dimen>
23-
<dimen name="text_size_16">53sp</dimen>
24-
<dimen name="text_size_17">57sp</dimen>
25-
<dimen name="text_size_18">60sp</dimen>
26-
<dimen name="text_size_19">63sp</dimen>
27-
<dimen name="text_size_20">67sp</dimen>
28-
<dimen name="text_size_22">73sp</dimen>
29-
<dimen name="text_size_24">80sp</dimen>
30-
31-
<!-- 标题 按钮编剧-->
32-
<dimen name="button_title_padding">27dp</dimen>
33-
<!-- Default screen margins, per the Android Design guidelines. -->
34-
35-
<dimen name="gallery_item_width">300dp</dimen>
36-
37-
<dimen name="s24">50dp</dimen>
38-
<dimen name="s25">52dp</dimen>
39-
<dimen name="s30">57dp</dimen>
40-
<dimen name="action_bar_height">160dp</dimen>
41-
<dimen name="user_info_cell_height">150dp</dimen>
42-
43-
<dimen name="user_left_cell_height">267dp</dimen>
44-
45-
<dimen name="locus_map_bottom_height">220dp</dimen>
46-
47-
<dimen name="input_height">150dp</dimen>
48-
49-
<dimen name="button_height">160dp</dimen>
50-
517
<!-- ******************************Widget******************************* -->
528
<dimen name="widget_min_size_1">3px</dimen>
539
<dimen name="widget_min_size_2">7px</dimen>
@@ -446,53 +402,53 @@
446402
<dimen name="widget_size_358">1193dp</dimen>
447403
<dimen name="widget_size_359">1197dp</dimen>
448404
<dimen name="widget_size_360">1200dp</dimen>
449-
<dimen name="widget_size_361">1217dp</dimen>
450-
<dimen name="widget_size_366">1233dp</dimen>
451-
<dimen name="widget_size_371">1250dp</dimen>
452-
<dimen name="widget_size_376">1267dp</dimen>
453-
<dimen name="widget_size_381">1283dp</dimen>
454-
<dimen name="widget_size_386">1300dp</dimen>
455-
<dimen name="widget_size_391">1317dp</dimen>
456-
<dimen name="widget_size_396">1333dp</dimen>
457-
<dimen name="widget_size_401">1350dp</dimen>
458-
<dimen name="widget_size_406">1367dp</dimen>
459-
<dimen name="widget_size_411">1383dp</dimen>
460-
<dimen name="widget_size_416">1400dp</dimen>
461-
<dimen name="widget_size_421">1417dp</dimen>
462-
<dimen name="widget_size_426">1433dp</dimen>
463-
<dimen name="widget_size_431">1450dp</dimen>
464-
<dimen name="widget_size_436">1467dp</dimen>
465-
<dimen name="widget_size_441">1483dp</dimen>
466-
<dimen name="widget_size_446">1500dp</dimen>
467-
<dimen name="widget_size_451">1517dp</dimen>
468-
<dimen name="widget_size_456">1533dp</dimen>
469-
<dimen name="widget_size_461">1550dp</dimen>
470-
<dimen name="widget_size_466">1567dp</dimen>
471-
<dimen name="widget_size_471">1583dp</dimen>
472-
<dimen name="widget_size_476">1600dp</dimen>
473-
<dimen name="widget_size_481">1617dp</dimen>
474-
<dimen name="widget_size_486">1633dp</dimen>
475-
<dimen name="widget_size_491">1650dp</dimen>
476-
<dimen name="widget_size_496">1667dp</dimen>
477-
<dimen name="widget_size_501">1683dp</dimen>
478-
<dimen name="widget_size_506">1700dp</dimen>
479-
<dimen name="widget_size_511">1717dp</dimen>
480-
<dimen name="widget_size_516">1733dp</dimen>
481-
<dimen name="widget_size_521">1750dp</dimen>
482-
<dimen name="widget_size_526">1767dp</dimen>
483-
<dimen name="widget_size_531">1783dp</dimen>
484-
<dimen name="widget_size_536">1800dp</dimen>
485-
<dimen name="widget_size_541">1817dp</dimen>
486-
<dimen name="widget_size_546">1833dp</dimen>
487-
<dimen name="widget_size_551">1850dp</dimen>
488-
<dimen name="widget_size_556">1867dp</dimen>
489-
<dimen name="widget_size_561">1883dp</dimen>
490-
<dimen name="widget_size_566">1900dp</dimen>
491-
<dimen name="widget_size_571">1917dp</dimen>
492-
<dimen name="widget_size_576">1933dp</dimen>
493-
<dimen name="widget_size_581">1950dp</dimen>
494-
<dimen name="widget_size_586">1967dp</dimen>
495-
<dimen name="widget_size_591">1983dp</dimen>
496-
<dimen name="widget_size_596">2000dp</dimen>
405+
<dimen name="widget_size_365">1217dp</dimen>
406+
<dimen name="widget_size_370">1233dp</dimen>
407+
<dimen name="widget_size_375">1250dp</dimen>
408+
<dimen name="widget_size_380">1267dp</dimen>
409+
<dimen name="widget_size_385">1283dp</dimen>
410+
<dimen name="widget_size_390">1300dp</dimen>
411+
<dimen name="widget_size_395">1317dp</dimen>
412+
<dimen name="widget_size_400">1333dp</dimen>
413+
<dimen name="widget_size_405">1350dp</dimen>
414+
<dimen name="widget_size_410">1367dp</dimen>
415+
<dimen name="widget_size_415">1383dp</dimen>
416+
<dimen name="widget_size_420">1400dp</dimen>
417+
<dimen name="widget_size_425">1417dp</dimen>
418+
<dimen name="widget_size_430">1433dp</dimen>
419+
<dimen name="widget_size_435">1450dp</dimen>
420+
<dimen name="widget_size_440">1467dp</dimen>
421+
<dimen name="widget_size_445">1483dp</dimen>
422+
<dimen name="widget_size_450">1500dp</dimen>
423+
<dimen name="widget_size_455">1517dp</dimen>
424+
<dimen name="widget_size_460">1533dp</dimen>
425+
<dimen name="widget_size_465">1550dp</dimen>
426+
<dimen name="widget_size_470">1567dp</dimen>
427+
<dimen name="widget_size_475">1583dp</dimen>
428+
<dimen name="widget_size_480">1600dp</dimen>
429+
<dimen name="widget_size_485">1617dp</dimen>
430+
<dimen name="widget_size_490">1633dp</dimen>
431+
<dimen name="widget_size_495">1650dp</dimen>
432+
<dimen name="widget_size_500">1667dp</dimen>
433+
<dimen name="widget_size_505">1683dp</dimen>
434+
<dimen name="widget_size_510">1700dp</dimen>
435+
<dimen name="widget_size_515">1717dp</dimen>
436+
<dimen name="widget_size_520">1733dp</dimen>
437+
<dimen name="widget_size_525">1750dp</dimen>
438+
<dimen name="widget_size_530">1767dp</dimen>
439+
<dimen name="widget_size_535">1783dp</dimen>
440+
<dimen name="widget_size_540">1800dp</dimen>
441+
<dimen name="widget_size_545">1817dp</dimen>
442+
<dimen name="widget_size_550">1833dp</dimen>
443+
<dimen name="widget_size_555">1850dp</dimen>
444+
<dimen name="widget_size_560">1867dp</dimen>
445+
<dimen name="widget_size_565">1883dp</dimen>
446+
<dimen name="widget_size_570">1900dp</dimen>
447+
<dimen name="widget_size_575">1917dp</dimen>
448+
<dimen name="widget_size_580">1933dp</dimen>
449+
<dimen name="widget_size_585">1950dp</dimen>
450+
<dimen name="widget_size_590">1967dp</dimen>
451+
<dimen name="widget_size_595">1983dp</dimen>
452+
<dimen name="widget_size_600">2000dp</dimen>
497453
</resources>
498454

0 commit comments

Comments
 (0)