Merge branch 'main' into 'nicolas'

# Conflicts:
#   lib/main.dart
This commit is contained in:
2022-12-12 12:16:34 +00:00
2 changed files with 395 additions and 16 deletions
+217
View File
@@ -0,0 +1,217 @@
import 'package:flutter/material.dart';
class MyHomePage extends StatefulWidget {
const MyHomePage({super.key, required this.title});
final String title;
@override
State<MyHomePage> createState() => _MyHomePageState();
}
//Da haben wir letztes mal gemacht aber ich weiß jetzt nicht warum es nicht funktioniert
//??????
/*class _MyHomePageState extends State<MyHomePage> {
int _selectedIndex = 0;
static final List<Widget> _widgetOptions = <Widget>
[
Table(border: TableBorder.all(),
columnWidths:const<
int, TableColumnWidth>{
0: IntrinsicColumnWidth(),
1: FlexColumnWidth(),
2: FixedColumnWidth(64),
},
defaultVerticalAlignment: TableCellVerticalAlignment.middle,
children: <TableRow>[
TableRow(
children: <Widget>[
Container(
height: 32,
color: Colors.green,
),
TableCell(
verticalAlignment: TableCellVerticalAlignment.top,
child: Container(
height: 32,
width: 32,
color: Colors.red,
),
),
Container(
height: 64,
color: Colors.blue,
),
],
),
TableRow(
decoration: const BoxDecoration(
color: Colors.grey,
),
children: <Widget>[
Container(
height: 64,
width: 128,
color: Colors.purple,
),
Container(
height: 32,
color: Colors.yellow,
),
Center(
child: Container(
height: 32,
width: 32,
color: Colors.orange,
),
),
],
),
],
),
];
void _onItemTapped(int index) {
setState(() {
_selectedIndex = index;
});
}
int _counter = 0;
void _incrementCounter() {
setState(() {
_counter++;
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(widget.title),
),
body: Center(
/*
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
const Text(
'Knopfdruck:',
),
Text(
'$_counter',
style: Theme.of(context).textTheme.headline4,
),
],
),*/
child: _widgetOptions.elementAt(_selectedIndex),
),
floatingActionButton: FloatingActionButton(
onPressed: _incrementCounter,
tooltip: 'Increment',
child: const Icon(Icons.add),
),
bottomNavigationBar: BottomAppBar(
color: const Color(0xFF1601FD),
child: IconTheme(
data: IconThemeData(color: Theme.of(context).colorScheme.onPrimary),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
IconButton(
tooltip: 'News',
icon: const Icon(Icons.newspaper),
onPressed: /*() {}*/() => _onItemTapped(0),
),
//if (centerLocations.contains(fabLocation)) const Spacer(),
IconButton(
tooltip: 'Mängel',
icon: const Icon(Icons.warning),
onPressed: () => /*{_pushMangel()}*/ _onItemTapped(1),
),
IconButton(
tooltip: 'Profil',
icon: const Icon(Icons.person),
onPressed: () => /*{_pushProfile()}*/ _onItemTapped(2),
),
],
),
),
)
);
}
}
*/
class _MyHomePageState extends State<MyHomePage> {
int _selectedIndex = 0;
static const TextStyle optionStyle =
TextStyle(fontSize: 30, fontWeight: FontWeight.bold);
static const List<Widget> _widgetOptions = <Widget>[
Text(
'Index 0: Home',
style: optionStyle,
),
Text(
'Index 1: Business',
style: optionStyle,
),
Text(
'Index 2: School',
style: optionStyle,
),
Text(
'Index 3: Settings',
style: optionStyle,
),
];
void _onItemTapped(int index) {
setState(() {
_selectedIndex = index;
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('BottomNavigationBar Sample'),
),
body: Center(
child: _widgetOptions.elementAt(_selectedIndex),
),
bottomNavigationBar: BottomNavigationBar(
items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.home),
label: 'Home',
backgroundColor: Colors.red,
),
BottomNavigationBarItem(
icon: Icon(Icons.business),
label: 'Business',
backgroundColor: Colors.green,
),
BottomNavigationBarItem(
icon: Icon(Icons.school),
label: 'School',
backgroundColor: Colors.purple,
),
BottomNavigationBarItem(
icon: Icon(Icons.settings),
label: 'Settings',
backgroundColor: Colors.pink,
),
],
currentIndex: _selectedIndex,
selectedItemColor: Colors.amber[800],
onTap: _onItemTapped,
),
);
}
}
+177 -15
View File
@@ -1,6 +1,8 @@
//TEST
//TEST, TEST
import 'package:flutter/material.dart';
import 'home.dart';
void main() {
runApp(const MyApp());
}
@@ -19,6 +21,7 @@ class MyApp extends StatelessWidget {
}
}
/*
class MyHomePage extends StatefulWidget {
const MyHomePage({super.key, required this.title});
@@ -27,8 +30,8 @@ class MyHomePage extends StatefulWidget {
@override
State<MyHomePage> createState() => _MyHomePageState();
}
class ProfilePage extends StatefulWidget {
*/
/*class ProfilePage extends StatefulWidget {
const ProfilePage({super.key, required this.title});
final String title;
@@ -44,9 +47,46 @@ class MangelPage extends StatefulWidget {
@override
State<MangelPage> createState() => _MangelPageState();
}*/
/*
class _MyHomePageState extends State<MyHomePage> {
int _selectedIndex = 0;
static const List<Widget> _widgetOptions = <Widget>[
ListView(
padding: const EdgeInsets.all(8),
children: <Widget>[
Container(
height: 50,
color: Colors.amber[600],
child: const Center(child: Text('Entry A')),
),
Container(
height: 50,
color: Colors.amber[500],
child: const Center(child: Text('Entry B')),
),
Container(
height: 50,
color: Colors.amber[100],
child: const Center(child: Text('Entry C')),
),
],
),
Text(
'Index 1: Mängel',
),
Text(
'Index 2: Profil',
),
];
void _onItemTapped(int index) {
setState(() {
_selectedIndex = index;
});
}
class _MyHomePageState extends State<MyHomePage> {
int _counter = 0;
void _incrementCounter() {
@@ -55,7 +95,7 @@ class _MyHomePageState extends State<MyHomePage> {
});
}
void _pushMangel(){
/* void _pushMangel(){
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const MangelPage(title: 'Mängel'),
@@ -69,7 +109,7 @@ class _MyHomePageState extends State<MyHomePage> {
builder: (context) => const ProfilePage(title: 'Profil'),
),
);
}
}*/
@override
Widget build(BuildContext context) {
@@ -80,7 +120,7 @@ class _MyHomePageState extends State<MyHomePage> {
title: Text(widget.title),
),
body: Center(
/*
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -93,7 +133,8 @@ class _MyHomePageState extends State<MyHomePage> {
style: Theme.of(context).textTheme.headline4,
),
],
),
),*/
child: _widgetOptions.elementAt(_selectedIndex),
),
floatingActionButton: FloatingActionButton(
onPressed: _incrementCounter,
@@ -110,18 +151,18 @@ class _MyHomePageState extends State<MyHomePage> {
IconButton(
tooltip: 'News',
icon: const Icon(Icons.newspaper),
onPressed: () {},
onPressed: /*() {}*/() => _onItemTapped(0),
),
//if (centerLocations.contains(fabLocation)) const Spacer(),
IconButton(
tooltip: 'Mängel',
icon: const Icon(Icons.warning),
onPressed: () => {_pushMangel()},
onPressed: () => /*{_pushMangel()}*/ _onItemTapped(1),
),
IconButton(
tooltip: 'Profil',
icon: const Icon(Icons.person),
onPressed: () => {_pushProfile()},
onPressed: () => /*{_pushProfile()}*/ _onItemTapped(2),
),
],
),
@@ -129,9 +170,22 @@ class _MyHomePageState extends State<MyHomePage> {
)
);
}
}*/
/*
class _ProfilePageState extends State<ProfilePage> {
void _pushMangel(){
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const MangelPage(title: 'Mängel'),
),
);
}
class _ProfilePageState extends State<ProfilePage> {
void _pushNews(){
Navigator.pop(context);
}
@override
@@ -156,18 +210,18 @@ class _ProfilePageState extends State<ProfilePage> {
IconButton(
tooltip: 'News',
icon: const Icon(Icons.newspaper),
onPressed: () {},
onPressed: () => {_pushNews()},
),
//if (centerLocations.contains(fabLocation)) const Spacer(),
IconButton(
tooltip: 'Mängel',
icon: const Icon(Icons.warning),
onPressed: () {},
onPressed: () => {_pushMangel()},
),
IconButton(
tooltip: 'Profil',
icon: const Icon(Icons.person),
onPressed: () => {},
onPressed: () {},
),
],
),
@@ -179,6 +233,17 @@ class _ProfilePageState extends State<ProfilePage> {
class _MangelPageState extends State<MangelPage> {
void _pushProfile(){
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => const ProfilePage(title: 'Profil'),
),
);
}
void _pushNews(){
Navigator.pop(context);
}
@override
Widget build(BuildContext context) {
@@ -221,4 +286,101 @@ class _MangelPageState extends State<MangelPage> {
)
);
}
}*/
//https://api.flutter.dev/flutter/material/BottomNavigationBar-class.html
/*
import 'package:flutter/material.dart';
void main() => runApp(const MyApp());
class MyApp extends StatelessWidget {
const MyApp({super.key});
static const String _title = 'Flutter Code Sample';
@override
Widget build(BuildContext context) {
return const MaterialApp(
title: _title,
home: MyStatefulWidget(),
);
}
}
class MyStatefulWidget extends StatefulWidget {
const MyStatefulWidget({super.key});
@override
State<MyStatefulWidget> createState() => _MyStatefulWidgetState();
}
class _MyStatefulWidgetState extends State<MyStatefulWidget> {
int _selectedIndex = 0;
static const TextStyle optionStyle =
TextStyle(fontSize: 30, fontWeight: FontWeight.bold);
static const List<Widget> _widgetOptions = <Widget>[
Text(
'Index 0: Home',
style: optionStyle,
),
Text(
'Index 1: Business',
style: optionStyle,
),
Text(
'Index 2: School',
style: optionStyle,
),
Text(
'Index 3: Settings',
style: optionStyle,
),
];
void _onItemTapped(int index) {
setState(() {
_selectedIndex = index;
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('BottomNavigationBar Sample'),
),
body: Center(
child: _widgetOptions.elementAt(_selectedIndex),
),
bottomNavigationBar: BottomNavigationBar(
items: const <BottomNavigationBarItem>[
BottomNavigationBarItem(
icon: Icon(Icons.home),
label: 'Home',
backgroundColor: Colors.red,
),
BottomNavigationBarItem(
icon: Icon(Icons.business),
label: 'Business',
backgroundColor: Colors.green,
),
BottomNavigationBarItem(
icon: Icon(Icons.school),
label: 'School',
backgroundColor: Colors.purple,
),
BottomNavigationBarItem(
icon: Icon(Icons.settings),
label: 'Settings',
backgroundColor: Colors.pink,
),
],
currentIndex: _selectedIndex,
selectedItemColor: Colors.amber[800],
onTap: _onItemTapped,
),
);
}
}
*/