From: Andy Scherzinger Date: Tue, 27 Oct 2015 12:55:22 +0000 (+0100) Subject: updating FAB lib to 1.10.1 X-Git-Tag: beta-20151202~3^2~21 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/578bbdb0fbd3fd4a3d812a2271f81e5f9ea3faf4 updating FAB lib to 1.10.1 --- diff --git a/build.gradle b/build.gradle index 56ba3462..817b5281 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +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.0' + 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 f4e0b0de..3b4370c0 100644 --- a/project.properties +++ b/project.properties @@ -11,4 +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-0-exploded-aar +android.library.reference.3=libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar diff --git a/setup_env.bat b/setup_env.bat index 4172a943..b0fef5ee 100644 --- a/setup_env.bat +++ b/setup_env.bat @@ -23,7 +23,7 @@ call git submodule init call git submodule update call android.bat update project -p libs/android-support-appcompat-v7-exploded-aar --target android-22 -call android.bat update project -p libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar --target android-22 +call android.bat update project -p libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar --target android-22 call android.bat update lib-project -p owncloud-android-library call android.bat update project -p . call android.bat update project -p oc_jb_workaround diff --git a/setup_env.sh b/setup_env.sh index aadbb46c..6ca3a859 100755 --- a/setup_env.sh +++ b/setup_env.sh @@ -18,7 +18,7 @@ function initForAnt { #Prepare project android-support-appcompat-v7 ; JAR file is not enough, includes resources android update lib-project -p libs/android-support-appcompat-v7-exploded-aar --target android-22 - android update lib-project -p libs/com-getbase-floatingactionbutton-1-10-0-exploded-aar --target android-22 + android update lib-project -p libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar --target android-22 #As default it updates the ant scripts android update lib-project -p owncloud-android-library