polish SSO dialog

drawable_resources/key.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M7,14A2,2 0 0,1 5,12A2,2 0 0,1 7,10A2,2 0 0,1 9,12A2,2 0 0,1 7,14M12.65,10C11.83,7.67 9.61,6 7,6A6,6 0 0,0 1,12A6,6 0 0,0 7,18C9.61,18 11.83,16.33 12.65,14H17V18H21V14H23V10H12.65Z" /></svg>

src/main/AndroidManifest.xml

@@ -306,7 +306,8 @@
 
         <activity
             android:name=".ui.activity.SsoGrantPermissionActivity"
-            android:exported="true"/>
+            android:exported="true"
+            android:theme="@style/Theme.ownCloud.Dialog.NoTitle" />
     </application>
 
 </manifest>

src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java

@@ -31,11 +31,8 @@ import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
-import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
@@ -75,9 +72,6 @@ public class SsoGrantPermissionActivity extends BaseActivity {
 
     private static final String TAG = SsoGrantPermissionActivity.class.getCanonicalName();
 
-    private StyleSpan styleSpanBold = new StyleSpan(Typeface.BOLD);
-    private ForegroundColorSpan foregroundColorSpanBlack = new ForegroundColorSpan(Color.BLACK);
-
     private String packageName;
     private Account account;
 
@@ -89,9 +83,6 @@ public class SsoGrantPermissionActivity extends BaseActivity {
     @BindView(R.id.permissionText)
     TextView permissionText;
 
-    @BindView(R.id.ticker)
-    ImageView ticker;
-
     @BindView(R.id.btnGrant)
     Button grantPermissionButton;
 
@@ -133,19 +124,9 @@ public class SsoGrantPermissionActivity extends BaseActivity {
             Log.e(TAG, e.getMessage());
         }
 
-        themeUI();
-    }
-
-    private void themeUI() {
         int primaryColor = ThemeUtils.primaryColor(this, true);
         grantPermissionButton.setTextColor(primaryColor);
         declinePermissionButton.setTextColor(primaryColor);
-
-        Drawable mTintedCheck = DrawableCompat.wrap(
-                ContextCompat.getDrawable(this, R.drawable.account_circle_white));
-        int tint = ThemeUtils.elementColor(this);
-        DrawableCompat.setTint(mTintedCheck, tint);
-        ticker.setImageDrawable(mTintedCheck);
     }
 
     @Override
@@ -159,8 +140,8 @@ public class SsoGrantPermissionActivity extends BaseActivity {
         for (String textBlock : toBeStyledText) {
             int start = text.indexOf(textBlock);
             int end = start + textBlock.length();
-            ssb.setSpan(styleSpanBold, start, end, 0);
-            ssb.setSpan(foregroundColorSpanBlack, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            ssb.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0);
+            ssb.setSpan(new ForegroundColorSpan(Color.BLACK), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 
         return ssb;

src/main/res/drawable/ic_key.xml

@@ -1,23 +0,0 @@
-<!--
-    @author Google LLC
-    Copyright (C) 2018 Google LLC
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#FFF" android:pathData="M7,14A2,2 0 0,1 5,12A2,2 0 0,1 7,10A2,2 0 0,1 9,12A2,2 0 0,1 7,14M12.65,10C11.83,7.67 9.61,6 7,6A6,6 0 0,0 1,12A6,6 0 0,0 7,18C9.61,18 11.83,16.33 12.65,14H17V18H21V14H23V10H12.65Z" />
-</vector>

src/main/res/layout/activity_sso_grant_permission.xml

@@ -24,29 +24,14 @@
     android:layout_margin="@dimen/standard_margin"
     tools:context="com.owncloud.android.ui.activity.SsoGrantPermissionActivity">
 
-    <FrameLayout
-        android:id="@+id/appIcon_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@+id/permissionText">
-
-        <ImageView
-            android:id="@+id/appIcon"
-            android:layout_width="@dimen/user_icon_size"
-            android:layout_height="@dimen/user_icon_size"
-            android:layout_gravity="top|start"
-            android:contentDescription="@null"
-            android:src="@drawable/background" />
-
-        <ImageView
-            android:id="@+id/ticker"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
-            android:layout_gravity="bottom|end"
-            android:background="@drawable/round_bgnd"
-            android:contentDescription="@string/active_user"
-            android:src="@drawable/ic_key" />
-    </FrameLayout>
+    <ImageView
+        android:id="@+id/appIcon"
+        android:layout_width="@dimen/user_icon_size"
+        android:layout_height="@dimen/user_icon_size"
+        android:layout_gravity="top|start"
+        android:contentDescription="@null"
+        android:src="@drawable/background"
+        app:layout_constraintTop_toTopOf="@+id/permissionText" />
 
     <TextView
         android:id="@+id/permissionText"
@@ -56,6 +41,7 @@
         android:paddingLeft="@dimen/permission_dialog_text_padding"
         android:paddingRight="@dimen/zero"
         android:paddingStart="@dimen/permission_dialog_text_padding"
+        android:paddingBottom="@dimen/standard_padding"
         android:textSize="@dimen/permission_dialog_text_size"
         app:layout_constraintBottom_toTopOf="@+id/btnGrant"
         app:layout_constraintTop_toTopOf="parent"

src/main/res/values/strings.xml

@@ -818,7 +818,7 @@
     <string name="fab_label">Add or upload</string>
     <string name="account_creation_failed">Account creation failed</string>
 
-    <string name="single_sign_on_request_token" formatted="true">Grant %1$s access to your Nextcloud account (%2$s)?</string>
+    <string name="single_sign_on_request_token" formatted="true">Allow %1$s to access to your Nextcloud account %2$s?</string>
     <string name="permission_deny">Deny</string>
     <string name="permission_allow">Allow</string>