mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 05:35:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'setup_colors' into setup_app_name

Browse source
This commit is contained in:
masensio 2013-10-18 12:24:29 +02:00
commit ea7f8fe491
14 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/drawable/list_selector.xml
View file

@ -22,6 +22,6 @@
<item android:drawable="@color/owncloud_blue_bright" android:state_pressed="true"/>
<item android:drawable="@color/owncloud_blue_bright" android:state_focused="true"/>
<item android:drawable="@color/owncloud_white" />
<item android:drawable="@color/background_color" />
</selector>

4
res/drawable/main_header_bg.xml
View file

@ -19,8 +19,8 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="#1D2D44"
android:endColor="#1D2D44"
android:startColor="@color/actionbar_start_color"
android:endColor="@color/actionbar_end_color"
android:angle="270"
/>
<corners android:radius="0dp" />

2
res/layout-v14/generic_explanation.xml
View file

@ -19,7 +19,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
android:id="@+id/explanation"
android:orientation="vertical">

2
res/layout/failed_upload_files.xml
View file

@ -20,7 +20,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
android:orientation="vertical"
android:id="@+id/failed_files_list_view">

2
res/layout/failed_upload_message_view.xml
View file

@ -2,7 +2,7 @@
android:id="@+id/failed_upload_message_view"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
android:orientation="vertical" >
<TextView android:id="@+id/faild_upload_message"

2
res/layout/file_preview.xml
View file

@ -23,7 +23,7 @@
android:id="@+id/top"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
android:gravity="center"
tools:context=".ui.fragment.FilePreviewFragment" >

2
res/layout/files.xml
View file

@ -20,7 +20,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
android:orientation="horizontal"
android:baselineAligned="false"
>

2
res/layout/fragment_changelog.xml
View file

@ -19,7 +19,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
android:id="@+id/explanation"
android:orientation="vertical">

2
res/layout/generic_explanation.xml
View file

@ -19,7 +19,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
android:id="@+id/explanation"
android:orientation="vertical">

4
res/layout/preview_image_fragment.xml
View file

@ -23,7 +23,7 @@
android:id="@+id/fdScrollView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
android:gravity="center_horizontal"
-->
@ -32,7 +32,7 @@
android:id="@+id/top"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
tools:context=".ui.fragment.PreviewImageFragment" >
<ProgressBar

2
res/layout/upload_files_layout.xml
View file

@ -20,7 +20,7 @@
android:id="@+id/upload_files_layout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/owncloud_white"
android:background="@color/background_color"
android:orientation="vertical" >
<fragment

1
res/values/colors.xml
View file

@ -21,6 +21,5 @@
<color name="filelist_icon_backgorund">#DDDDDD</color>
<color name="owncloud_blue_bright">#00ddff</color>
<color name="owncloud_white">#F7F7F7</color>
</resources>

5
res/values/setup.xml
View file

@ -17,4 +17,9 @@
<string name="auth_method_oauth2">off</string>
<string name="auth_method_saml_web_sso">off</string>
<!-- Colors -->
<color name="background_color">#F7F7F7</color>
<color name="actionbar_start_color">#1D2D44</color>
<color name="actionbar_end_color">#1D2D44</color>
</resources>

8
src/com/owncloud/android/ui/activity/InstantUploadActivity.java
View file

@ -149,7 +149,7 @@ public class InstantUploadActivity extends Activity {
loadmoreBtn = new Button(this);
loadmoreBtn.setId(42);
loadmoreBtn.setText(getString(R.string.failed_upload_load_more_images));
loadmoreBtn.setBackgroundResource(R.color.owncloud_white);
loadmoreBtn.setBackgroundResource(R.color.background_color);
loadmoreBtn.setTextSize(12);
loadmoreBtn.setOnClickListener(new OnClickListener() {
@Override
@ -328,14 +328,14 @@ public class InstantUploadActivity extends Activity {
TextView failureTextView = new TextView(this);
failureTextView.setText(getString(R.string.failed_upload_failure_text) + message);
failureTextView.setBackgroundResource(R.color.owncloud_white);
failureTextView.setBackgroundResource(R.color.background_color);
failureTextView.setTextSize(8);
failureTextView.setOnLongClickListener(getOnLongClickListener(message));
failureTextView.setPadding(5, 5, 5, 10);
TextView retryButton = new TextView(this);
retryButton.setId(id);
retryButton.setText(img_path);
retryButton.setBackgroundResource(R.color.owncloud_white);
retryButton.setBackgroundResource(R.color.background_color);
retryButton.setTextSize(8);
retryButton.setOnClickListener(getImageButtonOnClickListener(img_path));
retryButton.setOnLongClickListener(getOnLongClickListener(message));
@ -365,7 +365,7 @@ public class InstantUploadActivity extends Activity {
private CheckBox getFileCheckbox(int id) {
CheckBox retryCB = new CheckBox(this);
retryCB.setId(id);
retryCB.setBackgroundResource(R.color.owncloud_white);
retryCB.setBackgroundResource(R.color.background_color);
retryCB.setTextSize(8);
retryCB.setTag(retry_chexbox_tag);
return retryCB;