From 4940135140fe6ae460aad637b604db430b58bf49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=97=D0=BB=20=D0=93=D1=80=D0=B8?= =?UTF-8?q?=D0=B3=D0=BE=D1=80=27=D1=94=D0=B2?= Date: Thu, 20 Jun 2024 16:09:43 +0300 Subject: [PATCH] Remove some mobile-web code --- src/css/main.scss | 1 - src/css/states/mobile_warning.scss | 51 ------------------------------ src/html/index.html | 11 ------- src/js/application.js | 24 +++++--------- src/js/states/mobile_warning.js | 32 ------------------- 5 files changed, 8 insertions(+), 111 deletions(-) delete mode 100644 src/css/states/mobile_warning.scss delete mode 100644 src/js/states/mobile_warning.js diff --git a/src/css/main.scss b/src/css/main.scss index 155b9b95..a461d7e3 100644 --- a/src/css/main.scss +++ b/src/css/main.scss @@ -25,7 +25,6 @@ @import "states/keybindings"; @import "states/settings"; @import "states/about"; -@import "states/mobile_warning"; @import "states/changelog"; @import "states/puzzle_menu"; @import "states/mods"; diff --git a/src/css/states/mobile_warning.scss b/src/css/states/mobile_warning.scss deleted file mode 100644 index d4c9a9a8..00000000 --- a/src/css/states/mobile_warning.scss +++ /dev/null @@ -1,51 +0,0 @@ -#state_MobileWarningState { - display: flex; - align-items: center; - background: #555b75 !important; - @include S(padding, 20px); - box-sizing: border-box; - justify-content: center; - flex-direction: column; - - .logo { - width: 80%; - max-width: 200px; - margin-bottom: 10px; - } - - p { - color: rgba(#fff, 0.5); - display: block; - margin-bottom: 13px; - font-size: 16px; - line-height: 20px; - max-width: 300px; - text-align: left; - a { - color: $colorBlueBright; - } - } - - .standaloneLink { - width: 200px; - height: 48px; - min-height: 40px; - & { - background: #000 uiResource("steam_link_btn/0.png") center center / contain no-repeat; - } - display: block; - text-indent: -999em; - cursor: pointer; - margin-top: 10px; - pointer-events: all; - transition: all 0.12s ease-in; - transition-property: opacity, transform; - @include S(border-radius, $globalBorderRadius); - overflow: hidden; - - &:hover { - transform: skewX(-1deg) scale(1.02); - opacity: 0.9; - } - } -} diff --git a/src/html/index.html b/src/html/index.html index da67db6d..c0b9d40d 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -3,17 +3,6 @@ shapez - - - - - - - - diff --git a/src/js/application.js b/src/js/application.js index 9ef2338b..4e04e9c7 100644 --- a/src/js/application.js +++ b/src/js/application.js @@ -1,6 +1,5 @@ import { AnimationFrame } from "./core/animation_frame"; import { BackgroundResourcesLoader } from "./core/background_resources_loader"; -import { IS_MOBILE } from "./core/config"; import { GameState } from "./core/game_state"; import { GLOBAL_APP, setGlobalApp } from "./core/globals"; import { InputDistributor } from "./core/input_distributor"; @@ -10,6 +9,9 @@ import { StateManager } from "./core/state_manager"; import { TrackedState } from "./core/tracked_state"; import { getPlatformName, waitNextFrame } from "./core/utils"; import { Vector } from "./core/vector"; +import { MOD_SIGNALS } from "./mods/mod_signals"; +import { MODS } from "./mods/modloader"; +import { ClientAPI } from "./platform/api"; import { NoAchievementProvider } from "./platform/no_achievement_provider"; import { Sound } from "./platform/sound"; import { Storage } from "./platform/storage"; @@ -20,16 +22,12 @@ import { AboutState } from "./states/about"; import { ChangelogState } from "./states/changelog"; import { InGameState } from "./states/ingame"; import { KeybindingsState } from "./states/keybindings"; -import { MainMenuState } from "./states/main_menu"; -import { MobileWarningState } from "./states/mobile_warning"; -import { PreloadState } from "./states/preload"; -import { SettingsState } from "./states/settings"; -import { PuzzleMenuState } from "./states/puzzle_menu"; -import { ClientAPI } from "./platform/api"; import { LoginState } from "./states/login"; -import { MODS } from "./mods/modloader"; -import { MOD_SIGNALS } from "./mods/mod_signals"; +import { MainMenuState } from "./states/main_menu"; import { ModsState } from "./states/mods"; +import { PreloadState } from "./states/preload"; +import { PuzzleMenuState } from "./states/puzzle_menu"; +import { SettingsState } from "./states/settings"; /** * @typedef {import("./platform/achievement_provider").AchievementProviderInterface} AchievementProviderInterface @@ -125,12 +123,7 @@ export class Application { Loader.linkAppAfterBoot(this); - // Check for mobile - if (IS_MOBILE) { - this.stateMgr.moveToState("MobileWarningState"); - } else { - this.stateMgr.moveToState("PreloadState"); - } + this.stateMgr.moveToState("PreloadState"); // Starting rendering this.ticker.frameEmitted.add(this.onFrameEmitted, this); @@ -149,7 +142,6 @@ export class Application { /** @type {Array} */ const states = [ PreloadState, - MobileWarningState, MainMenuState, InGameState, SettingsState, diff --git a/src/js/states/mobile_warning.js b/src/js/states/mobile_warning.js deleted file mode 100644 index 208f03cb..00000000 --- a/src/js/states/mobile_warning.js +++ /dev/null @@ -1,32 +0,0 @@ -import { GameState } from "../core/game_state"; - -export class MobileWarningState extends GameState { - constructor() { - super("MobileWarningState"); - } - - getInnerHTML() { - return ` - - - -

I'm sorry, but shapez.io is not available on mobile devices yet!

-

If you have a desktop device, you can get shapez on Steam:

- - - Play on Steam! - `; - } - - getThemeMusic() { - return null; - } - - getHasFadeIn() { - return false; - } - - onLeave() { - // this.dialogs.cleanup(); - } -}