Commit graph

4127 commits

Author SHA1 Message Date
Andy Scherzinger
71f68b4c8c fix for progressbars on pre lollipop and post ics for seekbar thumbs 2015-08-14 18:55:31 +02:00
Andy Scherzinger
a7859b4ab4 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
Conflicts:
	res/layout/drawer.xml
	res/layout/drawer_list_item.xml
	res/values/styles.xml
2015-08-14 17:45:22 +02:00
Andy Scherzinger
92af92ee3b merged part of the fixes from material buttons branch to fix bugs reported in PR #1076 2015-08-14 17:18:36 +02:00
Andy Scherzinger
7df40c01c8 fixed drawer font size, changed color according to material guide 2015-08-14 16:00:35 +02:00
Andy Scherzinger
9d08a3f306 fix for drawer width 2015-08-14 15:40:22 +02:00
Andy Scherzinger
abb6e2dbd5 Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices 2015-08-14 15:29:22 +02:00
Andy Scherzinger
607fb6f587 group change data and size together and calculate decimals based on total size see comment in PR #1090 2015-08-14 10:05:26 +02:00
Andy Scherzinger
c86e92870f fixed padding of list items 2015-08-14 00:34:12 +02:00
tobiasKaminsky
be5dbcbb2e fixed bug caused by rotating the device 2015-08-13 20:11:58 +02:00
Andy Scherzinger
927ce968d7 fixed progress wheel 2015-08-13 19:43:56 +02:00
Andy Scherzinger
414f43f326 fixed arrow coloring on the pull to refresh on the file list 2015-08-13 19:28:44 +02:00
Andy Scherzinger
1c7de5c7a5 coloring the progress wheel 2015-08-13 19:16:11 +02:00
Andy Scherzinger
f17011ff68 some more styling for the log screen 2015-08-13 19:05:20 +02:00
Andy Scherzinger
455b349c08 moved everything to AppCompatActivity since ActionBarActivity is deprecated 2015-08-13 18:46:19 +02:00
Andy Scherzinger
5b92747895 standard material paddings set 2015-08-13 18:39:53 +02:00
Andy Scherzinger
64910f59bb fixed checkbox (now also material design on pre lollipop) 2015-08-13 18:39:36 +02:00
Andy Scherzinger
8a8eb435a3 set standard 16dp whitespaces via config values not hardcoded 2015-08-13 18:08:21 +02:00
Andy Scherzinger
bbd529289c Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-13 17:58:58 +02:00
Andy Scherzinger
ba3bc9cbfd minor padding change on logo 2015-08-13 17:54:58 +02:00
Andy Scherzinger
bac0fa5f28 move from deprecated ActionBarActivity to AppCompatActivity 2015-08-13 17:54:33 +02:00
Andy Scherzinger
af2af7198b Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
Conflicts:
	res/layout/ssl_untrusted_cert_layout.xml
	res/layout/ssl_validator_layout.xml
2015-08-13 15:57:38 +02:00
Andy Scherzinger
60e0f09278 Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons 2015-08-13 15:41:59 +02:00
Jenkins for ownCloud
a244bdf1ca [tx-robot] updated from transifex 2015-08-13 01:13:38 -04:00
Andy Scherzinger
f7d6939264 fix for text field focus colors 2015-08-12 19:12:56 +02:00
Andy Scherzinger
05ca0270a8 fixed button style blue/grey 2015-08-12 18:54:27 +02:00
Andy Scherzinger
c4d8c423b0 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar 2015-08-12 18:49:33 +02:00
Andy Scherzinger
5257af90bc fixed username to be single line and ellipsized in case of lang names 2015-08-12 18:48:33 +02:00
Jenkins for ownCloud
c4b639e964 [tx-robot] updated from transifex 2015-08-12 01:13:37 -04:00
Andy Scherzinger
066190f977 Update SETUP.md
updated documentation due to move to android-22 for actual AppCompat lib and ownCloud app compile Target
2015-08-11 15:40:27 +02:00
masensio
eda6f71491 Move create folder button to action bar in Uploader 2015-08-11 11:14:26 +02:00
Jenkins for ownCloud
c19bb85a24 [tx-robot] updated from transifex 2015-08-11 01:13:39 -04:00
Andy Scherzinger
6809e4a9de 16dp spacing for the footer too 2015-08-10 18:50:24 +02:00
Andy Scherzinger
e22b547401 further 16dp spacings 2015-08-10 18:36:50 +02:00
Andy Scherzinger
c085ffd545 inital work on 16dp margin/padding values and material margin/padding values for List items as well as font sizes 2015-08-10 18:32:25 +02:00
Andy Scherzinger
dde5e5575c Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar 2015-08-10 13:02:16 +02:00
Andy Scherzinger
275028a5e3 Merge branch 'master' of https://github.com/owncloud/android into material_toolbar 2015-08-10 13:01:40 +02:00
Andy Scherzinger
456647c996 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-10 11:19:23 +02:00
David A. Velasco
64ebb2c1d3 Enforce to recalculate row height when measuring the footer to get it correctly placed in the grid view 2015-08-10 11:12:43 +02:00
Andy Scherzinger
6a22a8cd3b Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-08-10 10:54:05 +02:00
Jenkins for ownCloud
2b79f3292f [tx-robot] updated from transifex 2015-08-10 01:13:35 -04:00
Jenkins for ownCloud
2206585f52 [tx-robot] updated from transifex 2015-08-09 01:13:36 -04:00
Jenkins for ownCloud
5258172ffd [tx-robot] updated from transifex 2015-08-08 01:13:38 -04:00
Andy Scherzinger
0d75348b30 use custom checkbox images (material design) while toggling 2015-08-07 18:20:51 +02:00
Andy Scherzinger
a3ccc6a559 fix for the button styling (land) 2015-08-07 18:05:50 +02:00
Andy Scherzinger
f4445284d0 material checkbox drawables instead of version dependend ones 2015-08-07 18:05:34 +02:00
Andy Scherzinger
bbfb414695 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-08-07 17:11:04 +02:00
Andy Scherzinger
4a4296a07e Material Buttons (draft) 2015-08-07 17:09:47 +02:00
Jenkins for ownCloud
8d4d1bfffb [tx-robot] updated from transifex 2015-08-07 04:57:36 -04:00
Jenkins for ownCloud
80c112ad1a [tx-robot] updated from transifex 2015-08-07 04:44:18 -04:00
David A. Velasco
537e075fca Merge branch 'develop'
Conflicts FIXED:
	owncloud-android-library
2015-08-07 10:17:03 +02:00