diff --git a/.gitignore b/.gitignore index 8292ebd7..ed988dab 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,7 @@ gradle/wrapper/gradlew* syncthing/go syncthing/go.tgz syncthing/go.zip -syncthing/android-ndk-r16b +syncthing/android-ndk-r* syncthing/ndk.zip # External build artifacts diff --git a/app/build.gradle b/app/build.gradle index 949e6e31..a6718670 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,14 +4,14 @@ apply plugin: 'com.github.triplet.play' dependencies { implementation 'eu.chainfire:libsuperuser:1.0.0.201704021214' - implementation 'com.android.support:design:27.0.2' + implementation 'com.android.support:design:27.1.1' implementation 'com.google.zxing:android-integration:3.3.0' implementation 'com.google.code.gson:gson:2.8.2' implementation 'org.mindrot:jbcrypt:0.4' implementation 'com.google.guava:guava:23.6-android' implementation 'com.annimon:stream:1.1.9' implementation 'com.android.volley:volley:1.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.google.dagger:dagger:2.14.1' annotationProcessor "com.google.dagger:dagger-compiler:2.14.1" androidTestImplementation 'com.android.support.test:rules:1.0.2' @@ -21,7 +21,7 @@ dependencies { android { // Changes to these values need to be reflected in `.travis.yml` compileSdkVersion 27 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.2' buildTypes.debug.applicationIdSuffix ".debug" dataBinding.enabled = true diff --git a/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png new file mode 100644 index 00000000..836237d1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png new file mode 100644 index 00000000..38f841e3 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png new file mode 100644 index 00000000..10f0d15d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png new file mode 100644 index 00000000..7ef944db Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png index 76b5dbad..56d5d9fc 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png and b/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png differ diff --git a/build.gradle b/build.gradle index 3a8103da..4653bbbd 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.github.triplet.gradle:play-publisher:1.2.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0' diff --git a/syncthing/build-syncthing.py b/syncthing/build-syncthing.py index d162868d..6c959cfd 100644 --- a/syncthing/build-syncthing.py +++ b/syncthing/build-syncthing.py @@ -136,12 +136,12 @@ def install_ndk(): # Consts. pwd_path = os.path.dirname(os.path.realpath(__file__)) if sys.platform == 'win32': - url = 'https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip' - expected_shasum = 'f3f1909ed1052e98dda2c79d11c22f3da28daf25' + url = 'https://dl.google.com/android/repository/android-ndk-r18-windows-x86_64.zip' + expected_shasum = '7fc0e0f94d86ea389bd18761abdc1bae2c005587' else: - url = 'https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip' - expected_shasum = '42aa43aae89a50d1c66c3f9fdecd676936da6128' + url = 'https://dl.google.com/android/repository/android-ndk-r18-linux-x86_64.zip' + expected_shasum = '2ac2e8e1ef73ed551cac3a1479bb28bd49369212' zip_fullfn = pwd_path + os.path.sep + 'ndk.zip'; # Download NDK. @@ -161,10 +161,10 @@ def install_ndk(): print("[ok] Checksum of", zip_fullfn, "matches expected value.") # Proceed with extraction of the NDK if necessary. - ndk_home_path = pwd_path + os.path.sep + 'android-ndk-r16b' + ndk_home_path = pwd_path + os.path.sep + 'android-ndk-r18' if not os.path.isfile(ndk_home_path + os.path.sep + "sysroot" + os.path.sep + "NOTICE"): print("Extracting NDK ...") - # This will go to a subfolder "android-ndk-r16b" in the current path. + # This will go to a subfolder "android-ndk-r18" in the current path. file_name, file_extension = os.path.splitext(url_base_name) zip = zipfile.ZipFile(zip_fullfn, 'r') zip.extractall(pwd_path)