1
0
mirror of https://gitlab.com/comunic/comunicmobile synced 2024-11-22 04:49:21 +00:00

Adapt initialize widget

This commit is contained in:
Pierre HUBERT 2021-04-23 12:24:35 +02:00
parent d980239a68
commit 2292454830
3 changed files with 42 additions and 33 deletions

View File

@ -2,6 +2,7 @@ import 'dart:io';
import 'package:comunic/main.dart';
import 'package:comunic/models/config.dart';
import 'package:flutter/material.dart';
/// Forez development configuration
///
@ -24,6 +25,8 @@ void main() {
apiServerUri: "/",
apiServerSecure: false,
clientName: "ForezFlutter",
splashBackgroundColor: Colors.green.shade900,
appName: "#Forez",
));
HttpOverrides.global = new MyHttpOverride();

View File

@ -15,6 +15,7 @@ class Config {
final bool apiServerSecure;
final String clientName;
final Color splashBackgroundColor;
final String appName;
const Config({
@required this.apiServerName,
@ -22,11 +23,13 @@ class Config {
@required this.apiServerSecure,
@required this.clientName,
this.splashBackgroundColor = defaultColor,
this.appName = "Comunic",
}) : assert(apiServerName != null),
assert(apiServerUri != null),
assert(apiServerSecure != null),
assert(clientName != null),
assert(splashBackgroundColor != null);
assert(splashBackgroundColor != null),
assert(appName != null);
/// Get and set static configuration
static Config _config;

View File

@ -11,6 +11,7 @@ import 'package:comunic/ui/routes/main_route/main_route.dart';
import 'package:comunic/ui/routes/main_route/smartphone_route.dart';
import 'package:comunic/ui/routes/main_route/tablet_route.dart';
import 'package:comunic/ui/routes/welcome_route.dart';
import 'package:comunic/ui/widgets/login_routes_theme.dart';
import 'package:comunic/ui/widgets/safe_state.dart';
import 'package:comunic/utils/flutter_utils.dart';
import 'package:comunic/utils/intl_utils.dart';
@ -113,38 +114,40 @@ class _InitializeWidgetState extends SafeState<InitializeWidget> {
/// Build loading widget
Widget _buildNonReadyWidget() {
return Scaffold(
backgroundColor: config().splashBackgroundColor,
body: Center(
child: Material(
color: Colors.transparent,
textStyle: TextStyle(color: Colors.white),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Spacer(
flex: 4,
),
Text(
tr("Comunic"),
style: TextStyle(fontSize: 50),
),
Spacer(
flex: 2,
),
_error ? _buildErrorWidget() : _buildConnectingWidget(),
Spacer(
flex: 2,
),
!isWeb
? Text(tr("Version %version% - Build %build%", args: {
"version": VersionHelper.info.version.toString(),
"build": VersionHelper.info.buildNumber.toString()
}))
: Container(),
Spacer(flex: 1),
],
return LoginRoutesTheme(
child: Scaffold(
backgroundColor: config().splashBackgroundColor,
body: Center(
child: Material(
color: Colors.transparent,
textStyle: TextStyle(color: Colors.white),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Spacer(
flex: 4,
),
Text(
config().appName,
style: TextStyle(fontSize: 50),
),
Spacer(
flex: 2,
),
_error ? _buildErrorWidget() : _buildConnectingWidget(),
Spacer(
flex: 2,
),
!isWeb
? Text(tr("Version %version% - Build %build%", args: {
"version": VersionHelper.info.version.toString(),
"build": VersionHelper.info.buildNumber.toString()
}))
: Container(),
Spacer(flex: 1),
],
),
),
),
),