redo welcome screen

pull/2/head
axtlos 3 years ago
parent b2dcceb644
commit d604d7c529
No known key found for this signature in database
GPG Key ID: C642EA4B2F4096BE

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

@ -71,8 +71,6 @@ Widget desktopView(currDesktop, setDesktop, next) {
child: SingleChildScrollView( child: SingleChildScrollView(
primary: false, primary: false,
child: Column( child: Column(
//mainAxisAlignment: MainAxisAlignment.spaceEvenly,
//crossAxisAlignment: CrossAxisAlignment.stretch,
children: desktops children: desktops
.map<Widget>( .map<Widget>(
(desktop) => desktopTemplate(desktop, setDesktop)) (desktop) => desktopTemplate(desktop, setDesktop))

@ -120,8 +120,6 @@ Widget keyboard(
child: SingleChildScrollView( child: SingleChildScrollView(
primary: false, primary: false,
child: Column( child: Column(
//mainAxisAlignment: MainAxisAlignment.spaceEvenly,
//crossAxisAlignment: CrossAxisAlignment.stretch,
children: keymaps children: keymaps
.map<Widget>( .map<Widget>(
(keymap) => layoutTemplate(keymap, setChosenLayout)) (keymap) => layoutTemplate(keymap, setChosenLayout))
@ -131,7 +129,6 @@ Widget keyboard(
), ),
), ),
const SizedBox(width: 50), const SizedBox(width: 50),
//Expanded(child: layouts()),
Expanded( Expanded(
child: Container( child: Container(
padding: const EdgeInsets.all(10), padding: const EdgeInsets.all(10),
@ -150,8 +147,6 @@ Widget keyboard(
child: SingleChildScrollView( child: SingleChildScrollView(
primary: false, primary: false,
child: Column( child: Column(
//mainAxisAlignment: MainAxisAlignment.spaceEvenly,
//crossAxisAlignment: CrossAxisAlignment.stretch,
children: chosenLayout.variant children: chosenLayout.variant
.map<Widget>((map) => .map<Widget>((map) =>
variantTemplate(map, chosenLayout, nextPage)) variantTemplate(map, chosenLayout, nextPage))

@ -56,7 +56,7 @@ Widget users(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
const SizedBox(width: 10), const SizedBox(width: 20),
SizedBox( SizedBox(
width: 600, width: 600,
child: Container( child: Container(

@ -1,71 +1,137 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'dart:io';
Widget welcome(next) { Widget welcome(next) {
return Container( return Container(
decoration: const BoxDecoration( //decoration: const BoxDecoration(
image: DecorationImage( // image: DecorationImage(
fit: BoxFit.cover, // fit: BoxFit.cover,
image: AssetImage('assets/welcome-bg-alt.png'), // image: AssetImage('assets/welcome-bg-alt.png'),
), // ),
), //),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
const SizedBox(height: 20), const SizedBox(height: 50),
Row( const Text(
mainAxisAlignment: MainAxisAlignment.center, 'Welcome to Crystal Linux',
children: const [ style: TextStyle(
Text( fontSize: 30,
'Welcome to Jade', fontWeight: FontWeight.bold,
style: TextStyle( color: Color.fromARGB(255, 169, 0, 255),
fontSize: 50, ),
fontWeight: FontWeight.bold,
color: Color.fromARGB(255, 169, 0, 255)),
),
],
), ),
const SizedBox(height: 10), const SizedBox(height: 20),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: const [ crossAxisAlignment: CrossAxisAlignment.center,
Text(
'Installing crystal made easy',
style: TextStyle(
fontSize: 40,
color: Color.fromARGB(255, 169, 0, 255),
),
),
],
),
Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
Row( ElevatedButton(
mainAxisAlignment: MainAxisAlignment.end, style: TextButton.styleFrom(
children: [ primary: const Color.fromARGB(0, 23, 23, 23),
Column( backgroundColor: const Color.fromARGB(0, 23, 23, 23),
children: [ elevation: 0,
TextButton( padding: EdgeInsets.zero,
onPressed: () { ),
next(); onPressed: () {
}, exit(0);
child: const Text('Start'), },
style: TextButton.styleFrom( child: Container(
primary: Colors.white, width: 500,
backgroundColor: const Color.fromARGB(255, 169, 0, 255), height: 500,
minimumSize: const Size(80, 50), padding: const EdgeInsets.all(10),
padding: const EdgeInsets.all(10), decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
border: Border.all(color: Colors.black),
color: const Color.fromARGB(255, 30, 30, 30),
boxShadow: const [
BoxShadow(
color: Colors.black,
blurRadius: 2,
offset: Offset(-2, 3),
),
],
),
child: Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: const [
SizedBox(height: 20),
Text("Try Crystal Linux without installing",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.white)),
SizedBox(height: 5),
Image(
image: AssetImage(
'assets/crystal-logo-minimal.png',
),
height: 400,
fit: BoxFit.scaleDown,
), ),
],
),
),
),
),
const SizedBox(width: 20),
ElevatedButton(
style: TextButton.styleFrom(
primary: const Color.fromARGB(0, 23, 23, 23),
backgroundColor: const Color.fromARGB(0, 23, 23, 23),
elevation: 0,
padding: EdgeInsets.zero,
),
onPressed: next,
child: Container(
width: 500,
height: 500,
padding: const EdgeInsets.all(10),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
border: Border.all(color: Colors.black),
color: const Color.fromARGB(255, 30, 30, 30),
boxShadow: const [
BoxShadow(
color: Colors.black,
blurRadius: 2,
offset: Offset(-2, 3),
), ),
const SizedBox(height: 10),
], ],
), ),
const SizedBox(width: 30), child: Expanded(
], child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: const [
SizedBox(height: 20),
Text("Start the installation",
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.white)),
SizedBox(height: 5),
Image(
image: AssetImage(
'assets/jade_logo.png',
),
height: 400,
fit: BoxFit.scaleDown,
),
],
),
),
),
), ),
const SizedBox(height: 7)
], ],
), ),
const SizedBox(height: 20),
const Text(
"Starting Crystal linux without installing will not change anything on your computer,",
style: TextStyle(fontSize: 20, color: Colors.white)),
const Text(
"it's recommended to try that first to see if everything works",
style: TextStyle(fontSize: 20, color: Colors.white))
], ],
), ),
); );

@ -230,16 +230,8 @@ class _JadeguiState extends State<Jadegui> {
} }
Widget condition() { Widget condition() {
// other logic
// Declare a widget variable,
// it will be assigned later according
// to the condition
Widget widget; Widget widget;
// Using switch statement to display desired
// widget if any certain condition is met
// You are free to use any condition
// For simplicity I have used boolean contition
switch (_selectedIndex) { switch (_selectedIndex) {
case 0: case 0:
widget = welcome(() { widget = welcome(() {
@ -370,17 +362,6 @@ class _JadeguiState extends State<Jadegui> {
}, },
); );
break; break;
/*case 5:
print("Desktop: ${currDesktop.name}");
widget = const Text(
'Showing Desktop screen',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color.fromARGB(255, 169, 0, 255),
),
);
break;*/
case 5: case 5:
widget = const Text( widget = const Text(
'Showing Misc screen', 'Showing Misc screen',
@ -423,7 +404,7 @@ class _JadeguiState extends State<Jadegui> {
break; break;
default: default:
widget = const Text( widget = const Text(
'You should not see this, report this at git.tar.black/crystal/jade_gui', 'You should not see this, report this at https://git.tar.black/crystal/jade_gui',
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

Loading…
Cancel
Save