Merge pull request #5386 from nextcloud/backport/5383/stable-3.10

[stable-3.10] Auth activity with primary white color
nextcloud · Feb 3, 2020 · 383f496 · 383f496
2 parents b8eab0e + 25a7f51
commit 383f496
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -129,6 +129,7 @@
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.utils.PermissionUtil;
+import com.owncloud.android.utils.ThemeUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -621,6 +622,7 @@ private void initOverallUi() {
         scanQR = findViewById(R.id.scanQR);
         if (deviceInfo.hasCamera(this)) {
             scanQR.setOnClickListener(v -> onScan());
+            ThemeUtils.tintDrawable(scanQR.getDrawable(), getResources().getColor(R.color.login_text_color));
         } else {
             scanQR.setVisibility(View.GONE);
         }

diff --git a/src/main/res/layout-land/account_setup.xml b/src/main/res/layout-land/account_setup.xml
@@ -204,8 +204,7 @@
                 android:layout_height="wrap_content"
                 android:background="@color/transparent"
                 android:contentDescription="@string/scanQR_description"
-                android:src="@drawable/qrcode_scan"
-                android:theme="@style/Button.Login" />
+                android:src="@drawable/qrcode_scan" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonOK"

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
@@ -52,7 +52,6 @@
     <!-- Colors -->
     <color name="login_btn_tint">#ffffff</color>
     <color name="login_btn_stroke">#ffffff</color>
-    <color name="login_asset">#ffffff</color>
     <color name="bg_default">#FFFFFF</color>
     <color name="background_color_inverse">#000000</color>
     <color name="primary_button_background_color">@color/color_accent</color>

diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
@@ -91,9 +91,9 @@
 
 	<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.Toolbar">
 		<item name="android:windowBackground">@color/primary</item>
-		<item name="colorControlNormal">@color/login_text_hint_color</item>
-		<item name="colorControlActivated">@color/login_asset</item>
-		<item name="colorControlHighlight">@color/login_text_hint_color</item>
+        <item name="colorControlNormal">@color/login_text_color</item>
+        <item name="colorControlActivated">@color/login_text_color</item>
+        <item name="colorControlHighlight">@color/login_text_color</item>
 		<item name="colorAccent">@color/login_text_hint_color</item>
 		<item name="android:textColorHint">@color/login_text_hint_color</item>
 	</style>