Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/table number #124

Open
wants to merge 89 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
45b48c8
progress on dependency upgrade
Jan 26, 2024
82f76e8
chore: run dart fix
Jan 27, 2024
84c914c
fix api.dart
Jan 27, 2024
9811062
applies some fixes to view_team.dart
anudaweerasinghe Jan 27, 2024
0ac657a
Solid button type fixes
rlyss Jan 27, 2024
7e6b091
Merge remote-tracking branch 'origin/upgrade' into upgrade
rlyss Jan 27, 2024
6305675
fixes view_team issues
anudaweerasinghe Jan 27, 2024
44f03b7
Merge branch 'upgrade' of https://github.com/ScottyLabs/tartanhacks_d…
anudaweerasinghe Jan 27, 2024
f44760a
fixes teams_list
anudaweerasinghe Jan 27, 2024
23add14
fixes team_api
anudaweerasinghe Jan 27, 2024
5a5d8dc
fixes sponsors.dart
anudaweerasinghe Jan 27, 2024
6670912
fixes see_invites
anudaweerasinghe Jan 27, 2024
f79efeb
Edit events page fix
rlyss Jan 27, 2024
b28861c
Merge remote-tracking branch 'origin/upgrade' into upgrade
rlyss Jan 27, 2024
4ade55e
fixes project_submissions
anudaweerasinghe Jan 27, 2024
ad206ae
Merge branch 'upgrade' of https://github.com/ScottyLabs/tartanhacks_d…
anudaweerasinghe Jan 27, 2024
60c16b6
fixes login
anudaweerasinghe Jan 27, 2024
7900f2a
fixes leaderboard
anudaweerasinghe Jan 27, 2024
772eaea
fixes home
anudaweerasinghe Jan 27, 2024
efe445e
fixes forgot
anudaweerasinghe Jan 27, 2024
ce7c164
fixes enter_prizes
anudaweerasinghe Jan 27, 2024
f44102c
Grad box height width nullable
rlyss Jan 27, 2024
7bcb9be
fix index.dart
Jan 27, 2024
8e17945
fixes some issues in editcheckinitem
anudaweerasinghe Jan 27, 2024
05dce13
Merge branch 'upgrade' of https://github.com/ScottyLabs/tartanhacks_d…
anudaweerasinghe Jan 27, 2024
512c4b6
fixes sponsors
anudaweerasinghe Jan 27, 2024
9b370a5
fixes qr_scan_config
anudaweerasinghe Jan 27, 2024
469ac10
Old bookmarks
rlyss Jan 27, 2024
06c6f40
some fixes to profile_page
anudaweerasinghe Jan 28, 2024
93db539
checkin_qr type fixes
rlyss Jan 28, 2024
41450e0
fix new.dart
Jan 28, 2024
7a872e0
fixes checkin.dart
anudaweerasinghe Jan 28, 2024
b0546b7
Merge branch 'upgrade' of https://github.com/ScottyLabs/tartanhacks_d…
anudaweerasinghe Jan 28, 2024
b873d4b
editcheckinitem fixed
anudaweerasinghe Jan 28, 2024
03bdbf2
edit event done
anudaweerasinghe Jan 28, 2024
dff3f88
fix create_team.dart
Jan 28, 2024
7696f4f
profile_page type fixes
rlyss Jan 28, 2024
fe842b0
fix logout button by setting theme
Jan 28, 2024
dcfc03a
make user company field optional
Jan 28, 2024
76efcb4
fix leaderboard entry structure
Jan 28, 2024
1ddaffd
make profile fields nullable
Jan 28, 2024
edd2816
team is optional
Jan 28, 2024
df52c70
project is optional
Jan 28, 2024
5b2e5d1
revert to main login
Jan 28, 2024
5047200
set sponsor to false
Jan 28, 2024
bef171b
profile page: profile fields are nullable
Jan 28, 2024
f9fb98d
multiple api fixes
Jan 28, 2024
6160db1
fix check in
Jan 28, 2024
332eeb6
update app version
Jan 28, 2024
fe1878d
makes college level not required field
anudaweerasinghe Jan 29, 2024
1dea25c
removes print from profile data parsing
anudaweerasinghe Jan 29, 2024
d6520cd
fixes check in confirmation dialog text color
anudaweerasinghe Jan 29, 2024
cb20215
fixes checkin list state update - total points and check boxes
anudaweerasinghe Jan 29, 2024
b8b0b0d
fixes new checkin item form
anudaweerasinghe Jan 29, 2024
e3a1992
fixes admin create/edit check in item
anudaweerasinghe Jan 29, 2024
6d50065
fixes gradle for android installation
anudaweerasinghe Jan 29, 2024
6d7859c
iOS top curve height
rlyss Jan 29, 2024
72dfcf7
Merge branch 'upgrade' into anuda/checkin
jhong66 Jan 29, 2024
0ed920f
Merge pull request #121 from ScottyLabs/anuda/checkin
Adrastopoulos Jan 29, 2024
00977e7
fix edit.dart
Jan 27, 2024
5d2ea57
throw errors instead of returning null
Jan 27, 2024
00e28a0
fix pages/events/new.dart
Jan 28, 2024
d7c00a9
update app icons
Jan 29, 2024
5415060
run dart fix
Adrastopoulos Jan 29, 2024
d9be994
updates hacking end time
anudaweerasinghe Jan 29, 2024
5e3bc97
fixes check in merge issues
anudaweerasinghe Jan 29, 2024
04a6ca7
remove error from team validator
Adrastopoulos Jan 29, 2024
2dac9b9
fix profile page modal route settings cast
jhong66 Jan 29, 2024
d9a8752
project submission fixes
jhong66 Jan 29, 2024
545a3a6
adds android icons
anudaweerasinghe Jan 31, 2024
005f566
reverts profile_page.dart
anudaweerasinghe Jan 31, 2024
de0df51
switches to prod backend and updates android icons
anudaweerasinghe Jan 31, 2024
ba1e03d
updates android app icon and minSdkVersion
anudaweerasinghe Jan 31, 2024
380715a
prizes make eligibility optional
jhong66 Jan 31, 2024
28a302c
uncomment confirmed user check
jhong66 Jan 31, 2024
83569f5
swap api url and fix getUserTeam error throw
jhong66 Jan 31, 2024
dcdad13
edit leaderboard padding
jhong66 Jan 31, 2024
c2f660c
Fix team member name overflow, null check bugs, decline endpoint, and…
rlyss Feb 1, 2024
0d0e4c4
remove prints
Adrastopoulos Feb 1, 2024
5a0f93c
Merge pull request #122 from ScottyLabs/project-submission-fix
Adrastopoulos Feb 1, 2024
f5ab1a9
v4.0.4
Adrastopoulos Feb 1, 2024
cfac936
always update java build config
Adrastopoulos Feb 1, 2024
78ee22c
fix profile
Adrastopoulos Feb 1, 2024
e080062
v4.0.5
Adrastopoulos Feb 1, 2024
7371d36
fix schedule
Adrastopoulos Feb 2, 2024
3220bcc
v4.0.6
Adrastopoulos Feb 2, 2024
56b02a9
update events
Adrastopoulos Feb 2, 2024
d77201f
v4.0.7
Adrastopoulos Feb 2, 2024
cf0b06e
feat: config and table number
Adrastopoulos Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}
8 changes: 4 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
}

