Material Icons

[torstendiesel]

[simonpoole]

Thanks, I'll give this a look some time next week.

From a contributing pov: please don't merge your PR, always rebase it on the head of the development branch (in this case master) and then force push it to github.

Further, you don't have to do it right now, but it is a good idea to squash your commits in to a sensible set of commits (use gits interactive rebase). For example my interest in Reverted "icon_note" back to what it was when it was called "note_small" is not particularly large you could squash/fixup that in to the commit where things went wrong.

[HolgerJeromin]

Ref #2991

[simonpoole]

@torstendiesel this current doesn't compile which makes it a bit difficult to test:

   de.blau.android-mergeCurrentDebugResources-65:/values/values.xml:11763: error: resource drawable/culvert_white (aka de.blau.android:drawable/culvert_white) not found.
   de.blau.android-mergeCurrentDebugResources-65:/values/values.xml:11763: error: resource drawable/culvert_white (aka de.blau.android:drawable/culvert_white) not found.

[torstendiesel]

@simonpoole It should compile now, it was just missing one icon.

From a contributing pov: please don't merge your PR, always rebase it on the head of the development branch (in this case master) and then force push it to github.

Do you mind explaining this a little bit further? Both for what it means git-wise and for what procedure I should follow to do it. My forked version (https://github.com/torstendiesel/osmeditor4android/tree/master) should be good to go, I won't do any git actions for now.

[simonpoole]

@simonpoole It should compile now, it was just missing one icon.

From a contributing pov: please don't merge your PR, always rebase it on the head of the development branch (in this case master) and then force push it to github.

Do you mind explaining this a little bit further? Both for what it means git-wise and for what procedure I should follow to do it. My forked version (https://github.com/torstendiesel/osmeditor4android/tree/master) should be good to go, I won't do any git actions for now.

Rebasing re-applies your commits at the head of the target branch https://git-scm.com/book/en/v2/Git-Branching-Rebasing

Essentially as a result it is if you had done your work on a fresh branch that had started off at the current head.

In our case, with your branch checked-out:

git rebase master

Doing this has a number of advantages, but in the end it mainly gives a much cleaner linear history of changes https://github.com/MarcusWolschon/osmeditor4android/network and makes it a lot easier to review PRs.

[torstendiesel]

Got it, thanks. After trying to use my build a little bit, I realized I have accidentally introduced a crash when trying to edit tags / presets, so I'll need to have a look at it before doing anything important with the build!