Skip to content

Commit d8e15ad

Browse files
committed
Updated demo app to show correct image & cleanup.
1 parent 9ba7eb9 commit d8e15ad

File tree

7 files changed

+112
-33
lines changed

7 files changed

+112
-33
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
demo/.godot/
66
demo/addons/
77
demo/android/
8+
demo/ios/
89
android/.idea/

android/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ lint/tmp/
9292
# Godot
9393
.godot/
9494
*.import
95-
demo/addons
96-
demo/android
9795

9896
# Mac OS
9997
.DS_Store

demo/Main.gd

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,24 @@ extends Node
1010
@onready var share: Share = $Share as Share
1111
@onready var _text_edit: TextEdit = $CanvasLayer/CenterContainer/VBoxContainer/VBoxContainer/TextEdit as TextEdit
1212
@onready var _label: RichTextLabel = $CanvasLayer/CenterContainer/VBoxContainer/RichTextLabel as RichTextLabel
13-
@onready var _texture_rect: TextureRect = $CanvasLayer/CenterContainer/VBoxContainer/TextureRect as TextureRect
13+
@onready var _android_texture_rect: TextureRect = $CanvasLayer/CenterContainer/VBoxContainer/HBoxContainer/AndroidTextureRect as TextureRect
14+
@onready var _ios_texture_rect: TextureRect = $CanvasLayer/CenterContainer/VBoxContainer/HBoxContainer/iOSTextureRect as TextureRect
15+
16+
var _active_texture_rect: TextureRect
17+
18+
19+
func _ready() -> void:
20+
if OS.has_feature("ios"):
21+
_android_texture_rect.hide()
22+
_active_texture_rect = _ios_texture_rect
23+
else:
24+
_ios_texture_rect.hide()
25+
_active_texture_rect = _android_texture_rect
1426

1527

1628
func _on_share_texture_button_pressed() -> void:
1729
_print_to_screen("Sharing texture")
18-
share.share_texture(_texture_rect.texture, shared_title, shared_subject, _text_edit.text)
30+
share.share_texture(_active_texture_rect.texture, shared_title, shared_subject, _text_edit.text)
1931

2032

2133
func _on_share_viewport_button_pressed() -> void:

demo/Main.tscn

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
[gd_scene load_steps=4 format=3 uid="uid://l8x26cvum7uc"]
1+
[gd_scene load_steps=5 format=3 uid="uid://l8x26cvum7uc"]
22

33
[ext_resource type="Script" uid="uid://bs7h6e1sy3ff2" path="res://Main.gd" id="1_2cf00"]
44
[ext_resource type="Texture2D" uid="uid://m4tg7rfoxxbk" path="res://assets/share-android.png" id="2_gmsde"]
5-
[ext_resource type="Script" uid="uid://d212h0bxswm4c" path="res://addons/SharePlugin/Share.gd" id="3_i1lxr"]
5+
[ext_resource type="Texture2D" uid="uid://dxo8m44hy2ln1" path="res://assets/share-ios.png" id="3_cm0pq"]
6+
[ext_resource type="Script" uid="uid://crex1flhfi0wt" path="res://addons/SharePlugin/Share.gd" id="3_i1lxr"]
67

78
[node name="Main" type="Node"]
89
script = ExtResource("1_2cf00")
@@ -20,13 +21,24 @@ grow_vertical = 2
2021
layout_mode = 2
2122
theme_override_constants/separation = 20
2223

