From 8157146498e3483d17d0626b05a2d35e4c8d281b Mon Sep 17 00:00:00 2001
From: Amine <aminecmi@gmail.com>
Date: Sat, 21 Oct 2017 20:10:19 +0200
Subject: [PATCH] Strings, updates, and sonarqube.

---
 app/build.gradle                       |  8 ++++++--
 app/src/main/AndroidManifest.xml       | 13 +++++++++----
 app/src/main/res/values-fr/strings.xml |  2 +-
 app/src/main/res/values/strings.xml    |  2 +-
 build.gradle                           |  8 +++++++-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cc0e6bf..719f437 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,6 +23,8 @@ def versionNameFromGit() {
     return gitVersion().trim()
 }
 
+apply plugin: 'org.sonarqube'
+
 apply plugin: 'com.android.application'
 
 apply plugin: 'io.fabric'
@@ -30,12 +32,14 @@ apply plugin: 'io.fabric'
 apply plugin: 'kotlin-android'
 
 repositories {
-    maven { url 'https://maven.fabric.io/public' }
+    maven {
+        url 'https://maven.fabric.io/public'
+    }
 }
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
         minSdkVersion 16
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9ecc30d..a501c0b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,8 @@
             android:name=".IntroActivity"
             android:theme="@style/Theme.Intro">
         </activity>
-        <activity android:name=".LoginActivity"
+        <activity
+            android:name=".LoginActivity"
             android:label="@string/title_activity_login">
         </activity>
         <activity android:name=".HomeActivity">
@@ -41,13 +42,15 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="apps.amine.bou.readerforselfoss.HomeActivity" />
         </activity>
-        <activity android:name=".SourcesActivity"
+        <activity
+            android:name=".SourcesActivity"
             android:parentActivityName=".HomeActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".HomeActivity" />
         </activity>
-        <activity android:name=".AddSourceActivity"
+        <activity
+            android:name=".AddSourceActivity"
             android:parentActivityName=".SourcesActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -61,9 +64,11 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
-        <activity android:name=".ReaderActivity"
+        <activity
+            android:name=".ReaderActivity"
             android:theme="@style/DragDismissTheme">
         </activity>
+
         <meta-data
             android:name="apps.amine.bou.readerforselfoss.utils.glide.SelfSignedGlideModule"
             android:value="GlideModule" />
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ef9c686..bb63b6c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -31,7 +31,7 @@
     <string name="cant_get_read">"Impossible de récupérer les éléments lus."</string>
     <string name="nothing_here">"Il n'y a rien ici !"</string>
     <string name="tab_new">"Non lus"</string>
-    <string name="tab_read">"Lus"</string>
+    <string name="tab_read">"Tous"</string>
     <string name="tab_favs">"Favoris"</string>
     <string name="action_about">"À propos"</string>
     <string name="marked_as_read">"Marqué comme lu"</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b87e5da..ac8647d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,7 +31,7 @@
     <string name="cant_get_read">"Can't get read articles"</string>
     <string name="nothing_here">"Nothing here"</string>
     <string name="tab_new">"New"</string>
-    <string name="tab_read">"Read"</string>
+    <string name="tab_read">"All"</string>
     <string name="tab_favs">"Favorites"</string>
     <string name="action_about">"About"</string>
     <string name="marked_as_read">"Item read"</string>
diff --git a/build.gradle b/build.gradle
index 4518158..478d7ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,14 +5,20 @@ buildscript {
     repositories {
         jcenter()
         google()
+        maven {
+            url "https://jitpack.io"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:3.0.0-rc2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'com.google.gms:google-services:3.1.0'
+
+        // Not the official version https://stackoverflow.com/questions/46525040/sonarqube-android-not-working-for-gradle-3-0-0/46813528#46813528
+        classpath "com.github.Shusshu:sonar-scanner-gradle:feature~support-android-gradle-3-SNAPSHOT"
     }
 }