This repository was archived by the owner on Jun 8, 2024. It is now read-only.
File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1313# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1414# org.gradle.parallel=true
1515# Wed Dec 28 20:18:09 CST 2016
16- systemProp.http.proxyHost =localhost
1716org.gradle.jvmargs =-Xmx1536m
18- systemProp.http.proxyPort =1080
1917BUILD_TOOLS_VERSION =25.0.2
2018VERSION_NAME =2.5.0
2119TARGET_SDK_VERSION =25
Original file line number Diff line number Diff line change @@ -32,13 +32,13 @@ dependencies {
3232 compile ' com.android.support:design:25.1.0'
3333 compile ' com.android.support:support-v13:25.1.0'
3434 compile ' com.android.support:customtabs:25.1.0'
35- compile ' com.roughike:bottom-bar:1.3.9 '
36- compile ' com.google.code.gson:gson:2.7 '
37- compile ' com.squareup.okhttp3:okhttp:3.3.1 '
35+ compile ' com.roughike:bottom-bar:2.1.1 '
36+ compile ' com.google.code.gson:gson:2.8.0 '
37+ compile ' com.squareup.okhttp3:okhttp:3.6.0 '
3838 compile ' com.rengwuxian.materialedittext:library:2.1.4'
3939 compile ' com.github.RikkaW:MaterialPreference:v1.4.4'
40- compile ' de.hdodenhof:circleimageview:2.0 .0'
41- compile ' me.dm7.barcodescanner:zxing:1.8.4 '
42- compile ' com.tencent.bugly:crashreport:2.1.7 '
40+ compile ' de.hdodenhof:circleimageview:2.1 .0'
41+ compile ' me.dm7.barcodescanner:zxing:1.9 '
42+ compile ' com.tencent.bugly:crashreport:2.4.0 '
4343 compile ' moe.feng:AlipayZeroSdk:1.1'
4444}
Original file line number Diff line number Diff line change 4343 android:layout_marginStart=" 24dp"
4444 android:text=" @string/activity_add"
4545 android:textAppearance=" @style/TextAppearance.AppCompat.Display1"
46- android:textColor=" @color/white" />
46+ android:textColor=" @android: color/white" />
4747
4848 </android .support.design.widget.CollapsingToolbarLayout>
4949
You can’t perform that action at this time.
0 commit comments