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

Commit 2a504fb

Browse files
committed
Adjusted the look of the stars
Moved the weather package into the lib folder to adjust some parameters of the night sky background. Now stars cover the whole screen and are less frequent.
1 parent fd536c8 commit 2a504fb

7 files changed

Lines changed: 616 additions & 23 deletions

File tree

.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":"/Users/shivam/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/mobile_scanner-2.1.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.1.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.1.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.1.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-01-19 20:32:22.481638","version":"3.0.5"}
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.1.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.1.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.1.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.6/","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.1.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":"2022-12-30 14:12:42.427090","version":"3.0.5"}

lib/ui/pages/annoucements/announcements.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ class AnnouncementsState extends State {
5252
alignment: Alignment.centerLeft,
5353
child: Text(
5454
'Announcements:',
55-
style: Theme.of(context).textTheme.subtitle1,
55+
style: Theme.of(context)
56+
.textTheme
57+
.subtitle1!
58+
.copyWith(color: Color.fromRGBO(209, 233, 239, 1)),
5659
),
5760
),
5861
),

lib/ui/pages/home.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import 'package:hackru/weather/utils/weather_type.dart';
2+
import 'package:hackru/weather/bg/weather_bg.dart';
13
import 'package:hackru/models/cred_manager.dart';
24
import 'package:hackru/styles.dart';
35
import 'package:hackru/ui/pages/annoucements/announcements.dart';
46
import 'package:hackru/ui/pages/dashboard/dashboard.dart';
57
import 'package:hackru/ui/pages/events/events.dart';
68
import 'package:flutter/material.dart';
7-
import 'package:flutter_weather_bg_null_safety/flutter_weather_bg.dart';
89

910
class Home extends StatefulWidget {
1011
static const String routeName = '/material/bottom_navigation';

lib/ui/pages/qr_scanner/Scanner.dart

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ class _ScannerState extends State<Scanner> with SingleTickerProviderStateMixin {
542542
_authToken,
543543
userEmailOrId,
544544
event,
545-
true,
545+
false,
546546
);
547547
// updateStatus(
548548
// BASE_URL, _storedEmail, _authToken, userEmailOrId, "checked-in");
@@ -553,27 +553,27 @@ class _ScannerState extends State<Scanner> with SingleTickerProviderStateMixin {
553553
// debugPrint('already ' + userEmailOrId);
554554
result = 'ALREADY SCANNED';
555555
var rescan = await _scanDialogWarning('ALREADY SCANNED!');
556-
if (rescan) {
557-
return notScanned;
558-
}
559-
// // debugPrint('$rescan');
560556
// if (rescan) {
561-
// numUserScanned = await attendEvent(
562-
// BASE_URL,
563-
// _storedEmail!,
564-
// _authToken!,
565-
// userEmailOrId,
566-
// event!,
567-
// true,
568-
// );
569-
// // int test = numUserScanned as int;
570-
// // debugPrint('********** user event count: $test');
571-
// // if (prev > numUserScanned) {
572-
// result = 'SCANNED!';
573-
// // }
574-
// } else {
575557
// return notScanned;
576558
// }
559+
// // debugPrint('$rescan');
560+
if (rescan) {
561+
numUserScanned = await attendEvent(
562+
BASE_URL,
563+
_storedEmail,
564+
_authToken,
565+
userEmailOrId,
566+
event,
567+
true,
568+
);
569+
// int test = numUserScanned as int;
570+
// debugPrint('********** user event count: $test');
571+
// if (prev > numUserScanned) {
572+
result = 'SCANNED!';
573+
// }
574+
} else {
575+
return notScanned;
576+
}
577577
} on UserNotFound {
578578
// debugPrint('hashqr:' + userEmailOrId);
579579
if (!_isEmailAddress(userEmailOrId)) {

lib/weather/bg/weather_bg.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/material.dart';
2+
import 'package:hackru/weather/bg/weather_cloud_bg.dart';
23
import 'package:hackru/weather/bg/weather_color_bg.dart';
34
import 'package:hackru/weather/bg/weather_night_star_bg.dart';
45
import 'package:hackru/weather/bg/weather_rain_snow_bg.dart';
@@ -136,6 +137,9 @@ class WeatherItemBg extends StatelessWidget {
136137
WeatherColorBg(
137138
weatherType: weatherType,
138139
),
140+
WeatherCloudBg(
141+
weatherType: weatherType,
142+
),
139143
_buildRainSnowBg(),
140144
_buildThunderBg(),
141145
_buildNightStarBg(),

0 commit comments

Comments
 (0)