...
This commit is contained in:
parent
9225ee6026
commit
1883fef583
3
devtools_options.yaml
Normal file
3
devtools_options.yaml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
description: This file stores settings for Dart & Flutter DevTools.
|
||||||
|
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
|
||||||
|
extensions:
|
||||||
@ -1 +1,2 @@
|
|||||||
|
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
|
||||||
#include "Generated.xcconfig"
|
#include "Generated.xcconfig"
|
||||||
|
|||||||
@ -1 +1,2 @@
|
|||||||
|
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
|
||||||
#include "Generated.xcconfig"
|
#include "Generated.xcconfig"
|
||||||
|
|||||||
43
ios/Podfile
Normal file
43
ios/Podfile
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
# Uncomment this line to define a global platform for your project
|
||||||
|
# platform :ios, '13.0'
|
||||||
|
|
||||||
|
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
|
||||||
|
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
|
||||||
|
|
||||||
|
project 'Runner', {
|
||||||
|
'Debug' => :debug,
|
||||||
|
'Profile' => :release,
|
||||||
|
'Release' => :release,
|
||||||
|
}
|
||||||
|
|
||||||
|
def flutter_root
|
||||||
|
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
|
||||||
|
unless File.exist?(generated_xcode_build_settings_path)
|
||||||
|
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
|
||||||
|
end
|
||||||
|
|
||||||
|
File.foreach(generated_xcode_build_settings_path) do |line|
|
||||||
|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
|
||||||
|
return matches[1].strip if matches
|
||||||
|
end
|
||||||
|
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
|
||||||
|
end
|
||||||
|
|
||||||
|
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
|
||||||
|
|
||||||
|
flutter_ios_podfile_setup
|
||||||
|
|
||||||
|
target 'Runner' do
|
||||||
|
use_frameworks!
|
||||||
|
|
||||||
|
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
|
||||||
|
target 'RunnerTests' do
|
||||||
|
inherit! :search_paths
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
post_install do |installer|
|
||||||
|
installer.pods_project.targets.each do |target|
|
||||||
|
flutter_additional_ios_build_settings(target)
|
||||||
|
end
|
||||||
|
end
|
||||||
48
ios/Podfile.lock
Normal file
48
ios/Podfile.lock
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
PODS:
|
||||||
|
- Flutter (1.0.0)
|
||||||
|
- Google-Mobile-Ads-SDK (11.13.0):
|
||||||
|
- GoogleUserMessagingPlatform (>= 1.1)
|
||||||
|
- google_mobile_ads (5.3.1):
|
||||||
|
- Flutter
|
||||||
|
- Google-Mobile-Ads-SDK (~> 11.13.0)
|
||||||
|
- webview_flutter_wkwebview
|
||||||
|
- GoogleUserMessagingPlatform (3.1.0)
|
||||||
|
- shared_preferences_foundation (0.0.1):
|
||||||
|
- Flutter
|
||||||
|
- FlutterMacOS
|
||||||
|
- webview_flutter_wkwebview (0.0.1):
|
||||||
|
- Flutter
|
||||||
|
- FlutterMacOS
|
||||||
|
|
||||||
|
DEPENDENCIES:
|
||||||
|
- Flutter (from `Flutter`)
|
||||||
|
- google_mobile_ads (from `.symlinks/plugins/google_mobile_ads/ios`)
|
||||||
|
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
|
||||||
|
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`)
|
||||||
|
|
||||||
|
SPEC REPOS:
|
||||||
|
trunk:
|
||||||
|
- Google-Mobile-Ads-SDK
|
||||||
|
- GoogleUserMessagingPlatform
|
||||||
|
|
||||||
|
EXTERNAL SOURCES:
|
||||||
|
Flutter:
|
||||||
|
:path: Flutter
|
||||||
|
google_mobile_ads:
|
||||||
|
:path: ".symlinks/plugins/google_mobile_ads/ios"
|
||||||
|
shared_preferences_foundation:
|
||||||
|
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
|
||||||
|
webview_flutter_wkwebview:
|
||||||
|
:path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
|
||||||
|
|
||||||
|
SPEC CHECKSUMS:
|
||||||
|
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
|
||||||
|
Google-Mobile-Ads-SDK: 14f57f2dc33532a24db288897e26494640810407
|
||||||
|
google_mobile_ads: fe0e2c1764ad95323dd0e3081d0bb2d58411f957
|
||||||
|
GoogleUserMessagingPlatform: befe603da6501006420c206222acd449bba45a9c
|
||||||
|
shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
|
||||||
|
webview_flutter_wkwebview: 29eb20d43355b48fe7d07113835b9128f84e3af4
|
||||||
|
|
||||||
|
PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
|
||||||
|
|
||||||
|
COCOAPODS: 1.16.2
|
||||||
@ -7,10 +7,12 @@
|
|||||||
objects = {
|
objects = {
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
|
0A725DCED1CD98FFB2302DCE /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77DE2DA095E51846864B8323 /* Pods_RunnerTests.framework */; };
|
||||||
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
|
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
|
||||||
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
|
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
|
||||||
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
|
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
|
||||||
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
|
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
|
||||||
|
892AD903CF9CF6401853688E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C17158024398284F8AFFB89 /* Pods_Runner.framework */; };
|
||||||
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
|
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
|
||||||
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
|
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
|
||||||
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
|
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
|
||||||
@ -42,11 +44,15 @@
|
|||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
|
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
|
||||||
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
|
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
|
||||||
|
16622FECA3EBEF8EB65B3451 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
|
||||||
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
|
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
|
||||||
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
|
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
|
||||||
|
430C66C34C3442E77FF42FC9 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
|
||||||
|
4C449A31118EAE166EA6F0E7 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
|
||||||
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
|
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
|
||||||
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||||
|
77DE2DA095E51846864B8323 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
|
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
|
||||||
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
|
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
|
||||||
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
|
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
|
||||||
@ -55,6 +61,10 @@
|
|||||||
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||||
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||||
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||||
|
9C17158024398284F8AFFB89 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
|
A7B396FC7090E1529EF1895D /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
|
||||||
|
E3F4FE4B993EBC989F4C963F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
|
||||||
|
F2F92AAC40F014CF652C59C0 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
/* Begin PBXFrameworksBuildPhase section */
|
/* Begin PBXFrameworksBuildPhase section */
|
||||||
@ -62,6 +72,15 @@
|
|||||||
isa = PBXFrameworksBuildPhase;
|
isa = PBXFrameworksBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
|
892AD903CF9CF6401853688E /* Pods_Runner.framework in Frameworks */,
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
};
|
||||||
|
C6050980F0BFBC4078BF1FB9 /* Frameworks */ = {
|
||||||
|
isa = PBXFrameworksBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
0A725DCED1CD98FFB2302DCE /* Pods_RunnerTests.framework in Frameworks */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@ -94,6 +113,8 @@
|
|||||||
97C146F01CF9000F007C117D /* Runner */,
|
97C146F01CF9000F007C117D /* Runner */,
|
||||||
97C146EF1CF9000F007C117D /* Products */,
|
97C146EF1CF9000F007C117D /* Products */,
|
||||||
331C8082294A63A400263BE5 /* RunnerTests */,
|
331C8082294A63A400263BE5 /* RunnerTests */,
|
||||||
|
ED39DAD180D309D951343F67 /* Pods */,
|
||||||
|
C882BDE0FEF4272B17FD0811 /* Frameworks */,
|
||||||
);
|
);
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
@ -121,6 +142,29 @@
|
|||||||
path = Runner;
|
path = Runner;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
|
C882BDE0FEF4272B17FD0811 /* Frameworks */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
9C17158024398284F8AFFB89 /* Pods_Runner.framework */,
|
||||||
|
77DE2DA095E51846864B8323 /* Pods_RunnerTests.framework */,
|
||||||
|
);
|
||||||
|
name = Frameworks;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
|
ED39DAD180D309D951343F67 /* Pods */ = {
|
||||||
|
isa = PBXGroup;
|
||||||
|
children = (
|
||||||
|
4C449A31118EAE166EA6F0E7 /* Pods-Runner.debug.xcconfig */,
|
||||||
|
E3F4FE4B993EBC989F4C963F /* Pods-Runner.release.xcconfig */,
|
||||||
|
16622FECA3EBEF8EB65B3451 /* Pods-Runner.profile.xcconfig */,
|
||||||
|
430C66C34C3442E77FF42FC9 /* Pods-RunnerTests.debug.xcconfig */,
|
||||||
|
A7B396FC7090E1529EF1895D /* Pods-RunnerTests.release.xcconfig */,
|
||||||
|
F2F92AAC40F014CF652C59C0 /* Pods-RunnerTests.profile.xcconfig */,
|
||||||
|
);
|
||||||
|
name = Pods;
|
||||||
|
path = Pods;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
/* End PBXGroup section */
|
/* End PBXGroup section */
|
||||||
|
|
||||||
/* Begin PBXNativeTarget section */
|
/* Begin PBXNativeTarget section */
|
||||||
@ -128,8 +172,10 @@
|
|||||||
isa = PBXNativeTarget;
|
isa = PBXNativeTarget;
|
||||||
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
|
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
|
||||||
buildPhases = (
|
buildPhases = (
|
||||||
|
D9965B2772196F9BC76EC2E1 /* [CP] Check Pods Manifest.lock */,
|
||||||
331C807D294A63A400263BE5 /* Sources */,
|
331C807D294A63A400263BE5 /* Sources */,
|
||||||
331C807F294A63A400263BE5 /* Resources */,
|
331C807F294A63A400263BE5 /* Resources */,
|
||||||
|
C6050980F0BFBC4078BF1FB9 /* Frameworks */,
|
||||||
);
|
);
|
||||||
buildRules = (
|
buildRules = (
|
||||||
);
|
);
|
||||||
@ -145,12 +191,15 @@
|
|||||||
isa = PBXNativeTarget;
|
isa = PBXNativeTarget;
|
||||||
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
|
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
|
||||||
buildPhases = (
|
buildPhases = (
|
||||||
|
520C38BB116D4F7C1080344A /* [CP] Check Pods Manifest.lock */,
|
||||||
9740EEB61CF901F6004384FC /* Run Script */,
|
9740EEB61CF901F6004384FC /* Run Script */,
|
||||||
97C146EA1CF9000F007C117D /* Sources */,
|
97C146EA1CF9000F007C117D /* Sources */,
|
||||||
97C146EB1CF9000F007C117D /* Frameworks */,
|
97C146EB1CF9000F007C117D /* Frameworks */,
|
||||||
97C146EC1CF9000F007C117D /* Resources */,
|
97C146EC1CF9000F007C117D /* Resources */,
|
||||||
9705A1C41CF9048500538489 /* Embed Frameworks */,
|
9705A1C41CF9048500538489 /* Embed Frameworks */,
|
||||||
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
|
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
|
||||||
|
60E1658554BB66F9045D2A2F /* [CP] Embed Pods Frameworks */,
|
||||||
|
98993E38BEFD6F91AB8FA262 /* [CP] Copy Pods Resources */,
|
||||||
);
|
);
|
||||||
buildRules = (
|
buildRules = (
|
||||||
);
|
);
|
||||||
@ -238,6 +287,45 @@
|
|||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
|
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
|
||||||
};
|
};
|
||||||
|
520C38BB116D4F7C1080344A /* [CP] Check Pods Manifest.lock */ = {
|
||||||
|
isa = PBXShellScriptBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
);
|
||||||
|
inputFileListPaths = (
|
||||||
|
);
|
||||||
|
inputPaths = (
|
||||||
|
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
|
||||||
|
"${PODS_ROOT}/Manifest.lock",
|
||||||
|
);
|
||||||
|
name = "[CP] Check Pods Manifest.lock";
|
||||||
|
outputFileListPaths = (
|
||||||
|
);
|
||||||
|
outputPaths = (
|
||||||
|
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
shellPath = /bin/sh;
|
||||||
|
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
||||||
|
showEnvVarsInLog = 0;
|
||||||
|
};
|
||||||
|
60E1658554BB66F9045D2A2F /* [CP] Embed Pods Frameworks */ = {
|
||||||
|
isa = PBXShellScriptBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
);
|
||||||
|
inputFileListPaths = (
|
||||||
|
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
|
||||||
|
);
|
||||||
|
name = "[CP] Embed Pods Frameworks";
|
||||||
|
outputFileListPaths = (
|
||||||
|
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
shellPath = /bin/sh;
|
||||||
|
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
|
||||||
|
showEnvVarsInLog = 0;
|
||||||
|
};
|
||||||
9740EEB61CF901F6004384FC /* Run Script */ = {
|
9740EEB61CF901F6004384FC /* Run Script */ = {
|
||||||
isa = PBXShellScriptBuildPhase;
|
isa = PBXShellScriptBuildPhase;
|
||||||
alwaysOutOfDate = 1;
|
alwaysOutOfDate = 1;
|
||||||
@ -253,6 +341,45 @@
|
|||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
|
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
|
||||||
};
|
};
|
||||||
|
98993E38BEFD6F91AB8FA262 /* [CP] Copy Pods Resources */ = {
|
||||||
|
isa = PBXShellScriptBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
);
|
||||||
|
inputFileListPaths = (
|
||||||
|
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
|
||||||
|
);
|
||||||
|
name = "[CP] Copy Pods Resources";
|
||||||
|
outputFileListPaths = (
|
||||||
|
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
shellPath = /bin/sh;
|
||||||
|
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
|
||||||
|
showEnvVarsInLog = 0;
|
||||||
|
};
|
||||||
|
D9965B2772196F9BC76EC2E1 /* [CP] Check Pods Manifest.lock */ = {
|
||||||
|
isa = PBXShellScriptBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
);
|
||||||
|
inputFileListPaths = (
|
||||||
|
);
|
||||||
|
inputPaths = (
|
||||||
|
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
|
||||||
|
"${PODS_ROOT}/Manifest.lock",
|
||||||
|
);
|
||||||
|
name = "[CP] Check Pods Manifest.lock";
|
||||||
|
outputFileListPaths = (
|
||||||
|
);
|
||||||
|
outputPaths = (
|
||||||
|
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
shellPath = /bin/sh;
|
||||||
|
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
||||||
|
showEnvVarsInLog = 0;
|
||||||
|
};
|
||||||
/* End PBXShellScriptBuildPhase section */
|
/* End PBXShellScriptBuildPhase section */
|
||||||
|
|
||||||
/* Begin PBXSourcesBuildPhase section */
|
/* Begin PBXSourcesBuildPhase section */
|
||||||
@ -379,6 +506,7 @@
|
|||||||
};
|
};
|
||||||
331C8088294A63A400263BE5 /* Debug */ = {
|
331C8088294A63A400263BE5 /* Debug */ = {
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
|
baseConfigurationReference = 430C66C34C3442E77FF42FC9 /* Pods-RunnerTests.debug.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
@ -396,6 +524,7 @@
|
|||||||
};
|
};
|
||||||
331C8089294A63A400263BE5 /* Release */ = {
|
331C8089294A63A400263BE5 /* Release */ = {
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
|
baseConfigurationReference = A7B396FC7090E1529EF1895D /* Pods-RunnerTests.release.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
@ -411,6 +540,7 @@
|
|||||||
};
|
};
|
||||||
331C808A294A63A400263BE5 /* Profile */ = {
|
331C808A294A63A400263BE5 /* Profile */ = {
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
|
baseConfigurationReference = F2F92AAC40F014CF652C59C0 /* Pods-RunnerTests.profile.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
|
|||||||
3
ios/Runner.xcworkspace/contents.xcworkspacedata
generated
3
ios/Runner.xcworkspace/contents.xcworkspacedata
generated
@ -4,4 +4,7 @@
|
|||||||
<FileRef
|
<FileRef
|
||||||
location = "group:Runner.xcodeproj">
|
location = "group:Runner.xcodeproj">
|
||||||
</FileRef>
|
</FileRef>
|
||||||
|
<FileRef
|
||||||
|
location = "group:Pods/Pods.xcodeproj">
|
||||||
|
</FileRef>
|
||||||
</Workspace>
|
</Workspace>
|
||||||
|
|||||||
@ -2,14 +2,20 @@
|
|||||||
|
|
||||||
class GameRankDto {
|
class GameRankDto {
|
||||||
final String playerName;
|
final String playerName;
|
||||||
final int primaryScore; // 스도쿠에서는 시간(초)
|
final int primaryScore; // 시간 (초)
|
||||||
|
final int? secondaryScore; // 점수 (저장된 값, 예: 0~4)
|
||||||
|
|
||||||
GameRankDto({required this.playerName, required this.primaryScore});
|
GameRankDto({
|
||||||
|
required this.playerName,
|
||||||
|
required this.primaryScore,
|
||||||
|
this.secondaryScore
|
||||||
|
});
|
||||||
|
|
||||||
factory GameRankDto.fromJson(Map<String, dynamic> json) {
|
factory GameRankDto.fromJson(Map<String, dynamic> json) {
|
||||||
return GameRankDto(
|
return GameRankDto(
|
||||||
playerName: json['playerName'],
|
playerName: json['playerName'],
|
||||||
primaryScore: (json['primaryScore'] as num).toInt(),
|
primaryScore: (json['primaryScore'] as num).toInt(),
|
||||||
|
secondaryScore: (json['secondaryScore'] as num?)?.toInt(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,23 +1,23 @@
|
|||||||
// lib/models/sudoku_game_dto.dart
|
// lib/models/sudoku_game_dto.dart
|
||||||
|
|
||||||
// 🔽 [수정] PuzzleData.kt의 새 DTO (puzzleId -> blockSize)
|
|
||||||
class SudokuGameDto {
|
class SudokuGameDto {
|
||||||
|
final int puzzleId; // 👈 [추가] 서버에서 보낸 ID
|
||||||
final String question;
|
final String question;
|
||||||
final String solution;
|
final String solution;
|
||||||
final int blockSize; // 예: 3 (3x3 블록)
|
final int blockSize;
|
||||||
|
|
||||||
// 🔽 [추가] blockSize로부터 gridSize 계산 (예: 9)
|
|
||||||
final int gridSize;
|
final int gridSize;
|
||||||
|
|
||||||
SudokuGameDto({
|
SudokuGameDto({
|
||||||
|
required this.puzzleId, // 👈 [추가]
|
||||||
required this.question,
|
required this.question,
|
||||||
required this.solution,
|
required this.solution,
|
||||||
required this.blockSize,
|
required this.blockSize,
|
||||||
}) : gridSize = blockSize * blockSize; // 생성 시 gridSize 자동 계산
|
}) : gridSize = blockSize * blockSize;
|
||||||
|
|
||||||
factory SudokuGameDto.fromJson(Map<String, dynamic> json) {
|
factory SudokuGameDto.fromJson(Map<String, dynamic> json) {
|
||||||
int bs = json['blockSize'] ?? 3;
|
int bs = json['blockSize'] ?? 3;
|
||||||
return SudokuGameDto(
|
return SudokuGameDto(
|
||||||
|
puzzleId: json['puzzleId'], // 👈 [추가] 서버의 puzzleId 매핑
|
||||||
question: json['question'],
|
question: json['question'],
|
||||||
solution: json['solution'],
|
solution: json['solution'],
|
||||||
blockSize: bs,
|
blockSize: bs,
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
// lib/models/unified_rank_dto.dart
|
// lib/models/unified_rank_dto.dart
|
||||||
|
|
||||||
class UnifiedRankDto {
|
class UnifiedRankDto {
|
||||||
|
final String userId; // 👈 [추가] 앱-고유 ID
|
||||||
final String gameType;
|
final String gameType;
|
||||||
final String? contextId;
|
final String? contextId;
|
||||||
final String playerName;
|
final String playerName;
|
||||||
@ -8,6 +9,7 @@ class UnifiedRankDto {
|
|||||||
final int? secondaryScore;
|
final int? secondaryScore;
|
||||||
|
|
||||||
UnifiedRankDto({
|
UnifiedRankDto({
|
||||||
|
required this.userId, // 👈 [추가] 생성자에 추가
|
||||||
required this.gameType,
|
required this.gameType,
|
||||||
this.contextId,
|
this.contextId,
|
||||||
required this.playerName,
|
required this.playerName,
|
||||||
@ -18,6 +20,7 @@ class UnifiedRankDto {
|
|||||||
// Dart 객체를 JSON으로 변환 (서버 전송용)
|
// Dart 객체를 JSON으로 변환 (서버 전송용)
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
return {
|
return {
|
||||||
|
'userId': userId, // 👈 [추가]
|
||||||
'gameType': gameType,
|
'gameType': gameType,
|
||||||
'contextId': contextId,
|
'contextId': contextId,
|
||||||
'playerName': playerName,
|
'playerName': playerName,
|
||||||
|
|||||||
@ -1,21 +1,31 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
import 'dart:developer';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:sudoku_app/models/sudoku_game_dto.dart';
|
import 'package:sudoku_app/models/sudoku_game_dto.dart';
|
||||||
import 'package:sudoku_app/models/sudoku_theme.dart';
|
import 'package:sudoku_app/models/sudoku_theme.dart';
|
||||||
import 'package:sudoku_app/models/unified_rank_dto.dart';
|
import 'package:sudoku_app/models/unified_rank_dto.dart';
|
||||||
import 'package:sudoku_app/services/puzzle_service.dart';
|
import 'package:sudoku_app/services/puzzle_service.dart';
|
||||||
|
import 'package:sudoku_app/services/identity_service.dart';
|
||||||
import 'package:sudoku_app/widgets/ad_banner_widget.dart';
|
import 'package:sudoku_app/widgets/ad_banner_widget.dart';
|
||||||
import 'package:sudoku_app/widgets/number_pad.dart';
|
import 'package:sudoku_app/widgets/number_pad.dart';
|
||||||
import 'package:sudoku_app/widgets/sudoku_board.dart';
|
import 'package:sudoku_app/widgets/sudoku_board.dart';
|
||||||
|
import 'package:sudoku_app/models/game_rank_dto.dart';
|
||||||
|
|
||||||
|
// 랭킹 팝업의 2단계 UI 상태를 관리하기 위한 enum
|
||||||
|
enum _RankSubmissionStep { enterName, submitting, showList }
|
||||||
|
|
||||||
class GameScreen extends StatefulWidget {
|
class GameScreen extends StatefulWidget {
|
||||||
final SudokuGameDto gameData;
|
final SudokuGameDto gameData;
|
||||||
final String themeName;
|
final String themeName;
|
||||||
|
final String userId;
|
||||||
|
final String? userName;
|
||||||
|
|
||||||
const GameScreen({
|
const GameScreen({
|
||||||
super.key,
|
super.key,
|
||||||
required this.gameData,
|
required this.gameData,
|
||||||
required this.themeName,
|
required this.themeName,
|
||||||
|
required this.userId,
|
||||||
|
required this.userName,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@ -24,6 +34,7 @@ class GameScreen extends StatefulWidget {
|
|||||||
|
|
||||||
class _GameScreenState extends State<GameScreen> {
|
class _GameScreenState extends State<GameScreen> {
|
||||||
final PuzzleService _puzzleService = PuzzleService();
|
final PuzzleService _puzzleService = PuzzleService();
|
||||||
|
final IdentityService _identityService = IdentityService();
|
||||||
|
|
||||||
late final int blockSize;
|
late final int blockSize;
|
||||||
late final int gridSize;
|
late final int gridSize;
|
||||||
@ -41,6 +52,11 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
Set<int> incorrectCells = {};
|
Set<int> incorrectCells = {};
|
||||||
bool isValidating = false;
|
bool isValidating = false;
|
||||||
|
|
||||||
|
_RankSubmissionStep _rankStep = _RankSubmissionStep.enterName;
|
||||||
|
List<GameRankDto> _rankingList = [];
|
||||||
|
String _submittedPlayerName = "";
|
||||||
|
|
||||||
|
|
||||||
// "A" -> 10 (파싱용)
|
// "A" -> 10 (파싱용)
|
||||||
int _charToInt(String char) {
|
int _charToInt(String char) {
|
||||||
if (char == '0') return 0;
|
if (char == '0') return 0;
|
||||||
@ -96,7 +112,6 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
|
|
||||||
if (selectedNumberPad != null) {
|
if (selectedNumberPad != null) {
|
||||||
|
|
||||||
// 오답 블로킹
|
|
||||||
if (incorrectCells.isNotEmpty && !incorrectCells.contains(index)) {
|
if (incorrectCells.isNotEmpty && !incorrectCells.contains(index)) {
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
const SnackBar(
|
const SnackBar(
|
||||||
@ -104,15 +119,13 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
duration: Duration(seconds: 1),
|
duration: Duration(seconds: 1),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
return; // 입력 처리 중단
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final int numberValue = selectedNumberPad!;
|
final int numberValue = selectedNumberPad!;
|
||||||
puzzleCells[index] = numberValue;
|
puzzleCells[index] = numberValue;
|
||||||
|
|
||||||
// 정답과 비교
|
|
||||||
if (numberValue != solutionCells[index]) {
|
if (numberValue != solutionCells[index]) {
|
||||||
// 점수 차감
|
|
||||||
if (!incorrectCells.contains(index)) {
|
if (!incorrectCells.contains(index)) {
|
||||||
if (score > 0) {
|
if (score > 0) {
|
||||||
score--;
|
score--;
|
||||||
@ -160,16 +173,38 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _onRestartGameTapped() {
|
||||||
|
setState(() {
|
||||||
|
puzzleCells = originalCells.toList();
|
||||||
|
incorrectCells.clear();
|
||||||
|
selectedIndex = null;
|
||||||
|
selectedNumberPad = null;
|
||||||
|
score = 5;
|
||||||
|
|
||||||
|
timer?.cancel();
|
||||||
|
secondsElapsed = 0;
|
||||||
|
startTimer();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void _onQuitGameTapped() {
|
||||||
|
Navigator.of(context).pop();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Future<void> _validateGame() async {
|
Future<void> _validateGame() async {
|
||||||
// ... (기존과 동일)
|
|
||||||
if (isValidating) return;
|
if (isValidating) return;
|
||||||
setState(() { isValidating = true; });
|
setState(() { isValidating = true; });
|
||||||
|
|
||||||
timer?.cancel();
|
timer?.cancel();
|
||||||
String currentAnswer = puzzleCells.map(_intToChar).join('');
|
String currentAnswer = puzzleCells.map(_intToChar).join('');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final bool result = await _puzzleService.validateSolution(
|
final bool result = await _puzzleService.validateSolution(
|
||||||
widget.gameData.question, currentAnswer, blockSize,
|
widget.gameData.puzzleId,
|
||||||
|
currentAnswer,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (result) {
|
if (result) {
|
||||||
if(mounted) _showRankingDialog();
|
if(mounted) _showRankingDialog();
|
||||||
} else {
|
} else {
|
||||||
@ -194,36 +229,144 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 랭킹 등록 팝업 (2단계 UI)
|
||||||
void _showRankingDialog() {
|
void _showRankingDialog() {
|
||||||
// ... (기존과 동일)
|
final nameController = TextEditingController(text: widget.userName);
|
||||||
final nameController = TextEditingController();
|
|
||||||
bool isSubmitting = false;
|
bool isSubmitting = false;
|
||||||
|
final bool hasExistingName = widget.userName != null;
|
||||||
|
|
||||||
|
_rankStep = _RankSubmissionStep.enterName;
|
||||||
|
_rankingList = [];
|
||||||
|
_submittedPlayerName = "";
|
||||||
|
String? dialogErrorMessage; // 👈 [신규] 팝업 내부 에러 메시지
|
||||||
|
|
||||||
final String contextId = "SUDOKU_${gridSize}x${gridSize}_L${_difficultyLevel(widget.gameData.question)}";
|
final String contextId = "SUDOKU_${gridSize}x${gridSize}_L${_difficultyLevel(widget.gameData.question)}";
|
||||||
|
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
barrierDismissible: false,
|
barrierDismissible: false,
|
||||||
builder: (ctx) {
|
builder: (ctx) {
|
||||||
return StatefulBuilder(
|
return StatefulBuilder(
|
||||||
builder: (context, setDialogState) {
|
builder: (context, setDialogState) {
|
||||||
return AlertDialog(
|
|
||||||
title: const Text('🎉 성공! 기록을 남겨주세요.'),
|
Widget closeButton = TextButton(
|
||||||
content: Column(
|
onPressed: () {
|
||||||
mainAxisSize: MainAxisSize.min,
|
Navigator.of(ctx).pop();
|
||||||
children: [
|
Navigator.of(context).pop();
|
||||||
Text('($contextId)'),
|
},
|
||||||
Text('완료 시간: $secondsElapsed 초'),
|
child: const Text('닫기'),
|
||||||
const SizedBox(height: 20),
|
);
|
||||||
TextField(
|
|
||||||
controller: nameController,
|
Widget rankListWidget = Expanded(
|
||||||
decoration: const InputDecoration(
|
child: _rankingList.isEmpty
|
||||||
labelText: '이름 (10자 이내)',
|
? const Center(child: Text("현재 랭킹이 없습니다."))
|
||||||
border: OutlineInputBorder(),
|
: ListView.builder(
|
||||||
|
itemCount: _rankingList.length,
|
||||||
|
shrinkWrap: true,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final rank = _rankingList[index];
|
||||||
|
final bool isMe = rank.playerName == _submittedPlayerName;
|
||||||
|
int displayScore = 5 - (rank.secondaryScore ?? 5);
|
||||||
|
|
||||||
|
final min = (rank.primaryScore ~/ 60).toString().padLeft(2, '0');
|
||||||
|
final sec = (rank.primaryScore % 60).toString().padLeft(2, '0');
|
||||||
|
final time = '$min:$sec';
|
||||||
|
|
||||||
|
return ListTile(
|
||||||
|
selected: isMe,
|
||||||
|
selectedTileColor: Colors.blue.shade100,
|
||||||
|
leading: Text('${index + 1}.', style: const TextStyle(fontWeight: FontWeight.bold)),
|
||||||
|
title: Text(rank.playerName, style: TextStyle(fontWeight: isMe ? FontWeight.bold : FontWeight.normal)),
|
||||||
|
trailing: Text('$time (Score: $displayScore)', style: const TextStyle(fontWeight: FontWeight.bold, color: Colors.black87)),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
maxLength: 10,
|
);
|
||||||
|
|
||||||
|
Widget nameEntryWidget = Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Text('완료 시간: $secondsElapsed 초 / 남은 점수: $score 점'),
|
||||||
|
const SizedBox(height: 20),
|
||||||
|
TextField(
|
||||||
|
controller: nameController,
|
||||||
|
readOnly: hasExistingName,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
labelText: hasExistingName ? '등록된 이름' : '이름 (10자 이내)',
|
||||||
|
border: const OutlineInputBorder(),
|
||||||
|
// 🔽 [신규] 에러 메시지가 있으면 TextField에 에러 스타일 적용
|
||||||
|
errorText: dialogErrorMessage,
|
||||||
),
|
),
|
||||||
],
|
maxLength: 10,
|
||||||
),
|
),
|
||||||
actions: [
|
],
|
||||||
|
);
|
||||||
|
|
||||||
|
Widget submitButton = ElevatedButton(
|
||||||
|
onPressed: () async {
|
||||||
|
final playerName = nameController.text.trim();
|
||||||
|
if (playerName.isEmpty) {
|
||||||
|
// SnackBar 대신 팝업 내부 에러로 변경
|
||||||
|
setDialogState(() {
|
||||||
|
dialogErrorMessage = "이름을 입력해주세요.";
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setDialogState(() {
|
||||||
|
_rankStep = _RankSubmissionStep.submitting;
|
||||||
|
_submittedPlayerName = playerName;
|
||||||
|
dialogErrorMessage = null; // 👈 [신규] 에러 메시지 초기화
|
||||||
|
});
|
||||||
|
|
||||||
|
final rankDto = UnifiedRankDto(
|
||||||
|
userId: widget.userId,
|
||||||
|
gameType: 'SUDOKU',
|
||||||
|
contextId: contextId,
|
||||||
|
playerName: playerName,
|
||||||
|
primaryScore: secondsElapsed,
|
||||||
|
secondaryScore: (5 - score),
|
||||||
|
);
|
||||||
|
|
||||||
|
try {
|
||||||
|
await _puzzleService.submitRank(rankDto);
|
||||||
|
|
||||||
|
if (!hasExistingName) {
|
||||||
|
await _identityService.saveUserName(playerName);
|
||||||
|
}
|
||||||
|
|
||||||
|
final ranks = await _puzzleService.fetchRanks('SUDOKU', contextId);
|
||||||
|
|
||||||
|
setDialogState(() {
|
||||||
|
_rankingList = ranks;
|
||||||
|
_rankStep = _RankSubmissionStep.showList;
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch (e) {
|
||||||
|
// 🔽 [수정] 랭킹 등록 실패 시 (이름 중복 등)
|
||||||
|
log("!!! 랭킹 등록 실패 !!!", error: e);
|
||||||
|
|
||||||
|
setDialogState(() {
|
||||||
|
_rankStep = _RankSubmissionStep.enterName; // 1단계(이름 입력)로 복귀
|
||||||
|
// 👈 [신규] 서버 에러 메시지를 팝업에 표시
|
||||||
|
dialogErrorMessage = e.toString().replaceFirst("Exception: ", "");
|
||||||
|
});
|
||||||
|
// ❌ SnackBar 제거
|
||||||
|
}
|
||||||
|
},
|
||||||
|
child: const Text('랭킹 등록'),
|
||||||
|
);
|
||||||
|
|
||||||
|
Widget dialogContent;
|
||||||
|
if (_rankStep == _RankSubmissionStep.showList) {
|
||||||
|
dialogContent = rankListWidget;
|
||||||
|
} else {
|
||||||
|
dialogContent = nameEntryWidget;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Widget> dialogActions;
|
||||||
|
if (_rankStep == _RankSubmissionStep.enterName) {
|
||||||
|
dialogActions = [
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.of(ctx).pop();
|
Navigator.of(ctx).pop();
|
||||||
@ -231,46 +374,24 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
},
|
},
|
||||||
child: const Text('닫기'),
|
child: const Text('닫기'),
|
||||||
),
|
),
|
||||||
isSubmitting
|
submitButton
|
||||||
? const Padding(
|
];
|
||||||
padding: EdgeInsets.all(8.0),
|
} else if (_rankStep == _RankSubmissionStep.submitting) {
|
||||||
child: CircularProgressIndicator(),
|
dialogActions = [const CircularProgressIndicator()];
|
||||||
)
|
} else {
|
||||||
: ElevatedButton(
|
dialogActions = [closeButton];
|
||||||
onPressed: () async {
|
}
|
||||||
final playerName = nameController.text.trim();
|
|
||||||
if (playerName.isEmpty) {
|
return AlertDialog(
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
title: Text(_rankStep == _RankSubmissionStep.showList
|
||||||
const SnackBar(content: Text('이름을 입력해주세요.')),
|
? '🏆 상위 10개 랭킹 ($contextId)'
|
||||||
);
|
: '🎉 성공! 기록을 남겨주세요.'),
|
||||||
return;
|
content: SizedBox(
|
||||||
}
|
width: 400,
|
||||||
setDialogState(() { isSubmitting = true; });
|
height: _rankStep == _RankSubmissionStep.showList ? 400 : null,
|
||||||
final rankDto = UnifiedRankDto(
|
child: dialogContent,
|
||||||
gameType: 'SUDOKU',
|
),
|
||||||
contextId: contextId,
|
actions: dialogActions,
|
||||||
playerName: playerName,
|
|
||||||
primaryScore: secondsElapsed,
|
|
||||||
secondaryScore: null,
|
|
||||||
);
|
|
||||||
try {
|
|
||||||
await _puzzleService.submitRank(rankDto);
|
|
||||||
if (!mounted) return;
|
|
||||||
Navigator.of(ctx).pop();
|
|
||||||
Navigator.of(context).pop();
|
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
|
||||||
const SnackBar(content: Text('랭킹이 등록되었습니다!')),
|
|
||||||
);
|
|
||||||
} catch (e) {
|
|
||||||
setDialogState(() { isSubmitting = false; });
|
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
|
||||||
SnackBar(content: Text(e.toString())),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
child: const Text('랭킹 등록'),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@ -290,7 +411,6 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
// 🔽 [수정] 타이머 텍스트를 AppBar로 이동시키기 위해 build 메서드 상단으로 이동
|
|
||||||
String formattedTime =
|
String formattedTime =
|
||||||
'${(secondsElapsed ~/ 60).toString().padLeft(2, '0')}:${(secondsElapsed % 60).toString().padLeft(2, '0')}';
|
'${(secondsElapsed ~/ 60).toString().padLeft(2, '0')}:${(secondsElapsed % 60).toString().padLeft(2, '0')}';
|
||||||
|
|
||||||
@ -303,94 +423,107 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
body: SafeArea(
|
||||||
title: const Text('Sudoku'), // 👈 [수정] 테마 이름 제거
|
child: Column(
|
||||||
actions: [
|
children: [
|
||||||
// 🔽 [수정] AppBar 우측에 타이머 추가
|
Expanded(
|
||||||
Padding(
|
child: LayoutBuilder(
|
||||||
padding: const EdgeInsets.only(right: 20.0),
|
builder: (context, constraints) {
|
||||||
child: Center(
|
bool isLandscape = constraints.maxWidth > constraints.maxHeight;
|
||||||
child: Text(
|
if (isLandscape) {
|
||||||
formattedTime,
|
return _buildLandscapeLayout(context, numberCounts, constraints, formattedTime);
|
||||||
style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
|
} else {
|
||||||
|
return _buildPortraitLayout(context, numberCounts, constraints, formattedTime);
|
||||||
|
}
|
||||||
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
const AdBannerWidget(),
|
||||||
],
|
],
|
||||||
),
|
|
||||||
body: Column(
|
|
||||||
children: [
|
|
||||||
// 1. 게임 콘텐츠 영역
|
|
||||||
Expanded(
|
|
||||||
child: LayoutBuilder(
|
|
||||||
builder: (context, constraints) {
|
|
||||||
bool isLandscape = constraints.maxWidth > constraints.maxHeight;
|
|
||||||
if (isLandscape) {
|
|
||||||
return _buildLandscapeLayout(context, numberCounts);
|
|
||||||
} else {
|
|
||||||
return _buildPortraitLayout(context, numberCounts);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
|
|
||||||
// 2. 광고 배너
|
|
||||||
const AdBannerWidget(),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 🔽 [수정] formattedTime 파라미터 제거
|
|
||||||
Widget _buildPortraitLayout(BuildContext context, Map<int, int> numberCounts) {
|
|
||||||
return Center(
|
|
||||||
child: ConstrainedBox(
|
|
||||||
constraints: const BoxConstraints(maxWidth: 600),
|
|
||||||
child: SingleChildScrollView(
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.all(16.0),
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
_buildGameInfoWidget(), // 👈 [수정] 파라미터 제거
|
|
||||||
const SizedBox(height: 15),
|
|
||||||
_buildSudokuBoardWidget(),
|
|
||||||
const SizedBox(height: 15),
|
|
||||||
_buildNumberPadWidget(context, numberCounts, isLandscape: false),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 🔽 [수정] formattedTime 파라미터 제거
|
Widget _buildPortraitLayout(BuildContext context, Map<int, int> numberCounts, BoxConstraints constraints, String formattedTime) {
|
||||||
Widget _buildLandscapeLayout(BuildContext context, Map<int, int> numberCounts) {
|
final double boardWidth = (constraints.maxWidth > 600) ? 600 : constraints.maxWidth;
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.all(16.0),
|
return Center(
|
||||||
child: Row(
|
child: ConstrainedBox(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
constraints: BoxConstraints(maxWidth: boardWidth),
|
||||||
children: [
|
child: Column(
|
||||||
Expanded(
|
children: [
|
||||||
flex: 6,
|
Padding(
|
||||||
child: Center(
|
padding: const EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 0),
|
||||||
child: AspectRatio(
|
child: _buildGameInfoWidget(formattedTime),
|
||||||
aspectRatio: 1.0,
|
),
|
||||||
child: _buildSudokuBoardWidget(),
|
Expanded(
|
||||||
|
child: Center(
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
_buildSudokuBoardWidget(),
|
||||||
|
const SizedBox(height: 15),
|
||||||
|
_buildNumberPadWidget(context, numberCounts, isLandscape: false, boardWidth: boardWidth),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
const SizedBox(width: 16),
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildLandscapeLayout(BuildContext context, Map<int, int> numberCounts, BoxConstraints constraints, String formattedTime) {
|
||||||
|
|
||||||
|
const double infoBarHeight = 60.0;
|
||||||
|
double boardWidth = constraints.maxHeight - infoBarHeight - 32.0;
|
||||||
|
|
||||||
|
const double numberPadScaleRatio = 0.6;
|
||||||
|
double padWidth = boardWidth * numberPadScaleRatio;
|
||||||
|
|
||||||
|
if (padWidth < 200) padWidth = 200;
|
||||||
|
if (padWidth > 350) padWidth = 350;
|
||||||
|
|
||||||
|
double totalWidth = boardWidth + (padWidth + 100) + 16.0;
|
||||||
|
if (totalWidth > (constraints.maxWidth - 32.0)) {
|
||||||
|
double scale = (constraints.maxWidth - 32.0) / totalWidth;
|
||||||
|
boardWidth *= scale;
|
||||||
|
padWidth *= scale;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
_buildGameInfoWidget(formattedTime),
|
||||||
Expanded(
|
Expanded(
|
||||||
flex: 4,
|
child: Row(
|
||||||
child: SingleChildScrollView(
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
child: Column(
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
_buildGameInfoWidget(), // 👈 [수정] 파라미터 제거
|
SizedBox(
|
||||||
const SizedBox(height: 20),
|
width: boardWidth,
|
||||||
_buildNumberPadWidget(context, numberCounts, isLandscape: true),
|
child: _buildSudokuBoardWidget(),
|
||||||
],
|
),
|
||||||
),
|
const SizedBox(width: 16),
|
||||||
|
SizedBox(
|
||||||
|
width: padWidth + 100,
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
_buildNumberPadWidget(context, numberCounts, isLandscape: true, boardWidth: boardWidth),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@ -398,16 +531,13 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 🔽 [수정] 상단 정보 (점수, 힌트, 되돌리기) - 타이머 제거
|
Widget _buildGameInfoWidget(String formattedTime) {
|
||||||
Widget _buildGameInfoWidget() {
|
|
||||||
return Row(
|
return Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
// 1. 점수
|
|
||||||
Text('SCORE: $score', style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold)),
|
Text('SCORE: $score', style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold)),
|
||||||
|
Text(formattedTime, style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold)),
|
||||||
// 2. 버튼 그룹 (힌트, 되돌리기)
|
|
||||||
Row(
|
Row(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
@ -427,7 +557,6 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 게임 보드 (변경 없음)
|
|
||||||
Widget _buildSudokuBoardWidget() {
|
Widget _buildSudokuBoardWidget() {
|
||||||
return SudokuBoard(
|
return SudokuBoard(
|
||||||
blockSize: blockSize,
|
blockSize: blockSize,
|
||||||
@ -441,24 +570,62 @@ class _GameScreenState extends State<GameScreen> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 숫자 패드 (변경 없음)
|
Widget _buildNumberPadWidget(BuildContext context, Map<int, int> numberCounts, {required bool isLandscape, required double boardWidth}) {
|
||||||
Widget _buildNumberPadWidget(BuildContext context, Map<int, int> numberCounts, {required bool isLandscape}) {
|
const double numberPadScaleRatio = 0.6;
|
||||||
double? maxWidth = !isLandscape
|
double? padMaxWidth;
|
||||||
? 600 * 0.6
|
|
||||||
: null;
|
|
||||||
|
|
||||||
return Center(
|
if (!isLandscape) {
|
||||||
child: ConstrainedBox(
|
padMaxWidth = boardWidth * numberPadScaleRatio;
|
||||||
constraints: BoxConstraints(maxWidth: maxWidth ?? double.infinity),
|
} else {
|
||||||
child: NumberPad(
|
padMaxWidth = null;
|
||||||
blockSize: blockSize,
|
}
|
||||||
theme: activeTheme,
|
|
||||||
numberCounts: numberCounts,
|
Widget numberPadGrid = ConstrainedBox(
|
||||||
selectedNumber: selectedNumberPad,
|
constraints: BoxConstraints(maxWidth: padMaxWidth ?? double.infinity),
|
||||||
onNumberTapped: onNumberTapped,
|
child: NumberPad(
|
||||||
isLandscape: isLandscape,
|
blockSize: blockSize,
|
||||||
),
|
theme: activeTheme,
|
||||||
|
numberCounts: numberCounts,
|
||||||
|
selectedNumber: selectedNumberPad,
|
||||||
|
onNumberTapped: onNumberTapped,
|
||||||
|
isLandscape: isLandscape,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Widget quitButton = IconButton(
|
||||||
|
icon: Icon(Icons.close, color: Colors.red.shade700, size: 30),
|
||||||
|
onPressed: _onQuitGameTapped,
|
||||||
|
tooltip: "게임 종료",
|
||||||
|
);
|
||||||
|
|
||||||
|
Widget restartButton = IconButton(
|
||||||
|
icon: Icon(Icons.refresh, color: Colors.blue.shade700, size: 30),
|
||||||
|
onPressed: _onRestartGameTapped,
|
||||||
|
tooltip: "다시하기",
|
||||||
|
);
|
||||||
|
|
||||||
|
if (isLandscape) {
|
||||||
|
return Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
numberPadGrid,
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||||
|
children: [quitButton, restartButton],
|
||||||
|
)
|
||||||
|
],
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
quitButton,
|
||||||
|
Expanded(child: numberPadGrid),
|
||||||
|
restartButton,
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4,6 +4,7 @@ import 'package:sudoku_app/models/sudoku_theme.dart';
|
|||||||
import 'package:sudoku_app/screens/game_screen.dart';
|
import 'package:sudoku_app/screens/game_screen.dart';
|
||||||
import 'package:sudoku_app/screens/ranking_screen.dart';
|
import 'package:sudoku_app/screens/ranking_screen.dart';
|
||||||
import 'package:sudoku_app/services/puzzle_service.dart';
|
import 'package:sudoku_app/services/puzzle_service.dart';
|
||||||
|
import 'package:sudoku_app/services/identity_service.dart'; // 👈 ID 서비스 임포트
|
||||||
import 'package:sudoku_app/widgets/ad_banner_widget.dart';
|
import 'package:sudoku_app/widgets/ad_banner_widget.dart';
|
||||||
|
|
||||||
class HomeScreen extends StatefulWidget {
|
class HomeScreen extends StatefulWidget {
|
||||||
@ -14,38 +15,39 @@ class HomeScreen extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _HomeScreenState extends State<HomeScreen> {
|
class _HomeScreenState extends State<HomeScreen> {
|
||||||
// 난이도
|
// 8단계 난이도
|
||||||
double _difficultyLevel = 2.0;
|
double _difficultyLevel = 4.0; // 1.0 ~ 8.0 (기본값 Level 4: 중급 9x9)
|
||||||
final List<String> levelLabels = ["Easy", "Normal", "Medium", "Hard", "Expert"];
|
final List<String> levelLabels = [
|
||||||
|
"입문 (4x4)", "초급 (4x4)",
|
||||||
|
"쉬움 (9x9)", "중급 (9x9)", "어려움 (9x9)",
|
||||||
|
"전문가 (16x16)", "마스터 (16x16)", "지옥 (16x16)"
|
||||||
|
];
|
||||||
|
|
||||||
// 그리드 크기
|
|
||||||
double _blockSize = 3.0;
|
|
||||||
// 🔽 [수정] 16x16, 25x25 옵션 제거
|
|
||||||
final List<String> sizeLabels = ["4x4", "9x9"];
|
|
||||||
|
|
||||||
// 테마 이름
|
|
||||||
late String _selectedThemeName;
|
late String _selectedThemeName;
|
||||||
|
|
||||||
bool isLoading = false;
|
bool isLoading = false;
|
||||||
final PuzzleService _puzzleService = PuzzleService();
|
final PuzzleService _puzzleService = PuzzleService();
|
||||||
|
final IdentityService _identityService = IdentityService(); // 👈 ID 서비스 초기화
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
// 기본 테마를 '랜덤' 이름으로 설정
|
_selectedThemeName = AppThemes.random; // 기본 테마 '랜덤'
|
||||||
_selectedThemeName = AppThemes.random;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _startGame() async {
|
Future<void> _startGame() async {
|
||||||
setState(() { isLoading = true; });
|
setState(() { isLoading = true; });
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final String level = _difficultyLevel.round().toString();
|
// 1. 난이도 값(String) 전달
|
||||||
final String blockSize = _blockSize.round().toString();
|
final String difficulty = _difficultyLevel.round().toString();
|
||||||
|
|
||||||
final SudokuGameDto gameData = await _puzzleService.startGame(level, blockSize);
|
// 2. 서버에서 게임 데이터 가져오기
|
||||||
|
final SudokuGameDto gameData = await _puzzleService.startGame(difficulty);
|
||||||
|
|
||||||
|
// 3. 로컬에서 앱-고유 ID와 저장된 이름 가져오기
|
||||||
|
final String userId = await _identityService.getOrCreateUserId();
|
||||||
|
final String? userName = await _identityService.getSavedUserName();
|
||||||
|
|
||||||
// 선택된 '테마 이름(String)'을 그대로 전달
|
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
Navigator.push(
|
Navigator.push(
|
||||||
context,
|
context,
|
||||||
@ -53,6 +55,8 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
builder: (context) => GameScreen(
|
builder: (context) => GameScreen(
|
||||||
gameData: gameData,
|
gameData: gameData,
|
||||||
themeName: _selectedThemeName,
|
themeName: _selectedThemeName,
|
||||||
|
userId: userId, // 👈 ID 전달
|
||||||
|
userName: userName, // 👈 이름 전달
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@ -76,6 +80,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
appBar: AppBar(title: const Text('스도쿠 게임')),
|
appBar: AppBar(title: const Text('스도쿠 게임')),
|
||||||
body: LayoutBuilder( // 비율 기반 레이아웃
|
body: LayoutBuilder( // 비율 기반 레이아웃
|
||||||
builder: (context, constraints) {
|
builder: (context, constraints) {
|
||||||
|
// 너비/높이 비율 변수 (0.6 = 너비가 높이의 60%를 넘지 않도록 함)
|
||||||
const double maxContentRatio = 0.6;
|
const double maxContentRatio = 0.6;
|
||||||
final double constrainedWidth = constraints.maxHeight * maxContentRatio;
|
final double constrainedWidth = constraints.maxHeight * maxContentRatio;
|
||||||
|
|
||||||
@ -91,36 +96,22 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
child: Column(
|
child: Column(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
// 1. 난이도 선택
|
// 1. 난이도 선택 (8단계)
|
||||||
const Text("난이도", style: TextStyle(fontSize: 18)),
|
const Text("난이도", style: TextStyle(fontSize: 18)),
|
||||||
|
Text(
|
||||||
|
levelLabels[_difficultyLevel.round() - 1],
|
||||||
|
style: const TextStyle(fontSize: 22, fontWeight: FontWeight.bold, color: Colors.blue),
|
||||||
|
),
|
||||||
Slider(
|
Slider(
|
||||||
value: _difficultyLevel,
|
value: _difficultyLevel,
|
||||||
min: 1.0, max: 5.0, divisions: 4,
|
min: 1.0, max: 8.0, divisions: 7, // 8단계
|
||||||
label: levelLabels[_difficultyLevel.round() - 1],
|
label: levelLabels[_difficultyLevel.round() - 1],
|
||||||
onChanged: (newValue) => setState(() { _difficultyLevel = newValue; }),
|
onChanged: (newValue) => setState(() { _difficultyLevel = newValue; }),
|
||||||
),
|
),
|
||||||
|
|
||||||
const SizedBox(height: 20),
|
const SizedBox(height: 20),
|
||||||
|
|
||||||
// 2. 그리드 크기 선택
|
// 2. 테마 선택 (String 기반)
|
||||||
const Text("그리드 크기", style: TextStyle(fontSize: 18)),
|
|
||||||
Text(
|
|
||||||
// 🔽 [수정] 인덱스 매핑 변경 (2.0 -> index 0)
|
|
||||||
sizeLabels[_blockSize.round() - 2],
|
|
||||||
style: const TextStyle(fontSize: 22, fontWeight: FontWeight.bold, color: Colors.deepOrange),
|
|
||||||
),
|
|
||||||
Slider(
|
|
||||||
value: _blockSize,
|
|
||||||
// 🔽 [수정] 최대값을 3.0으로, divisions를 1로 변경
|
|
||||||
min: 2.0, max: 3.0, divisions: 1,
|
|
||||||
label: sizeLabels[_blockSize.round() - 2],
|
|
||||||
activeColor: Colors.deepOrange,
|
|
||||||
onChanged: (newValue) => setState(() { _blockSize = newValue; }),
|
|
||||||
),
|
|
||||||
|
|
||||||
const SizedBox(height: 20),
|
|
||||||
|
|
||||||
// 3. 테마 선택 (String 기반)
|
|
||||||
const Text("테마", style: TextStyle(fontSize: 18)),
|
const Text("테마", style: TextStyle(fontSize: 18)),
|
||||||
DropdownButton<String>(
|
DropdownButton<String>(
|
||||||
value: _selectedThemeName,
|
value: _selectedThemeName,
|
||||||
@ -150,11 +141,19 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
|
|
||||||
const SizedBox(height: 10),
|
const SizedBox(height: 10),
|
||||||
|
|
||||||
|
// "랭킹 보기" 버튼
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
|
// 현재 슬라이더의 난이도 이름(String)을 가져옴
|
||||||
|
final String currentDifficultyName = levelLabels[_difficultyLevel.round() - 1];
|
||||||
|
|
||||||
Navigator.push(
|
Navigator.push(
|
||||||
context,
|
context,
|
||||||
MaterialPageRoute(builder: (context) => const RankingScreen()),
|
MaterialPageRoute(
|
||||||
|
builder: (context) => RankingScreen(
|
||||||
|
initialDifficultyName: currentDifficultyName,
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
child: const Text('랭킹 보기'),
|
child: const Text('랭킹 보기'),
|
||||||
|
|||||||
@ -3,7 +3,13 @@ import 'package:sudoku_app/models/game_rank_dto.dart';
|
|||||||
import 'package:sudoku_app/services/puzzle_service.dart';
|
import 'package:sudoku_app/services/puzzle_service.dart';
|
||||||
|
|
||||||
class RankingScreen extends StatefulWidget {
|
class RankingScreen extends StatefulWidget {
|
||||||
const RankingScreen({super.key});
|
// 🔽 [추가] 홈 화면에서 전달받을 초기 난이도 이름
|
||||||
|
final String? initialDifficultyName;
|
||||||
|
|
||||||
|
const RankingScreen({
|
||||||
|
super.key,
|
||||||
|
this.initialDifficultyName, // 👈 생성자에 추가
|
||||||
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<RankingScreen> createState() => _RankingScreenState();
|
State<RankingScreen> createState() => _RankingScreenState();
|
||||||
@ -11,67 +17,129 @@ class RankingScreen extends StatefulWidget {
|
|||||||
|
|
||||||
class _RankingScreenState extends State<RankingScreen> {
|
class _RankingScreenState extends State<RankingScreen> {
|
||||||
final PuzzleService _puzzleService = PuzzleService();
|
final PuzzleService _puzzleService = PuzzleService();
|
||||||
// FutureBuilder를 사용하여 비동기 데이터를 쉽게 처리
|
|
||||||
late Future<List<GameRankDto>> _rankingFuture;
|
late Future<List<GameRankDto>> _rankingFuture;
|
||||||
|
|
||||||
|
// 8단계 난이도에 맞는 Context ID 맵
|
||||||
|
final Map<String, String> difficultyContexts = {
|
||||||
|
"입문 (4x4)": "SUDOKU_4x4_L1",
|
||||||
|
"초급 (4x4)": "SUDOKU_4x4_L2",
|
||||||
|
"쉬움 (9x9)": "SUDOKU_9x9_L3",
|
||||||
|
"중급 (9x9)": "SUDOKU_9x9_L4",
|
||||||
|
"어려움 (9x9)": "SUDOKU_9x9_L5",
|
||||||
|
"전문가 (16x16)": "SUDOKU_16x16_L6",
|
||||||
|
"마스터 (16x16)": "SUDOKU_16x16_L7",
|
||||||
|
"지옥 (16x16)": "SUDOKU_16x16_L8",
|
||||||
|
};
|
||||||
|
late String _selectedDifficulty;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
// 화면이 로드될 때 스도쿠의 전체 랭킹을 가져옴 (contextId = null)
|
// 🔽 [수정]
|
||||||
_rankingFuture = _puzzleService.fetchRanks('SUDOKU', null);
|
// 1. HomeScreen에서 전달받은 값이 있는지 확인
|
||||||
|
String defaultDifficulty = widget.initialDifficultyName ?? "중급 (9x9)";
|
||||||
|
|
||||||
|
// 2. (안전장치) 전달받은 값이 맵에 없으면(예: 향후 변경) 기본값 사용
|
||||||
|
if (!difficultyContexts.containsKey(defaultDifficulty)) {
|
||||||
|
defaultDifficulty = "중급 (9x9)";
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. 랭킹 조회
|
||||||
|
_fetchRanksForDifficulty(defaultDifficulty);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 점수(초)를 'mm:ss' 형식으로 변환
|
void _fetchRanksForDifficulty(String difficultyName) {
|
||||||
String _formatScore(int seconds) {
|
setState(() {
|
||||||
|
_selectedDifficulty = difficultyName;
|
||||||
|
_rankingFuture = _puzzleService.fetchRanks('SUDOKU', difficultyContexts[_selectedDifficulty]);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 시간(초)을 'mm:ss' 형식으로 변환
|
||||||
|
String _formatTime(int seconds) {
|
||||||
final min = (seconds ~/ 60).toString().padLeft(2, '0');
|
final min = (seconds ~/ 60).toString().padLeft(2, '0');
|
||||||
final sec = (seconds % 60).toString().padLeft(2, '0');
|
final sec = (seconds % 60).toString().padLeft(2, '0');
|
||||||
return '$min:$sec';
|
return '$min:$sec';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// (5 - score)로 저장된 값을 -> "SCORE: 5"로 변환
|
||||||
|
String _formatScore(int? storedScore) {
|
||||||
|
int score = 5 - (storedScore ?? 5);
|
||||||
|
return 'SCORE: $score';
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(title: const Text('스도쿠 전체 랭킹')),
|
appBar: AppBar(title: const Text('스도쿠 랭킹')),
|
||||||
body: FutureBuilder<List<GameRankDto>>(
|
body: Column(
|
||||||
future: _rankingFuture,
|
children: [
|
||||||
builder: (context, snapshot) {
|
// 1. 난이도 선택 Dropdown
|
||||||
// 로딩 중일 때
|
Padding(
|
||||||
if (snapshot.connectionState == ConnectionState.waiting) {
|
padding: const EdgeInsets.all(16.0),
|
||||||
return const Center(child: CircularProgressIndicator());
|
child: DropdownButton<String>(
|
||||||
}
|
value: _selectedDifficulty, // 👈 initState에서 설정된 값으로 시작
|
||||||
// 에러 발생 시
|
isExpanded: true,
|
||||||
if (snapshot.hasError) {
|
items: difficultyContexts.keys.map((String difficultyName) {
|
||||||
return Center(child: Text('랭킹 로딩 실패: ${snapshot.error}'));
|
return DropdownMenuItem<String>(
|
||||||
}
|
value: difficultyName,
|
||||||
// 데이터가 없거나 비어있을 때
|
child: Text(difficultyName),
|
||||||
if (!snapshot.hasData || snapshot.data!.isEmpty) {
|
);
|
||||||
return const Center(child: Text('등록된 랭킹이 없습니다.'));
|
}).toList(),
|
||||||
}
|
onChanged: (String? newValue) {
|
||||||
|
if (newValue != null) {
|
||||||
|
_fetchRanksForDifficulty(newValue);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// 2. 랭킹 리스트
|
||||||
|
Expanded(
|
||||||
|
child: FutureBuilder<List<GameRankDto>>(
|
||||||
|
future: _rankingFuture,
|
||||||
|
builder: (context, snapshot) {
|
||||||
|
if (snapshot.connectionState == ConnectionState.waiting) {
|
||||||
|
return const Center(child: CircularProgressIndicator());
|
||||||
|
}
|
||||||
|
if (snapshot.hasError) {
|
||||||
|
return Center(child: Text('랭킹 로딩 실패: ${snapshot.error}'));
|
||||||
|
}
|
||||||
|
if (!snapshot.hasData || snapshot.data!.isEmpty) {
|
||||||
|
return const Center(child: Text('등록된 랭킹이 없습니다.'));
|
||||||
|
}
|
||||||
|
|
||||||
// 성공적으로 데이터를 가져왔을 때
|
final ranks = snapshot.data!;
|
||||||
final ranks = snapshot.data!;
|
return ListView.builder(
|
||||||
return ListView.builder(
|
itemCount: ranks.length,
|
||||||
itemCount: ranks.length,
|
itemBuilder: (context, index) {
|
||||||
itemBuilder: (context, index) {
|
final rank = ranks[index];
|
||||||
final rank = ranks[index];
|
return ListTile(
|
||||||
return ListTile(
|
leading: Text(
|
||||||
leading: Text(
|
'${index + 1}.',
|
||||||
'${index + 1}.',
|
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
|
||||||
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
|
),
|
||||||
),
|
title: Text(rank.playerName, style: const TextStyle(fontSize: 18)),
|
||||||
title: Text(rank.playerName, style: const TextStyle(fontSize: 18)),
|
trailing: Column(
|
||||||
trailing: Text(
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
_formatScore(rank.primaryScore), // 시간(초)을 mm:ss로 표시
|
crossAxisAlignment: CrossAxisAlignment.end,
|
||||||
style: const TextStyle(
|
children: [
|
||||||
fontSize: 16,
|
Text(
|
||||||
fontWeight: FontWeight.bold,
|
_formatTime(rank.primaryScore),
|
||||||
color: Colors.blue,
|
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: Colors.blue),
|
||||||
),
|
),
|
||||||
),
|
Text(
|
||||||
);
|
_formatScore(rank.secondaryScore),
|
||||||
},
|
style: const TextStyle(fontSize: 12, color: Colors.grey),
|
||||||
);
|
),
|
||||||
},
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
35
lib/services/identity_service.dart
Normal file
35
lib/services/identity_service.dart
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
// lib/services/identity_service.dart
|
||||||
|
|
||||||
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
import 'package:uuid/uuid.dart';
|
||||||
|
|
||||||
|
// 앱-고유 ID와 사용자 이름을 관리하는 서비스
|
||||||
|
class IdentityService {
|
||||||
|
static const String _userIdKey = 'app_user_id';
|
||||||
|
static const String _userNameKey = 'app_user_name';
|
||||||
|
|
||||||
|
// 1. 앱-고유 ID 가져오기 (없으면 생성)
|
||||||
|
Future<String> getOrCreateUserId() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
String? userId = prefs.getString(_userIdKey);
|
||||||
|
|
||||||
|
if (userId == null) {
|
||||||
|
// ID가 없으면 V4 UUID 생성
|
||||||
|
userId = const Uuid().v4();
|
||||||
|
await prefs.setString(_userIdKey, userId);
|
||||||
|
}
|
||||||
|
return userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. 랭킹에 등록한 사용자 이름 가져오기
|
||||||
|
Future<String?> getSavedUserName() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
return prefs.getString(_userNameKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. 랭킹 등록 성공 시, 사용자 이름 저장하기
|
||||||
|
Future<void> saveUserName(String name) async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
await prefs.setString(_userNameKey, name);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,19 +1,18 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:developer';
|
import 'dart:developer'; // 👈 [추가] log 함수를 위한 임포트
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
import 'package:sudoku_app/models/sudoku_game_dto.dart';
|
import 'package:sudoku_app/models/sudoku_game_dto.dart';
|
||||||
import 'package:sudoku_app/models/unified_rank_dto.dart';
|
import 'package:sudoku_app/models/unified_rank_dto.dart';
|
||||||
import 'package:sudoku_app/models/game_rank_dto.dart';
|
import 'package:sudoku_app/models/game_rank_dto.dart';
|
||||||
|
|
||||||
class PuzzleService {
|
class PuzzleService {
|
||||||
final String _baseUrl = "https://lunaticbum.kr"; // 👈 HTTPS 확인
|
final String _baseUrl = "https://lunaticbum.kr";
|
||||||
|
|
||||||
// 🔽 [수정] 'blockSize' 파라미터 추가
|
// ... (startGame 함수는 동일) ...
|
||||||
Future<SudokuGameDto> startGame(String level, String blockSize) async {
|
Future<SudokuGameDto> startGame(String difficulty) async {
|
||||||
final response = await http.get(
|
final response = await http.get(
|
||||||
Uri.parse('$_baseUrl/puzzle/sudoku/start?level=$level&blockSizeStr=$blockSize'),
|
Uri.parse('$_baseUrl/puzzle/sudoku/start?difficulty=$difficulty'),
|
||||||
);
|
);
|
||||||
|
|
||||||
if (response.statusCode == 200) {
|
if (response.statusCode == 200) {
|
||||||
final data = jsonDecode(utf8.decode(response.bodyBytes));
|
final data = jsonDecode(utf8.decode(response.bodyBytes));
|
||||||
return SudokuGameDto.fromJson(data);
|
return SudokuGameDto.fromJson(data);
|
||||||
@ -22,18 +21,16 @@ class PuzzleService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 🔽 [수정] puzzleId 대신 question, answer, blockSize를 전송
|
// ... (validateSolution 함수는 동일) ...
|
||||||
Future<bool> validateSolution(String question, String answer, int blockSize) async {
|
Future<bool> validateSolution(int puzzleId, String answer) async {
|
||||||
final response = await http.post(
|
final response = await http.post(
|
||||||
Uri.parse('$_baseUrl/puzzle/sudoku/validate'),
|
Uri.parse('$_baseUrl/puzzle/sudoku/validate'),
|
||||||
headers: {'Content-Type': 'application/json'},
|
headers: {'Content-Type': 'application/json'},
|
||||||
body: jsonEncode({
|
body: jsonEncode({
|
||||||
'question': question, // 👈 [수정]
|
'puzzleId': puzzleId,
|
||||||
'answer': answer,
|
'answer': answer,
|
||||||
'blockSize': blockSize, // 👈 [수정]
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
if (response.statusCode == 200) {
|
if (response.statusCode == 200) {
|
||||||
return jsonDecode(response.body)['correct'] ?? false;
|
return jsonDecode(response.body)['correct'] ?? false;
|
||||||
} else {
|
} else {
|
||||||
@ -43,43 +40,51 @@ class PuzzleService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// POST /api/ranks/submit
|
// POST /api/ranks/submit
|
||||||
Future<void> submitRank(UnifiedRankDto rankDto) async {
|
Future<void> submitRank(UnifiedRankDto rankDto) async {
|
||||||
|
|
||||||
|
final requestBody = jsonEncode(rankDto.toJson());
|
||||||
|
|
||||||
|
// 🔽 [로그 추가] 1. 서버로 전송하는 JSON 데이터 출력
|
||||||
|
log(">>> 랭킹 등록 요청: $requestBody");
|
||||||
|
|
||||||
final response = await http.post(
|
final response = await http.post(
|
||||||
Uri.parse('$_baseUrl/api/ranks/submit'),
|
Uri.parse('$_baseUrl/api/ranks/submit'),
|
||||||
headers: {'Content-Type': 'application/json'},
|
headers: {'Content-Type': 'application/json'},
|
||||||
body: jsonEncode(rankDto.toJson()),
|
body: requestBody,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (response.statusCode != 200) {
|
if (response.statusCode != 200) {
|
||||||
|
// 🔽 [로그 추가] 2. 서버가 200(OK)이 아닌 응답을 줬을 때
|
||||||
|
log("<<< 랭킹 등록 실패: ${response.statusCode}");
|
||||||
try {
|
try {
|
||||||
final errorBody = utf8.decode(response.bodyBytes);
|
final errorBody = utf8.decode(response.bodyBytes);
|
||||||
|
log("<<< 서버 에러 메시지: $errorBody"); // 👈 (예: "이미 사용 중인 이름입니다.")
|
||||||
throw Exception(errorBody);
|
throw Exception(errorBody);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
throw Exception('랭킹 등록 실패: ${response.reasonPhrase}');
|
throw Exception('랭킹 등록 실패: ${response.reasonPhrase}');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 🔽 [로그 추가] 3. 성공 시
|
||||||
|
log("<<< 랭킹 등록 성공: 200 OK");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ... (fetchRanks 함수는 동일) ...
|
||||||
Future<List<GameRankDto>> fetchRanks(String gameType, String? contextId) async {
|
Future<List<GameRankDto>> fetchRanks(String gameType, String? contextId) async {
|
||||||
final queryParams = {
|
final queryParams = {
|
||||||
'gameType': gameType,
|
'gameType': gameType,
|
||||||
if (contextId != null) 'contextId': contextId,
|
if (contextId != null) 'contextId': contextId,
|
||||||
};
|
};
|
||||||
// 쿼리 파라미터를 포함하여 URI 생성
|
|
||||||
final uri = Uri.parse('$_baseUrl/api/ranks/list').replace(queryParameters: queryParams);
|
final uri = Uri.parse('$_baseUrl/api/ranks/list').replace(queryParameters: queryParams);
|
||||||
|
|
||||||
final response = await http.get(uri);
|
final response = await http.get(uri);
|
||||||
|
|
||||||
if (response.statusCode == 200) {
|
if (response.statusCode == 200) {
|
||||||
// 서버에서 [ ... ] 형태의 JSON 배열을 받음
|
|
||||||
final List<dynamic> data = jsonDecode(utf8.decode(response.bodyBytes));
|
final List<dynamic> data = jsonDecode(utf8.decode(response.bodyBytes));
|
||||||
// 각 JSON 객체를 GameRankDto로 변환
|
|
||||||
return data.map((json) => GameRankDto.fromJson(json)).toList();
|
return data.map((json) => GameRankDto.fromJson(json)).toList();
|
||||||
} else {
|
} else {
|
||||||
throw Exception('랭킹 로딩 실패');
|
throw Exception('랭킹 로딩 실패');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1,20 +1,20 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:sudoku_app/models/sudoku_theme.dart'; // 👈 [추가]
|
import 'package:sudoku_app/models/sudoku_theme.dart'; // 👈 테마 모델 임포트
|
||||||
|
|
||||||
class SudokuBoard extends StatelessWidget {
|
class SudokuBoard extends StatelessWidget {
|
||||||
final int blockSize;
|
final int blockSize;
|
||||||
final SudokuTheme theme; // 👈 [추가]
|
final SudokuTheme theme; // 👈 이번 게임의 테마
|
||||||
final List<int> cells; // 👈 [수정] List<String> -> List<int>
|
final List<int> cells; // 👈 List<int> (0, 1, 10...)
|
||||||
final List<int> originalCells; // 👈 [수정] List<String> -> List<int>
|
final List<int> originalCells; // 👈 List<int> (0, 1, 10...)
|
||||||
final int? selectedIndex;
|
final int? selectedIndex;
|
||||||
final int? selectedNumberPad;
|
final int? selectedNumberPad; // 10진수 숫자 (1, 10...)
|
||||||
final Set<int> incorrectCells;
|
final Set<int> incorrectCells;
|
||||||
final Function(int) onCellTapped;
|
final Function(int) onCellTapped;
|
||||||
|
|
||||||
const SudokuBoard({
|
const SudokuBoard({
|
||||||
super.key,
|
super.key,
|
||||||
required this.blockSize,
|
required this.blockSize,
|
||||||
required this.theme, // 👈 [추가]
|
required this.theme,
|
||||||
required this.cells,
|
required this.cells,
|
||||||
required this.originalCells,
|
required this.originalCells,
|
||||||
required this.selectedIndex,
|
required this.selectedIndex,
|
||||||
@ -26,6 +26,7 @@ class SudokuBoard extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final int gridSize = blockSize * blockSize;
|
final int gridSize = blockSize * blockSize;
|
||||||
|
// 그리드 크기에 따라 폰트 크기 동적 조절
|
||||||
final double fontSize = (gridSize > 9) ? (gridSize > 16 ? 12 : 16) : 24;
|
final double fontSize = (gridSize > 9) ? (gridSize > 16 ? 12 : 16) : 24;
|
||||||
|
|
||||||
return AspectRatio(
|
return AspectRatio(
|
||||||
@ -40,16 +41,18 @@ class SudokuBoard extends StatelessWidget {
|
|||||||
int row = index ~/ gridSize;
|
int row = index ~/ gridSize;
|
||||||
int col = index % gridSize;
|
int col = index % gridSize;
|
||||||
|
|
||||||
int cellValue = cells[index]; // 👈 [수정] 0, 1, 10...
|
int cellValue = cells[index]; // 0, 1, 10...
|
||||||
bool isEditable = (originalCells[index] == 0); // 👈 [수정] "0" -> 0
|
bool isEditable = (originalCells[index] == 0);
|
||||||
bool isSelected = (index == selectedIndex);
|
bool isSelected = (index == selectedIndex);
|
||||||
|
|
||||||
bool isHighlighted = (cellValue != 0 && // 👈 [수정]
|
// int == int 비교
|
||||||
|
bool isHighlighted = (cellValue != 0 &&
|
||||||
selectedNumberPad != null &&
|
selectedNumberPad != null &&
|
||||||
cellValue == selectedNumberPad); // 👈 [수정] int == int 비교
|
cellValue == selectedNumberPad);
|
||||||
|
|
||||||
bool isIncorrect = incorrectCells.contains(index);
|
bool isIncorrect = incorrectCells.contains(index);
|
||||||
|
|
||||||
|
// blockSize에 따른 동적 보더
|
||||||
BorderSide thickBorder = const BorderSide(color: Colors.black, width: 2.0);
|
BorderSide thickBorder = const BorderSide(color: Colors.black, width: 2.0);
|
||||||
BorderSide thinBorder = const BorderSide(color: Colors.grey, width: 0.5);
|
BorderSide thinBorder = const BorderSide(color: Colors.grey, width: 0.5);
|
||||||
|
|
||||||
@ -75,7 +78,7 @@ class SudokuBoard extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
child: Text(
|
child: Text(
|
||||||
// 🔽 [수정] 0이면 비우고, 아니면 테마 기호("1", "A", "🍎") 표시
|
// 0이면 비우고, 아니면 테마 기호("1", "A", "🍎") 표시
|
||||||
cellValue == 0 ? '' : theme.getSymbol(cellValue),
|
cellValue == 0 ? '' : theme.getSymbol(cellValue),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: fontSize,
|
fontSize: fontSize,
|
||||||
|
|||||||
@ -1 +1,2 @@
|
|||||||
|
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
|
||||||
#include "ephemeral/Flutter-Generated.xcconfig"
|
#include "ephemeral/Flutter-Generated.xcconfig"
|
||||||
|
|||||||
@ -1 +1,2 @@
|
|||||||
|
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
|
||||||
#include "ephemeral/Flutter-Generated.xcconfig"
|
#include "ephemeral/Flutter-Generated.xcconfig"
|
||||||
|
|||||||
@ -5,8 +5,10 @@
|
|||||||
import FlutterMacOS
|
import FlutterMacOS
|
||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
|
import shared_preferences_foundation
|
||||||
import webview_flutter_wkwebview
|
import webview_flutter_wkwebview
|
||||||
|
|
||||||
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
||||||
|
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
|
||||||
WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
|
WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
|
||||||
}
|
}
|
||||||
|
|||||||
42
macos/Podfile
Normal file
42
macos/Podfile
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
platform :osx, '10.15'
|
||||||
|
|
||||||
|
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
|
||||||
|
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
|
||||||
|
|
||||||
|
project 'Runner', {
|
||||||
|
'Debug' => :debug,
|
||||||
|
'Profile' => :release,
|
||||||
|
'Release' => :release,
|
||||||
|
}
|
||||||
|
|
||||||
|
def flutter_root
|
||||||
|
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
|
||||||
|
unless File.exist?(generated_xcode_build_settings_path)
|
||||||
|
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
|
||||||
|
end
|
||||||
|
|
||||||
|
File.foreach(generated_xcode_build_settings_path) do |line|
|
||||||
|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
|
||||||
|
return matches[1].strip if matches
|
||||||
|
end
|
||||||
|
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
|
||||||
|
end
|
||||||
|
|
||||||
|
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
|
||||||
|
|
||||||
|
flutter_macos_podfile_setup
|
||||||
|
|
||||||
|
target 'Runner' do
|
||||||
|
use_frameworks!
|
||||||
|
|
||||||
|
flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
|
||||||
|
target 'RunnerTests' do
|
||||||
|
inherit! :search_paths
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
post_install do |installer|
|
||||||
|
installer.pods_project.targets.each do |target|
|
||||||
|
flutter_additional_macos_build_settings(target)
|
||||||
|
end
|
||||||
|
end
|
||||||
141
pubspec.lock
141
pubspec.lock
@ -41,6 +41,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.19.1"
|
version: "1.19.1"
|
||||||
|
crypto:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: crypto
|
||||||
|
sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "3.0.7"
|
||||||
fake_async:
|
fake_async:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -49,6 +57,30 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.3.3"
|
version: "1.3.3"
|
||||||
|
ffi:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: ffi
|
||||||
|
sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.1.4"
|
||||||
|
file:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: file
|
||||||
|
sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "7.0.1"
|
||||||
|
fixnum:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: fixnum
|
||||||
|
sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "1.1.1"
|
||||||
flutter:
|
flutter:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description: flutter
|
description: flutter
|
||||||
@ -67,6 +99,11 @@ packages:
|
|||||||
description: flutter
|
description: flutter
|
||||||
source: sdk
|
source: sdk
|
||||||
version: "0.0.0"
|
version: "0.0.0"
|
||||||
|
flutter_web_plugins:
|
||||||
|
dependency: transitive
|
||||||
|
description: flutter
|
||||||
|
source: sdk
|
||||||
|
version: "0.0.0"
|
||||||
google_mobile_ads:
|
google_mobile_ads:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@ -155,6 +192,38 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.9.1"
|
version: "1.9.1"
|
||||||
|
path_provider_linux:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: path_provider_linux
|
||||||
|
sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.2.1"
|
||||||
|
path_provider_platform_interface:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: path_provider_platform_interface
|
||||||
|
sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.1.2"
|
||||||
|
path_provider_windows:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: path_provider_windows
|
||||||
|
sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.3.0"
|
||||||
|
platform:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: platform
|
||||||
|
sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "3.1.6"
|
||||||
plugin_platform_interface:
|
plugin_platform_interface:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -163,6 +232,62 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.8"
|
version: "2.1.8"
|
||||||
|
shared_preferences:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: shared_preferences
|
||||||
|
sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.5.3"
|
||||||
|
shared_preferences_android:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_android
|
||||||
|
sha256: "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.15"
|
||||||
|
shared_preferences_foundation:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_foundation
|
||||||
|
sha256: "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.5.5"
|
||||||
|
shared_preferences_linux:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_linux
|
||||||
|
sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.1"
|
||||||
|
shared_preferences_platform_interface:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_platform_interface
|
||||||
|
sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.1"
|
||||||
|
shared_preferences_web:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_web
|
||||||
|
sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.3"
|
||||||
|
shared_preferences_windows:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: shared_preferences_windows
|
||||||
|
sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "2.4.1"
|
||||||
sky_engine:
|
sky_engine:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description: flutter
|
description: flutter
|
||||||
@ -224,6 +349,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.4.0"
|
version: "1.4.0"
|
||||||
|
uuid:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: uuid
|
||||||
|
sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "4.5.2"
|
||||||
vector_math:
|
vector_math:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@ -280,6 +413,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.23.2"
|
version: "3.23.2"
|
||||||
|
xdg_directories:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: xdg_directories
|
||||||
|
sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "1.1.0"
|
||||||
sdks:
|
sdks:
|
||||||
dart: ">=3.9.2 <4.0.0"
|
dart: ">=3.9.2 <4.0.0"
|
||||||
flutter: ">=3.35.0"
|
flutter: ">=3.35.0"
|
||||||
|
|||||||
@ -11,6 +11,9 @@ dependencies:
|
|||||||
sdk: flutter
|
sdk: flutter
|
||||||
http: ^1.2.1 # 이 줄 추가 (버전은 최신 버전 확인)
|
http: ^1.2.1 # 이 줄 추가 (버전은 최신 버전 확인)
|
||||||
google_mobile_ads: ^5.1.0
|
google_mobile_ads: ^5.1.0
|
||||||
|
# 🔽 [추가] 2줄
|
||||||
|
shared_preferences: ^2.2.3
|
||||||
|
uuid: ^4.4.0
|
||||||
|
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user