Kegbot / kegbot-android

Android beer kegerator frontend and controller app. Works with a Kegbot server to make your kegerator awesome.
http://kegbot.org/docs/android/
GNU General Public License v2.0
41 stars 53 forks source link

Add thermo sensor selection to Tap Settings #120

Closed johnnyruz closed 4 years ago

johnnyruz commented 4 years ago

Combined with PR #409 on kegbot-server, this will allow users to manage temperature sensors from the Android app similar to Flow Meters and Tap Toggles.

Sorry for all of the irrelevant tabbing, looks like Android Studio adjusted some of the indentation.

johnnyruz commented 4 years ago

Yeah @patfreeman that's the auto-indent that Android Studio applied, but I agree, I hate it as far as consistency and readability of the code changes.

Please give this a functional test if you can, and in the meantime I'm going to re-factor this to get rid of all that whitespace stuff.

mik3y commented 4 years ago

cool feature + awesome collaboration here!

on the lint stuff - if we need to do a great big "run the linter on everything" sort of change, i'd be happy to merge - best to do that with no other functional changes in the pull request.

mik3y commented 4 years ago

@johnnyruz - to get rid of the whitespace changes, something like the following could help do the trick.

starting point would be something like:

$ git checkout -b johnnyruz:try-two master
$ curl -s \
    https://patch-diff.githubusercontent.com/raw/Kegbot/kegbot-android/pull/120.diff | \
  git apply --cached --ignore-whitespace && \
  git checkout -- .

then git diff --cached and look for any dangling whitespace changes and nuke em.

(the no whitespace view of the current change looks quite sensible & could be compared against)

patfreeman commented 4 years ago

I was trying to slack him another solution, but then this happened: https://status.slack.com/2020-05/147dad376c8946ff

johnnyruz commented 4 years ago

Love the feedback, working on it now!

The suggestion about the whitespace sort of worked, but I dug into the formatting settings of Android Studio and updated some of the policies so that I can just apply that setting and the indentations line up. Latest will only have real code changes and all of the whitespace mess will be cleaned up.

johnnyruz commented 4 years ago

Updated code with whitespaces fixes and suggestions from @patfreeman

mik3y commented 4 years ago

thanks johnny, and thanks for handling the review pat! LGTM