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.

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

Kotlin and a bunch of other stuff #95

Merged
merged 63 commits into from
Feb 22, 2017
Merged

Kotlin and a bunch of other stuff #95

merged 63 commits into from
Feb 22, 2017

Commits on Nov 1, 2016

  1. Configuration menu
    Copy the full SHA
    b760d84 View commit details
    Browse the repository at this point in the history
  2. kotlin makes things pretty

    smichel17 committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    1cf781b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    73eebc8 View commit details
    Browse the repository at this point in the history
  4. merge feature_stop_state

    smichel17 committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    10a1e6a View commit details
    Browse the repository at this point in the history
  5. change filter mode to automatic toggle and code cleanup.

    Add a switch to toggle between sun and custom, not yet functional.
    smichel17 committed Nov 1, 2016
    Configuration menu
    Copy the full SHA
    ed2ec4f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    31b6877 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    52a4c39 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2016

  1. Mostly functional location switch. convert to kotlin because studio i…

    …s stupid.
    
    Automatic conversion also automatically stages the file, making it impossible
    to for me to separate changes I made before converting (which were going to
    be in a separate commit) and the conversion itself. Thanks, Obama.
    smichel17 committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    ed27961 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    de6b684 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    833b34a View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2016

  1. Configuration menu
    Copy the full SHA
    a583faa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3a341a9 View commit details
    Browse the repository at this point in the history
  3. Fix android studio warnings

    smichel17 committed Nov 12, 2016
    Configuration menu
    Copy the full SHA
    1789337 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2016

  1. Make most places null safe

    smichel17 committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    9876ef1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bb3cb14 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2016

  1. Configuration menu
    Copy the full SHA
    1da9558 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    21069ad View commit details
    Browse the repository at this point in the history
  3. re-add location preference (but keep location toggle)

    Add location updating, but it always fails.
    smichel17 committed Nov 14, 2016
    Configuration menu
    Copy the full SHA
    3f8c48a View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. Configuration menu
    Copy the full SHA
    36be1d2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2016

  1. Configuration menu
    Copy the full SHA
    9fd5b7a View commit details
    Browse the repository at this point in the history
  2. Use "usagestats" instead of constant on API 21

    Although the UsageStatsManager was added in API 21, the constant to
    specify this service wasn't added until API 22, so on API 21 we have to
    use the string "usagestats" to specify the service.
    raatmarien committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    4c7ab46 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6da0a39 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6f36402 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2016

  1. Configuration menu
    Copy the full SHA
    4ddce66 View commit details
    Browse the repository at this point in the history
  2. Replace pause with off

    smichel17 committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    e1afbbc View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2016

  1. Configuration menu
    Copy the full SHA
    9ca785f View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2016

  1. Many changes.

    Location updater changed to a service
    settingsmodel changed to config singleton
    variable name changes, notably some shades references removed;
        dim, intensity, and color changed to just that; automatic filter
        changed to time toggle and automatic suspend to secure suspend.
    Removed shadespresenter, merged into fragments themselves
    Fragments have a common superclass, eventpreferencefragment
    Added Util singleton
    changed switch to fab
    removed locationpref and filtertimepref, moved logic into fragment
    Add (currently not functional) subscriber index for performance and
       to get rid of compilation warnings about unused methods.
    smichel17 committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    3d4c47b View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2016

  1. fix build errors

    smichel17 committed Dec 1, 2016
    Configuration menu
    Copy the full SHA
    9e552bb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    99545a9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ff0d2b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2017

  1. Another messy commit, sorry. Includes:

    Add activities for secure suspend and time toggle prefs
    Change back to switch from fab
    Rename SettingsModel to Config and merge helper/Util into it
    Refactor requesting permissions (and a few other utils) into Config
    Add static stop(), start() and moveToState() methods on
      ScreenFilterService to decouple interface from implementation
    All events subclass an abstract Event class, for better typing
    Add summary for Timer
    A lot of cleanup. ex: get settings through Config instead of calling
      a function of a parent activity
    Add (currently unused) foundation for a SeekbarPreference class
    Fix filter incorrect state on start bug
    Rearrange ScreenFilterPresenter for easier refactoring in the future
    Whitespace and formatting changes to reduce verbosity
    Update kotlin extension to 1.0.6 and gradle to 2.2.3
    smichel17 committed Jan 28, 2017
    Configuration menu
    Copy the full SHA
    3be4703 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c0ab902 View commit details
    Browse the repository at this point in the history
  3. fix more merge stuff

    smichel17 committed Jan 28, 2017
    Configuration menu
    Copy the full SHA
    36e4293 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2017

  1. Configuration menu
    Copy the full SHA
    30b93df View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2017

  1. Fix some issues with opening Activities from prefs

    It seems that there where a few things going on. First Android couldn't
    find the Activities, which is solved by this commit by declaring
    specific actions for these Activities.
    
    Furthermore, the call to actionBar.setDisplayHomeAsUpEnabled throws an
    RunTimeError, it seems that method is abstract for that object.
    
    Lastly, Eventbus doesn't allow classes to initialize as an event class
    without subscribing to any events as was the case in
    SecureSuspendFragment. To fix this, this commit adds one event
    subscription to this class and does nothing with it.
    raatmarien committed Feb 5, 2017
    Configuration menu
    Copy the full SHA
    ef60c92 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2017

  1. Returned to sending filter state changes via intent.

    Use an enum for easier pattern matching on commandFlags.
    A little bit of code cleanup.
    Add comments in ScreenFilterPresenter about future refactoring.
    smichel17 committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    8d97285 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a15d38d View commit details
    Browse the repository at this point in the history
  3. enable more debugging

    smichel17 committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    87090df View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. Configuration menu
    Copy the full SHA
    f068484 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2a62b37 View commit details
    Browse the repository at this point in the history
  3. fix filter command sending

    smichel17 committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    b15c876 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2017

  1. Clean up ScreenFilterPresenter by

    Moving animation code into ScreenFilterView
    Moving state-dependent functions into the state subclasses
    smichel17 committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    7e0cb66 View commit details
    Browse the repository at this point in the history
  2. cleanup style and warnings

    smichel17 committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    410620c View commit details
    Browse the repository at this point in the history
  3. update copyright notices

    smichel17 committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    5631b48 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. Configuration menu
    Copy the full SHA
    5e6412c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    22c0759 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f464f2b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c417f32 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2017

  1. Configuration menu
    Copy the full SHA
    a589d47 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    340ef70 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f7092b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2017

  1. Configuration menu
    Copy the full SHA
    3dbf5e5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d11177c View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2017

  1. Configuration menu
    Copy the full SHA
    05814ce View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bf0e2ef View commit details
    Browse the repository at this point in the history
  3. cancel the right animator

    smichel17 committed Feb 18, 2017
    Configuration menu
    Copy the full SHA
    a8117c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2017

  1. Configuration menu
    Copy the full SHA
    41dc1c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c2ad7d2 View commit details
    Browse the repository at this point in the history
  3. fix crash on api<23

    smichel17 committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    dbeec87 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2017

  1. Don't email when opening project page

    The 'Visit project page' menu item also opened a new email, it now only
    opens the project page.
    raatmarien committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    0a7b057 View commit details
    Browse the repository at this point in the history
  2. Show correct animation when closing subactivity

    When the TimeToggleActivity or SecureSuspendActivity where closed with
    the arrow in the action bar, the wrong animation would display, making
    it seem that the main activity was opened over the subactivity. Now the
    close activity animation is displayed, so it looks like you are
    returning to the main activity (which you are, the subactivities aren't
    kept 'under' the main activity).
    
    To get android to display this animation correctly I used a sort of a
    workaround, overriding the functionality of the arrow in the action bar
    with calling finish() on the activity. I'm not aware of any other way to
    do this, so I think this should do fine.
    raatmarien committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    8c306f7 View commit details
    Browse the repository at this point in the history
  3. Ask for location permission when it isn't granted

    The app now asks for access to coarse location when the 'Times from
    location' switch is enabled and it doesn't have the permission, instead
    of silently failing.
    raatmarien committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    e15eab9 View commit details
    Browse the repository at this point in the history
  4. Set top switch correctly in onResume

    The maybeInitializedSwitch thing may be an ugly hack, but I don't know
    enough about Kotlin to find out the correct way. As far as I know it is
    null save and will only change it if the switch is already set up.
    raatmarien committed Feb 22, 2017
    Configuration menu
    Copy the full SHA
    9c3ba57 View commit details
    Browse the repository at this point in the history