From 9cc574c6978461727332e979faa8f4050340a455 Mon Sep 17 00:00:00 2001
From: Neslihan <tur.neslihan@gmail.com>
Date: Thu, 16 Mar 2017 19:11:49 +0300
Subject: [PATCH] Force upload activity to has always DarkTheme to make it
 readable

---
 .../commons/upload/SingleUploadFragment.java   |  8 ++++++++
 .../main/res/layout/fragment_single_upload.xml | 18 +++++++++++++-----
 app/src/main/res/values/colors.xml             |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
index 5f4ff14d6..c8bb2acfe 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.ListPreference;
@@ -112,6 +113,13 @@ public class SingleUploadFragment extends Fragment {
         licenseSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+
+                //Set selected color to white because it should be readable on random images.
+                TextView selectedText = (TextView) licenseSpinner.getChildAt(0);
+                if (selectedText != null) {
+                    selectedText.setTextColor(Color.WHITE);
+                }
+
                 String licenseName = parent.getItemAtPosition(position).toString();
 
                 String license = Prefs.Licenses.CC_BY_SA_3; // default value
diff --git a/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml
index d59292b29..a581ab2a2 100644
--- a/app/src/main/res/layout/fragment_single_upload.xml
+++ b/app/src/main/res/layout/fragment_single_upload.xml
@@ -4,13 +4,14 @@
     android:layout_height="match_parent"
     android:layout_gravity="fill"
     android:orientation="vertical"
-    android:background="#AA000000"
+    android:background="?attr/fragmentCategorisationBackground"
     android:paddingBottom="8dip"
     android:paddingLeft="16dip"
     android:paddingStart="16dip"
     android:paddingRight="16dip"
     android:paddingEnd="16dip"
     android:paddingTop="8dip"
+    android:theme="@style/DarkAppTheme"
     >
 
     <EditText
@@ -32,16 +33,23 @@
         android:imeOptions="flagNoExtractUi"
         />
 
-    <Spinner
-        android:id="@+id/licenseSpinner"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:theme="@style/LightAppTheme"
         >
-    </Spinner>
+        <Spinner
+            android:id="@+id/licenseSpinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            >
+        </Spinner>
+    </LinearLayout>
+
 
     <Button
         android:text="@string/use_previous"
-        android:background="#90000000"
+        android:background="?attr/buttonBackground"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/titleDescButton"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7c8fad193..185da1cfe 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,7 +16,7 @@
     <color name="fragment_categorisation_background_dark">#AA000000</color>
     <color name="fragment_categorisation_background_light">#44ffffff</color>
     <color name="button_background_dark">#90000000</color>
-    <color name="button_background_light">#60000000</color>
+    <color name="button_background_light">#B0000000</color>
     <color name="upload_overlay_background_dark">#77000000</color>
     <color name="upload_overlay_background_light">#44000000</color>