23-
[node name="TextureRect" type="TextureRect" parent="CanvasLayer/CenterContainer/VBoxContainer"]
24+
[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/CenterContainer/VBoxContainer"]
25+
layout_mode = 2
26+
size_flags_horizontal = 4
27+
28+
[node name="AndroidTextureRect" type="TextureRect" parent="CanvasLayer/CenterContainer/VBoxContainer/HBoxContainer"]
2429
custom_minimum_size = Vector2(0, 128)
2530
layout_mode = 2
2631
texture = ExtResource("2_gmsde")
2732
expand_mode = 3
2833
stretch_mode = 5
2934

35+
[node name="iOSTextureRect" type="TextureRect" parent="CanvasLayer/CenterContainer/VBoxContainer/HBoxContainer"]
36+
custom_minimum_size = Vector2(0, 128)
37+
layout_mode = 2
38+
texture = ExtResource("3_cm0pq")
39+
expand_mode = 3
40+
stretch_mode = 5
41+
3042
[node name="Label" type="Label" parent="CanvasLayer/CenterContainer/VBoxContainer"]
3143
layout_mode = 2
3244
theme_override_font_sizes/font_size = 24

demo/export_presets.cfg

Lines changed: 81 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,32 @@
33
name="Android"
44
platform="Android"
55
runnable=true
6+
advanced_options=false
67
dedicated_server=false
78
custom_features=""
89
export_filter="all_resources"
910
include_filter=""
1011
exclude_filter=""
1112
export_path=""
13+
patches=PackedStringArray()
1214
encryption_include_filters=""
1315
encryption_exclude_filters=""
16+
seed=0
1417
encrypt_pck=false
1518
encrypt_directory=false
19+
script_export_mode=2
1620

1721
[preset.0.options]
1822

1923
custom_template/debug=""
2024
custom_template/release=""
2125
gradle_build/use_gradle_build=true
26+
gradle_build/gradle_build_directory=""
27+
gradle_build/android_source_template=""
2228
gradle_build/export_format=0
2329
gradle_build/min_sdk=""
2430
gradle_build/target_sdk=""
31+
gradle_build/custom_theme_attributes={}
2532
architectures/armeabi-v7a=false
2633
architectures/arm64-v8a=true
2734
architectures/x86=false
@@ -40,13 +47,17 @@ package/show_as_launcher_app=false
4047
launcher_icons/main_192x192=""
4148
launcher_icons/adaptive_foreground_432x432=""
4249
launcher_icons/adaptive_background_432x432=""
50+
launcher_icons/adaptive_monochrome_432x432=""
4351
graphics/opengl_debug=false
52+
shader_baker/enabled=false
4453
xr_features/xr_mode=0
54+
gesture/swipe_to_dismiss=false
4555
screen/immersive_mode=true
4656
screen/support_small=true
4757
screen/support_normal=true
4858
screen/support_large=true
4959
screen/support_xlarge=true
60+
screen/edge_to_edge=false
5061
user_data_backup/allow=false
5162
command_line/extra_args=""
5263
apk_expansion/enable=false
@@ -57,6 +68,7 @@ permissions/access_checkin_properties=false
5768
permissions/access_coarse_location=false
5869
permissions/access_fine_location=false
5970
permissions/access_location_extra_commands=false
71+
permissions/access_media_location=false
6072
permissions/access_mock_location=false
6173
permissions/access_network_state=false
6274
permissions/access_surface_flinger=false
@@ -134,6 +146,7 @@ permissions/mount_format_filesystems=false
134146
permissions/mount_unmount_filesystems=false
135147
permissions/nfc=false
136148
permissions/persistent_activity=false
149+
permissions/post_notifications=false
137150
permissions/process_outgoing_calls=false
138151
permissions/read_calendar=false
139152
permissions/read_call_log=false
@@ -143,6 +156,10 @@ permissions/read_frame_buffer=false
143156
permissions/read_history_bookmarks=false
144157
permissions/read_input_state=false
145158
permissions/read_logs=false
159+
permissions/read_media_audio=false
160+
permissions/read_media_images=false
161+
permissions/read_media_video=false
162+
permissions/read_media_visual_user_selected=false
146163
permissions/read_phone_state=false
147164
permissions/read_profile=false
148165
permissions/read_sms=false
@@ -211,9 +228,11 @@ custom_features=""
211228
export_filter="all_resources"
212229
include_filter=""
213230
exclude_filter=""
214-
export_path="../../../Xcode/share_demo/Share Demo.ipa"
231+
export_path="../../../../Xcode/plugin/share_demo/Share Demo.ipa"
232+
patches=PackedStringArray()
215233
encryption_include_filters=""
216234
encryption_exclude_filters=""
235+
seed=0
217236
encrypt_pck=false
218237
encrypt_directory=false
219238
script_export_mode=2
@@ -225,25 +244,28 @@ custom_template/release=""
225244
architectures/arm64=true
226245
application/app_store_team_id="GODOTTEAM1"
227246
application/code_sign_identity_debug=""
228-
application/export_method_debug=1
229247
application/code_sign_identity_release=""
248+
application/provisioning_profile_specifier_debug=""
249+
application/provisioning_profile_specifier_release=""
230250
application/export_method_release=0
231-
application/targeted_device_family=2
232251
application/bundle_identifier="org.godotengine.share.demo"
233252
application/signature=""
234253
application/short_version=""
235254
application/version=""
236-
application/min_ios_version="12.0"
237255
application/additional_plist_content=""
238256
application/icon_interpolation=4
239257
application/export_project_only=false
240258
application/delete_old_export_files_unconditionally=false
241-
application/generate_simulator_library_if_missing=true
242259
plugins/SharePlugin=true
260+
entitlements/increased_memory_limit=false
261+
entitlements/game_center=false
262+
entitlements/push_notifications="Disabled"
263+
entitlements/additional=""
243264
capabilities/access_wifi=false
244-
capabilities/push_notifications=false
245265
capabilities/performance_gaming_tier=false
246266
capabilities/performance_a12=false
267+
capabilities/additional=PackedStringArray()
268+
shader_baker/enabled=false
247269
user_data/accessible_from_files_app=false
248270
user_data/accessible_from_itunes_sharing=false
249271
privacy/camera_usage_description=""
@@ -399,23 +421,68 @@ privacy/collected_data/other_data_types/collected=false
399421
privacy/collected_data/other_data_types/linked_to_user=false
400422
privacy/collected_data/other_data_types/used_for_tracking=false
401423
privacy/collected_data/other_data_types/collection_purposes=0
402-
icons/iphone_120x120=""
403-
icons/iphone_180x180="res://assets/180.png"
404-
icons/ipad_76x76=""
405-
icons/ipad_152x152=""
406-
icons/ipad_167x167="res://assets/167.png"
407-
icons/app_store_1024x1024="res://assets/1024.png"
408-
icons/spotlight_40x40=""
409-
icons/spotlight_80x80="res://assets/80.png"
424+
icons/icon_1024x1024=""
425+
icons/icon_1024x1024_dark=""
426+
icons/icon_1024x1024_tinted=""
410427
icons/settings_58x58=""
428+
icons/settings_58x58_dark=""
429+
icons/settings_58x58_tinted=""
411430
icons/settings_87x87="res://assets/87.png"
431+
icons/settings_87x87_dark=""
432+
icons/settings_87x87_tinted=""
412433
icons/notification_40x40=""
434+
icons/notification_40x40_dark=""
435+
icons/notification_40x40_tinted=""
413436
icons/notification_60x60="res://assets/60.png"
437+
icons/notification_60x60_dark=""
438+
icons/notification_60x60_tinted=""
439+
icons/notification_76x76=""
440+
icons/notification_76x76_dark=""
441+
icons/notification_76x76_tinted=""
442+
icons/notification_114x114=""
443+
icons/notification_114x114_dark=""
444+
icons/notification_114x114_tinted=""
445+
icons/spotlight_80x80="res://assets/80.png"
446+
icons/spotlight_80x80_dark=""
447+
icons/spotlight_80x80_tinted=""
448+
icons/spotlight_120x120=""
449+
icons/spotlight_120x120_dark=""
450+
icons/spotlight_120x120_tinted=""
451+
icons/iphone_120x120=""
452+
icons/iphone_120x120_dark=""
453+
icons/iphone_120x120_tinted=""
454+
icons/iphone_180x180="res://assets/180.png"
455+
icons/iphone_180x180_dark=""
456+
icons/iphone_180x180_tinted=""
457+
icons/ipad_167x167="res://assets/167.png"
458+
icons/ipad_167x167_dark=""
459+
icons/ipad_167x167_tinted=""
460+
icons/ipad_152x152=""
461+
icons/ipad_152x152_dark=""
462+
icons/ipad_152x152_tinted=""
463+
icons/ios_128x128=""
464+
icons/ios_128x128_dark=""
465+
icons/ios_128x128_tinted=""
466+
icons/ios_192x192=""
467+
icons/ios_192x192_dark=""
468+
icons/ios_192x192_tinted=""
469+
icons/ios_136x136=""
470+
icons/ios_136x136_dark=""
471+
icons/ios_136x136_tinted=""
472+
icons/app_store_1024x1024="res://assets/1024.png"
473+
icons/app_store_1024x1024_dark=""
474+
icons/app_store_1024x1024_tinted=""
475+
application/targeted_device_family=2
476+
application/min_ios_version="12.0"
414477
storyboard/image_scale_mode=0
415478
storyboard/custom_image@2x=""
416479
storyboard/custom_image@3x=""
417480
storyboard/use_custom_bg_color=false
418481
storyboard/custom_bg_color=Color(0, 0, 0, 1)
482+
application/generate_simulator_library_if_missing=true
483+
capabilities/push_notifications=false
484+
icons/ipad_76x76=""
485+
icons/spotlight_40x40=""
419486
application/launch_screens_interpolation=4
420487
storyboard/use_launch_screen_storyboard=true
421488
landscape_launch_screens/iphone_2436x1125=""

ios/.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ DerivedData/
4141
*.svg.import
4242

4343
# project specific
44-
bin/*
44+
build/
4545
godot/
4646
Pods/
4747
Podfile.lock
48-
49-
# Plugin-specific
50-
demo/addons/
51-
demo/ios/

ios/.gitmodules

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)