Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Material buttons - before in #1090 #1209

Merged
merged 84 commits into from
Dec 29, 2015
Merged

Material buttons - before in #1090 #1209

merged 84 commits into from
Dec 29, 2015

Conversation

davivel
Copy link
Contributor

@davivel davivel commented Oct 22, 2015

@AndyScherzinger
Merge branch 'master' of https://github.com/owncloud/android into mat…
bbfb414 
…erial_buttons
@AndyScherzinger
material checkbox drawables instead of version dependend ones
f444528
@AndyScherzinger
fix for the button styling (land)
a3ccc6a
@AndyScherzinger
use custom checkbox images (material design) while toggling
0d75348
@AndyScherzinger
Merge branch 'master' of https://github.com/owncloud/android into mat…
6a22a8c 
…erial_buttons
@AndyScherzinger
Merge branch 'material_toolbar' of https://github.com/owncloud/android …
456647c 
…into material_buttons
@AndyScherzinger
inital work on 16dp margin/padding values and material margin/padding…
c085ffd 
… values for List items as well as font sizes
@AndyScherzinger
further 16dp spacings
e22b547
@AndyScherzinger
16dp spacing for the footer too
6809e4a
@AndyScherzinger
fixed button style blue/grey
05ca027
@AndyScherzinger
fix for text field focus colors
f7d6939
@AndyScherzinger
Merge branch 'material_toolbar' of https://github.com/owncloud/android …
af2af71 
…into material_buttons

Conflicts:
	res/layout/ssl_untrusted_cert_layout.xml
	res/layout/ssl_validator_layout.xml
@AndyScherzinger
minor padding change on logo
ba3bc9c
@AndyScherzinger
Merge branch 'material_toolbar' of https://github.com/owncloud/android …
bbd5292 
…into material_buttons
@AndyScherzinger
set standard 16dp whitespaces via config values not hardcoded
8a8eb43
@AndyScherzinger
fixed checkbox (now also material design on pre lollipop)
64910f5
@AndyScherzinger
standard material paddings set
5b92747
@AndyScherzinger
moved everything to AppCompatActivity since ActionBarActivity is depr…
455b349 
…ecated
@AndyScherzinger
some more styling for the log screen
f17011f
@AndyScherzinger
coloring the progress wheel
1c7de5c
@AndyScherzinger
fixed arrow coloring on the pull to refresh on the file list
414f43f
@AndyScherzinger
fixed progress wheel
927ce96
@AndyScherzinger
fixed padding of list items
c86e928
@AndyScherzinger
group change data and size together and calculate decimals based on t…
607fb6f 
…otal size see comment in PR #1090
@AndyScherzinger
Move to AppCompat AlertDialog for proper rendering on pre-lollipop de…
abb6e2d 
…vices
@AndyScherzinger
fix for drawer width
9d08a3f
@AndyScherzinger
fixed drawer font size, changed color according to material guide
7df40c0
@AndyScherzinger
Merge branch 'material_toolbar' of https://github.com/owncloud/android …
a7859b4 
…into material_buttons

Conflicts:
	res/layout/drawer.xml
	res/layout/drawer_list_item.xml
	res/values/styles.xml
@AndyScherzinger
Merge branch 'material_toolbar' of https://github.com/owncloud/android …
267179e 
…into material_buttons
@AndyScherzinger
Merge branch 'material_toolbar' of https://github.com/owncloud/android …
172767d 
…into material_buttons
davivel
davivel reviewed Dec 17, 2015
View reviewed changes
res/layout/log_send_file.xml

<android.support.v7.widget.AppCompatButton
<Button
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intended? Not the other way around?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, it should be AppCompatButton

@davivel
Copy link
Contributor Author

davivel commented Dec 17, 2015

@AndyScherzinger , did you start coding the changes? I did it locally to start testing. Sorry, I should have warned you before :$ ...

@AndyScherzinger
Copy link
Contributor

No I didn't, so feel free to push :)

@davivel
Copy link
Contributor Author

davivel commented Dec 17, 2015

Code review is 👍 ; QA is indeed in progress, but not all of it will be done today.

@AndyScherzinger
Copy link
Contributor

Thanks for your efforts @davivel 👍

@davivel davivel modified the milestones: 1.9.1-current, backlog Dec 23, 2015
@davivel
Copy link
Contributor Author

davivel commented Dec 23, 2015

Scheduled for next release :)

This was referenced Dec 23, 2015
Closed
Merged
@AndyScherzinger
Copy link
Contributor

Wow nice! Exspecially seeing the process behind QA here. Impressive! 👍

@jesmrec jesmrec mentioned this pull request Dec 23, 2015
Closed
@AndyScherzinger
fix for #1381
dd8c65d
@AndyScherzinger
Merge branch 'material_buttons' of https://github.com/owncloud/android …
cc2ba71 
…into material_buttons
@AndyScherzinger
Merge branch 'master' of https://github.com/owncloud/android into mat…
a812784 
…erial_buttons

Conflicts (resolved):
	res/layout/drawer.xml
	res/values/colors.xml
	res/values/setup.xml
@AndyScherzinger
Copy link
Contributor

@davivel I merged the master branch changes and resolved the conflicts surrounding the color changes for the setup.xml you did. Please have a look if it's fine. I did a check and ran the branch on my phone and everything looks fine to me. 😃

@AndyScherzinger AndyScherzinger mentioned this pull request Dec 29, 2015
Closed
2 tasks
masensio pushed a commit that referenced this pull request Dec 29, 2015
Merge pull request #1209 from owncloud/material_buttons
7c58039 
Material buttons - before in #1090
@masensio masensio merged commit 7c58039 into master Dec 29, 2015
@masensio masensio deleted the material_buttons branch December 29, 2015 11:31
@jancborchardt
Copy link
Member

Oooooooh nice! :) Finally merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@davivel davivel

Labels
Approved by qa Design
Projects
None yet
Milestone
1.9.1
Development

Successfully merging this pull request may close these issues.
8 participants
@davivel @AndyScherzinger @jancborchardt @tobiasKaminsky @LukasReschke @LukeOwlclaw @masensio @jesmrec