Remove remaining gift modal and custom Friends references
This commit is contained in:
1 parent
989f484068
commit
f9c12273e1
4 files changed
+5
-8
No files matched your search
@@ -385,9 +385,8 @@ app_update_draw :: (vapp: *void, viewport: Rectangle) {
|
||||
app_profile_record_habits(profile_habits_start)
|
||||
profile_sync_start = app_profile_now()
|
||||
if DewAvailable() {
|
||||
// The balance stays current on the Profile overview and while a gift is chosen.
|
||||
dew_visible := (app.breathing.screen == ScreenProfile && app.profile_tab == PROFILE_TAB_OVERVIEW) ||
|
||||
(app.modal.active != 0 && app.modal.type == cast(ModalType)ModalDewGift)
|
||||
// The balance stays current on the Profile overview.
|
||||
dew_visible := app.breathing.screen == ScreenProfile && app.profile_tab == PROFILE_TAB_OVERVIEW
|
||||
DewTick(dew_visible, GetTime())
|
||||
DewRewardsTick()
|
||||
if DewTakeSyncRequest() {
|
||||
|
||||
@@ -242,8 +242,7 @@ updateapp :: (app: *InnerBreeze) {
|
||||
back_requested := IsKeyPressed(APP_KEY_BACK) ||
|
||||
((app.launcher_open || app.breathing.screen == ScreenNodeApp || (app.modal.active != 0 &&
|
||||
(app.modal.type == cast(ModalType)ModalStoragePlans ||
|
||||
app.modal.type == cast(ModalType)ModalDewTopUp ||
|
||||
app.modal.type == cast(ModalType)ModalDewGift))) && escape_requested)
|
||||
app.modal.type == cast(ModalType)ModalDewTopUp))) && escape_requested)
|
||||
#if !#defined(ANDROID_BUILD) && !#defined(PLATFORM_WEB) {
|
||||
if IsKeyPressed(KEY_BACKSPACE) && ((app.breathing.screen == ScreenStart && app.practice_tab != PRACTICE_TAB_PLAY) || app.breathing.screen == ScreenSession || app.breathing.screen == ScreenMeditation || app.breathing.screen == ScreenSunSalutation || app.breathing.screen == ScreenPatterns || app.breathing.screen == ScreenTaiChi || app.breathing.screen == ScreenAstralProjection || app.breathing.screen == ScreenWorkout) {
|
||||
back_requested = true
|
||||
|
||||
@@ -33,7 +33,7 @@ app_background_sync_safe :: (app: *InnerBreeze) -> s32 {
|
||||
return ifx BackgroundSyncSafeFields(
|
||||
app.modal.active, app.habit_edit.active,
|
||||
app.sync_server_url_focused, app.sync_alias_focused,
|
||||
app.profile_friend_input_focused, app.breathing.screen,
|
||||
app.breathing.screen,
|
||||
app_visible_practice_screen(app), SyncOnFrameThread()) then 1 else 0
|
||||
}
|
||||
|
||||
|
||||
@@ -38,14 +38,13 @@ BackgroundSyncSafe :: (state: SyncSafetyState) -> bool {
|
||||
|
||||
BackgroundSyncSafeFields :: (modal_active: s32, habit_edit_active: s32,
|
||||
server_url_focused: s32, alias_focused: s32,
|
||||
friend_input_focused: s32, screen: s32, practice_screen: s32,
|
||||
screen: s32, practice_screen: s32,
|
||||
frame_thread_transport: bool) -> bool {
|
||||
state: SyncSafetyState
|
||||
state.modal_active = modal_active
|
||||
state.habit_edit_active = habit_edit_active
|
||||
state.server_url_focused = server_url_focused
|
||||
state.alias_focused = alias_focused
|
||||
state.friend_input_focused = friend_input_focused
|
||||
state.screen = screen
|
||||
state.practice_screen = practice_screen
|
||||
state.frame_thread_transport = frame_thread_transport
|
||||
|
||||
Reference in new issue
Block a user