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

Commit 4e4ba03

Browse files
bhivambhivam
authored
Merge pull request #107 from HackRU/UI-updates
UI updates
2 parents 43f98bf + 56b0e34 commit 4e4ba03

File tree

7 files changed

+69
-44
lines changed

7 files changed

+69
-44
lines changed

‎.flutter-plugins-dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mobile_scanner","path":"/home/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.0.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/home/shivam/.pub-cache/hosted/pub.dev/path_provider_foundation-2.1.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/home/shivam/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.1.2/","native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"/home/shivam/.pub-cache/hosted/pub.dev/url_launcher_ios-6.0.18/","native_build":true,"dependencies":[]},{"name":"webview_flutter_wkwebview","path":"/home/shivam/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-2.9.5/","native_build":true,"dependencies":[]}],"android":[{"name":"mobile_scanner","path":"/home/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.0.0/","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"/home/shivam/.pub-cache/hosted/pub.dev/path_provider_android-2.0.22/","native_build":true,"dependencies":[]},{"name":"shared_preferences_android","path":"/home/shivam/.pub-cache/hosted/pub.dev/shared_preferences_android-2.0.15/","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"/home/shivam/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.23/","native_build":true,"dependencies":[]},{"name":"webview_flutter_android","path":"/home/shivam/.pub-cache/hosted/pub.dev/webview_flutter_android-2.10.4/","native_build":true,"dependencies":[]}],"macos":[{"name":"mobile_scanner","path":"/home/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.0.0/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/home/shivam/.pub-cache/hosted/pub.dev/path_provider_foundation-2.1.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/home/shivam/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.1.2/","native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"/home/shivam/.pub-cache/hosted/pub.dev/url_launcher_macos-3.0.2/","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/shivam/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.7/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/home/shivam/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.1.3/","native_build":false,"dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/home/shivam/.pub-cache/hosted/pub.dev/url_launcher_linux-3.0.2/","native_build":true,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/home/shivam/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.3/","native_build":false,"dependencies":[]},{"name":"shared_preferences_windows","path":"/home/shivam/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.1.3/","native_build":false,"dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/home/shivam/.pub-cache/hosted/pub.dev/url_launcher_windows-3.0.2/","native_build":true,"dependencies":[]}],"web":[{"name":"mobile_scanner","path":"/home/shivam/.pub-cache/hosted/pub.dev/mobile_scanner-2.0.0/","dependencies":[]},{"name":"shared_preferences_web","path":"/home/shivam/.pub-cache/hosted/pub.dev/shared_preferences_web-2.0.4/","dependencies":[]},{"name":"url_launcher_web","path":"/home/shivam/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.14/","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":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"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-01-26 22:13:36.217890","version":"3.7.0"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mobile_scanner","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/mobile_scanner-2.0.0/","native_build":true,"dependencies":[]},{"name":"path_provider_ios","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_ios-2.0.11/","native_build":true,"dependencies":[]},{"name":"shared_preferences_ios","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_ios-2.1.1/","native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_ios-6.0.17/","native_build":true,"dependencies":[]},{"name":"webview_flutter_wkwebview","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.9.5/","native_build":true,"dependencies":[]}],"android":[{"name":"mobile_scanner","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/mobile_scanner-2.0.0/","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_android-2.0.22/","native_build":true,"dependencies":[]},{"name":"shared_preferences_android","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_android-2.0.14/","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_android-6.0.22/","native_build":true,"dependencies":[]},{"name":"webview_flutter_android","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.10.4/","native_build":true,"dependencies":[]}],"macos":[{"name":"mobile_scanner","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/mobile_scanner-2.0.0/","native_build":true,"dependencies":[]},{"name":"path_provider_macos","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-2.0.7/","native_build":true,"dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-2.0.4/","native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-3.0.1/","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-2.1.7/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-2.1.2/","native_build":false,"dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_linux-3.0.1/","native_build":true,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-2.1.3/","native_build":false,"dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-2.1.2/","native_build":false,"dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_windows-3.0.1/","native_build":true,"dependencies":[]}],"web":[{"name":"mobile_scanner","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/mobile_scanner-2.0.0/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-2.0.4/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-2.0.13/","dependencies":[]}]},"dependencyGraph":[{"name":"mobile_scanner","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_ios","path_provider_linux","path_provider_macos","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_ios","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_ios","shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_ios","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"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-02-05 00:14:24.725757","version":"3.0.5"}

‎lib/defaults.dart‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ const BASE_URL = 'https://api.hackru.org/prod';
66

77
const MISC_URL = 'http://hackru-misc.s3-website-us-west-2.amazonaws.com';
88
const WAIVER_URL = 'https://hackru.org/resources/waiver.pdf';
9+
10+
/*
11+
Waiting on updated links for these
912
const DEVPOST_URL = 'https://hackru-s22.devpost.com';
10-
const SLACK_PAGE_URL = 'hackruspring2023.slack.com/';
11-
const HELP_Q_URL = 'http://mentorq.hackru.org/';
1213
const FOOD_MENU_URL = 'https://s3-us-west-2.amazonaws.com/hackru-misc/menu.pdf';
14+
*/
15+
const SLACK_PAGE_URL = 'https://hackruspring2023.slack.com/';
16+
const HELP_Q_URL = 'http://mentorq.hackru.org/';
1317
const HACKRU_SIGN_UP = 'https://hackru.org/signup';
1418

1519
const REPOSITORY_URL = 'https://github.com/HackRU/OneAppFlutter';

‎lib/generated_plugin_registrant.dart‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// Generated file. Do not edit.
3+
//
4+
5+
// ignore_for_file: directives_ordering
6+
// ignore_for_file: lines_longer_than_80_chars
7+
// ignore_for_file: depend_on_referenced_packages
8+
9+
import 'package:mobile_scanner/mobile_scanner_web_plugin.dart';
10+
import 'package:shared_preferences_web/shared_preferences_web.dart';
11+
import 'package:url_launcher_web/url_launcher_web.dart';
12+
13+
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
14+
15+
// ignore: public_member_api_docs
16+
void registerPlugins(Registrar registrar) {
17+
MobileScannerWebPlugin.registerWith(registrar);
18+
SharedPreferencesPlugin.registerWith(registrar);
19+
UrlLauncherPlugin.registerWith(registrar);
20+
registrar.registerMessageHandler();
21+
}

‎lib/ui/pages/help/help.dart‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ const helpResources = [
1818
"desc": "Talk to friends, mentors, and organizers at HackRU",
1919
"url": SLACK_PAGE_URL
2020
},
21-
{"name": "Devpost", "desc": "Submit your projects", "url": DEVPOST_URL},
21+
// {"name": "Devpost", "desc": "Submit your projects", "url": DEVPOST_URL},
2222
{
2323
"name": "Rutgers Campus Map",
2424
"desc": "Rutgers University - College Ave Campus",
2525
"url":
2626
"https://maps.rutgers.edu/#/?bus=true&dining=true&healthCare=true&lat=40.503942&lng=-74.450773&parking=true&sidebar=true&zoom=17"
2727
},
28-
{
29-
"name": "Register Your Vehicle",
30-
"desc": "Register for free parking permit",
31-
"url":
32-
"https://hackru.us3.list-manage.com/track/click?u=457c42db47ebf530a0fc733fb&id=704cc129a9&e=c9b098417d"
33-
}
28+
// {
29+
// "name": "Register Your Vehicle",
30+
// "desc": "Register for free parking permit",
31+
// "url":
32+
// "https://hackru.us3.list-manage.com/track/click?u=457c42db47ebf530a0fc733fb&id=704cc129a9&e=c9b098417d"
33+
// }
3434
];
3535

3636
class Help extends StatelessWidget {
@@ -46,35 +46,32 @@ class Help extends StatelessWidget {
4646
Widget build(BuildContext context) {
4747
return Scaffold(
4848
backgroundColor: bgColor,
49-
body: Container(
50-
padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
51-
child: Column(
52-
crossAxisAlignment: CrossAxisAlignment.start,
53-
children: [
54-
IconButton(
55-
onPressed: toggleHelp,
56-
icon: Icon(Icons.close),
57-
color: textColor,
58-
),
59-
ListView.builder(
60-
padding: EdgeInsets.all(0),
61-
shrinkWrap: true,
62-
controller: ScrollController(),
63-
itemCount: helpResources.length,
64-
itemBuilder: (BuildContext context, int index) {
65-
HelpResource helpResource =
66-
HelpResource.fromJson(helpResources[index]);
67-
return HelpButton(
68-
resource: helpResource,
69-
bgColor: buttonColor,
70-
splashColor: splashColor,
71-
textColor: textColor,
72-
);
73-
},
74-
),
75-
],
49+
appBar: PreferredSize(
50+
preferredSize: Size.fromHeight(50),
51+
child: AppBar(
52+
foregroundColor: Colors.transparent,
53+
backgroundColor: Colors.transparent,
54+
shadowColor: Colors.transparent,
55+
leading: IconButton(
56+
onPressed: toggleHelp,
57+
icon: Icon(Icons.close),
58+
color: textColor,
59+
),
7660
),
7761
),
62+
body: ListView.builder(
63+
itemCount: helpResources.length,
64+
itemBuilder: (BuildContext context, int index) {
65+
HelpResource helpResource =
66+
HelpResource.fromJson(helpResources[index]);
67+
return HelpButton(
68+
resource: helpResource,
69+
bgColor: buttonColor,
70+
splashColor: splashColor,
71+
textColor: textColor,
72+
);
73+
},
74+
),
7875
);
7976
}
8077
}

‎lib/ui/pages/login/login_form.dart‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,13 @@ class LoginFormState extends State<LoginForm> {
299299
padding: const EdgeInsets.only(top: 5.0, bottom: 25.0),
300300
child: Column(
301301
children: <Widget>[
302-
RichText(
303-
text: TextSpan(
304-
children: span,
305-
style: DefaultTextStyle.of(context).style,
302+
FittedBox(
303+
fit: BoxFit.fitWidth,
304+
child: RichText(
305+
text: TextSpan(
306+
children: span,
307+
style: DefaultTextStyle.of(context).style,
308+
),
306309
),
307310
),
308311
Text(

‎lib/ui/pages/qr_scanner/Scanner.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,15 @@ class _ScannerState extends State<Scanner> with SingleTickerProviderStateMixin {
188188
}
189189

190190
void _qrRequest(String scanData) async {
191-
var message;
191+
String message;
192192
message = await _lcsHandle(scanData);
193193
debugPrint(message);
194194
if (message == 'SCANNED!' ||
195195
message == 'EMAIL SCANNED!' ||
196196
message == 'DAY-OF QR LINKED!') {
197197
_scanDialogSuccess(message);
198198
} else {
199-
await await _warningDialog(message);
199+
await _warningDialog(message);
200200
}
201201
}
202202

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies:
3030
intl: ^0.17.0
3131
json_annotation: ^4.4.0
3232
meta: ^1.7.0
33-
mobile_scanner: 2.0.0
33+
mobile_scanner: ^2.0.0
3434
# mobile_scanner:
3535
# path: depend/mobile_scanner-more_fixes
3636
# path_provider: ^2.0.9

0 commit comments

Comments
 (0)