From acb27766a81d3400f2be4f10bf610f7560626ad6 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Fri, 4 Aug 2017 05:42:43 +0200 Subject: [PATCH] Update android sdk to api 26 --- CHANGELOG.md | 5 ++ app/build.gradle | 50 ++++++++++++------- .../io/github/gsantner/opoc/util/AdBlock.java | 5 +- app/src/main/res/values-ja/strings-about.xml | 3 ++ .../res/values-ja/strings-preferences.xml | 4 ++ .../res/values-no-rNO/strings-preferences.xml | 36 +++++++++++++ build.gradle | 2 +- circle.yml | 14 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 9 files changed, 93 insertions(+), 28 deletions(-) create mode 100644 app/src/main/res/values-no-rNO/strings-preferences.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 9763ac8d..69933520 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### v1.0.2 +- Update to android sdk26 +- Improve build script +- Update translation file license + ### v1.0.1 (2017-07-30) - Update SimpleMarkdownParser - Move untranslatable strings diff --git a/app/build.gradle b/app/build.gradle index 318ab139..de4c0dee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,16 +1,30 @@ apply plugin: 'com.android.application' -apply plugin: 'android-apt' + +ext { + version_sdk = [ + compileSdk : 26, + buildTools : "26.0.1", + minSdk : 17 + //targetSdk: compileSdk, + ] + version_sdk.targetSdk = version_sdk.compileSdk + version_lib = [ + appcompat : "26.0.0", + butterknife : "8.7.0", + netcipher : "2.0.0-alpha1" + ] +} android { - compileSdkVersion 24 - buildToolsVersion "24.0.3" + compileSdkVersion version_sdk.compileSdk + buildToolsVersion version_sdk.buildTools defaultConfig { - minSdkVersion 17 - targetSdkVersion 24 + minSdkVersion version_sdk.minSdk + targetSdkVersion version_sdk.targetSdk - versionCode 21 - versionName "1.0.1" + versionCode 22 + versionName "1.0.2-dev" applicationId "com.github.dfa.diaspora_android" resValue 'string', 'app_name', "dandelion*" @@ -54,6 +68,7 @@ android { // Additional repositories repositories { + google() maven { url "https://jitpack.io" } @@ -68,18 +83,19 @@ dependencies { testCompile 'junit:junit:4.12' // Android standard libs - compile 'com.android.support:appcompat-v7:24.2.1' - compile 'com.android.support:design:24.1.0' //Don't update. Broken up to 25.0.0 - compile 'com.android.support:support-v4:24.2.1' - compile 'com.android.support:customtabs:24.2.1' - compile 'com.android.support:cardview-v7:24.2.1' + compile "com.android.support:appcompat-v7:${version_lib.appcompat}" + compile "com.android.support:design:${version_lib.appcompat}" + compile "com.android.support:support-v4:${version_lib.appcompat}" + compile "com.android.support:customtabs:${version_lib.appcompat}" + compile "com.android.support:cardview-v7:${version_lib.appcompat}" // More libraries - compile 'com.jakewharton:butterknife:8.0.1' - compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1' - compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1' - compile 'com.github.DASAR:ShiftColorPicker:v0.5' - apt 'com.jakewharton:butterknife-compiler:8.0.1' + compile "com.jakewharton:butterknife:${version_lib.butterknife}" + compile "info.guardianproject.netcipher:netcipher:${version_lib.netcipher}" + compile "info.guardianproject.netcipher:netcipher-webkit:${version_lib.netcipher}" + compile "com.github.DASAR:ShiftColorPicker:v0.5" + + annotationProcessor "com.jakewharton:butterknife-compiler:${version_lib.butterknife}" } // ##################### diff --git a/app/src/main/java/io/github/gsantner/opoc/util/AdBlock.java b/app/src/main/java/io/github/gsantner/opoc/util/AdBlock.java index a8a6cc27..7302f912 100644 --- a/app/src/main/java/io/github/gsantner/opoc/util/AdBlock.java +++ b/app/src/main/java/io/github/gsantner/opoc/util/AdBlock.java @@ -5,7 +5,7 @@ * worth it, you can buy me a coke in return. Provided as is without any kind * of warranty. No attribution required. - Gregor Santner * - * License: Creative Commons Zero (CC0 1.0) + * License of this file: Creative Commons Zero (CC0 1.0) * http://creativecommons.org/publicdomain/zero/1.0/ * ---------------------------------------------------------------------------- */ @@ -47,6 +47,7 @@ import java.util.Set; /** * Simple Host-Based AdBlocker */ +@SuppressWarnings({"WeakerAccess", "SpellCheckingInspection"}) public class AdBlock { private static final AdBlock instance = new AdBlock(); @@ -163,7 +164,7 @@ public class AdBlock { if (resFilename.startsWith("adblock_domains__")) { adblockResIds.add(resId); } - } catch (IllegalAccessException ignored) { + } catch (IllegalAccessException | IllegalArgumentException ignored) { } } return adblockResIds; diff --git a/app/src/main/res/values-ja/strings-about.xml b/app/src/main/res/values-ja/strings-about.xml index c966dc86..770950f3 100644 --- a/app/src/main/res/values-ja/strings-about.xml +++ b/app/src/main/res/values-ja/strings-about.xml @@ -1,10 +1,12 @@ + アプリについて ライセンス デバッグ アプリケーション デバイス + ダイアスポラ* ポッド デバッグログ デバッグ ログ (詳細) アプリバージョン: %1$s @@ -27,6 +29,7 @@ みんなに広めよう! diaspora* と #dandelion について家族や友人に広めてください! あなたの体験についてブログしませんか? 私たちにあなたからの話を聞かせてください! アプリを共有 + やあ! #dandelion をチェックしてください! %1$s メンテナンススタッフ 現在、このアプリは以下の人によって開発およびメンテナンスされています <br><br>%1$s diff --git a/app/src/main/res/values-ja/strings-preferences.xml b/app/src/main/res/values-ja/strings-preferences.xml index 600b499f..d4a5ca6d 100644 --- a/app/src/main/res/values-ja/strings-preferences.xml +++ b/app/src/main/res/values-ja/strings-preferences.xml @@ -42,8 +42,12 @@ 画像の読み込み 安全なモバイルデータのため、画像の読み込みを無効にします + 画面の回転 + 画面の自動回転をコントロール デフォルト センサー\n(システムの設定を無視) + ポートレート (縦向き) + ランドスケープ (横向き) Tor プリセットを読み込む Tor (Orbot) HTTP プロキシのプロキシ設定を読み込みます diff --git a/app/src/main/res/values-no-rNO/strings-preferences.xml b/app/src/main/res/values-no-rNO/strings-preferences.xml new file mode 100644 index 00000000..cb58b642 --- /dev/null +++ b/app/src/main/res/values-no-rNO/strings-preferences.xml @@ -0,0 +1,36 @@ + + + + + + Den øvre verktøylinjen laster inn strømmen + Klikk på en tom plass i den øvre verktøylinjen for å åpne strømmen + + Utseende + Nettverk + Pod-innstillinger + Brukbarhet + + + Navigasjonsbryter + Kontrollér synligheten for innlegg i navigasjonsskuffen + Bruker + Generelt + Administrator + + Tema og farger + Kontrollér hvilke farger som brukes i appen + Primærfarge + Verktøylinjefarge + Aksentfarge + Fremgangslinjefarge + AMOLED-modus + + + + + + + + + diff --git a/build.gradle b/build.gradle index 28fe9aeb..657098a8 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' // NOTE: Do not place your application dependencies here; they belong diff --git a/circle.yml b/circle.yml index 8ee4b16e..35978980 100644 --- a/circle.yml +++ b/circle.yml @@ -19,17 +19,17 @@ machine: dependencies: pre: # Android SDK Platform - - if [ ! -d "/usr/local/android-sdk-linux/platforms/android-24" ]; then echo y | android update sdk --no-ui --all --filter "android-24"; fi + - if [ ! -d "/usr/local/android-sdk-linux/platforms/android-26" ]; then echo y | android update sdk --no-ui --all --filter "android-26"; fi # Android SDK Build-tools - - if [ ! -d "/usr/local/android-sdk-linux/build-tools/24.0.3" ]; then echo y | android update sdk --no-ui --all --filter "build-tools-24.0.3"; fi - # Android Support Repository - - if [ ! -d "/usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/design/24.2.0" ]; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"; fi + - if [ ! -d "/usr/local/android-sdk-linux/build-tools/26.0.1" ]; then echo y | android update sdk --no-ui --all --filter "build-tools-26.0.1"; fi + # Android Support Repository - deprecated + #- if [ ! -d "/usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/design/26.2.0" ]; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"; fi cache_directories: - - /usr/local/android-sdk-linux/platforms/android-24 - - /usr/local/android-sdk-linux/build-tools/24.0.3 - - /usr/local/android-sdk-linux/extras/android/m2repository + - /usr/local/android-sdk-linux/platforms/android-26 + - /usr/local/android-sdk-linux/build-tools/26.0.1 + #- /usr/local/android-sdk-linux/extras/android/m2repository ################### test: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae71f55..f1b5a66f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.2-all.zip