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

Commit 59e0c95

Browse files
committed
Revert "Implemented swipe to change page funcationality"
This reverts commit 3a750e1.
1 parent b5d6a94 commit 59e0c95

8 files changed

Lines changed: 665 additions & 78 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:25:48.614773","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":"2023-01-06 00:29:09.364788","version":"3.0.5"}

lib/ui/pages/dashboard/dashboard.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:async';
22
import 'dart:ui';
33
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
4-
import 'package:hackru/ui/pages/dashboard/social_media.dart';
4+
import 'package:hackru/ui/widgets/social_media.dart';
55
import 'package:url_launcher/url_launcher.dart' as url_launcher;
66
import 'package:hackru/defaults.dart';
77
import 'package:hackru/models/cred_manager.dart';

lib/ui/pages/dashboard/social_media.dart

Lines changed: 0 additions & 41 deletions
This file was deleted.

lib/ui/widgets/social_media.dart

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,41 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:hackru/styles.dart';
13

4+
class SocialMediaCard extends StatelessWidget {
5+
final VoidCallback? onPressed;
6+
final IconData? iconData;
7+
final Color bgColor;
8+
final Color iconColor;
9+
const SocialMediaCard(
10+
{Key? key,
11+
this.onPressed,
12+
this.iconData,
13+
required this.bgColor,
14+
required this.iconColor})
15+
: super(key: key);
16+
17+
@override
18+
Widget build(BuildContext context) {
19+
return Padding(
20+
padding: const EdgeInsets.all(8.0),
21+
child: Card(
22+
elevation: 0,
23+
color: bgColor,
24+
shape: const RoundedRectangleBorder(
25+
borderRadius: BorderRadius.all(Radius.circular(10.0)),
26+
),
27+
child: InkWell(
28+
onTap: onPressed,
29+
child: Padding(
30+
padding: const EdgeInsets.all(10.0),
31+
child: Icon(
32+
iconData,
33+
color: iconColor,
34+
size: 30.0,
35+
),
36+
),
37+
),
38+
),
39+
);
40+
}
41+
}

lib/weather/bg/weather_bg.dart

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import 'package:flutter/material.dart';
22
import 'package:hackru/weather/bg/weather_color_bg.dart';
3+
import 'package:hackru/weather/bg/weather_night_star_bg.dart';
34
import 'package:hackru/weather/bg/weather_rain_snow_bg.dart';
5+
import 'package:hackru/weather/bg/weather_thunder_bg.dart';
46

57
import '../utils/weather_type.dart';
68

@@ -91,6 +93,26 @@ class WeatherItemBg extends StatelessWidget {
9193
WeatherItemBg({Key? key, required this.weatherType, this.width, this.height})
9294
: super(key: key);
9395

96+
/// 构建晴晚背景效果
97+
Widget _buildNightStarBg() {
98+
if (weatherType == WeatherType.sunnyNight) {
99+
return WeatherNightStarBg(
100+
weatherType: weatherType,
101+
);
102+
}
103+
return Container();
104+
}
105+
106+
/// 构建雷暴效果
107+
Widget _buildThunderBg() {
108+
if (weatherType == WeatherType.thunder) {
109+
return WeatherThunderBg(
110+
weatherType: weatherType,
111+
);
112+
}
113+
return Container();
114+
}
115+
94116
/// 构建雨雪背景效果
95117
Widget _buildRainSnowBg() {
96118
if (WeatherUtil.isSnowRain(weatherType)) {
@@ -115,6 +137,8 @@ class WeatherItemBg extends StatelessWidget {
115137
weatherType: weatherType,
116138
),
117139
_buildRainSnowBg(),
140+
_buildThunderBg(),
141+
_buildNightStarBg(),
118142
],
119143
),
120144
),

0 commit comments

Comments
 (0)