Skip to content

Commit 9b1b416

Browse files
w8385w8385
committed
Merge branch 'refs/heads/dev'
2 parents bf67b0d + a31fb97 commit 9b1b416

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1260
-5323
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,13 @@ unlinked_spec.ds
113113
**/xcuserdata/
114114

115115
# Windows
116+
**/windows/flutter/ephemeral/
116117
**/windows/flutter/generated_plugin_registrant.cc
117118
**/windows/flutter/generated_plugin_registrant.h
118119
**/windows/flutter/generated_plugins.cmake
119120

120121
# Linux
122+
**/linux/flutter/ephemeral/
121123
**/linux/flutter/generated_plugin_registrant.cc
122124
**/linux/flutter/generated_plugin_registrant.h
123125
**/linux/flutter/generated_plugins.cmake

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ android {
5252

5353
defaultConfig {
5454
applicationId "com.w8385.my_solved"
55-
minSdkVersion 34
55+
minSdkVersion 26
5656
targetSdkVersion 34
5757
multiDexEnabled true
5858
versionCode flutterVersionCode.toInteger()

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
66
<uses-permission android:name="android.permission.VIBRATE" />
77
<uses-permission android:name="android.permission.WAKE_LOCK" />
8-
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
98
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
109
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
1110
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />

‎assets/images/icons/streak.svg‎

Lines changed: 3 additions & 4 deletions
Loading

‎assets/images/venues/solved ac.png‎

3.09 KB
Loading

‎ios/Podfile‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,68 @@ end
3737
post_install do |installer|
3838
installer.pods_project.targets.each do |target|
3939
flutter_additional_ios_build_settings(target)
40+
41+
target.build_configurations.each do |config|
42+
# You can remove unused permissions here
43+
# for more information: https://github.com/BaseflowIT/flutter-permission-handler/blob/master/permission_handler/ios/Classes/PermissionHandlerEnums.h
44+
# e.g. when you don't need camera permission, just add 'PERMISSION_CAMERA=0'
45+
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
46+
'$(inherited)',
47+
48+
## dart: PermissionGroup.calendar
49+
'PERMISSION_EVENTS=1',
50+
51+
## dart: PermissionGroup.calendarFullAccess
52+
'PERMISSION_EVENTS_FULL_ACCESS=1',
53+
54+
## dart: PermissionGroup.reminders
55+
'PERMISSION_REMINDERS=1',
56+
57+
## dart: PermissionGroup.contacts
58+
'PERMISSION_CONTACTS=1',
59+
60+
## dart: PermissionGroup.camera
61+
'PERMISSION_CAMERA=1',
62+
63+
## dart: PermissionGroup.microphone
64+
'PERMISSION_MICROPHONE=1',
65+
66+
## dart: PermissionGroup.speech
67+
'PERMISSION_SPEECH_RECOGNIZER=1',
68+
69+
## dart: PermissionGroup.photos
70+
'PERMISSION_PHOTOS=1',
71+
72+
## The 'PERMISSION_LOCATION' macro enables the `locationWhenInUse` and `locationAlways` permission. If
73+
## the application only requires `locationWhenInUse`, only specify the `PERMISSION_LOCATION_WHENINUSE`
74+
## macro.
75+
##
76+
## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
77+
'PERMISSION_LOCATION=1',
78+
'PERMISSION_LOCATION_WHENINUSE=0',
79+
80+
## dart: PermissionGroup.notification
81+
'PERMISSION_NOTIFICATIONS=1',
82+
83+
## dart: PermissionGroup.mediaLibrary
84+
'PERMISSION_MEDIA_LIBRARY=1',
85+
86+
## dart: PermissionGroup.sensors
87+
'PERMISSION_SENSORS=1',
88+
89+
## dart: PermissionGroup.bluetooth
90+
'PERMISSION_BLUETOOTH=1',
91+
92+
## dart: PermissionGroup.appTrackingTransparency
93+
'PERMISSION_APP_TRACKING_TRANSPARENCY=1',
94+
95+
## dart: PermissionGroup.criticalAlerts
96+
'PERMISSION_CRITICAL_ALERTS=1',
97+
98+
## dart: PermissionGroup.criticalAlerts
99+
'PERMISSION_ASSISTANT=1',
100+
]
101+
102+
end
40103
end
41104
end

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
9705A1C41CF9048500538489 /* Embed Frameworks */,
142142
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
143143
422C7C08E960A75E42192BA5 /* [CP] Embed Pods Frameworks */,
144+
9E8351797C4609EA8A7C0443 /* [CP] Copy Pods Resources */,
144145
);
145146
buildRules = (
146147
);
@@ -247,6 +248,23 @@
247248
shellPath = /bin/sh;
248249
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
249250
};
251+
9E8351797C4609EA8A7C0443 /* [CP] Copy Pods Resources */ = {
252+
isa = PBXShellScriptBuildPhase;
253+
buildActionMask = 2147483647;
254+
files = (
255+
);
256+
inputFileListPaths = (
257+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
258+
);
259+
name = "[CP] Copy Pods Resources";
260+
outputFileListPaths = (
261+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
262+
);
263+
runOnlyForDeploymentPostprocessing = 0;
264+
shellPath = /bin/sh;
265+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
266+
showEnvVarsInLog = 0;
267+
};
250268
FF7096C9997BA71D3CB1F92C /* [CP] Check Pods Manifest.lock */ = {
251269
isa = PBXShellScriptBuildPhase;
252270
buildActionMask = 2147483647;

‎ios/Runner/Info.plist‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<dict>
55
<key>CADisableMinimumFrameDurationOnPhone</key>
66
<true/>
7+
<key>com.apple.developer.siri</key>
8+
<true/>
79
<key>CFBundleDevelopmentRegion</key>
810
<string>$(DEVELOPMENT_LANGUAGE)</string>
911
<key>CFBundleDisplayName</key>
@@ -38,5 +40,75 @@
3840
</array>
3941
<key>UIViewControllerBasedStatusBarAppearance</key>
4042
<false/>
43+
44+
45+
<!-- Permission options for the `location` group -->
46+
<key>NSLocationWhenInUseUsageDescription</key>
47+
<string>Need location when in use</string>
48+
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
49+
<string>Always and when in use!</string>
50+
<key>NSLocationUsageDescription</key>
51+
<string>Older devices need location.</string>
52+
<key>NSLocationAlwaysUsageDescription</key>
53+
<string>Can I have location always?</string>
54+
55+
<!-- Permission options for the `mediaLibrary` group -->
56+
<key>NSAppleMusicUsageDescription</key>
57+
<string>Music!</string>
58+
<key>kTCCServiceMediaLibrary</key>
59+
<string>media</string>
60+
61+
<!-- Permission options for the `calendar` group -->
62+
<key>NSCalendarsUsageDescription</key>
63+
<string>Calendars</string>
64+
<key>NSCalendarsFullAccessUsageDescription</key>
65+
<string>Calendar full access</string>
66+
67+
<!-- Permission options for the `camera` group -->
68+
<key>NSCameraUsageDescription</key>
69+
<string>camera</string>
70+
71+
<!-- Permission options for the `contacts` group -->
72+
<key>NSContactsUsageDescription</key>
73+
<string>contacts</string>
74+
75+
<!-- Permission options for the `microphone` group -->
76+
<key>NSMicrophoneUsageDescription</key>
77+
<string>microphone</string>
78+
79+
<!-- Permission options for the `speech` group -->
80+
<key>NSSpeechRecognitionUsageDescription</key>
81+
<string>speech</string>
82+
83+
<!-- Permission options for the `sensors` group -->
84+
<key>NSMotionUsageDescription</key>
85+
<string>motion</string>
86+
87+
<!-- Permission options for the `photos` group -->
88+
<key>NSPhotoLibraryUsageDescription</key>
89+
<string>photos</string>
90+
91+
<!-- Permission options for the `reminder` group -->
92+
<key>NSRemindersUsageDescription</key>
93+
<string>reminders</string>
94+
95+
<!-- Permission options for the `bluetooth` -->
96+
<key>NSBluetoothAlwaysUsageDescription</key>
97+
<string>bluetooth</string>
98+
<key>NSBluetoothPeripheralUsageDescription</key>
99+
<string>bluetooth</string>
100+
101+
<!-- Permission options for the `appTrackingTransparency` -->
102+
<key>NSUserTrackingUsageDescription</key>
103+
<string>appTrackingTransparency</string>
104+
105+
<!-- Permission options for the `assistant` group -->
106+
<key>NSSiriUsageDescription</key>
107+
<string>The example app would like access to Siri Kit to demonstrate requesting authorization.</string>
108+
109+
<key>CADisableMinimumFrameDurationOnPhone</key>
110+
<true/>
111+
<key>UIApplicationSupportsIndirectInputEvents</key>
112+
<true/>
41113
</dict>
42114
</plist>

0 commit comments

Comments
 (0)