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

Update images. New Styles for Buttons, Dropdown and Progress

Browse source
This commit is contained in:
masensio 2013-10-30 18:37:05 +01:00
parent 4849affc6f
commit 20b5ecbac1
29 changed files with 56 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-hdpi/dropdown_default.9.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 663 B

BIN
res/drawable-hdpi/dropdown_disabled.9.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 484 B

BIN
res/drawable-hdpi/dropdown_focused.9.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 761 B

BIN
res/drawable-hdpi/dropdown_pressed.9.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 738 B

BIN
res/drawable-hdpi/spinner_48_inner.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.4 KiB

BIN
res/drawable-ldpi/spinner_48_inner.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

BIN
res/drawable-mdpi/dropdown_default.9.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 473 B

BIN
res/drawable-mdpi/dropdown_disabled.9.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 354 B

BIN
res/drawable-mdpi/dropdown_focused.9.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 524 B

BIN
res/drawable-mdpi/dropdown_pressed.9.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 503 B

BIN
res/drawable-mdpi/spinner_48_inner.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3 KiB

28
res/drawable/dropdown.xml
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application
Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/dropdown_disabled" />
<item android:state_pressed="true"
android:drawable="@drawable/dropdown_pressed" />
<item android:state_pressed="false" android:state_focused="true"
android:drawable="@drawable/dropdown_focused" />
<item android:drawable="@drawable/dropdown_default" />
</selector>

36
res/drawable/indeterminate_progress.xml
View file

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application
Copyright (C) 2012-2013 ownCloud Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- item>
<rotate
android:drawable="@drawable/freenet_spinner_48_outer"
android:pivotX="50%"
android:pivotY="50%"
android:fromDegrees="0"
android:toDegrees="1080" />
</item-->
<item>
<rotate
android:drawable="@drawable/spinner_48_inner"
android:pivotX="50%"
android:pivotY="50%"
android:fromDegrees="0"
android:toDegrees="720" />
</item>
</layer-list>

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

@ -185,7 +185,7 @@
</LinearLayout>
<com.owncloud.android.ui.CustomButton
<Button
android:id="@id/buttonOK"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@ -49,14 +49,14 @@
android:orientation="horizontal" >
<!-- 'OK' / 'CANCEL' BUTTONS CHANGE THEIR ORDER FROM ANDROID 4.0 ; THANKS, GOOGLE -->
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/common_cancel" />
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
res/layout/account_setup.xml
View file

@ -166,7 +166,7 @@
android:gravity="center_vertical"
android:text="@string/auth_unauthorized" />
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/buttonOK"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
res/layout/extensions_available_dialog.xml
View file

@ -34,14 +34,14 @@
android:layout_margin="5dp"
android:weightSum="1.0" >
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/buttonNo"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/common_no"
android:layout_weight="0.5"/>
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/buttonYes"
android:layout_width="fill_parent"
android:layout_height="wrap_content"

4
res/layout/failed_upload_files.xml
View file

@ -63,7 +63,7 @@
android:text="@string/failed_upload_all_cb"
android:textSize="8sp" />
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/failed_upload_retry_all_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -72,7 +72,7 @@
android:text="@string/failed_upload_headline_retryall_btn"
android:textSize="8sp" />
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/failed_upload_delete_all_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
res/layout/failed_upload_message_view.xml
View file

@ -10,7 +10,7 @@
android:layout_height="wrap_content"
android:minWidth="100dp"/>
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/failed_uploadactivity_close_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"

4
res/layout/generic_explanation.xml
View file

@ -48,14 +48,14 @@
android:gravity="center"
android:orientation="horizontal" >
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/common_ok" />
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
res/layout/log_send_file.xml
View file

@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:gravity="bottom">
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/deleteLogHistoryButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout/no_account_available.xml
View file

@ -39,7 +39,7 @@
android:text="@string/main_wrn_accsetup"
android:textAppearance="?android:attr/textAppearanceMedium" />
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/setup_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
res/layout/pincodelock.xml
View file

@ -68,7 +68,7 @@
style="@style/PassCodeStyle" />
</LinearLayout>
<com.owncloud.android.ui.CustomButton android:layout_width="wrap_content"
<Button android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/common_cancel"
android:textColor="@android:color/black"

