Browse Source

Auth activity with primary white color

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 5 years ago
parent
commit
f8ff0e106a

+ 2 - 0
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -129,6 +129,7 @@ import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertL
 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 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         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);
         }

+ 1 - 2
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"

+ 3 - 3
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>