responsive web version
This commit is contained in:
parent
41be81e532
commit
d9c930c494
|
|
@ -195,7 +195,7 @@ class RouteGenerator {
|
|||
data: MediaQuery.of(context).copyWith(
|
||||
textScaleFactor: 1.0,
|
||||
size: Size(
|
||||
deviceSize.width / 16 * 9,
|
||||
deviceSize.height * 9 / 16,
|
||||
deviceSize.height,
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -9,22 +9,34 @@ import 'package:didvan/models/view/action_sheet_data.dart';
|
|||
import 'package:didvan/models/view/alert_data.dart';
|
||||
import 'package:didvan/views/widgets/didvan/button.dart';
|
||||
import 'package:didvan/views/widgets/didvan/text.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:rive/rive.dart';
|
||||
|
||||
class ActionSheetUtils {
|
||||
static late BuildContext context;
|
||||
|
||||
static MediaQueryData get mediaQueryData {
|
||||
final ds = MediaQuery.of(context).size;
|
||||
double width = ds.width;
|
||||
final shortestSide = ds.shortestSide;
|
||||
final bool useMobileLayout = shortestSide < 600;
|
||||
if (kIsWeb && !useMobileLayout) {
|
||||
width = ds.height * 9 / 16;
|
||||
}
|
||||
return MediaQuery.of(context).copyWith(size: Size(width, ds.height));
|
||||
}
|
||||
|
||||
static Future<void> showLogoLoadingIndicator() async {
|
||||
await showDialog(
|
||||
barrierDismissible: false,
|
||||
context: context,
|
||||
builder: (context) => Padding(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: MediaQuery.of(context).size.width / 3,
|
||||
),
|
||||
builder: (context) => Center(
|
||||
child: SizedBox(
|
||||
width: mediaQueryData.size.width * 0.4,
|
||||
child: RiveAnimation.asset(Assets.logoLoadingAnimation),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -76,6 +88,9 @@ class ActionSheetUtils {
|
|||
|
||||
static Future<void> showBottomSheet({required ActionSheetData data}) async {
|
||||
await showModalBottomSheet(
|
||||
constraints: BoxConstraints(
|
||||
maxWidth: mediaQueryData.size.width,
|
||||
),
|
||||
backgroundColor: Colors.transparent,
|
||||
isScrollControlled: true,
|
||||
context: context,
|
||||
|
|
@ -168,7 +183,8 @@ class ActionSheetUtils {
|
|||
shape: const RoundedRectangleBorder(
|
||||
borderRadius: DesignConfig.mediumBorderRadius,
|
||||
),
|
||||
child: Padding(
|
||||
child: Container(
|
||||
width: mediaQueryData.size.width * 0.8,
|
||||
padding: const EdgeInsets.all(24.0),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
|
|
|
|||
|
|
@ -60,10 +60,10 @@ class CategoryItem extends StatelessWidget {
|
|||
child: Container(
|
||||
width: !_useWebMobileLayout(context)
|
||||
? _width(context) / 2
|
||||
: ds.width / 5,
|
||||
: ds.width / 7,
|
||||
height: !_useWebMobileLayout(context)
|
||||
? _width(context) / 2
|
||||
: ds.width / 5,
|
||||
: ds.width / 7,
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).colorScheme.surface,
|
||||
boxShadow: DesignConfig.defaultShadow,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@ import 'package:didvan/config/design_config.dart';
|
|||
import 'package:didvan/config/theme_data.dart';
|
||||
import 'package:didvan/constants/app_icons.dart';
|
||||
import 'package:didvan/models/enums.dart';
|
||||
import 'package:didvan/models/view/action_sheet_data.dart';
|
||||
import 'package:didvan/services/media/media.dart';
|
||||
import 'package:didvan/utils/action_sheet.dart';
|
||||
import 'package:didvan/views/home/studio/studio_details/studio_details_state.dart';
|
||||
import 'package:didvan/views/home/studio/studio_details/widgets/studio_details_widget.dart';
|
||||
import 'package:didvan/views/home/studio/studio_state.dart';
|
||||
|
|
@ -275,13 +277,18 @@ class _PlayerNavBar extends StatelessWidget {
|
|||
}
|
||||
final state = context.read<StudioState>();
|
||||
showModalBottomSheet(
|
||||
constraints: BoxConstraints(
|
||||
maxWidth: ActionSheetUtils.mediaQueryData.size.width,
|
||||
),
|
||||
backgroundColor: Colors.transparent,
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
builder: (context) => ChangeNotifierProvider<StudioState>.value(
|
||||
value: state,
|
||||
child: Consumer<StudioDetailsState>(
|
||||
builder: (context, state, child) => ExpandableBottomSheet(
|
||||
builder: (context, state, child) => MediaQuery(
|
||||
data: ActionSheetUtils.mediaQueryData,
|
||||
child: ExpandableBottomSheet(
|
||||
key: sheetKey,
|
||||
background: Align(
|
||||
alignment: Alignment.bottomCenter,
|
||||
|
|
@ -336,8 +343,10 @@ class _PlayerNavBar extends StatelessWidget {
|
|||
),
|
||||
)
|
||||
: StudioDetailsWidget(
|
||||
onMarkChanged: (id, value) =>
|
||||
context.read<StudioState>().changeMark(id, value, true),
|
||||
onMarkChanged: (id, value) => context
|
||||
.read<StudioState>()
|
||||
.changeMark(id, value, true),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -235,6 +235,8 @@ class _DidvanPageViewState extends State<DidvanPageView> {
|
|||
borderRadius: DesignConfig.lowBorderRadius,
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: SizedBox(
|
||||
width: ActionSheetUtils.mediaQueryData.size.width,
|
||||
child: DidvanCard(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
|
|
@ -263,6 +265,7 @@ class _DidvanPageViewState extends State<DidvanPageView> {
|
|||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
launch(href);
|
||||
|
|
|
|||
|
|
@ -14,36 +14,44 @@
|
|||
This is a placeholder for base href that will be replaced by the value of
|
||||
the `--base-href` argument provided to `flutter build`.
|
||||
-->
|
||||
<base href="$FLUTTER_BASE_HREF">
|
||||
<base href="$FLUTTER_BASE_HREF" />
|
||||
|
||||
<meta charset="UTF-8">
|
||||
<meta content="IE=Edge" http-equiv="X-UA-Compatible">
|
||||
<meta name="description" content="A new Flutter project.">
|
||||
<meta charset="UTF-8" />
|
||||
<meta content="IE=Edge" http-equiv="X-UA-Compatible" />
|
||||
<meta name="description" content="A new Flutter project." />
|
||||
|
||||
<!-- iOS meta tags & icons -->
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
<meta name="apple-mobile-web-app-title" content="didvan">
|
||||
<link rel="apple-touch-icon" href="icons/icon.png">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
||||
<meta name="apple-mobile-web-app-title" content="didvan" />
|
||||
<link rel="apple-touch-icon" href="icons/icon.png" />
|
||||
|
||||
<!-- Favicon -->
|
||||
<link rel="icon" type="image/png" href="favicon.png" />
|
||||
|
||||
<title>Didvan</title>
|
||||
<link rel="manifest" href="manifest.json">
|
||||
<link rel="manifest" href="manifest.json" />
|
||||
<style>
|
||||
.container {
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
display: flex; /* Default Axis is X*/
|
||||
justify-content: center; /* Main Axis */
|
||||
align-items: center; /* Cross Axis */
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.indicator {
|
||||
width: 50vw;
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 600px) {
|
||||
.indicator {
|
||||
width: 25vw;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body style="overflow: hidden">
|
||||
<div id="loading_indicator" class="container">
|
||||
<img class="indicator" src="./assets/lib/assets/animations/loading.gif" />
|
||||
|
|
@ -59,25 +67,25 @@
|
|||
return;
|
||||
}
|
||||
scriptLoaded = true;
|
||||
var scriptTag = document.createElement('script');
|
||||
var scriptTag = document.createElement("script");
|
||||
scriptTag.src = `main.dart.js?version=${Math.random()}`;
|
||||
scriptTag.type = 'application/javascript';
|
||||
scriptTag.type = "application/javascript";
|
||||
document.body.append(scriptTag);
|
||||
}
|
||||
|
||||
if ('serviceWorker' in navigator) {
|
||||
if ("serviceWorker" in navigator) {
|
||||
// Service workers are supported. Use them.
|
||||
window.addEventListener('load', function () {
|
||||
window.addEventListener("load", function () {
|
||||
// Wait for registration to finish before dropping the <script> tag.
|
||||
// Otherwise, the browser will load the script multiple times,
|
||||
// potentially different versions.
|
||||
var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
|
||||
navigator.serviceWorker.register(serviceWorkerUrl)
|
||||
.then((reg) => {
|
||||
var serviceWorkerUrl =
|
||||
"flutter_service_worker.js?v=" + serviceWorkerVersion;
|
||||
navigator.serviceWorker.register(serviceWorkerUrl).then((reg) => {
|
||||
function waitForActivation(serviceWorker) {
|
||||
serviceWorker.addEventListener('statechange', () => {
|
||||
if (serviceWorker.state == 'activated') {
|
||||
console.log('Installed new service worker.');
|
||||
serviceWorker.addEventListener("statechange", () => {
|
||||
if (serviceWorker.state == "activated") {
|
||||
console.log("Installed new service worker.");
|
||||
loadMainDartJs();
|
||||
}
|
||||
});
|
||||
|
|
@ -89,12 +97,12 @@
|
|||
} else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
|
||||
// When the app updates the serviceWorkerVersion changes, so we
|
||||
// need to ask the service worker to update.
|
||||
console.log('New service worker available.');
|
||||
console.log("New service worker available.");
|
||||
reg.update();
|
||||
waitForActivation(reg.installing);
|
||||
} else {
|
||||
// Existing service worker is still good.
|
||||
console.log('Loading app from service worker.');
|
||||
console.log("Loading app from service worker.");
|
||||
loadMainDartJs();
|
||||
}
|
||||
});
|
||||
|
|
@ -104,7 +112,7 @@
|
|||
setTimeout(() => {
|
||||
if (!scriptLoaded) {
|
||||
console.warn(
|
||||
'Failed to load app from service worker. Falling back to plain <script> tag.',
|
||||
"Failed to load app from service worker. Falling back to plain <script> tag."
|
||||
);
|
||||
loadMainDartJs();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue