From 4dbb02406938e880f7191890cd4475715e68c7a9 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Wed, 22 Aug 2018 19:42:45 +0200
Subject: [PATCH] Prepares release 1.10.4

---
 app/build.gradle                              |  8 ++--
 .../mastodon/activities/AboutActivity.java    | 39 +++++++++++--------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1273fd41b..466d2986e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "fr.gouv.etalab.mastodon"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 128
-        versionName "1.10.4-beta-1"
+        versionCode 129
+        versionName "1.10.4"
     }
     flavorDimensions "default"
     buildTypes {
@@ -50,6 +50,7 @@ ext.guavaLibraryVersion = '24.1-android'
 ext.photoViewLibraryVersion = '2.0.0'
 ext.swipebackLibraryVersion = '1.0.2'
 ext.ratethisappLibraryVersion = '1.2.0'
+ext.uploadServiceVersion = "3.4.2"
 
 dependencies {
     implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
@@ -70,7 +71,8 @@ dependencies {
     implementation 'com.github.stom79:country-picker-android:1.2.0'
     implementation 'com.github.stom79:mytransl:1.5'
 
-
+    implementation "net.gotev:uploadservice:$uploadServiceVersion"
+    implementation "net.gotev:uploadservice-okhttp:$uploadServiceVersion"
     playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion"
 
 
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java
index a394d3c49..da075df28 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java
@@ -133,23 +133,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
             }
         });
 
-
-        if( theme == Helper.THEME_LIGHT) {
-            about_code.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
-            about_thekinrar.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
-            about_translation.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
-            about_license.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
-        }
-
-        TextView about_website = findViewById(R.id.about_website);
-        about_website.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://tom79.bitbucket.io"));
-                startActivity(browserIntent);
-            }
-        });
-
         TextView about_wiki = findViewById(R.id.about_wiki);
         SpannableString content = new SpannableString(about_wiki.getText().toString());
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
@@ -181,6 +164,28 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
             }
         });
 
+        if( theme == Helper.THEME_LIGHT) {
+            about_code.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
+            about_thekinrar.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
+            about_translation.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
+            about_license.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
+            about_support.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
+            paypal.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
+        }
+
+        TextView about_website = findViewById(R.id.about_website);
+        about_website.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://tom79.bitbucket.io"));
+                startActivity(browserIntent);
+            }
+        });
+
+
+
+
+
         setTitle(R.string.action_about);
         lv_contributors.setExpanded(true);
         lv_developers.setExpanded(true);