Avoid duplicate files #1168
Avoid duplicate files #1168
Conversation
| @@ -11,4 +11,18 @@ | |||
|
|
|||
| </declare-styleable> | |||
|
|
|||
| <string-array name="pref_behaviour_entries"> | |||
| <item>do nothing</item> | |||
There was a problem hiding this comment.
I think it is better to define a string per item and use them in the string-array item instead of using a literal.
Besides, we are using Transifex to translate into different languages and it takes the file strings.xml to do the translation.
There was a problem hiding this comment.
You are absolutely right, I have changed it.
|
@ALL: Please review |
|
|
show summary for behaviour
…connection switch (no wlan to wlan)
|
Behaviour now has a default value. |
|
@AndyScherzinger Regarding the dialog, it is not happening to me, so I cannot verify if. |
|
@AndyScherzinger 16dp as padding on the left. Do I have to put this also on the right? |
|
Yes, it should also be on the right even tough I guess we will never hit that end :) |
|
As for the dialog, not really. This only happens on pre-lollipop devices where one needs to explizitely replace dialogs with the appCompat ones. Not sure if and how that could be achieved for a preference screen and its list preference in particular. |
|
I pushed a custom list preference implementation that should take care of it. @davivel @masensio can you by any change test this on a real device to make sure my latest push to this branch works for the List Preference? The replacement in the UI works perfectly on my nexus5 btw. |
|
Added some more styleing, see screenshot |
|
@jancborchardt any comment on the paddings? The bottom elements are now in line with the material style guide (16dp) and thus are perfectly aligned with the icon in the action bar. Unfortunately the icons of the list items are slightly larger than the others and are thus center aligned with the actionbar icons (on the left) and the bottom "bar" icons. It looks a bit out of balance but I don't have any idea how to "fix" this visual inbalance :( |
|
I believe that Jan is on holiday so we'll have to figure things out by ourselves for a bit ;-) I like how it looks now - perhaps we can merge it this way and create an issue to fix it later on. That creates a nice junior job for somebody new to our Android app! |
|
Sweet! Than it is already in place in this PR. |
|
@AndyScherzinger Thank you for your help with this PR. |
|
@masensio the line isn't doubled (#1168 (comment)) I just added a grey line as a separator between the list and the bottom button area, so in some cases while scrolling it might leave the impression that there are 2 lines which is 1 for the bottom area and one is the list divider 😄 |
|
@AndyScherzinger, ok I understood this line is a separator. |
|
@jancborchardt what do you think, regarding @masensio's idea for the separating line? (see screenshot #1168 (comment)). Making the line slightly thicker would be easy but would probably introduce a new style since then we might have to adapt it so other screens with button bars on the bottom. Not sure what would be the best way to handle this. |
| Log_OC.d(TAG, "upload file and do nothing"); | ||
| i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_FORGET); | ||
| } else if (behaviour.equalsIgnoreCase("COPY")) { | ||
| i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_COPY); |
There was a problem hiding this comment.
If I'm not wrong, is this option accesible at this point?
Same comment for behaviour.equalsIgnoreCase("DELETE")
There was a problem hiding this comment.
COPY and DELETE exist no longer, so we can remove them.
|
Hi @tobiasKaminsky, For me the code is good. :) |
|
PR Accepted :) |
|
👍 |
|
Awesome! 👍 |
|
👍 wohoow! Just tested on beta, works great! Thank you! |
|
WHOOHOOOO |
As discussed in #819
Reported issues: