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

merge upstream #1

Open
wants to merge 197 commits into
base: master
Choose a base branch
from
Open

merge upstream #1

wants to merge 197 commits into from

Commits on Jan 10, 2017

  1. Allow some Coins

    @exmatrikulator @YtvwlD
    exmatrikulator authored and YtvwlD committed Jan 10, 2017
    Configuration menu
    Copy the full SHA
    a2796bf View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2017

  1. Use Retrofit.

    @YtvwlD
    YtvwlD committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    507c354 View commit details
    Browse the repository at this point in the history

  2. UserController: Remove userToJSONPostParams.

    @YtvwlD
    YtvwlD committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    f31ba26 View commit details
    Browse the repository at this point in the history

  3. longrunningio: Remove unused imports.

    @YtvwlD
    YtvwlD committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    ee43366 View commit details
    Browse the repository at this point in the history

  4. Move more things into MeteroidNetworkActivity.

    @YtvwlD
    YtvwlD committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    7e23a75 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2017

  1. longrunningio: Merge the different HTTP methods.

    @YtvwlD
    YtvwlD committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    72e0bb7 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2017

  1. Remove superflous != null checks

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    d1cefbf View commit details
    Browse the repository at this point in the history

  2. Make Drink more similar to the stuff we get from Mete.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    67985ad View commit details
    Browse the repository at this point in the history

  3. Make User more similar to the stuff we get from Mete.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    57c42f3 View commit details
    Browse the repository at this point in the history

  4. PickUsername: Use already created api of MeteroidNetworkActivity.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    491510a View commit details
    Browse the repository at this point in the history

  5. Move initializeRetrofit from Utility to MeteroidNetworkActivity.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    7d5dec7 View commit details
    Browse the repository at this point in the history

  6. LongRunningIO: Add logging.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    180dfe4 View commit details
    Browse the repository at this point in the history

  7. Make more use of Retrofit and GSON.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    5e15c79 View commit details
    Browse the repository at this point in the history

  8. Delete unused controllers.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    26ef48c View commit details
    Browse the repository at this point in the history

  9. Add "-Xlint:unchecked" to compiler args.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    6da2547 View commit details
    Browse the repository at this point in the history

  10. Specify more types for LongRunningIORequest.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    ee587b9 View commit details
    Browse the repository at this point in the history

  11. Specify types for LongRunningIOCallback.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    6aec78f View commit details
    Browse the repository at this point in the history

  12. LongRunningIORequest: Remove runOnUiThread. 

    This isn't needed anymore, because Retrofit executes the callbacks
automagically on the thread that created the request.
    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    5a869b2 View commit details
    Browse the repository at this point in the history

  13. Make LongRunningIOCallback the interface to implement. 

    (instead of inheriting MeteroidNetworkActivity)
    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    2f642cb View commit details
    Browse the repository at this point in the history

  14. Specify more types in LongRunningIORequest.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    21486fc View commit details
    Browse the repository at this point in the history

  15. PickUsername: Specify types for LongRunningIOCallback more explicitly.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    6f7d8b2 View commit details
    Browse the repository at this point in the history

  16. Some = this are no longer needed.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    752c6f2 View commit details
    Browse the repository at this point in the history

  17. UserSettings: Split processIOResult.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    ca319f9 View commit details
    Browse the repository at this point in the history

  18. Replace getResources().getDrawable() with Context.getDrawable(). 

    The former one was deprecated with Marshmallow.
    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    1824d15 View commit details
    Browse the repository at this point in the history

  19. Add the possibility to delete a user.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    9c4efbb View commit details
    Browse the repository at this point in the history

  20. Reset saved userID after deletion of a user.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    5faf76d View commit details
    Browse the repository at this point in the history

  21. Remove dependency on okhttp3.

    @YtvwlD
    YtvwlD committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    a193e00 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2017

  1. Release v2.3.0.

    @YtvwlD
    YtvwlD committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    9d55e2a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. Replace donationRecommendation with price.

    @YtvwlD
    YtvwlD committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    f4575ad View commit details
    Browse the repository at this point in the history

  2. Support accounts being inactive.

    @YtvwlD
    YtvwlD committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    0197d8d View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2017

  1. Make User.active default to true. 

    This is useful for old (not yet updated) instances of Mete.
    @YtvwlD
    YtvwlD committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    ccda1b3 View commit details
    Browse the repository at this point in the history

  2. Revert "Make User.active default to true." 

    This reverts commit ccda1b3.

Well, this didn't work. ¯\_(ツ)_/¯

So, now there's an imcompatibility if you're using a current version of Meteroid
with an instance of Mete before fe561e1 (i.e. not updated for about a year).
To be clear: This will not mess up any data.
But all accounts will be displayed as inactive and editing or creating new
or existing users won't be possible until the Mete instance is upgraded.
    @YtvwlD
    YtvwlD committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    ab3cd0b View commit details
    Browse the repository at this point in the history

  3. Supports drinks being inactive.

    @YtvwlD
    YtvwlD committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    dc17934 View commit details
    Browse the repository at this point in the history

  4. Release v2.3.1

    @YtvwlD
    YtvwlD committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    a468f82 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2017

  1. Support buying drinks by barcode (closes #13).

    @YtvwlD
    YtvwlD committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    4448427 View commit details
    Browse the repository at this point in the history

  2. "Clarify" error message in BuyDrink.

    @YtvwlD
    YtvwlD committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    9fcb3ba View commit details
    Browse the repository at this point in the history

  3. Move raw ressources into a folder.

    @YtvwlD
    YtvwlD committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    4bc247f View commit details
    Browse the repository at this point in the history

  4. Resize the user avatar (fixes #11).

    @YtvwlD
    YtvwlD committed Mar 25, 2017
    Configuration menu
    Copy the full SHA
    d35cb32 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2017

  1. Display negative account balances in red (closes #12).

    @YtvwlD
    YtvwlD committed Mar 26, 2017
    Configuration menu
    Copy the full SHA
    20815fb View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2017

  1. Release v2.3.2

    @YtvwlD
    YtvwlD committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    b6f9baf View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2017

  1. Add a floating action button for adding a user.

    @YtvwlD
    YtvwlD committed Apr 2, 2017
    Configuration menu
    Copy the full SHA
    b211ac9 View commit details
    Browse the repository at this point in the history

  2. Add a floating action button for scanning a barcode.

    @YtvwlD
    YtvwlD committed Apr 2, 2017
    Configuration menu
    Copy the full SHA
    bd50f14 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2017

  1. Make BuyDrink fit on small screens on Gingerbread.

    @YtvwlD
    YtvwlD committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    7fd4816 View commit details
    Browse the repository at this point in the history

  2. Release v2.3.3

    @YtvwlD
    YtvwlD committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    66f63ad View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2017

  1. Show less menu entries on Gingerbread.

    @YtvwlD
    YtvwlD committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    04d32de View commit details
    Browse the repository at this point in the history

  2. PickUsername: Don't destroy the whole activity when reloading.

    @YtvwlD
    YtvwlD committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    04127e8 View commit details
    Browse the repository at this point in the history

  3. BuyDrink: Don't destroy the whole activity when reloading.

    @YtvwlD
    YtvwlD committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    8a7a224 View commit details
    Browse the repository at this point in the history

  4. PickUsername: Bring back the reload function for Gingerbread.

    @YtvwlD
    YtvwlD committed Apr 13, 2017
    Configuration menu
    Copy the full SHA
    17b8427 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. Add SwipeRefreshLayout to PickUsername.

    @YtvwlD
    YtvwlD committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    eb50d7e View commit details
    Browse the repository at this point in the history

  2. PickUsername: Hide the error message on reload.

    @YtvwlD
    YtvwlD committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    a37ab7d View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2017

  1. Changed buy/kaufen into donate/spenden to meet the legal base of mete.

    bullycamper committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    b6e9e7c View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2017

  1. Fix ü.

    @YtvwlD
    YtvwlD committed Sep 17, 2017
    Configuration menu
    Copy the full SHA
    a14719a View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2017

  1. Update Android SDK.

    @YtvwlD
    YtvwlD committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    df1801d View commit details
    Browse the repository at this point in the history

  2. Update a few dependencies.

    @YtvwlD
    YtvwlD committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    378a0fa View commit details
    Browse the repository at this point in the history

  3. Retrieve defaults for new users when creating new users.

    @YtvwlD
    YtvwlD committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    806ddf4 View commit details
    Browse the repository at this point in the history

  4. Remove gradle.properties.

    @YtvwlD
    YtvwlD committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    fe0720f View commit details
    Browse the repository at this point in the history

  5. More compatibility with Java 7.

    @YtvwlD
    YtvwlD committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    a58567a View commit details
    Browse the repository at this point in the history

  6. Correctly pass parameters in a POST.

    @YtvwlD
    YtvwlD committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    087c165 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2017

  1. Add audit and redirect as properties for users.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    600f462 View commit details
    Browse the repository at this point in the history

  2. When creating or modifying a user, send JSON in the POST body.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    e34ad3f View commit details
    Browse the repository at this point in the history

  3. Add data binding to UserSettings.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    54c689f View commit details
    Browse the repository at this point in the history

  4. UserSettings: setWritable

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    cf7230f View commit details
    Browse the repository at this point in the history

  5. UserSettings: Remove unused imports.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    6f89488 View commit details
    Browse the repository at this point in the history

  6. Add data binding to BuyDrink.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    e2fac0b View commit details
    Browse the repository at this point in the history

  7. Add util.Config.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    1c15bf2 View commit details
    Browse the repository at this point in the history

  8. Config: Make default values more clear.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    37a86f6 View commit details
    Browse the repository at this point in the history

  9. Make clear what userID==0 means.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    e268d66 View commit details
    Browse the repository at this point in the history

  10. Config: Logging.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    7fd75b1 View commit details
    Browse the repository at this point in the history

  11. Config: Add a version.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    4485e94 View commit details
    Browse the repository at this point in the history

  12. Upgrade Gradle.

    @YtvwlD
    YtvwlD committed Oct 8, 2017
    Configuration menu
    Copy the full SHA
    38e1915 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2017

  1. Downgrade org.jetbrains:annotations.

    @YtvwlD
    YtvwlD committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    262944f View commit details
    Browse the repository at this point in the history

  2. Add (simple) databinding to SetHostname.

    @YtvwlD
    YtvwlD committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    5861a33 View commit details
    Browse the repository at this point in the history

  3. Add (simple) databinding to PickUsername.

    @YtvwlD
    YtvwlD committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    846c318 View commit details
    Browse the repository at this point in the history

  4. PickUsername: Don't keep multiUserMode as a seperate variable.

    @YtvwlD
    YtvwlD committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    1cdcb96 View commit details
    Browse the repository at this point in the history

  5. PickUsername: Get rid of seperate NEW_USER_ID.

    @YtvwlD
    YtvwlD committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    0c2a201 View commit details
    Browse the repository at this point in the history

  6. Config: Set NO_USER_ID to -1.

    @YtvwlD
    YtvwlD committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    28adfac View commit details
    Browse the repository at this point in the history

  7. Config: Add api_version.

    @YtvwlD
    YtvwlD committed Oct 9, 2017
    Configuration menu
    Copy the full SHA
    b874272 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2018

  1. Fix b8742: Correctly save the new config version. 

    The config migration did work, but the version number wasn't updated.
This has had no consequences.
    @YtvwlD
    YtvwlD committed Feb 8, 2018
    Configuration menu
    Copy the full SHA
    286118d View commit details
    Browse the repository at this point in the history

  2. Move the connection to an own class.

    @YtvwlD
    YtvwlD committed Feb 8, 2018
    Configuration menu
    Copy the full SHA
    61c6737 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2018

  1. Make Config a singleton.

    @YtvwlD
    YtvwlD committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    0db2c35 View commit details
    Browse the repository at this point in the history

  2. Make Connection a singleton.

    @YtvwlD
    YtvwlD committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    9d36675 View commit details
    Browse the repository at this point in the history

  3. Correctly reset the connection.

    @YtvwlD
    YtvwlD committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    1073b63 View commit details
    Browse the repository at this point in the history

  4. Guess the API version after setting a hostname.

    @YtvwlD
    YtvwlD committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    a789fe7 View commit details
    Browse the repository at this point in the history

  5. Connection: Try to upgrade the API version.

    @YtvwlD
    YtvwlD committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    4d03e72 View commit details
    Browse the repository at this point in the history

  6. Fix adding users.

    @YtvwlD
    YtvwlD committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    36d179e View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2018

  1. SetHostname: Only instantiate Connection after setting the hostname.

    @YtvwlD
    YtvwlD committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    b12da86 View commit details
    Browse the repository at this point in the history

  2. PickUsername: Reset the userID when adding a new user.

    @YtvwlD
    YtvwlD committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    2155a40 View commit details
    Browse the repository at this point in the history

  3. Release v2.4.0.

    @YtvwlD
    YtvwlD committed Feb 11, 2018
    Configuration menu
    Copy the full SHA
    f40c917 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2018

  1. Let Mete handle the sorting of drinks. 

    Now, disabled drinks will be placed at the end.
And all drinks will be sorted by name, just like users know it from Mete.
    @YtvwlD
    YtvwlD committed Feb 25, 2018
    Configuration menu
    Copy the full SHA
    c9c8f6b View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2018

  1. Upgrade Gradle.

    @YtvwlD
    YtvwlD committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    d17e289 View commit details
    Browse the repository at this point in the history

  2. Update Retrofit.

    @YtvwlD
    YtvwlD committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    f840cee View commit details
    Browse the repository at this point in the history

  3. Update SDK and Build Tools.

    @YtvwlD
    YtvwlD committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    959949c View commit details
    Browse the repository at this point in the history

  4. Set the target SDK to 27.

    @YtvwlD
    YtvwlD committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    5157c81 View commit details
    Browse the repository at this point in the history

  5. Update Travis config.

    @YtvwlD
    YtvwlD committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    7936424 View commit details
    Browse the repository at this point in the history

  6. Add missing http://.

    @YtvwlD
    YtvwlD committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    5d1675a View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

  1. Release v2.4.1.

    @YtvwlD
    YtvwlD committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    5e11bfa View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2019

  1. SetHostname: Don't treat "https://" as valid (closes #16).

    @YtvwlD
    YtvwlD committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    0b3c5a6 View commit details
    Browse the repository at this point in the history

  2. UserSettings: Also gray out ActionBar buttons when waiting for someth… 

    …ing (closes #15).
    @YtvwlD
    YtvwlD committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    6750ca9 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2019

  1. BuyDrink: Handle edge case where touched item is null.

    @YtvwlD
    YtvwlD committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    83c28ed View commit details
    Browse the repository at this point in the history

  2. Update Retrofit.

    @YtvwlD
    YtvwlD committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    70a9429 View commit details
    Browse the repository at this point in the history

  3. Set Android Pie as the target version.

    @YtvwlD
    YtvwlD committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    1c1fec2 View commit details
    Browse the repository at this point in the history

  4. Update Gradle and wrapper to 4.10.3.

    @YtvwlD
    YtvwlD committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    90e137d View commit details
    Browse the repository at this point in the history

  5. UserSettings: Properly disable ActionBar buttons.

    @YtvwlD
    YtvwlD committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    13c2e44 View commit details
    Browse the repository at this point in the history

  6. UserSettings: Workaround for 2.3.3.

    @YtvwlD
    YtvwlD committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    8fbaa49 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2019

  1. Release v2.4.2.

    @YtvwlD
    YtvwlD committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    38272f7 View commit details
    Browse the repository at this point in the history

  2. UserSettings: Fix issue with ActionBar buttons being wrongly disabled.

    @YtvwlD
    YtvwlD committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    b799228 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2019

  1. Add MeteroidItem as an interface implemented by drinks and users.

    @YtvwlD
    YtvwlD committed Jan 20, 2019
    Configuration menu
    Copy the full SHA
    599be32 View commit details
    Browse the repository at this point in the history

  2. Add fast scrolling for selecting users and drinks.

    @YtvwlD
    YtvwlD committed Jan 20, 2019
    Configuration menu
    Copy the full SHA
    904baa9 View commit details
    Browse the repository at this point in the history

  3. Allow connections over HTTP on Android 9.

    @YtvwlD
    YtvwlD committed Jan 20, 2019
    Configuration menu
    Copy the full SHA
    520ed82 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2019

  1. Gradle: Use mavenCentral().

    @YtvwlD
    YtvwlD committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    3e4148f View commit details
    Browse the repository at this point in the history

  2. Warn when entering a HTTP URL.

    @YtvwlD
    YtvwlD committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    c4ec915 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. BuyDrink: Fix a NullPointerException when scanning a barcode.

    @YtvwlD
    YtvwlD committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    785a3b8 View commit details
    Browse the repository at this point in the history

  2. longrunningio: Just catch network issues.

    @YtvwlD
    YtvwlD committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    a93a5b2 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2019

  1. Utility: Simplify arrayToHex.

    @YtvwlD
    YtvwlD committed Jan 26, 2019
    Configuration menu
    Copy the full SHA
    019d199 View commit details
    Browse the repository at this point in the history

  2. LongRunningIO: Pass empty reponses.

    @YtvwlD
    YtvwlD committed Jan 26, 2019
    Configuration menu
    Copy the full SHA
    949b13f View commit details
    Browse the repository at this point in the history

  3. Replace imageloader with Picasso.

    @YtvwlD
    YtvwlD committed Jan 26, 2019
    Configuration menu
    Copy the full SHA
    8fe1189 View commit details
    Browse the repository at this point in the history

  4. Don't ignore exceptions that can't occur.

    @YtvwlD
    YtvwlD committed Jan 26, 2019
    Configuration menu
    Copy the full SHA
    eb7a618 View commit details
    Browse the repository at this point in the history

  5. BuyDrink: Remove error message when refreshing.

    @YtvwlD
    YtvwlD committed Jan 26, 2019
    Configuration menu
    Copy the full SHA
    23c1d7c View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2019

  1. Utility: Use Config.

    @YtvwlD
    YtvwlD committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    3df7f83 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2019

  1. Update the state of the checkbox after tapping.

    @YtvwlD
    YtvwlD committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    9708ddb View commit details
    Browse the repository at this point in the history

  2. Remove MenuUtility.onClickMultiUserMode.

    @YtvwlD
    YtvwlD committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    dc29d03 View commit details
    Browse the repository at this point in the history

  3. Fix typo in Utility.toggleMultiUserMode.

    @YtvwlD
    YtvwlD committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    d154a31 View commit details
    Browse the repository at this point in the history

  4. Release v2.5.0.

    @YtvwlD
    YtvwlD committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    04e1c58 View commit details
    Browse the repository at this point in the history

  5. BuyDrink: Honour user.redirect in multi-user mode (closes #18).

    @YtvwlD
    YtvwlD committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    070aee1 View commit details
    Browse the repository at this point in the history

  6. Update Google Play link

    @YtvwlD
    YtvwlD committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    9354746 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. BuyDrink: Support buying a drink via intent.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    6b664fc View commit details
    Browse the repository at this point in the history

  2. Add a shortcut for the last bought drink.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    2fa4f37 View commit details
    Browse the repository at this point in the history

  3. Only install shortcuts on Android versions that support them.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    934f9ed View commit details
    Browse the repository at this point in the history

  4. Support scanning barcodes via intent.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    59160bb View commit details
    Browse the repository at this point in the history

  5. Add BuyDrink.scanBarcode.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    ada5388 View commit details
    Browse the repository at this point in the history

  6. Add a shortcut when scanning a barcode.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    785a166 View commit details
    Browse the repository at this point in the history

  7. BuyDrink: Don't create shortcuts when in multi-user mode.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    3c7ef02 View commit details
    Browse the repository at this point in the history

  8. Add an about screen.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    c3c52ea View commit details
    Browse the repository at this point in the history

  9. About: Support going back by tapping the icon in the ActionBar.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    253f4f6 View commit details
    Browse the repository at this point in the history

  10. About: Change fallback version name.

    @YtvwlD
    YtvwlD committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    45523df View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2019

  1. About: Add a link to Github

    @YtvwlD
    YtvwlD committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    a6629bb View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2019

  1. MeteroidAdapter: Fix getPositionForSection to not throw an exception.

    @YtvwlD
    YtvwlD committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    470fd99 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2019

  1. Give more space to drinks in grid view.

    @YtvwlD
    YtvwlD committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    1c52ba9 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2019

  1. Don't show the checkbox for multi-user mode in BuyDrink.

    @YtvwlD
    YtvwlD committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    36902c4 View commit details
    Browse the repository at this point in the history

  2. BuyDrink: Rework exit behavior.

    @YtvwlD
    YtvwlD committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    04b9659 View commit details
    Browse the repository at this point in the history

  3. Start with PickUsername if in multi-user mode.

    @YtvwlD
    YtvwlD committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    ca1d20c View commit details
    Browse the repository at this point in the history

  4. Finish MainActivity directly.

    @YtvwlD
    YtvwlD committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    6c2cb77 View commit details
    Browse the repository at this point in the history

  5. PickUsername: Record successful loading.

    @YtvwlD
    YtvwlD committed Feb 9, 2019
    Configuration menu
    Copy the full SHA
    fd1e24f View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2019

  1. Get the LayoutInflater more easily.

    @YtvwlD
    YtvwlD committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    e1c6dbb View commit details
    Browse the repository at this point in the history

  2. Don't increase the padding in dialogs on tablets.

    @YtvwlD
    YtvwlD committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    25c123c View commit details
    Browse the repository at this point in the history

  3. Hide the delete menu item in SetHostname.

    @YtvwlD
    YtvwlD committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    d98764d View commit details
    Browse the repository at this point in the history

  4. Add class files to .gitignore.

    @YtvwlD
    YtvwlD committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    1745870 View commit details
    Browse the repository at this point in the history

  5. Move res_raw to gfx

    @YtvwlD
    YtvwlD committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    7518d13 View commit details
    Browse the repository at this point in the history

  6. Add an empty glass.

    @YtvwlD
    YtvwlD committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    b48e480 View commit details
    Browse the repository at this point in the history

  7. BuyDrink: Always finish when going to PickUsername.

    @YtvwlD
    YtvwlD committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    6c925e8 View commit details
    Browse the repository at this point in the history

  8. Utility: Add flags to startActivity.

    @YtvwlD
    YtvwlD committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    7c10072 View commit details
    Browse the repository at this point in the history

  9. UserSettings: Always finish.

    @YtvwlD
    YtvwlD committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    006222b View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. Use SpotBugs.

    @YtvwlD
    YtvwlD committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    26856e9 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2019

  1. Picasso: Use placeholder instead of error. 

    In this case, users don't get to see missing avatars.
    @YtvwlD
    YtvwlD committed May 24, 2019
    Configuration menu
    Copy the full SHA
    3fcce6f View commit details
    Browse the repository at this point in the history

  2. Change default URL. 

    This is now specific to Chaosdorf, but this is arguably the most popular instance.
    @YtvwlD
    YtvwlD committed May 24, 2019
    Configuration menu
    Copy the full SHA
    16da884 View commit details
    Browse the repository at this point in the history

  3. Bump version to 2.6.0.

    @YtvwlD
    YtvwlD committed May 24, 2019
    Configuration menu
    Copy the full SHA
    ec8d198 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2019

  1. MeteroidAdapter: Fix getPositionForSection to not throw an exception. 

    This is related to 470fd99 and #19.
    @YtvwlD
    YtvwlD committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    60cbc0c View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2019

  1. Update Retrofit 

    The new version doesn't officially support Android < 5 anymore,
but it still seems to work on Android 2.3.3.
    @YtvwlD
    YtvwlD committed Oct 20, 2019
    Configuration menu
    Copy the full SHA
    840e703 View commit details
    Browse the repository at this point in the history

  2. Update SDK, build tools and target SDK version to Android 10

    @YtvwlD
    YtvwlD committed Oct 20, 2019
    Configuration menu
    Copy the full SHA
    d80027e View commit details
    Browse the repository at this point in the history

  3. Bump version to 2.6.1

    @YtvwlD
    YtvwlD committed Oct 20, 2019
    Configuration menu
    Copy the full SHA
    3283cd0 View commit details
    Browse the repository at this point in the history

  4. Fix Travis config 

    d80027e introduced new a Android SDK and build tools.
Travis needs to have those installed.
    @YtvwlD
    YtvwlD committed Oct 20, 2019
    Configuration menu
    Copy the full SHA
    adc0202 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. Show multiple dynamic shortcuts at the same time (closes #24)

    @YtvwlD
    YtvwlD committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    1a6a2c5 View commit details
    Browse the repository at this point in the history

  2. Notify the system which shortcut has been used 

    Also, send similar events.
This should reorder the launcher's shortcut list.
    @YtvwlD
    YtvwlD committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    5f40b0e View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. Update dependencies where possible

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    dab8260 View commit details
    Browse the repository at this point in the history

  2. util: Make singletons volatile

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    e1731e7 View commit details
    Browse the repository at this point in the history

  3. Don't duplicate code in a switch-case

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    ac9b1eb View commit details
    Browse the repository at this point in the history

  4. Disable shortcuts when deselecting user and reenable them when possible

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    f6e671b View commit details
    Browse the repository at this point in the history

  5. Bump version to 2.7.0

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    78537d9 View commit details
    Browse the repository at this point in the history

  6. Replace com.melnykov.fab.FloatingActionButton with com.shamanland.fab… 

    ….FloatingActionButton
    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    4e27631 View commit details
    Browse the repository at this point in the history

  7. Don't specify version of the Android support library

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    582a437 View commit details
    Browse the repository at this point in the history

  8. Update Android Gradle plugin to 3.3.2 (closes #22) 

    This is the latest one that works with our Gradle version.
Also, this forces us to drop support for all Android versions
earlier than API 14 aka. Ice Cream Sandwhich aka. version 4.0.
    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    faec748 View commit details
    Browse the repository at this point in the history

  9. Update Gradle and wrapper to 5.6.4

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    09965c3 View commit details
    Browse the repository at this point in the history

  10. build.gradle: Replace compile with implementation

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    72edff5 View commit details
    Browse the repository at this point in the history

  11. Adjust path for SpotBugs

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    82d2429 View commit details
    Browse the repository at this point in the history

  12. Update Android Gradle plugin to 3.6.2

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    783d7f3 View commit details
    Browse the repository at this point in the history

  13. Update Gradle SpotBugs plugin to 3.0.0

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    45a5159 View commit details
    Browse the repository at this point in the history

  14. Move <uses-sdk> from AndroidManifest.xml to build.gradle

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    9883fac View commit details
    Browse the repository at this point in the history

  15. Upgrade Gradle and wrapper to 6.3 

    Also, adjust path for SpotBugs.
    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    cb0d492 View commit details
    Browse the repository at this point in the history

  16. Revert "UserSettings: Workaround for 2.3.3." 

    This reverts commit 8fbaa49.
    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    227d513 View commit details
    Browse the repository at this point in the history

  17. Merge default values and v11+ ones.

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    40d881e View commit details
    Browse the repository at this point in the history

  18. Gradle: Remove workaround for Gingerbread.

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    67a7883 View commit details
    Browse the repository at this point in the history

  19. Remove code specific to pre-Holo versions of Android

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    b5fe5ab View commit details
    Browse the repository at this point in the history

  20. Remove unused layout property

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    dc2c212 View commit details
    Browse the repository at this point in the history

  21. Ensure that updateShortcuts is only being called on Android 7.1 and n… 

    …ewer
    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    7467f4c View commit details
    Browse the repository at this point in the history

  22. Remove unneeded XML schema

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    04f95f3 View commit details
    Browse the repository at this point in the history

  23. Add autofill hints on user settings page

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    76a19e4 View commit details
    Browse the repository at this point in the history

  24. Don't specify a Java version

    @YtvwlD
    YtvwlD committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    0ca2f30 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Use view binding for the grid view in PickUsername

    @YtvwlD
    YtvwlD committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    3525685 View commit details
    Browse the repository at this point in the history

  2. PickUsername: Don't support adding users via the last item 

    As we now only support Android >= 4, we always have an ActionBar.
    @YtvwlD
    YtvwlD committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    166a7eb View commit details
    Browse the repository at this point in the history

Commits on May 9, 2020

  1. Update German translation

    @YtvwlD
    YtvwlD committed May 9, 2020
    Configuration menu
    Copy the full SHA
    75c745d View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2020

  1. Update Android Gradle plugin to 4.0.1

    @YtvwlD
    YtvwlD committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    22c02d3 View commit details
    Browse the repository at this point in the history

  2. Move dataBinding and viewBinding config 

    The old location was deprecated.
    @YtvwlD
    YtvwlD committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    1f70c9a View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2021

  1. Update Picasso

    @YtvwlD
    YtvwlD committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    60ba990 View commit details
    Browse the repository at this point in the history

  2. Target Android 11

    @YtvwlD
    YtvwlD committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    5e0074f View commit details
    Browse the repository at this point in the history

  3. Try to unify support version libraries 

    Picasso depends on 27.1, the view binding depends on 26.1.
    @YtvwlD
    YtvwlD committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    20ad08d View commit details
    Browse the repository at this point in the history

  4. Update Gradle and wrapper to 6.8.3

    @YtvwlD
    YtvwlD committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    2b71e36 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. Bump version to 2.8.0

    @YtvwlD
    YtvwlD committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    05fc8ed View commit details
    Browse the repository at this point in the history