mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-21 12:45:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

update to Android Studio 3.1 tooling including build fixes

Browse source
This commit is contained in:
AndyScherzinger 2018-04-03 17:18:24 +02:00
parent c1fabc2f60
commit 54eb9bb9a4
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
6 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build.gradle
View file

@ -14,7 +14,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.google.gms:google-services:3.0.0'
}
}
@ -30,7 +30,7 @@ configurations.all {
}
ext {
supportLibraryVersion = '26.1.0'
supportLibraryVersion = '27.1.0'
googleLibraryVersion = '11.2.2'
androidLibraryVersion = '1.0.40'
@ -69,12 +69,12 @@ android {
javaMaxHeapSize "4g"
}
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 27
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -226,7 +226,9 @@ dependencies {
// implementation "com.google.firebase:firebase-core:${googleLibraryVersion}"
implementation 'org.parceler:parceler-api:1.1.9'
annotationProcessor 'org.parceler:parceler:1.1.9'
implementation 'com.github.bumptech.glide:glide:3.7.0'
implementation ('com.github.bumptech.glide:glide:3.7.0') {
exclude group: "com.android.support"
}
implementation 'com.caverock:androidsvg:1.2.1'
implementation "com.android.support:support-annotations:${supportLibraryVersion}"
implementation 'com.google.code.gson:gson:2.8.2'
@ -249,7 +251,7 @@ dependencies {
//androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
implementation 'org.jetbrains:annotations:15.0'
androidTestCompile 'tools.fastlane:screengrab:1.0.0'
androidTestImplementation 'tools.fastlane:screengrab:1.0.0'
}
configurations.all {

1
gradle.properties
View file

@ -1 +0,0 @@
android.enableAapt2=false

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri May 05 19:09:31 CEST 2017
#Tue Apr 03 16:56:17 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

2
src/main/java/com/owncloud/android/media/MediaService.java
View file

@ -34,7 +34,7 @@ import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.WifiLock;
import android.os.IBinder;
import android.os.PowerManager;
import android.support.v7.app.NotificationCompat;
import android.support.v4.app.NotificationCompat;
import android.widget.Toast;
import com.owncloud.android.R;

2
src/main/res/values-v19/styles.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
<style name="Theme.ownCloud.Overlay" parent="Theme.ownCloud">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="android:windowFullscreen">true</item>

22
src/main/res/values/styles.xml
View file

@ -126,7 +126,7 @@
</style>
<!-- separat translucent action bar style -->
<style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
<style name="Theme.ownCloud.Overlay" parent="@style/Theme.ownCloud">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="android:windowFullscreen">true</item>
@ -145,19 +145,19 @@
</style>
<!-- Progress bar -->
<style name="Widget.ownCloud.TopProgressBar" parent="style/Widget.AppCompat.ProgressBar.Horizontal">
<style name="Widget.ownCloud.TopProgressBar" parent="@style/Widget.AppCompat.ProgressBar.Horizontal">
<item name="android:progressDrawable">@drawable/actionbar_progress_horizontal</item>
<item name="android:indeterminateDrawable">@drawable/actionbar_progress_indeterminate_horizontal</item>
</style>
<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.AppCompat">
<style name="Theme.ownCloud.Fullscreen" parent="@style/Theme.AppCompat">
<item name="android:windowFullscreen">true</item>
<item name="colorAccent">@color/color_accent</item>
</style>
<style name="Theme.ownCloud.Widget.ActionBar"
parent="style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="android:background">@color/primary</item>
<item name="background">@color/primary</item>
<item name="android:textColor">#ffffff</item>
@ -168,19 +168,19 @@
</style>
<!-- Dialogs -->
<style name="Theme.ownCloud.Dialog" parent="style/Theme.AppCompat.Light.Dialog.Alert">
<style name="Theme.ownCloud.Dialog" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
<item name="windowNoTitle">false</item>
<item name="colorAccent">@color/color_accent</item>
<item name="buttonBarButtonStyle">@style/Theme.ownCloud.Dialog.ButtonBar.Button</item>
<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
</style>
<style name="Theme.ownCloud.Dialog.NoTitle" parent="style/Theme.ownCloud.Dialog">
<style name="Theme.ownCloud.Dialog.NoTitle" parent="@style/Theme.ownCloud.Dialog">
<item name="windowNoTitle">true</item>
<item name="colorAccent">@color/color_accent</item>
</style>
<style name="Theme.ownCloud.Dialog.NoButtonBarStyle" parent="style/Theme.AppCompat.Light.Dialog.Alert">
<style name="Theme.ownCloud.Dialog.NoButtonBarStyle" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
<item name="windowNoTitle">false</item>
<item name="colorAccent">@color/color_accent</item>
</style>
@ -200,7 +200,7 @@
fix see:
http://stackoverflow.com/questions/27187353/dialog-buttons-with-long-text-not-wrapping-squeezed-out-material-theme-on-an
-->
<style name="Theme.ownCloud.Dialog.ButtonBar" parent="style/Widget.AppCompat.Button.ButtonBar.AlertDialog">
<style name="Theme.ownCloud.Dialog.ButtonBar" parent="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog">
<!-- Making sure, the button bar uses parent width and is not restricted in height -->
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
@ -208,7 +208,7 @@
<item name="android:minHeight">@null</item>
</style>
<style name="Theme.ownCloud.Dialog.ButtonBar.Button" parent="style/Widget.AppCompat.Button.Borderless.Colored">
<style name="Theme.ownCloud.Dialog.ButtonBar.Button" parent="@style/Widget.AppCompat.Button.Borderless.Colored">
<!-- Setting the weight as follows should result in equally wide buttons filling the alert dialog width,
but instead they span further out of the dialog, breaking in multiple lines though -->
<item name="android:layout_width">0dp</item>
@ -237,10 +237,10 @@
</style>
<!-- Text styles -->
<style name="NextcloudTextAppearanceHeadline" parent="style/TextAppearance.AppCompat.Headline">
<style name="NextcloudTextAppearanceHeadline" parent="@style/TextAppearance.AppCompat.Headline">
<item name="android:textSize">26sp</item>
<item name="android:textColor">#000000</item>
</style>
<style name="NextcloudTextAppearanceMedium" parent="style/TextAppearance.AppCompat.Medium">
<style name="NextcloudTextAppearanceMedium" parent="@style/TextAppearance.AppCompat.Medium">
</style>
</resources>