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

feat: setup app lock screen #2243

Merged
merged 9 commits into from
Sep 19, 2023
Merged

feat: setup app lock screen #2243

merged 9 commits into from
Sep 19, 2023

Commits on Sep 18, 2023

  1. setup app lock screen

    @MohamadJaara
    MohamadJaara committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    3a8b4f9 View commit details
    Browse the repository at this point in the history

  2. trigger CI

    @MohamadJaara
    MohamadJaara committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    0c202c8 View commit details
    Browse the repository at this point in the history

  3. detekt

    @MohamadJaara
    MohamadJaara committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    d81ffe2 View commit details
    Browse the repository at this point in the history

  4. add test

    @MohamadJaara
    MohamadJaara committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    bb54ced View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feat/app-lock-setup-screen 

    # Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsScreen.kt
    @MohamadJaara
    MohamadJaara committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    28bd3de View commit details
    Browse the repository at this point in the history

  6. detekt

    @MohamadJaara
    MohamadJaara committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    e2854d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Update app/src/main/kotlin/com/wire/android/ui/home/appLock/SetLockCo… 

    …deScreen.kt

Co-authored-by: Alexandre Ferris <ferris.alexandre@gmail.com>
    @MohamadJaara @alexandreferris
    MohamadJaara and alexandreferris committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    e635dae View commit details
    Browse the repository at this point in the history

  2. missing import

    @MohamadJaara
    MohamadJaara committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    41b0230 View commit details
    Browse the repository at this point in the history

  3. remove hard codded string

    @MohamadJaara
    MohamadJaara committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    0b90eed View commit details
    Browse the repository at this point in the history