diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index e87f432..575fa83 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -16,8 +16,8 @@ android { applicationId = "com.atridad.ascently" minSdk = 31 targetSdk = 36 - versionCode = 42 - versionName = "2.1.0" + versionCode = 43 + versionName = "2.1.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/branding/generate.py b/branding/generate.py index 1a3974a..c4a2082 100755 --- a/branding/generate.py +++ b/branding/generate.py @@ -246,33 +246,26 @@ def main() -> None: with open(dst, "w") as f: f.write(content) - img_light = Image.new("RGBA", (1024, 1024), (255, 255, 255, 255)) + img_light = Image.new("RGB", (1024, 1024), (255, 255, 255)) draw_light = ImageDraw.Draw(img_light) - mask = Image.new("L", (1024, 1024), 0) - mask_draw = ImageDraw.Draw(mask) - mask_draw.rounded_rectangle((0, 0, 1024, 1024), radius=180, fill=255) scaled = scale_and_center(polygons, 1024, int(1024 * 0.7)) for poly in scaled: coords = [(x, y) for x, y in poly["coords"]] draw_light.polygon(coords, fill=poly["fill"]) - img_light.putalpha(mask) img_light.save(ios_assets / "app_icon_1024.png") - img_dark = Image.new("RGBA", (1024, 1024), (26, 26, 26, 255)) + img_dark = Image.new("RGB", (1024, 1024), (26, 26, 26)) draw_dark = ImageDraw.Draw(img_dark) for poly in scaled: coords = [(x, y) for x, y in poly["coords"]] draw_dark.polygon(coords, fill=poly["fill"]) - img_dark.putalpha(mask) img_dark.save(ios_assets / "app_icon_1024_dark.png") - img_tinted = Image.new("RGBA", (1024, 1024), (0, 0, 0, 0)) + img_tinted = Image.new("RGB", (1024, 1024), (0, 0, 0)) draw_tinted = ImageDraw.Draw(img_tinted) for i, poly in enumerate(scaled): coords = [(x, y) for x, y in poly["coords"]] - opacity = int(255 * (0.8 if i == 0 else 0.9)) - draw_tinted.polygon(coords, fill=(0, 0, 0, opacity)) - img_tinted.putalpha(mask) + draw_tinted.polygon(coords, fill=(0, 0, 0)) img_tinted.save(ios_assets / "app_icon_1024_tinted.png") print(" Android...") diff --git a/ios/Ascently.xcodeproj/project.pbxproj b/ios/Ascently.xcodeproj/project.pbxproj index 24ebef4..78e358c 100644 --- a/ios/Ascently.xcodeproj/project.pbxproj +++ b/ios/Ascently.xcodeproj/project.pbxproj @@ -465,7 +465,7 @@ CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = 4BC9Y2LL4B; DRIVERKIT_DEPLOYMENT_TARGET = 24.6; ENABLE_PREVIEWS = YES; @@ -487,7 +487,7 @@ "@executable_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 15.6; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -513,7 +513,7 @@ CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = 4BC9Y2LL4B; DRIVERKIT_DEPLOYMENT_TARGET = 24.6; ENABLE_PREVIEWS = YES; @@ -535,7 +535,7 @@ "@executable_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 15.6; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -602,7 +602,7 @@ ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = 4BC9Y2LL4B; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SessionStatusLive/Info.plist; @@ -613,7 +613,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -632,7 +632,7 @@ ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = 4BC9Y2LL4B; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SessionStatusLive/Info.plist; @@ -643,7 +643,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; 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 cf3346b..597b85f 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/app_icon_1024.png b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 79d1104..3b0ddfc 100644 Binary files a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png 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 index f4f618b..6463d95 100644 Binary files a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_dark.png and b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_dark.png 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 index 667d793..64ebcc1 100644 Binary files a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_tinted.png and b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_tinted.png differ