android {
compileSdkVersion 31
compileSdkVersion 33

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -45,8 +45,8 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "org.scottylabs.thdapp"
minSdkVersion 20
targetSdkVersion 31
minSdkVersion 33
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -73,7 +73,7 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
Expand Down
5 changes: 3 additions & 2 deletions android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<background android:drawable="@mipmap/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
</adaptive-icon>

This file was deleted.

Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.6.0'
ext.kotlin_version = '1.9.22'
repositories {
google()
jcenter()
Expand All @@ -26,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
29 changes: 14 additions & 15 deletions integration_tests/login_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,21 @@ void main() {
IntegrationTestWidgetsFlutterBinding.ensureInitialized();

group('end-to-end login test', () {
testWidgets('enter login details',
(tester) async {
app.main();
await tester.pumpAndSettle();
testWidgets('enter login details', (tester) async {
app.main();
await tester.pumpAndSettle();

// Enter text into text fields
Finder textFieldFinder = find.byType(TextField);
await tester.enterText(textFieldFinder.first, "login details");
await tester.enterText(textFieldFinder.last, "password details");
// Enter text into text fields
Finder textFieldFinder = find.byType(TextField);
await tester.enterText(textFieldFinder.first, "login details");
await tester.enterText(textFieldFinder.last, "password details");

// Trigger a frame.
await tester.pumpAndSettle();
// Trigger a frame.
await tester.pumpAndSettle();

// Check for text in textfields
expect(find.text('login details'), findsOneWidget);
expect(find.text('password details'), findsOneWidget);
});
// Check for text in textfields
expect(find.text('login details'), findsOneWidget);
expect(find.text('password details'), findsOneWidget);
});
});
}
}
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
# platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
41 changes: 21 additions & 20 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,28 @@ PODS:
- image_cropper (0.0.4):
- Flutter
- TOCropViewController (~> 2.6.1)
- image_picker (0.0.1):
- image_picker_ios (0.0.1):
- Flutter
- integration_test (0.0.1):
- Flutter
- share (0.0.1):
- Flutter
- shared_preferences (0.0.1):
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- TOCropViewController (2.6.1)
- url_launcher (0.0.1):
- url_launcher_ios (0.0.1):
- Flutter

DEPENDENCIES:
- Flutter (from `Flutter`)
- flutter_smart_scan (from `.symlinks/plugins/flutter_smart_scan/ios`)
- image_cropper (from `.symlinks/plugins/image_cropper/ios`)
- image_picker (from `.symlinks/plugins/image_picker/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- integration_test (from `.symlinks/plugins/integration_test/ios`)
- share (from `.symlinks/plugins/share/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

SPEC REPOS:
trunk:
Expand All @@ -38,28 +39,28 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_smart_scan/ios"
image_cropper:
:path: ".symlinks/plugins/image_cropper/ios"
image_picker:
:path: ".symlinks/plugins/image_picker/ios"
image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/ios"
integration_test:
:path: ".symlinks/plugins/integration_test/ios"
share:
:path: ".symlinks/plugins/share/ios"
shared_preferences:
:path: ".symlinks/plugins/shared_preferences/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"

SPEC CHECKSUMS:
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_smart_scan: 2f7b350e28147cd3387810415be505ecc027bfb9
image_cropper: 60c2789d1f1a78c873235d4319ca0c34a69f2d98
image_picker: e3eacd46b94694dde7cf2705955cece853aa1a8f
integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
image_cropper: a3291c624a953049bc6a02e1f8c8ceb162a24b25
image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
integration_test: 13825b8a9334a850581300559b8839134b124670
share: 0b2c3e82132f5888bccca3351c504d0003b3b410
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812

PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011

COCOAPODS: 1.11.3
COCOAPODS: 1.14.3
57 changes: 34 additions & 23 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -165,7 +165,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "The Chromium Authors";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -211,10 +211,12 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
Expand Down Expand Up @@ -247,22 +249,22 @@
"${BUILT_PRODUCTS_DIR}/TOCropViewController/TOCropViewController.framework",
"${BUILT_PRODUCTS_DIR}/flutter_smart_scan/flutter_smart_scan.framework",
"${BUILT_PRODUCTS_DIR}/image_cropper/image_cropper.framework",
"${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework",
"${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework",
"${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework",
"${BUILT_PRODUCTS_DIR}/share/share.framework",
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
"${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TOCropViewController.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_smart_scan.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_cropper.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -366,7 +368,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand All @@ -384,7 +386,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 4Y39FMA838;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -394,13 +396,16 @@
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "TartanHacks Dashboard";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.0.1;
MARKETING_VERSION = 4.0.7;
PRODUCT_BUNDLE_IDENTIFIER = org.scottylabs.slapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -457,7 +462,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -506,7 +511,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand All @@ -525,7 +530,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 4Y39FMA838;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -535,13 +540,16 @@
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "TartanHacks Dashboard";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.0.1;
MARKETING_VERSION = 4.0.7;
PRODUCT_BUNDLE_IDENTIFIER = org.scottylabs.slapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -561,7 +569,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 4Y39FMA838;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -571,13 +579,16 @@
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "TartanHacks Dashboard";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.0.1;
MARKETING_VERSION = 4.0.7;
PRODUCT_BUNDLE_IDENTIFIER = org.scottylabs.slapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png
Diff not rendered.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png
Diff not rendered.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png
Diff not rendered.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png
Diff not rendered.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png
Diff not rendered.
Diff not rendered.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png
Diff not rendered.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png
Diff not rendered.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png
Diff not rendered.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/66.png
Diff not rendered.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png
Diff not rendered.
Binary file removed ios/Runner/Assets.xcassets/AppIcon.appiconset/92.png
Diff not rendered.
Loading