diff --git a/.gitignore b/.gitignore index 7ebddc7..978f0d1 100755 --- a/.gitignore +++ b/.gitignore @@ -409,7 +409,7 @@ web_resources/ pc_resources/ resources_hd/ web_resources_x2/ - +android_resources/ .artifacts/ diff --git a/optimize_android_resources.py b/optimize_android_resources.py index 88afd0a..12a127f 100644 --- a/optimize_android_resources.py +++ b/optimize_android_resources.py @@ -38,7 +38,8 @@ EXCEPTIONS = { "w/star_red.png", "w/white.png", "w/ui/img/main/aboutPage003android.png", - "w/ui_en/img/main/aboutPage003android.png" + "w/ui_en/img/main/aboutPage003android.png", + "w/exterior/texAtlas002.png", } # Path prefixes (relative to resources root, forward-slash) that get 8x reduction. @@ -63,10 +64,10 @@ def _resize_factor(rel: str) -> int: norm = rel.replace("\\", "/") for prefix in HIGH_REDUCTION_PREFIXES: if norm.startswith(prefix): - return 4 + return 8 for prefix in LOW_REDUCTION_POSTFIXES: if norm.endswith(prefix): - return 1 + return 2 return 4 @@ -120,8 +121,8 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(description="Optimize PNG images for web build") parser.add_argument("--src", default="resources", help="Source resources directory (default: resources)") - parser.add_argument("--dst", default="web_resources", + parser.add_argument("--dst", default="android_resources", help="Destination parent directory; will contain a 'resources' subdir " - "(default: web_resources)") + "(default: android_resources)") args = parser.parse_args() optimize(args.src, args.dst) diff --git a/proj-android/app/build.gradle b/proj-android/app/build.gradle index 6dd3d54..32fb06b 100644 --- a/proj-android/app/build.gradle +++ b/proj-android/app/build.gradle @@ -15,8 +15,8 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 37 - versionCode 3 - versionName "1.0.6" + versionCode 4 + versionName "1.0.7" externalNativeBuild { /*ndkBuild { arguments "APP_PLATFORM=android-19" diff --git a/resources/w/ui/screen_main_menu.json b/resources/w/ui/screen_main_menu.json index 190f6b2..78b1577 100644 --- a/resources/w/ui/screen_main_menu.json +++ b/resources/w/ui/screen_main_menu.json @@ -125,7 +125,7 @@ "y": 10, "width": 160, "height": 36, - "text": "v. 1.0.6", + "text": "v. 1.0.7", "fontSize": 24, "textCentered": false, "topAligned": true, diff --git a/resources/w/ui/screen_main_menu_android.json b/resources/w/ui/screen_main_menu_android.json index f95fab8..d39f6ea 100644 --- a/resources/w/ui/screen_main_menu_android.json +++ b/resources/w/ui/screen_main_menu_android.json @@ -116,7 +116,7 @@ "y": 10, "width": 160, "height": 36, - "text": "v. 1.0.6", + "text": "v. 1.0.7", "fontSize": 24, "textCentered": false, "topAligned": true, diff --git a/resources/w/ui_en/screen_main_menu.json b/resources/w/ui_en/screen_main_menu.json index c0a61e9..da79021 100644 --- a/resources/w/ui_en/screen_main_menu.json +++ b/resources/w/ui_en/screen_main_menu.json @@ -125,7 +125,7 @@ "y": 10, "width": 160, "height": 36, - "text": "v. 1.0.6", + "text": "v. 1.0.7", "fontSize": 24, "textCentered": false, "topAligned": true, diff --git a/resources/w/ui_en/screen_main_menu_android.json b/resources/w/ui_en/screen_main_menu_android.json index e84793b..db8615c 100644 --- a/resources/w/ui_en/screen_main_menu_android.json +++ b/resources/w/ui_en/screen_main_menu_android.json @@ -125,7 +125,7 @@ "y": 10, "width": 160, "height": 36, - "text": "v. 1.0.6", + "text": "v. 1.0.7", "fontSize": 24, "textCentered": false, "topAligned": true,