Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #11026 from osmandapp/master

Browse source 
update test branch
This commit is contained in:
Hardy 2021-02-27 18:26:57 +01:00 committed by GitHub
commit d202bdbb9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/build-common.gradle
View file

@ -373,4 +373,5 @@ dependencies {
} }
implementation 'com.jaredrummler:colorpicker:1.1.0' implementation 'com.jaredrummler:colorpicker:1.1.0'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.56' implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
implementation 'com.google.android.play:core:1.9.1'
} }

2
OsmAnd/build-library.gradle
View file

@ -57,5 +57,5 @@ project.afterEvaluate {
} }
dependencies { dependencies {
implementation 'com.google.android.gms:play-services-location:17.1.0' implementation 'com.google.android.gms:play-services-location:18.0.0'
} }

17
OsmAnd/build.gradle
View file

@ -190,22 +190,9 @@ dependencies {
opengldebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" opengldebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
openglImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" openglImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
openglImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" openglImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
implementation ("com.getkeepsafe.taptargetview:taptargetview:1.12.0"){
exclude group: 'com.android.support'
}
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
implementation ("com.github.HITGIF:TextFieldBoxes:1.4.5"){
exclude group: 'com.android.support'
}
implementation('com.github.scribejava:scribejava-apis:7.1.1'){
exclude group: "com.fasterxml.jackson.core"
}
implementation 'com.jaredrummler:colorpicker:1.1.0'
implementation "org.bouncycastle:bcpkix-jdk15on:1.56"
implementation 'com.google.android.play:core:1.9.1'
huaweiImplementation 'com.huawei.hms:iap:5.0.2.300' huaweiImplementation 'com.huawei.hms:iap:5.0.2.300'
gplayFreeImplementation 'com.google.android.gms:play-services-location:17.1.0' gplayFreeImplementation 'com.google.android.gms:play-services-location:18.0.0'
gplayFullImplementation 'com.google.android.gms:play-services-location:17.1.0' gplayFullImplementation 'com.google.android.gms:play-services-location:18.0.0'
} }

4
OsmAnd/res/values/styles.xml
View file

@ -250,6 +250,8 @@
<item name="image_help_announcement_time">@drawable/img_help_announcement_time_day</item> <item name="image_help_announcement_time">@drawable/img_help_announcement_time_day</item>
<item name="switch_button_active">@color/switch_button_active_light</item> <item name="switch_button_active">@color/switch_button_active_light</item>
<item name="bottom_navigation_item_background">@drawable/bottom_navigation_item_bg_light</item> <item name="bottom_navigation_item_background">@drawable/bottom_navigation_item_bg_light</item>
<item name="android:forceDarkAllowed">false</item>
</style> </style>
<style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar"> <style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@ -549,6 +551,8 @@
<item name="image_help_announcement_time">@drawable/img_help_announcement_time_night</item> <item name="image_help_announcement_time">@drawable/img_help_announcement_time_night</item>
<item name="switch_button_active">@color/switch_button_active_dark</item> <item name="switch_button_active">@color/switch_button_active_dark</item>
<item name="bottom_navigation_item_background">@drawable/bottom_navigation_item_bg_dark</item> <item name="bottom_navigation_item_background">@drawable/bottom_navigation_item_bg_dark</item>
<item name="android:forceDarkAllowed">false</item>
</style> </style>
<style name="FreeVersionBanner" parent="OsmandDarkTheme"> <style name="FreeVersionBanner" parent="OsmandDarkTheme">