From: tobiasKaminsky Date: Thu, 29 Oct 2015 17:09:14 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/upstream/material_fab' into beta X-Git-Tag: beta-20151122~92 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/563e6cbdad4dc183f95e18fb254e4a97efbb9a26?hp=ed763a67d304e2d90c39bbdf5b323ba10b997c2c Merge remote-tracking branch 'remotes/upstream/material_fab' into beta --- diff --git a/SETUP.md b/SETUP.md index 0f1bc8ed..64c04c97 100644 --- a/SETUP.md +++ b/SETUP.md @@ -90,6 +90,7 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap * Choose the projects with the next names under the 'New Project Name' column: ** owncloud-android ** android-support-appcompat-v7-exploded-aar +** com-getbase-floatingactionbutton-1-10-0-exploded-aar ** owncloud-android-workaround-accounts (optional) ** ownCloud Android Library ** ownCloud Sample Client (optional) @@ -102,11 +103,12 @@ The generated APK file is saved in android/build/outputs/apk as android-debug.ap * If any error persists, clean and build manually the next projects in order: ** ownCloud Android Library ** android-support-appcompat-v7-exploded-aar +** com-getbase-floatingactionbutton-1-10-0-exploded-aar ** owncloud-android * If any error on those projects persists, check the project properties. In the 'Android' section, API Level should be ** ownCloud Android Library -> API level 19 ** android-support-appcompat-v7-exploded-aa -> API level 22 -** owncloud-android -> API level 22 ; in this project, two library projects should appear referred in the bottom of the dialog: libs\android-support-appcompat-v7-exploded-aar and owncloud-android-library. Add them if needed. +** owncloud-android -> API level 22 ; in this project, three library projects should appear referred in the bottom of the dialog: libs\android-support-appcompat-v7-exploded-aar, ** com-getbase-floatingactionbutton-1-10-0-exploded-aar and owncloud-android-library. Add them if needed. * After those actions you should be good to go. HAVE FUN! diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index 6fd3e5b3..034ecb32 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -59,4 +59,8 @@ The third party software included and used by this project is: modifications com.ortiz.touch.ExtendedViewPager and com.ortiz.touch.TouchImageView classes. See https://github.com/MikeOrtiz/TouchImageView - \ No newline at end of file + * floatingactionbutton 1.10.0. + Copyright (c) 2014 Jerzy Chalupski + Licensed under Apache License, Version 2.0. + placed at libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar has been exploded by ownCloud Inc. + See https://github.com/futuresimple/android-floating-action-button \ No newline at end of file diff --git a/build.gradle b/build.gradle index b9ea96ec..be674c9f 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,7 @@ dependencies { compile project(':owncloud-android-library') compile 'com.jakewharton:disklrucache:2.0.2' compile 'com.android.support:appcompat-v7:22.2.1' + compile 'com.getbase:floatingactionbutton:1.10.1' } android { diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/.classpath b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/.classpath new file mode 100644 index 00000000..7bc01d9a --- /dev/null +++ b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/AndroidManifest.xml b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/AndroidManifest.xml new file mode 100644 index 00000000..f29e9873 --- /dev/null +++ b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/AndroidManifest.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/R.txt b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/R.txt new file mode 100644 index 00000000..c6d56648 --- /dev/null +++ b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/R.txt @@ -0,0 +1,55 @@ +int attr fab_addButtonColorNormal 0x7f010009 +int attr fab_addButtonColorPressed 0x7f010008 +int attr fab_addButtonPlusIconColor 0x7f01000b +int attr fab_addButtonSize 0x7f01000a +int attr fab_addButtonStrokeVisible 0x7f01000c +int attr fab_colorDisabled 0x7f010002 +int attr fab_colorNormal 0x7f010003 +int attr fab_colorPressed 0x7f010001 +int attr fab_expandDirection 0x7f01000f +int attr fab_icon 0x7f010004 +int attr fab_labelStyle 0x7f01000d +int attr fab_labelsPosition 0x7f01000e +int attr fab_plusIconColor 0x7f010000 +int attr fab_size 0x7f010005 +int attr fab_stroke_visible 0x7f010007 +int attr fab_title 0x7f010006 +int dimen fab_actions_spacing 0x7f030000 +int dimen fab_icon_size 0x7f030001 +int dimen fab_labels_margin 0x7f030002 +int dimen fab_plus_icon_size 0x7f030003 +int dimen fab_plus_icon_stroke 0x7f030004 +int dimen fab_shadow_offset 0x7f030005 +int dimen fab_shadow_radius 0x7f030006 +int dimen fab_size_mini 0x7f030007 +int dimen fab_size_normal 0x7f030008 +int dimen fab_stroke_width 0x7f030009 +int drawable fab_bg_mini 0x7f020000 +int drawable fab_bg_normal 0x7f020001 +int id down 0x7f040006 +int id fab_expand_menu_button 0x7f040000 +int id fab_label 0x7f040001 +int id left 0x7f040004 +int id mini 0x7f040002 +int id normal 0x7f040003 +int id right 0x7f040005 +int id up 0x7f040007 +int[] styleable AddFloatingActionButton { 0x7f010000 } +int styleable AddFloatingActionButton_fab_plusIconColor 0 +int[] styleable FloatingActionButton { 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005, 0x7f010006, 0x7f010007 } +int styleable FloatingActionButton_fab_colorDisabled 1 +int styleable FloatingActionButton_fab_colorNormal 2 +int styleable FloatingActionButton_fab_colorPressed 0 +int styleable FloatingActionButton_fab_icon 3 +int styleable FloatingActionButton_fab_size 4 +int styleable FloatingActionButton_fab_stroke_visible 6 +int styleable FloatingActionButton_fab_title 5 +int[] styleable FloatingActionsMenu { 0x7f010008, 0x7f010009, 0x7f01000a, 0x7f01000b, 0x7f01000c, 0x7f01000d, 0x7f01000e, 0x7f01000f } +int styleable FloatingActionsMenu_fab_addButtonColorNormal 1 +int styleable FloatingActionsMenu_fab_addButtonColorPressed 0 +int styleable FloatingActionsMenu_fab_addButtonPlusIconColor 3 +int styleable FloatingActionsMenu_fab_addButtonSize 2 +int styleable FloatingActionsMenu_fab_addButtonStrokeVisible 4 +int styleable FloatingActionsMenu_fab_expandDirection 7 +int styleable FloatingActionsMenu_fab_labelStyle 5 +int styleable FloatingActionsMenu_fab_labelsPosition 6 diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/aapt/AndroidManifest.xml b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/aapt/AndroidManifest.xml new file mode 100644 index 00000000..f29e9873 --- /dev/null +++ b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/aapt/AndroidManifest.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/annotations.zip b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/annotations.zip new file mode 100644 index 00000000..a46d2cee Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/annotations.zip differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/build.xml b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/build.xml new file mode 100644 index 00000000..4317fb0c --- /dev/null +++ b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/build.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/jars/classes.jar b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/jars/classes.jar new file mode 100644 index 00000000..723d01e0 Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/jars/classes.jar differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/libs/classes.jar b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/libs/classes.jar new file mode 100644 index 00000000..723d01e0 Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/libs/classes.jar differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/proguard.txt b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/proguard.txt new file mode 100644 index 00000000..b5429595 --- /dev/null +++ b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/proguard.txt @@ -0,0 +1,5 @@ +# keep getters/setters in RotatingDrawable so that animations can still work. +-keepclassmembers class com.getbase.floatingactionbutton.FloatingActionsMenu$RotatingDrawable { + void set*(***); + *** get*(); +} diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/project.properties b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/project.properties new file mode 100644 index 00000000..362a0a30 --- /dev/null +++ b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/project.properties @@ -0,0 +1,15 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-22 +android.library=true diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-hdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-hdpi-v4/fab_bg_mini.png new file mode 100644 index 00000000..4b48351c Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-hdpi-v4/fab_bg_mini.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-hdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-hdpi-v4/fab_bg_normal.png new file mode 100644 index 00000000..4daec66d Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-hdpi-v4/fab_bg_normal.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-mdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-mdpi-v4/fab_bg_mini.png new file mode 100644 index 00000000..218cf044 Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-mdpi-v4/fab_bg_mini.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-mdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-mdpi-v4/fab_bg_normal.png new file mode 100644 index 00000000..c157df36 Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-mdpi-v4/fab_bg_normal.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xhdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xhdpi-v4/fab_bg_mini.png new file mode 100644 index 00000000..d56bfe82 Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xhdpi-v4/fab_bg_mini.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xhdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xhdpi-v4/fab_bg_normal.png new file mode 100644 index 00000000..41614b93 Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xhdpi-v4/fab_bg_normal.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_mini.png new file mode 100644 index 00000000..1cdd2b1d Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_mini.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_normal.png new file mode 100644 index 00000000..14608fff Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxhdpi-v4/fab_bg_normal.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_mini.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_mini.png new file mode 100644 index 00000000..6fea6746 Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_mini.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_normal.png b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_normal.png new file mode 100644 index 00000000..0e78ff60 Binary files /dev/null and b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/drawable-xxxhdpi-v4/fab_bg_normal.png differ diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/values/values.xml b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/values/values.xml new file mode 100644 index 00000000..8139c61d --- /dev/null +++ b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/res/values/values.xml @@ -0,0 +1,22 @@ + + + + + + + + 16dp + 24dp + 8dp + 14dp + 2dp + 3dp + 9dp + 40dp + 56dp + 1dp + + + + + \ No newline at end of file diff --git a/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/src/.readme b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/src/.readme new file mode 100644 index 00000000..4bcebad8 --- /dev/null +++ b/libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar/src/.readme @@ -0,0 +1,2 @@ +This hidden file is there to ensure there is an src folder. +Once we support binary library this will go away. \ No newline at end of file diff --git a/project.properties b/project.properties index b7cabddb..3b4370c0 100644 --- a/project.properties +++ b/project.properties @@ -11,3 +11,4 @@ target=android-22 android.library.reference.1=owncloud-android-library android.library.reference.2=libs/android-support-appcompat-v7-exploded-aar +android.library.reference.3=libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar diff --git a/res/drawable-hdpi-v9/ic_action_download.png b/res/drawable-hdpi-v9/ic_action_download.png deleted file mode 100644 index 25476cd7..00000000 Binary files a/res/drawable-hdpi-v9/ic_action_download.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_action_refresh.png b/res/drawable-hdpi-v9/ic_action_refresh.png deleted file mode 100644 index a7fdc0df..00000000 Binary files a/res/drawable-hdpi-v9/ic_action_refresh.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_action_settings.png b/res/drawable-hdpi-v9/ic_action_settings.png deleted file mode 100644 index 86b54f4c..00000000 Binary files a/res/drawable-hdpi-v9/ic_action_settings.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_checkbox_blank_outline.png b/res/drawable-hdpi/ic_checkbox_blank_outline.png new file mode 100644 index 00000000..164dcb53 Binary files /dev/null and b/res/drawable-hdpi/ic_checkbox_blank_outline.png differ diff --git a/res/drawable-hdpi/ic_checkbox_marked.png b/res/drawable-hdpi/ic_checkbox_marked.png new file mode 100644 index 00000000..330d7b95 Binary files /dev/null and b/res/drawable-hdpi/ic_checkbox_marked.png differ diff --git a/res/drawable-hdpi/ic_import.png b/res/drawable-hdpi/ic_import.png new file mode 100644 index 00000000..ad728378 Binary files /dev/null and b/res/drawable-hdpi/ic_import.png differ diff --git a/res/drawable-mdpi-v9/ic_action_download.png b/res/drawable-mdpi-v9/ic_action_download.png deleted file mode 100644 index 2684c83f..00000000 Binary files a/res/drawable-mdpi-v9/ic_action_download.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_action_refresh.png b/res/drawable-mdpi-v9/ic_action_refresh.png deleted file mode 100644 index bb9d855f..00000000 Binary files a/res/drawable-mdpi-v9/ic_action_refresh.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_action_settings.png b/res/drawable-mdpi-v9/ic_action_settings.png deleted file mode 100644 index 47ef3f44..00000000 Binary files a/res/drawable-mdpi-v9/ic_action_settings.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_checkbox_blank_outline.png b/res/drawable-mdpi/ic_checkbox_blank_outline.png new file mode 100644 index 00000000..d4ca47c6 Binary files /dev/null and b/res/drawable-mdpi/ic_checkbox_blank_outline.png differ diff --git a/res/drawable-mdpi/ic_checkbox_marked.png b/res/drawable-mdpi/ic_checkbox_marked.png new file mode 100644 index 00000000..99df2742 Binary files /dev/null and b/res/drawable-mdpi/ic_checkbox_marked.png differ diff --git a/res/drawable-mdpi/ic_import.png b/res/drawable-mdpi/ic_import.png new file mode 100644 index 00000000..3bc69d1b Binary files /dev/null and b/res/drawable-mdpi/ic_import.png differ diff --git a/res/drawable-xhdpi/ic_checkbox_blank_outline.png b/res/drawable-xhdpi/ic_checkbox_blank_outline.png new file mode 100644 index 00000000..05024eb2 Binary files /dev/null and b/res/drawable-xhdpi/ic_checkbox_blank_outline.png differ diff --git a/res/drawable-xhdpi/ic_checkbox_marked.png b/res/drawable-xhdpi/ic_checkbox_marked.png new file mode 100644 index 00000000..3a2ca107 Binary files /dev/null and b/res/drawable-xhdpi/ic_checkbox_marked.png differ diff --git a/res/drawable-xhdpi/ic_import.png b/res/drawable-xhdpi/ic_import.png new file mode 100644 index 00000000..bf2f72ea Binary files /dev/null and b/res/drawable-xhdpi/ic_import.png differ diff --git a/res/drawable-xxhdpi/ic_checkbox_blank_outline.png b/res/drawable-xxhdpi/ic_checkbox_blank_outline.png new file mode 100644 index 00000000..ffb1ea8c Binary files /dev/null and b/res/drawable-xxhdpi/ic_checkbox_blank_outline.png differ diff --git a/res/drawable-xxhdpi/ic_checkbox_marked.png b/res/drawable-xxhdpi/ic_checkbox_marked.png new file mode 100644 index 00000000..fba7e0c9 Binary files /dev/null and b/res/drawable-xxhdpi/ic_checkbox_marked.png differ diff --git a/res/drawable-xxhdpi/ic_import.png b/res/drawable-xxhdpi/ic_import.png new file mode 100644 index 00000000..a4412aac Binary files /dev/null and b/res/drawable-xxhdpi/ic_import.png differ diff --git a/res/drawable-xxhdpi/ic_sort_variant.png b/res/drawable-xxhdpi/ic_sort_variant.png new file mode 100644 index 00000000..2918126d Binary files /dev/null and b/res/drawable-xxhdpi/ic_sort_variant.png differ diff --git a/res/drawable/fab_label_background.xml b/res/drawable/fab_label_background.xml new file mode 100644 index 00000000..4460dab0 --- /dev/null +++ b/res/drawable/fab_label_background.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml index bd4b0b6b..d90fb8a3 100644 --- a/res/layout-v14/generic_explanation.xml +++ b/res/layout-v14/generic_explanation.xml @@ -49,15 +49,17 @@ android:orientation="horizontal" > -