Skip to content
This repository has been archived by the owner on Feb 5, 2024. It is now read-only.

Commit

Permalink
changed order and title for help, adjusted timer paddings
Browse files Browse the repository at this point in the history
  • Loading branch information
@bhivam
bhivam committed Sep 5, 2023
1 parent d1c0040 commit 06f60c7
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .flutter-plugins-dependencies
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mobile_scanner","path":"/Users/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.1.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.1/","native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_ios-6.1.4/","native_build":true,"dependencies":[]},{"name":"webview_flutter_wkwebview","path":"/Users/shivam/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-2.9.5/","native_build":true,"dependencies":[]}],"android":[{"name":"mobile_scanner","path":"/Users/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.1.0/","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_android-2.0.24/","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.26/","native_build":true,"dependencies":[]},{"name":"webview_flutter_android","path":"/Users/shivam/.pub-cache/hosted/pub.dev/webview_flutter_android-2.10.4/","native_build":true,"dependencies":[]}],"macos":[{"name":"mobile_scanner","path":"/Users/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.1.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.1/","native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_macos-3.0.4/","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10/","native_build":false,"dependencies":[]},{"name":"url_launcher_linux","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_linux-3.0.4/","native_build":true,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.5/","native_build":false,"dependencies":[]},{"name":"url_launcher_windows","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_windows-3.0.5/","native_build":true,"dependencies":[]}],"web":[{"name":"mobile_scanner","path":"/Users/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.1.0/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.16/","dependencies":[]}]},"dependencyGraph":[{"name":"mobile_scanner","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2023-09-03 00:50:21.257916","version":"3.7.7"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mobile_scanner","path":"/Users/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.1.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.1/","native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_ios-6.1.4/","native_build":true,"dependencies":[]},{"name":"webview_flutter_wkwebview","path":"/Users/shivam/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-2.9.5/","native_build":true,"dependencies":[]}],"android":[{"name":"mobile_scanner","path":"/Users/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.1.0/","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_android-2.0.24/","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.26/","native_build":true,"dependencies":[]},{"name":"webview_flutter_android","path":"/Users/shivam/.pub-cache/hosted/pub.dev/webview_flutter_android-2.10.4/","native_build":true,"dependencies":[]}],"macos":[{"name":"mobile_scanner","path":"/Users/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.1.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.1/","native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_macos-3.0.4/","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.10/","native_build":false,"dependencies":[]},{"name":"url_launcher_linux","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_linux-3.0.4/","native_build":true,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/Users/shivam/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.5/","native_build":false,"dependencies":[]},{"name":"url_launcher_windows","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_windows-3.0.5/","native_build":true,"dependencies":[]}],"web":[{"name":"mobile_scanner","path":"/Users/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.1.0/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/shivam/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.16/","dependencies":[]}]},"dependencyGraph":[{"name":"mobile_scanner","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2023-09-03 15:06:23.113088","version":"3.7.7"}
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ android {

defaultConfig {
applicationId "org.hackru.oneapp.android"
minSdkVersion 24
targetSdkVersion 31
minSdkVersion 33
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down
15 changes: 9 additions & 6 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,16 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = CRV23DRSTD;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = org.hackru.oneapp.oneappflutter;
MARKETING_VERSION = 1.4.0;
PRODUCT_BUNDLE_IDENTIFIER = org.hackru.oneappios;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -485,15 +486,16 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = CRV23DRSTD;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = org.hackru.oneapp.oneappflutter;
MARKETING_VERSION = 1.4.0;
PRODUCT_BUNDLE_IDENTIFIER = org.hackru.oneappios;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -508,15 +510,16 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = CRV23DRSTD;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = org.hackru.oneapp.oneappflutter;
MARKETING_VERSION = 1.4.0;
PRODUCT_BUNDLE_IDENTIFIER = org.hackru.oneappios;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down
8 changes: 4 additions & 4 deletions ios/Runner/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
Expand All @@ -28,6 +30,8 @@
<true/>
<key>NSCameraUsageDescription</key>
<string>Can we access your camera in order to scan qrcodes?</string>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
Expand All @@ -54,9 +58,5 @@
<false/>
<key>io.flutter.embedded_views_preview</key>
<true/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>
4 changes: 2 additions & 2 deletions lib/defaults.dart
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
///=======================================
/// ENDPOINTS
///=======================================
// const BASE_URL = 'https://api.hackru.org/dev';
const BASE_URL = 'https://api.hackru.org/prod';
const BASE_URL = 'https://api.hackru.org/dev';
// const BASE_URL = 'https://api.hackru.org/prod';

const MISC_URL = 'http://hackru-misc.s3-website-us-west-2.amazonaws.com';
const WAIVER_URL = 'https://hackru.org/resources/waiver.pdf';
Expand Down
31 changes: 18 additions & 13 deletions lib/ui/pages/dashboard/dashboard.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,25 +295,26 @@ class DashboardState extends State<Dashboard> {
),
),
),
const SizedBox(height: 7.5),
// const SizedBox(height: 7.5),
],
Row(
children: [
if (!_hasAuthToken)
if (!_hasAuthToken) ...[
Expanded(
child: DashboardButton(
onPressed: _onLogin,
bgColor: Color.fromARGB(255, 19, 61, 53),
textColor: HackRUColors.pale_yellow,
label: "Login"),
),
Expanded(
child: DashboardButton(
onPressed: _onHelp,
bgColor: Colors.black26,
textColor: HackRUColors.pale_yellow,
label: "Help"),
)
Expanded(
child: DashboardButton(
onPressed: _onHelp,
bgColor: Colors.black26,
textColor: HackRUColors.pale_yellow,
label: "Helpful Links"),
)
]
],
),
if (credManager!.getAuthorization()) ...[
Expand All @@ -322,9 +323,7 @@ class DashboardState extends State<Dashboard> {
onPressed: _onScanner,
bgColor: Colors.black26,
textColor: HackRUColors.pale_yellow,
label: "QR Scanner")
],
if (credManager!.getAuthorization()) ...[
label: "QR Scanner"),
const SizedBox(height: 7.5),
DashboardButton(
onPressed: () => _onGetAttending(context),
Expand All @@ -334,6 +333,12 @@ class DashboardState extends State<Dashboard> {
],
if (_hasAuthToken) ...[
const SizedBox(height: 7.5),
DashboardButton(
onPressed: _onHelp,
bgColor: Colors.black26,
textColor: HackRUColors.pale_yellow,
label: "Helpful Links"),
const SizedBox(height: 7.5),
DashboardButton(
onPressed: _onLogout,
bgColor: Colors.black26,
Expand All @@ -342,7 +347,7 @@ class DashboardState extends State<Dashboard> {
],
Expanded(child: Container()),
Padding(
padding: const EdgeInsets.only(bottom: 8.0),
padding: const EdgeInsets.only(bottom: 20.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
Expand Down
10 changes: 5 additions & 5 deletions lib/ui/pages/help/help.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import 'package:url_launcher/url_launcher.dart';
import 'package:url_launcher/url_launcher_string.dart';

const helpResources = [
{
"name": "MentorQ",
"desc": "Get matched with a mentor for help!",
"url": HELP_Q_URL
},
// {
// "name": "MentorQ",
// "desc": "Get matched with a mentor for help!",
// "url": HELP_Q_URL
// },
{
"name": "Slack",
"desc": "Talk to friends, mentors, and organizers at HackRU",
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/widgets/social_media.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class SocialMediaCard extends StatelessWidget {
child: Icon(
iconData,
color: iconColor,
size: 30.0,
size: 25.0,
),
),
),
Expand Down
11 changes: 7 additions & 4 deletions lib/ui/widgets/sunrays.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,16 @@ class SunEffectPainter extends CustomPainter {
],
);

// TODO remove shado between circles
canvas.drawPath(
Path()
..moveTo(center.dx, center.dy)
..addArc(
Rect.fromCircle(center: center, radius: radius / 2.5), 0, 2 * pi),
Paint()
..shader = ui.Gradient.radial(center, radius / 2.5, [
Colors.white.withOpacity(0.03),
Colors.white.withOpacity(0.09)
Colors.white.withOpacity(0.06),
Colors.white.withOpacity(0.09),
]));

canvas.drawPath(
Expand All @@ -105,8 +106,10 @@ class SunEffectPainter extends CustomPainter {
..addArc(
Rect.fromCircle(center: center, radius: radius / 3.5), 0, 2 * pi),
Paint()
..shader = ui.Gradient.radial(center, radius / 3.5,
[Colors.white.withOpacity(0.3), Colors.white.withOpacity(0.08)]));
..shader = ui.Gradient.radial(center, radius / 3.5, [
Colors.white.withOpacity(0.3),
Colors.white.withOpacity(0.08),
]));

int numRays = 3;

Expand Down
Loading

0 comments on commit 06f60c7

Please sign in to comment.