fix: some

This commit is contained in:
2024-06-18 21:19:23 +03:00
parent 34c0ea5fa1
commit dd59a605ad
4 changed files with 10 additions and 16 deletions

View File

@@ -88,12 +88,6 @@ class _DetailPageState extends State<DetailPage> {
required BuildContext context, required BuildContext context,
MainAxisAlignment mainAxisAlignment = MainAxisAlignment.spaceAround, MainAxisAlignment mainAxisAlignment = MainAxisAlignment.spaceAround,
CrossAxisAlignment crossAxisAlignment = CrossAxisAlignment.center}) { CrossAxisAlignment crossAxisAlignment = CrossAxisAlignment.center}) {
// if (false && MediaQuery.of(context).size.width > 600) {
// return Row(
// mainAxisAlignment: mainAxisAlignment,
// crossAxisAlignment: crossAxisAlignment,
// children: children);
// }
return Column( return Column(
mainAxisAlignment: mainAxisAlignment, mainAxisAlignment: mainAxisAlignment,
crossAxisAlignment: crossAxisAlignment, crossAxisAlignment: crossAxisAlignment,
@@ -202,7 +196,6 @@ class _DetailPageState extends State<DetailPage> {
padding: const EdgeInsets.all(20), padding: const EdgeInsets.all(20),
child: SizedBox( child: SizedBox(
width: MediaQuery.sizeOf(context).width, width: MediaQuery.sizeOf(context).width,
// height: MediaQuery.sizeOf(context).height,
child: _buildRowOrCol( child: _buildRowOrCol(
context: context, context: context,
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
@@ -288,12 +281,14 @@ class _DetailPageState extends State<DetailPage> {
: categoryName!) : categoryName!)
: ''), : ''),
backgroundColor: Colors.white, backgroundColor: Colors.white,
labelStyle:
const TextStyle(color: Colors.black),
), ),
), ),
), ),
Center( Center(
child: MarkdownBody( child: MarkdownBody(
data: '### Отстаток: _${item!.count}_', data: '### Остаток: _${item!.count}_',
)), )),
item!.description != '' item!.description != ''
? Padding( ? Padding(

View File

@@ -19,6 +19,9 @@ class MyAppStateMobile extends State<MyApp> {
: MaterialApp( : MaterialApp(
title: 'GymLink Module', title: 'GymLink Module',
theme: theme, theme: theme,
themeMode: context.read<GymLinkProvider>().blackTheme
? ThemeMode.dark
: ThemeMode.light,
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
home: const MainPage(), home: const MainPage(),
), ),

View File

@@ -13,7 +13,7 @@ ThemeData getThemeData(Color color, bool dark) {
).copyWith( ).copyWith(
onPrimary: dark ? materialColor[600] : Colors.white, onPrimary: dark ? materialColor[600] : Colors.white,
), ),
useMaterial3: true, // useMaterial3: true,
); );
} }

View File

@@ -38,18 +38,14 @@
let colorChangeBtnRed = document.getElementById('colorChangeBtnRed'); let colorChangeBtnRed = document.getElementById('colorChangeBtnRed');
colorChangeBtnRed.addEventListener('click', function () { colorChangeBtnRed.addEventListener('click', function () {
var hexColor = '#FF0000' var hexColor = '#FF0000'.substring(1);
.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i, (m, r, g, b) => '#ff' + r + r + g + g + b + b)
.substring(1);
var numColor = parseInt(hexColor, 16); var numColor = parseInt(hexColor, 16);
appState.changeColor(numColor, true); appState.changeColor(numColor, true);
}); });
let colorChangeBtnBlue = document.getElementById('colorChangeBtnBlue'); let colorChangeBtnBlue = document.getElementById('colorChangeBtnBlue');
colorChangeBtnBlue.addEventListener('click', function () { colorChangeBtnBlue.addEventListener('click', function () {
var hexColor = '#0000FF' var hexColor = '#0000FF'.substring(1);
.replace(/^#?([a-f\d])([a-f\d])([a-f\d])$/i, (m, r, g, b) => '#ff' + r + r + g + g + b + b)
.substring(1);
var numColor = parseInt(hexColor, 16); var numColor = parseInt(hexColor, 16);
appState.changeColor(numColor, false); appState.changeColor(numColor, false);
}); });
@@ -60,7 +56,7 @@
}); });
function onError() { function onError() {
console.error('aboba'); console.error('Error');
} }
appState.setOnError(onError); appState.setOnError(onError);