mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1632 from owncloud/text_color_config_login_view

Browse source 
Setup text color in login view
This commit is contained in:
David A. Velasco 2016-04-29 18:37:22 +02:00
commit 81cbe015c5
5 changed files with 54 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
res/layout-land/account_setup.xml
View file

@ -26,7 +26,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_above="@+id/bottom_block"
android:layout_alignParentTop="true"
android:orientation="horizontal" >
@ -79,7 +79,6 @@
android:visibility="gone"
android:layout_marginBottom="10dp"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_expired_basic_auth_toast"/>
<FrameLayout
android:id="@+id/hostUrlFrame"
@ -96,6 +95,7 @@
android:inputType="textUri"
android:drawablePadding="5dp"
android:paddingRight="55dp"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_host_address"
>
@ -125,7 +125,6 @@
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:text="@string/auth_testing_connection"
android:minHeight="32dp"
android:contentDescription="@string/auth_testing_connection"/>
@ -138,7 +137,6 @@
android:onClick="onCheckClick"
android:text="@string/oauth_check_onoff"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:textAppearance="?android:attr/textAppearanceSmall"
android:contentDescription="@string/oauth_check_onoff"
/>
@ -152,6 +150,7 @@
android:text="@string/oauth2_url_endpoint_auth"
android:singleLine="true"
android:inputType="textUri"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:visibility="gone">
</EditText>
@ -165,6 +164,7 @@
android:text="@string/oauth2_url_endpoint_access"
android:singleLine="true"
android:inputType="textUri"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:visibility="gone">
<requestFocus />
@ -177,6 +177,7 @@
android:ems="10"
android:hint="@string/auth_username"
android:inputType="textNoSuggestions"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_username"
/>
@ -189,6 +190,7 @@
android:hint="@string/auth_password"
android:inputType="textPassword"
android:drawablePadding="5dp"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
/>
@ -201,7 +203,6 @@
android:drawableLeft="@android:drawable/stat_notify_sync"
android:drawablePadding="5dip"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_unauthorized"
/>
@ -228,19 +229,27 @@
android:enabled="false"
android:text="@string/setup_btn_connect"
android:contentDescription="@string/setup_btn_connect"/>
<Button
android:id="@+id/welcome_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@android:color/transparent"
android:onClick="onRegisterClick"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/auth_register"
android:textColor="@color/login_text_color"
android:contentDescription="@string/auth_register"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center|bottom">
<Button
android:id="@+id/welcome_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@android:color/transparent"
android:onClick="onRegisterClick"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/auth_register"
android:textColor="@color/login_text_color"
android:contentDescription="@string/auth_register"/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

41
res/layout/account_setup.xml
View file

@ -28,7 +28,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="@color/login_background_color"
android:gravity="center"
android:orientation="vertical"
@ -65,7 +65,6 @@
android:visibility="gone"
android:layout_marginBottom="10dp"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_expired_basic_auth_toast"/>
<FrameLayout
@ -83,6 +82,7 @@
android:inputType="textUri"
android:drawablePadding="5dp"
android:paddingRight="55dp"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_host_address"
>
@ -112,7 +112,6 @@
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:text="@string/auth_testing_connection"
android:minHeight="32dp"
android:contentDescription="@string/auth_testing_connection"/>
@ -126,7 +125,6 @@
android:text="@string/oauth_check_onoff"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/oauth_check_onoff"
/>
@ -136,6 +134,7 @@
android:layout_height="wrap_content"
android:ems="10"
android:enabled="false"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:text="@string/oauth2_url_endpoint_auth"
android:singleLine="true"
@ -152,6 +151,7 @@
android:text="@string/oauth2_url_endpoint_access"
android:singleLine="true"
android:inputType="textUri"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:visibility="gone"/>
@ -162,6 +162,7 @@
android:ems="10"
android:hint="@string/auth_username"
android:inputType="textNoSuggestions"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_username"
/>
@ -174,6 +175,7 @@
android:ems="10"
android:hint="@string/auth_password"
android:inputType="textPassword"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_password"
/>
@ -188,7 +190,6 @@
android:gravity="center_vertical"
android:text="@string/auth_unauthorized"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_unauthorized"/>
<android.support.v7.widget.AppCompatButton
@ -202,18 +203,24 @@
android:text="@string/setup_btn_connect"
android:contentDescription="@string/setup_btn_connect"/>
<Button
android:id="@+id/welcome_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:onClick="onRegisterClick"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/auth_register"
android:textColor="@color/login_text_color"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_register"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center|bottom">
<Button
android:id="@+id/welcome_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:onClick="onRegisterClick"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/auth_register"
android:textColor="@color/login_text_color"
android:contentDescription="@string/auth_register"/>
</LinearLayout>
</LinearLayout>

2
res/values/colors.xml
View file

@ -35,8 +35,6 @@
<color name="list_divider_background">#eee</color>
<color name="filelist_icon_backgorund">#DDDDDD</color>
<color name="dark_background_text_color">#EEEEEE</color>
<color name="login_text_color">#757575</color>
<color name="login_text_hint_color">#757575</color>
<color name="secondary_button_color">#D6D7D7</color>
<color name="transparent">#00000000</color>
<color name="secondaryTextColor">#a0a0a0</color>

2
res/values/oauth2_configuration.xml
View file

@ -6,7 +6,7 @@
<!-- values that should be provided by ownCloud server -->
<string name="oauth2_url_endpoint_auth">http://oauth2.authorization.server.org/paht/to/endpoint/for/authorization</string>
<string name="oauth2_url_endpoint_access">http://oauth2.authorization.server.org/paht/to/endporint/for/access/token</string>
<string name="oauth2_url_endpoint_access">http://oauth2.authorization.server.org/paht/to/endpoint/for/access/token</string>
<string name="oauth2_scope">owncloud</string>
<string name="oauth2_grant_type">authorization_code</string> <!-- the only one supported right now -->
<string name="oauth2_response_type">code</string> <!-- depends on oauth2_grant_type -->

2
res/values/setup.xml
View file

@ -29,6 +29,8 @@
<!-- Colors -->
<color name="login_text_color">#757575</color>
<color name="login_text_hint_color">#757575</color>
<color name="login_background_color">#FFFFFF</color>
<color name="login_logo_background_color">#FFFFFF</color>
<color name="background_color">#FFFFFF</color>