diff --git a/export_presets.cfg b/export_presets.cfg
index 32ac57e..f575fcd 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -3,6 +3,7 @@
name="Android"
platform="Android"
runnable=true
+advanced_options=false
dedicated_server=false
custom_features=""
export_filter="all_resources"
@@ -13,12 +14,16 @@ encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
+script_export_mode=2
[preset.0.options]
custom_template/debug=""
custom_template/release=""
gradle_build/use_gradle_build=false
+gradle_build/gradle_build_directory=""
+gradle_build/android_source_template=""
+gradle_build/compress_native_libraries=false
gradle_build/export_format=0
gradle_build/min_sdk=""
gradle_build/target_sdk=""
@@ -209,31 +214,35 @@ dotnet/embed_build_outputs=false
name="Web"
platform="Web"
runnable=true
+advanced_options=false
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
-export_path=""
+export_path="build/Talkpal.html"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
+script_export_mode=2
[preset.1.options]
custom_template/debug=""
custom_template/release=""
variant/extensions_support=false
-vram_texture_compression/for_desktop=true
-vram_texture_compression/for_mobile=false
+variant/thread_support=false
+vram_texture_compression/for_desktop=false
+vram_texture_compression/for_mobile=true
html/export_icon=true
html/custom_html_shell=""
html/head_include=""
html/canvas_resize_policy=2
html/focus_canvas_on_start=true
html/experimental_virtual_keyboard=false
-progressive_web_app/enabled=false
+progressive_web_app/enabled=true
+progressive_web_app/ensure_cross_origin_isolation_headers=true
progressive_web_app/offline_page=""
progressive_web_app/display=1
progressive_web_app/orientation=0
diff --git a/project.godot b/project.godot
index e81f3ab..426d818 100644
--- a/project.godot
+++ b/project.godot
@@ -12,7 +12,7 @@ config_version=5
config/name="Talkpal"
run/main_scene="res://scenes/main/main_tablet.tscn"
-config/features=PackedStringArray("4.2", "GL Compatibility")
+config/features=PackedStringArray("4.3", "GL Compatibility")
boot_splash/bg_color=Color(0.800491, 0.800491, 0.800491, 1)
boot_splash/image="res://assets/comfortel_logo.png"
config/icon="res://assets/comfortel_logo.png"
@@ -27,11 +27,12 @@ uuid="*res://addons/uuid/uuid.gd"
[display]
-window/size/viewport_width=1920
+window/size/viewport_width=1200
window/size/viewport_height=1000
window/stretch/mode="viewport"
-window/stretch/aspect="keep_width"
+window/stretch/aspect="expand"
window/handheld/orientation=1
+window/vsync/vsync_mode=0
[dotnet]
diff --git a/scenes/common/edit_field.tscn b/scenes/common/edit_field.tscn
index 6413242..cc8b805 100644
--- a/scenes/common/edit_field.tscn
+++ b/scenes/common/edit_field.tscn
@@ -34,6 +34,7 @@ text = " "
layout_mode = 2
size_flags_horizontal = 3
theme = ExtResource("2_iq8f3")
+max_length = 32
[node name="Text" type="TextEdit" parent="."]
visible = false
diff --git a/scenes/common/time/time_edit.tscn b/scenes/common/time/time_edit.tscn
index 3ba82cb..5e6ec5a 100644
--- a/scenes/common/time/time_edit.tscn
+++ b/scenes/common/time/time_edit.tscn
@@ -14,7 +14,7 @@ script = ExtResource("1_2wxyg")
[node name="TimeEdit" type="LineEdit" parent="."]
visible = false
layout_mode = 2
-text = "12:07 "
+text = "1:34 "
placeholder_text = "hh:mm (a/p)m"
script = ExtResource("2_7d4ae")
current_time = true
diff --git a/scenes/main/main_tablet.gd b/scenes/main/main_tablet.gd
index 01d6194..f4ac8d9 100644
--- a/scenes/main/main_tablet.gd
+++ b/scenes/main/main_tablet.gd
@@ -107,7 +107,8 @@ func load_page(value, with_update=true):
_pages[_current_page].visible = false
if _previous_page != _current_page:
- _previous_page = _current_page
+ if not _current_page == Pages.TimeSetting:
+ _previous_page = _current_page
_current_page = value
if with_update:
diff --git a/scenes/main/main_tablet.tscn b/scenes/main/main_tablet.tscn
index 8ffecc5..4d68879 100644
--- a/scenes/main/main_tablet.tscn
+++ b/scenes/main/main_tablet.tscn
@@ -46,6 +46,7 @@ grow_vertical = 2
[node name="Pages" type="BoxContainer" parent="Left"]
custom_minimum_size = Vector2(1200, 0)
layout_mode = 2
+size_flags_horizontal = 3
[node name="Board" parent="Left/Pages" instance=ExtResource("2_n47h4")]
layout_mode = 2
@@ -69,14 +70,14 @@ size_flags_horizontal = 10
size_flags_vertical = 0
[node name="Indent" type="BoxContainer" parent="Left/TimeStatusContainer"]
-custom_minimum_size = Vector2(0, 206.667)
+custom_minimum_size = Vector2(0, 207.333)
layout_mode = 2
size_flags_vertical = 3
[node name="TimeLabel" type="Label" parent="Left/TimeStatusContainer"]
layout_mode = 2
theme = ExtResource("5_atujq")
-text = "16:21"
+text = "01:38"
horizontal_alignment = 1
[node name="StatusLabel" type="Label" parent="Left/TimeStatusContainer"]
diff --git a/scenes/reservation/reservation_page.gd b/scenes/reservation/reservation_page.gd
index 8edd3fa..9848919 100644
--- a/scenes/reservation/reservation_page.gd
+++ b/scenes/reservation/reservation_page.gd
@@ -114,10 +114,10 @@ func _delete_reservation():
func _fields_are_correct():
var successful := true
- if len(_title_field.get_value()) < 1:
- print("The title is not entered.")
- _error_box.set_message("Не введено название встречи")
- successful = false
+ #if len(_title_field.get_value()) < 1:
+ # print("The title is not entered.")
+ # _error_box.set_message("Не введено название встречи")
+ # successful = false
if not _time_is_correct():
successful = false