diff --git a/android/gradlew.bat b/android/gradlew.bat index e509b2d..c4bdd3a 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -1,93 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/ios/Ascently.xcodeproj/project.pbxproj b/ios/Ascently.xcodeproj/project.pbxproj index 0aa3495..e0ced57 100644 --- a/ios/Ascently.xcodeproj/project.pbxproj +++ b/ios/Ascently.xcodeproj/project.pbxproj @@ -460,7 +460,7 @@ D24C19742E75002A0045894C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = Icon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -474,14 +474,17 @@ INFOPLIST_KEY_CFBundleDisplayName = Ascently; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.sports"; INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES; - INFOPLIST_KEY_NSCameraUsageDescription = "Ascently needs camera access to take photos of climbing problems."; - INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Ascently needs access to your photo library to save and display climbing problem images."; + INFOPLIST_KEY_NSAppleMusicUsageDescription = "This app (optionally) needs access to your music library to play your selected playlist during climbing sessions."; + INFOPLIST_KEY_NSCameraUsageDescription = "This app needs access to your camera to take photos of climbing problems."; + INFOPLIST_KEY_NSHealthShareUsageDescription = "This app needs access to save your climbing workouts to Apple Health."; + INFOPLIST_KEY_NSHealthUpdateUsageDescription = "This app needs access to save your climbing workouts to Apple Health."; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "This app needs access to your photo library to add photos to climbing problems."; + INFOPLIST_KEY_NSSupportsLiveActivities = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 17.6; + INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait"; + IPHONEOS_DEPLOYMENT_TARGET = 18.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -498,7 +501,7 @@ SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 6.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 18.6; WATCHOS_DEPLOYMENT_TARGET = 11.6; XROS_DEPLOYMENT_TARGET = 2.6; @@ -508,7 +511,7 @@ D24C19752E75002A0045894C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = Icon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -522,14 +525,17 @@ INFOPLIST_KEY_CFBundleDisplayName = Ascently; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.sports"; INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES; - INFOPLIST_KEY_NSCameraUsageDescription = "Ascently needs camera access to take photos of climbing problems."; - INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Ascently needs access to your photo library to save and display climbing problem images."; + INFOPLIST_KEY_NSAppleMusicUsageDescription = "This app (optionally) needs access to your music library to play your selected playlist during climbing sessions."; + INFOPLIST_KEY_NSCameraUsageDescription = "This app needs access to your camera to take photos of climbing problems."; + INFOPLIST_KEY_NSHealthShareUsageDescription = "This app needs access to save your climbing workouts to Apple Health."; + INFOPLIST_KEY_NSHealthUpdateUsageDescription = "This app needs access to save your climbing workouts to Apple Health."; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "This app needs access to your photo library to add photos to climbing problems."; + INFOPLIST_KEY_NSSupportsLiveActivities = YES; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 17.6; + INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait"; + IPHONEOS_DEPLOYMENT_TARGET = 18.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -546,7 +552,7 @@ SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 6.0; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 18.6; WATCHOS_DEPLOYMENT_TARGET = 11.6; XROS_DEPLOYMENT_TARGET = 2.6; @@ -608,6 +614,7 @@ INFOPLIST_FILE = SessionStatusLive/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = SessionStatusLive; INFOPLIST_KEY_NSHumanReadableCopyright = ""; + IPHONEOS_DEPLOYMENT_TARGET = 18.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -638,6 +645,7 @@ INFOPLIST_FILE = SessionStatusLive/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = SessionStatusLive; INFOPLIST_KEY_NSHumanReadableCopyright = ""; + IPHONEOS_DEPLOYMENT_TARGET = 18.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate b/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate index 66068d0..185b696 100644 Binary files a/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 428b184..0000000 --- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "images": [ - { - "filename": "app_icon_1024.png", - "idiom": "universal", - "platform": "ios", - "size": "1024x1024" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "dark" - } - ], - "filename": "app_icon_1024_dark.png", - "idiom": "universal", - "platform": "ios", - "size": "1024x1024" - }, - { - "appearances": [ - { - "appearance": "luminosity", - "value": "tinted" - } - ], - "filename": "app_icon_1024_tinted.png", - "idiom": "universal", - "platform": "ios", - "size": "1024x1024" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png deleted file mode 100644 index 3b0ddfc..0000000 Binary files a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and /dev/null differ diff --git a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_dark.png b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_dark.png deleted file mode 100644 index 6463d95..0000000 Binary files a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_dark.png and /dev/null differ diff --git a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_tinted.png b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_tinted.png deleted file mode 100644 index 64ebcc1..0000000 Binary files a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_tinted.png and /dev/null differ diff --git a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_dark_template.svg b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_dark_template.svg deleted file mode 100644 index 4ada200..0000000 --- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_dark_template.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_light_template.svg b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_light_template.svg deleted file mode 100644 index de57d76..0000000 --- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_light_template.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_tinted_template.svg b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_tinted_template.svg deleted file mode 100644 index e00f524..0000000 --- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_tinted_template.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/ios/Ascently/Balls.icon/Assets/AscentlyBlueBall.png b/ios/Ascently/Balls.icon/Assets/AscentlyBlueBall.png new file mode 100644 index 0000000..cecb942 Binary files /dev/null and b/ios/Ascently/Balls.icon/Assets/AscentlyBlueBall.png differ diff --git a/ios/Ascently/Balls.icon/Assets/AscentlyGreenBall.png b/ios/Ascently/Balls.icon/Assets/AscentlyGreenBall.png new file mode 100644 index 0000000..64e8a09 Binary files /dev/null and b/ios/Ascently/Balls.icon/Assets/AscentlyGreenBall.png differ diff --git a/ios/Ascently/Balls.icon/Assets/AscentlyRedBall.png b/ios/Ascently/Balls.icon/Assets/AscentlyRedBall.png new file mode 100644 index 0000000..83a444e Binary files /dev/null and b/ios/Ascently/Balls.icon/Assets/AscentlyRedBall.png differ diff --git a/ios/Ascently/Balls.icon/Assets/AscentlyYellowBall.png b/ios/Ascently/Balls.icon/Assets/AscentlyYellowBall.png new file mode 100644 index 0000000..9682362 Binary files /dev/null and b/ios/Ascently/Balls.icon/Assets/AscentlyYellowBall.png differ diff --git a/ios/Ascently/Balls.icon/icon.json b/ios/Ascently/Balls.icon/icon.json new file mode 100644 index 0000000..17433ed --- /dev/null +++ b/ios/Ascently/Balls.icon/icon.json @@ -0,0 +1,67 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "image-name" : "AscentlyRedBall.png", + "name" : "AscentlyRedBall", + "position" : { + "scale" : 0.4, + "translation-in-points" : [ + 90.60312499999992, + 127.86484375000009 + ] + } + }, + { + "image-name" : "AscentlyYellowBall.png", + "name" : "AscentlyYellowBall", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + 90.50312500000001, + -177.66484375 + ] + } + }, + { + "image-name" : "AscentlyBlueBall.png", + "name" : "AscentlyBlueBall", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + -138.20312500000006, + 177.3648437500001 + ] + } + }, + { + "image-name" : "AscentlyGreenBall.png", + "name" : "AscentlyGreenBall", + "position" : { + "scale" : 0.2, + "translation-in-points" : [ + -138.30312499999997, + -43.08515625000001 + ] + } + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/ios/Ascently/Icon.icon/Assets/AscetlyTriangle1.png b/ios/Ascently/Icon.icon/Assets/AscetlyTriangle1.png new file mode 100644 index 0000000..bde2a56 Binary files /dev/null and b/ios/Ascently/Icon.icon/Assets/AscetlyTriangle1.png differ diff --git a/ios/Ascently/Icon.icon/Assets/AscetlyTriangle2.png b/ios/Ascently/Icon.icon/Assets/AscetlyTriangle2.png new file mode 100644 index 0000000..544a1e9 Binary files /dev/null and b/ios/Ascently/Icon.icon/Assets/AscetlyTriangle2.png differ diff --git a/ios/Ascently/Icon.icon/icon.json b/ios/Ascently/Icon.icon/icon.json new file mode 100644 index 0000000..2d90f1c --- /dev/null +++ b/ios/Ascently/Icon.icon/icon.json @@ -0,0 +1,45 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "image-name" : "AscetlyTriangle2.png", + "name" : "AscetlyTriangle2", + "position" : { + "scale" : 0.75, + "translation-in-points" : [ + 108, + -53.8125 + ] + } + }, + { + "image-name" : "AscetlyTriangle1.png", + "name" : "AscetlyTriangle1", + "position" : { + "scale" : 0.5, + "translation-in-points" : [ + -215, + 39.9375 + ] + } + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/ios/Ascently/Info.plist b/ios/Ascently/Info.plist index f0d3170..ff579a6 100644 --- a/ios/Ascently/Info.plist +++ b/ios/Ascently/Info.plist @@ -4,18 +4,5 @@ UIFileSharingEnabled - NSSupportsLiveActivities - - - NSPhotoLibraryUsageDescription - This app needs access to your photo library to add photos to climbing problems. - NSCameraUsageDescription - This app needs access to your camera to take photos of climbing problems. - NSHealthShareUsageDescription - This app needs access to save your climbing workouts to Apple Health. - NSHealthUpdateUsageDescription - This app needs access to save your climbing workouts to Apple Health. - NSAppleMusicUsageDescription - This app (optionally) needs access to your music library to play your selected playlist during climbing sessions.