diff --git a/flutter/android/app/build.gradle.kts b/flutter/android/app/build.gradle.kts index 6b66a87..5bd3ecf 100644 --- a/flutter/android/app/build.gradle.kts +++ b/flutter/android/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - namespace = "com.example.tma_app" + namespace = "net.wandergo.app" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion @@ -21,7 +21,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.example.tma_app" + applicationId = "net.wandergo.app" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. minSdk = flutter.minSdkVersion diff --git a/flutter/android/app/src/main/kotlin/com/example/tma_app/MainActivity.kt b/flutter/android/app/src/main/kotlin/net/wandergo/app/MainActivity.kt similarity index 76% rename from flutter/android/app/src/main/kotlin/com/example/tma_app/MainActivity.kt rename to flutter/android/app/src/main/kotlin/net/wandergo/app/MainActivity.kt index af70f0b..383dc84 100644 --- a/flutter/android/app/src/main/kotlin/com/example/tma_app/MainActivity.kt +++ b/flutter/android/app/src/main/kotlin/net/wandergo/app/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.tma_app +package net.wandergo.app import io.flutter.embedding.android.FlutterActivity diff --git a/flutter/assets/fonts/OFL.txt b/flutter/assets/fonts/OFL.txt new file mode 100644 index 0000000..c0592ca --- /dev/null +++ b/flutter/assets/fonts/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2021, Kil Hyung-jin (https://github.com/orioncactus/pretendard), +with Reserved Font Name Pretendard. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/flutter/assets/fonts/Pretendard-Bold.otf b/flutter/assets/fonts/Pretendard-Bold.otf new file mode 100644 index 0000000..8e5e30a Binary files /dev/null and b/flutter/assets/fonts/Pretendard-Bold.otf differ diff --git a/flutter/assets/fonts/Pretendard-Medium.otf b/flutter/assets/fonts/Pretendard-Medium.otf new file mode 100644 index 0000000..0575069 Binary files /dev/null and b/flutter/assets/fonts/Pretendard-Medium.otf differ diff --git a/flutter/assets/fonts/Pretendard-Regular.otf b/flutter/assets/fonts/Pretendard-Regular.otf new file mode 100644 index 0000000..08bf4cf Binary files /dev/null and b/flutter/assets/fonts/Pretendard-Regular.otf differ diff --git a/flutter/assets/fonts/Pretendard-SemiBold.otf b/flutter/assets/fonts/Pretendard-SemiBold.otf new file mode 100644 index 0000000..e7e36ab Binary files /dev/null and b/flutter/assets/fonts/Pretendard-SemiBold.otf differ diff --git a/flutter/ios/Runner.xcodeproj/project.pbxproj b/flutter/ios/Runner.xcodeproj/project.pbxproj index 8fe3ebe..d95f54a 100644 --- a/flutter/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter/ios/Runner.xcodeproj/project.pbxproj @@ -372,7 +372,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp; + PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -388,7 +388,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -405,7 +405,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -420,7 +420,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -551,7 +551,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp; + PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -573,7 +573,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp; + PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/flutter/lib/core/theme/app_theme.dart b/flutter/lib/core/theme/app_theme.dart index e39be74..7bd278d 100644 --- a/flutter/lib/core/theme/app_theme.dart +++ b/flutter/lib/core/theme/app_theme.dart @@ -10,11 +10,9 @@ const double kPagePadding = 20; /// 앱 테마 — 흰 바탕, 그림자 없음, 브랜드색 하나. /// -/// 글꼴은 Pretendard 를 쓰기로 했다. 글꼴 파일을 받기 전까지는 기기 기본 글꼴로 보인다 -/// ([kFontFamily] 가 null). +/// 글꼴은 Pretendard(400·500·600·700, pubspec fonts) 하나만 쓴다. abstract final class AppTheme { - /// Pretendard 를 pubspec fonts 에 등록하면 'Pretendard' 로 바꾼다. - static const String? kFontFamily = null; + static const String kFontFamily = 'Pretendard'; static ThemeData light() { const colorScheme = ColorScheme.light( diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart index ba79cac..f86c73f 100644 --- a/flutter/lib/main.dart +++ b/flutter/lib/main.dart @@ -1,4 +1,6 @@ +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -15,6 +17,11 @@ Future main() async { // .env 파일이 없는 경우 무시 (기본값 사용) } final preferences = await SharedPreferences.getInstance(); + // 번들한 글꼴의 라이선스 — 패키지 라이선스와 함께 라이선스 화면에 보인다(OFL 고지 의무) + LicenseRegistry.addLicense(() async* { + final text = await rootBundle.loadString('assets/fonts/OFL.txt'); + yield LicenseEntryWithLineBreaks(const ['Pretendard'], text); + }); runApp( ProviderScope( diff --git a/flutter/linux/CMakeLists.txt b/flutter/linux/CMakeLists.txt index 00a43ef..308103e 100644 --- a/flutter/linux/CMakeLists.txt +++ b/flutter/linux/CMakeLists.txt @@ -7,7 +7,7 @@ project(runner LANGUAGES CXX) set(BINARY_NAME "tma_app") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.tma_app") +set(APPLICATION_ID "net.wandergo.app") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/flutter/macos/Runner.xcodeproj/project.pbxproj b/flutter/macos/Runner.xcodeproj/project.pbxproj index 5e008d7..7b68f88 100644 --- a/flutter/macos/Runner.xcodeproj/project.pbxproj +++ b/flutter/macos/Runner.xcodeproj/project.pbxproj @@ -385,7 +385,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tma_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tma_app"; @@ -399,7 +399,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tma_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tma_app"; @@ -413,7 +413,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tma_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/tma_app"; diff --git a/flutter/macos/Runner/Configs/AppInfo.xcconfig b/flutter/macos/Runner/Configs/AppInfo.xcconfig index a764c30..a47f2d0 100644 --- a/flutter/macos/Runner/Configs/AppInfo.xcconfig +++ b/flutter/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = tma_app // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.tmaApp +PRODUCT_BUNDLE_IDENTIFIER = net.wandergo.app // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2026 com.example. All rights reserved. diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index 035426a..3f3c18c 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -77,6 +77,21 @@ flutter: assets: - .env - assets/images/ + # Pretendard 라이선스(SIL OFL 1.1) — 앱의 오픈소스 라이선스 화면에 함께 보인다 + - assets/fonts/OFL.txt + + # Pretendard v1.3.9 정적 OTF (github.com/orioncactus/pretendard) — 디자인이 쓰는 굵기만 + fonts: + - family: Pretendard + fonts: + - asset: assets/fonts/Pretendard-Regular.otf + weight: 400 + - asset: assets/fonts/Pretendard-Medium.otf + weight: 500 + - asset: assets/fonts/Pretendard-SemiBold.otf + weight: 600 + - asset: assets/fonts/Pretendard-Bold.otf + weight: 700 # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images diff --git a/flutter/web/index.html b/flutter/web/index.html index 536a1d2..898a91e 100644 --- a/flutter/web/index.html +++ b/flutter/web/index.html @@ -23,13 +23,13 @@ - + - tma_app + WanderGo