Skip to content

Commit

Permalink
fine tuning icon work on login screen, making landscape visually en p…
Browse files Browse the repository at this point in the history 
…ar with portrait mode
  • Loading branch information
@AndyScherzinger
AndyScherzinger committed Jul 26, 2015
1 parent 49b3acd commit e72caeb
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 12 deletions.
Binary file removed res/drawable-xxhdpi/backup/owncloud_progress_bg_light.9.png
View file
Binary file not shown.
Binary file removed res/drawable-xxhdpi/backup/owncloud_progress_primary_light.9.png
View file
Binary file not shown.
Binary file removed res/drawable-xxhdpi/backup/owncloud_progress_secondary_light.9.png
View file
Binary file not shown.
Binary file added res/drawable-xxhdpi/common_error.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_action_refresh.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_action_refresh_grey.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_lock.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_lock_open.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 19 additions & 1 deletion res/layout-land/account_setup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
android:text="@string/auth_expired_basic_auth_toast"
android:visibility="gone"
android:layout_marginBottom="10dp"
android:textColor="#AAAAAA"

This comment has been minimized.

Sign in to view

Copy link
@masensio

masensio Aug 4, 2015

The same comment as in layout/account_setup.xml

This comment has been minimized.

Sign in to view

Copy link
@AndyScherzinger

AndyScherzinger Aug 4, 2015

Author Contributor

Fixed in commit 10c5498
android:textColorHint="#AAAAAA"
android:contentDescription="@string/auth_expired_basic_auth_toast"/>
<FrameLayout
android:id="@+id/hostUrlFrame"
Expand All @@ -92,6 +94,8 @@
android:inputType="textUri"
android:drawablePadding="5dp"
android:paddingRight="55dp"
android:textColor="#AAAAAA"
android:textColorHint="#AAAAAA"
android:contentDescription="@string/auth_host_address"
>
<requestFocus />
Expand Down Expand Up @@ -120,6 +124,8 @@
android:drawableLeft="@android:drawable/stat_notify_sync"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:textColor="#AAAAAA"
android:textColorHint="#AAAAAA"
android:text="@string/auth_testing_connection"
android:contentDescription="@string/auth_testing_connection"/>

Expand All @@ -130,6 +136,8 @@
android:checked="false"
android:onClick="onCheckClick"
android:text="@string/oauth_check_onoff"
android:textColor="#AAAAAA"
android:textColorHint="#AAAAAA"
android:textAppearance="?android:attr/textAppearanceSmall"
android:contentDescription="@string/oauth_check_onoff"
/>
Expand All @@ -143,6 +151,8 @@
android:text="@string/oauth2_url_endpoint_auth"
android:singleLine="true"
android:inputType="textUri"
android:textColor="#AAAAAA"
android:textColorHint="#AAAAAA"
android:visibility="gone">
</EditText>

Expand All @@ -155,6 +165,8 @@
android:text="@string/oauth2_url_endpoint_access"
android:singleLine="true"
android:inputType="textUri"
android:textColor="#AAAAAA"
android:textColorHint="#AAAAAA"
android:visibility="gone">
<requestFocus />
</EditText>
Expand All @@ -166,6 +178,8 @@
android:ems="10"
android:hint="@string/auth_username"
android:inputType="textNoSuggestions"
android:textColor="#AAAAAA"
android:textColorHint="#AAAAAA"
android:contentDescription="@string/auth_username"
/>

Expand All @@ -177,6 +191,8 @@
android:hint="@string/auth_password"
android:inputType="textPassword"
android:drawablePadding="5dp"
android:textColor="#AAAAAA"
android:textColorHint="#AAAAAA"
android:contentDescription="@string/auth_password"
/>

Expand All @@ -188,6 +204,8 @@
android:text="@string/auth_unauthorized"
android:drawableLeft="@android:drawable/stat_notify_sync"
android:drawablePadding="5dip"
android:textColor="#AAAAAA"
android:textColorHint="#AAAAAA"
android:contentDescription="@string/auth_unauthorized"
/>

Expand Down Expand Up @@ -224,7 +242,7 @@
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/auth_register"
android:textColor="#0000FF"
android:textColor="#AAAAAA"
android:contentDescription="@string/auth_register"/>
</LinearLayout>

Expand Down
6 changes: 3 additions & 3 deletions res/layout/account_setup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@
</EditText>
<ImageButton
android:id="@+id/embeddedRefreshButton"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|right"
android:layout_marginRight="5dp"
android:padding="0dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_action_refresh_black"
android:src="@drawable/ic_action_refresh_grey"
android:onClick="onRefreshClick"
android:visibility="gone"
android:background="@android:color/transparent"
Expand Down
16 changes: 8 additions & 8 deletions src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@

package com.owncloud.android.authentication;

import java.security.cert.X509Certificate;
import java.util.Map;

import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.Dialog;
Expand Down Expand Up @@ -93,6 +90,9 @@
import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
import com.owncloud.android.utils.DisplayUtils;

import java.security.cert.X509Certificate;
import java.util.Map;

/**
* This Activity is used to add an ownCloud account to the App
*/
Expand Down Expand Up @@ -1146,7 +1146,7 @@ private void updateServerStatusIconAndText(RemoteOperationResult result) {

switch (result.getCode()) {
case OK_SSL:
mServerStatusIcon = android.R.drawable.ic_secure;
mServerStatusIcon = R.drawable.ic_lock;
mServerStatusText = R.string.auth_secure_connection;
break;

Expand All @@ -1157,7 +1157,7 @@ private void updateServerStatusIconAndText(RemoteOperationResult result) {
mServerStatusIcon = R.drawable.ic_ok;
} else {
mServerStatusText = R.string.auth_nossl_plain_ok_title;
mServerStatusIcon = android.R.drawable.ic_partial_secure;
mServerStatusIcon = R.drawable.ic_lock_open;
}
break;

Expand Down Expand Up @@ -1207,7 +1207,7 @@ private void updateServerStatusIconAndText(RemoteOperationResult result) {
mServerStatusText = R.string.auth_unknown_error_title;
break;
case OK_REDIRECT_TO_NON_SECURE_CONNECTION:
mServerStatusIcon = android.R.drawable.ic_partial_secure;
mServerStatusIcon = R.drawable.ic_lock_open;
mServerStatusText = R.string.auth_redirect_non_secure_connection_title;
break;
default:
Expand All @@ -1227,7 +1227,7 @@ private void updateAuthStatusIconAndText(RemoteOperationResult result) {

switch (result.getCode()) {
case OK_SSL:
mAuthStatusIcon = android.R.drawable.ic_secure;
mAuthStatusIcon = R.drawable.ic_lock;
mAuthStatusText = R.string.auth_secure_connection;
break;

Expand All @@ -1238,7 +1238,7 @@ private void updateAuthStatusIconAndText(RemoteOperationResult result) {
mAuthStatusIcon = R.drawable.ic_ok;
} else {
mAuthStatusText = R.string.auth_nossl_plain_ok_title;
mAuthStatusIcon = android.R.drawable.ic_partial_secure;
mAuthStatusIcon = R.drawable.ic_lock_open;
}
break;

Expand Down

0 comments on commit e72caeb

Please sign in to comment.