diff --git a/fonts/Ubuntu_Mono/UFL.txt b/assets/fonts/Ubuntu_Mono/UFL.txt similarity index 100% rename from fonts/Ubuntu_Mono/UFL.txt rename to assets/fonts/Ubuntu_Mono/UFL.txt diff --git a/assets/fonts/Ubuntu_Mono/UbuntuMono-Bold.ttf b/assets/fonts/Ubuntu_Mono/UbuntuMono-Bold.ttf new file mode 100644 index 00000000..01ad81bf Binary files /dev/null and b/assets/fonts/Ubuntu_Mono/UbuntuMono-Bold.ttf differ diff --git a/assets/fonts/Ubuntu_Mono/UbuntuMono-BoldItalic.ttf b/assets/fonts/Ubuntu_Mono/UbuntuMono-BoldItalic.ttf new file mode 100644 index 00000000..731884eb Binary files /dev/null and b/assets/fonts/Ubuntu_Mono/UbuntuMono-BoldItalic.ttf differ diff --git a/fonts/Ubuntu_Mono/UbuntuMono-Italic.ttf b/assets/fonts/Ubuntu_Mono/UbuntuMono-Italic.ttf similarity index 100% rename from fonts/Ubuntu_Mono/UbuntuMono-Italic.ttf rename to assets/fonts/Ubuntu_Mono/UbuntuMono-Italic.ttf diff --git a/fonts/Ubuntu_Mono/UbuntuMono-Regular.ttf b/assets/fonts/Ubuntu_Mono/UbuntuMono-Regular.ttf similarity index 100% rename from fonts/Ubuntu_Mono/UbuntuMono-Regular.ttf rename to assets/fonts/Ubuntu_Mono/UbuntuMono-Regular.ttf diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 9625e105..7c569640 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 95c0670e..9383be8b 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -157,7 +157,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -344,7 +344,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -435,7 +435,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -484,7 +484,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a6b826db..5e31d3d3 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =2.12.0 <3.0.0" @@ -137,8 +137,8 @@ flutter: fonts: - family: UbuntuMono fonts: - - asset: fonts/Ubuntu_Mono/UbuntuMono-Italic.ttf - - asset: fonts/Ubuntu_Mono/UbuntuMono-Regular.ttf + - asset: assets/fonts/Ubuntu_Mono/UbuntuMono-Italic.ttf + - asset: assets/fonts/Ubuntu_Mono/UbuntuMono-Regular.ttf style: italic assets: - assets/ @@ -150,5 +150,5 @@ flutter: - assets/images/games/bf6/ - assets/images/games/bfv/ - assets/splash/ - - fonts/ - - fonts/Ubuntu_Mono/ \ No newline at end of file + - assets/fonts/ + - assets/fonts/Ubuntu_Mono/ \ No newline at end of file diff --git a/script/build android.cmd b/script/build android.cmd index de0f4a07..57d8ea66 100644 --- a/script/build android.cmd +++ b/script/build android.cmd @@ -1,8 +1,8 @@ # Android # (Local Build apk.file) : -flutter build apk lib/main.prod.dart --release --build-number 41 +flutter build apk lib/main.prod.dart --release --build-number 42 # (Build Google aab.file) : -flutter build appbundle lib/main.prod.dart --release --build-number 41 +flutter build appbundle lib/main.prod.dart --release --build-number 42 cp -R build/app/outputs/flutter-apk/*.* installation/ diff --git a/script/build ios.cmd b/script/build ios.cmd index 0958fbf0..94bf4b41 100644 --- a/script/build ios.cmd +++ b/script/build ios.cmd @@ -1,3 +1,3 @@ # Apple # (Build Apple ipa.file) : -flutter build ipa ./lib/main.prod.dart --release --build-number 7 \ No newline at end of file +flutter build ipa ./lib/main.prod.dart --release --build-number 1 \ No newline at end of file