From 94b8fc82d6be069efe30e5c1f30b5a17924f6bb9 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Thu, 18 May 2023 19:50:19 -0700 Subject: [PATCH] Add sync page --- app/src/main/assets/styles.css | 12 +++- app/src/main/assets/sync.html | 55 +++++++++++++++++++ app/src/main/assets/waiting.html | 17 ------ app/src/main/assets/welcome.html | 8 ++- app/src/main/java/gallery/memories/NativeX.kt | 7 +++ .../memories/service/AccountService.kt | 8 +-- 6 files changed, 82 insertions(+), 25 deletions(-) create mode 100644 app/src/main/assets/sync.html delete mode 100644 app/src/main/assets/waiting.html diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css index 667ccc52..5aedd3bf 100644 --- a/app/src/main/assets/styles.css +++ b/app/src/main/assets/styles.css @@ -26,7 +26,15 @@ body { text-align: center; } -p { +.animatable { + transition: opacity 0.7s ease-in-out, transform 0.7s ease-in-out; +} +.invisible { + transform: translateY(10px); + opacity: 0; +} + +p, div.p { color: white; margin-bottom: 30px; line-height: 1.5em;; @@ -78,6 +86,7 @@ input.m-input:focus { border: none; border-radius: 20px; cursor: pointer; + text-decoration: none; transition: background-color 0.3s ease-in-out; } @@ -90,7 +99,6 @@ input.m-input:focus { .m-button.link { background-color: unset; color: var(--fg-color); - text-decoration: none; } .login-button { diff --git a/app/src/main/assets/sync.html b/app/src/main/assets/sync.html new file mode 100644 index 00000000..a1ade84c --- /dev/null +++ b/app/src/main/assets/sync.html @@ -0,0 +1,55 @@ + + + + + Memories + + + + +
+ +

+ Waiting for login to complete
+ Keep this page open in the background +

+ + +
+ + + + \ No newline at end of file diff --git a/app/src/main/assets/waiting.html b/app/src/main/assets/waiting.html deleted file mode 100644 index 4046aff9..00000000 --- a/app/src/main/assets/waiting.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Memories - - - - -
- -

- Waiting for login to complete
- Keep this page open in the background -

- - \ No newline at end of file diff --git a/app/src/main/assets/welcome.html b/app/src/main/assets/welcome.html index 569b4d89..99a57122 100644 --- a/app/src/main/assets/welcome.html +++ b/app/src/main/assets/welcome.html @@ -7,7 +7,7 @@ -
+