6
res/layout/ssl_validator_layout.xml
View file

@ -408,21 +408,21 @@
android:layout_height="wrap_content"
android:gravity="center" >
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/common_cancel" />
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/details_btn"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/ssl_validator_btn_details_see" />
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/ok"
android:layout_width="0dp"
android:layout_height="wrap_content"

4
res/layout/upload_files_layout.xml
View file

@ -35,13 +35,13 @@
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal" >
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/upload_files_btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/common_cancel" />
<com.owncloud.android.ui.CustomButton
<Button
android:id="@+id/upload_files_btn_upload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
res/layout/uploader_layout.xml
View file

@ -33,7 +33,7 @@
</FrameLayout>
<LinearLayout android:id="@+id/linearLayout1"
android:layout_width="fill_parent" android:layout_alignParentBottom="true" android:layout_height="wrap_content" android:orientation="vertical">
<com.owncloud.android.ui.CustomButton android:layout_gravity="bottom" android:layout_height="wrap_content"
<Button android:layout_gravity="bottom" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:id="@+id/uploader_choose_folder"
android:text="@string/uploader_btn_upload_text"/>
</LinearLayout>

9
res/values-v11/versioned_styles.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Holo.Light.Button">
<item name="android:background">@android:drawable/btn_default</item>
<item name="android:textColor">@color/button_text_color</item>
</style>
</resources>

30
res/values/styles.xml
View file

@ -25,24 +25,24 @@
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
<item name="actionDropDownStyle">@style/DropDownStyle</item>
<item name="android:actionDropDownStyle">@style/DropDownStyle</item>
<item name="actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
<item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
</style>
<style name="Theme.ownCloud.noActionBar" parent="style/Theme.Sherlock.Light.NoActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
<item name="actionDropDownStyle">@style/DropDownStyle</item>
<item name="android:actionDropDownStyle">@style/DropDownStyle</item>
<item name="actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
<item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
</style>
<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.Sherlock.NoActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:windowFullscreen">true</item>
<item name="actionDropDownStyle">@style/DropDownStyle</item>
<item name="android:actionDropDownStyle">@style/DropDownStyle</item>
<item name="actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
<item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
</style>
@ -54,28 +54,14 @@
<item name="android:shadowRadius">1</item>
<item name="android:shadowDy">1</item>
<item name="android:backgroundSplit">@drawable/split_action_bg</item>
<item name="android:indeterminateProgressStyle">@style/IndeterminateStyle</item>
<item name="indeterminateProgressStyle">@style/IndeterminateStyle</item>
</style>
<!-- DropDown -->
<style name="DropDownStyle" parent="style/Widget.Sherlock.Spinner.DropDown.ActionBar">
<item name="android:background">@drawable/dropdown</item>
</style>
<style name="IndeterminateStyle" parent="style/Widget.Sherlock.ProgressBar">
<item name="android:indeterminateDrawable">@drawable/indeterminate_progress</item>
<item name="android:indeterminateProgressStyle">@style/Theme.ownCloud.IndeterminateStyle</item>
<item name="indeterminateProgressStyle">@style/Theme.ownCloud.IndeterminateStyle</item>
</style>
<!-- Dialogs -->
<style name="Theme.ownCloud.Dialog" parent="style/Theme.Sherlock.Light.Dialog">
</style>
<!-- Buttons -->
<style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Button">
<item name="android:background">@android:drawable/btn_default</item>
<item name="android:textColor">@color/button_text_color</item>
</style>
<!-- PopDownMenu -->
<style name="Animations.PopDownMenu" />

19
res/values/versioned_styles.xml Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Buttons -->
<style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Button">
<item name="android:background">@android:drawable/btn_default</item>
<item name="android:textColor">@color/button_text_color</item>
</style>
<!-- DropDown -->
<style name="Theme.ownCloud.DropDownStyle" parent="style/Widget.Sherlock.Spinner.DropDown.ActionBar">
<item name="android:background">@drawable/abs__spinner_ab_holo_dark</item>
</style>
<style name="Theme.ownCloud.IndeterminateStyle" parent="style/Widget.Sherlock.ProgressBar">
<item name="android:indeterminateDrawable">@drawable/abs__progress_medium_holo</item>
</style>
</resources>