Dimkov966/Remever
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Правки + иконка

Browse Source
This commit is contained in:
Vitalij
2025-04-01 22:38:36 +03:00
parent b1aefa9f11
commit fb7ff84087
87 changed files with 1653 additions and 1720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/screens/collections/widgets/collection_card.dart
View File

@@ -20,6 +20,10 @@ class CollectionCard extends StatelessWidget {
final Collection collection;
void _onCollectionTap(BuildContext context) {
context.pushRoute(CollectionDetailRoute(collection: collection));
}
@override
Widget build(BuildContext context) {
return Slidable(
@@ -33,7 +37,9 @@ class CollectionCard extends StatelessWidget {
backgroundColor: const Color(0xFFD7E6F4),
foregroundColor: const Color(0xFF0058AB),
icon: Icons.info_outline,
onPressed: () {},
onPressed: () {
showInfoToast('Пока недоступно');
},
),
const WSpace(8),
_buildSlidableAction(
@@ -44,7 +50,9 @@ class CollectionCard extends StatelessWidget {
collection.isLiked
? Icons.favorite_outlined
: Icons.favorite_border,
onPressed: () {},
onPressed: () {
showInfoToast('Пока недоступно');
},
),
const WSpace(8),
_buildSlidableAction(
@@ -52,12 +60,14 @@ class CollectionCard extends StatelessWidget {
backgroundColor: AppColors.secondary,
foregroundColor: AppColors.primary,
icon: Icons.visibility_off_outlined,
onPressed: () {},
onPressed: () {
showInfoToast('Пока недоступно');
},
),
],
),
child: GestureDetector(
onTap: () => context.pushRoute(CollectionDetailRoute()),
onTap: () => _onCollectionTap(context),
child: Container(
constraints: BoxConstraints(minHeight: 66.h, maxHeight: 84.h),
decoration: BoxDecoration(
@@ -162,10 +172,7 @@ class CollectionCard extends StatelessWidget {
condition: collection.image != null,
builder:
(context) => ClipOval(
child: Image.memory(
base64Decode(collection.image!),
fit: BoxFit.cover,
),
child: Image.memory(collection.image!, fit: BoxFit.cover),
),
fallback:
(context) => Center(

87
lib/screens/collections/widgets/collections_app_bar copy.dart
View File

@@ -1,87 +0,0 @@
import 'package:auto_route/auto_route.dart';
import 'package:flutter/material.dart';
import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
import 'package:remever/common/functions.dart';
import 'package:remever/common/resources.dart';
import 'package:remever/common/widgets/typography.dart';
import 'package:remever/common/widgets/wspace.dart';
import 'package:remever/components/extensions/context.dart';
import 'package:remever/gen/assets.gen.dart';
import 'package:remever/router.gr.dart';
import 'package:remever/screens/dialogs/filters_dialog.dart';
class CollectionsAppBar extends StatelessWidget implements PreferredSizeWidget {
const CollectionsAppBar({super.key});
@override
Size get preferredSize => Size.fromHeight(66.h);
@override
Widget build(BuildContext context) {
return AppBar(
toolbarHeight: 66.h,
backgroundColor: AppColors.white,
shadowColor: Colors.transparent,
title: Row(
children: <Widget>[
GestureDetector(
onLongPress: () => context.pushRoute(const SandboxRoute()),
child: AppTypography(
'Коллекции',
type: SemiBold28px(),
color: AppColors.body_text,
),
),
const WSpace(2),
Container(
height: 22.h,
width: 38.w,
decoration: BoxDecoration(
color: AppColors.secondary,
borderRadius: BorderRadius.circular(40).r,
),
child: Center(
child: AppTypography(
'2213',
type: Regular12px(),
color: AppColors.body_text,
),
),
),
],
),
actions: <Widget>[
AppBarIconButton(icon: Assets.icons.typeSearch, onTap: () {}),
AppBarIconButton(icon: Assets.icons.typeDownload, onTap: () {}),
AppBarIconButton(
icon: Assets.icons.typeSort,
onTap: () {
showCuperModalBottomSheet(
context: context,
height: 424.h,
builder: (BuildContext context) => const FiltersDialog(),
);
},
),
],
);
}
}
class AppBarIconButton extends StatelessWidget {
const AppBarIconButton({required this.icon, required this.onTap, super.key});
final AssetGenImage icon;
final void Function()? onTap;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onTap,
child: SizedBox(
width: 48.h,
child: Center(child: icon.image(height: 24.h, width: 24.w)),
),
);
}
}

48
lib/screens/collections/widgets/collections_app_bar.dart
View File

@@ -5,9 +5,13 @@ import 'package:remever/common/resources.dart';
import 'package:remever/common/widgets/typography.dart';
import 'package:remever/common/widgets/wspace.dart';
import 'package:remever/components/extensions/context.dart';
import 'package:remever/database/database.dart';
import 'package:remever/gen/assets.gen.dart';
import 'package:remever/inject.dart';
import 'package:remever/router.gr.dart';
import 'package:remever/screens/dialogs/filters_dialog.dart';
import 'package:remever/services/collection/collections_interface.dart';
import 'package:remever/widgets/debug/app_debug.dart';
class CollectionsAppBar extends StatelessWidget implements PreferredSizeWidget {
const CollectionsAppBar({super.key});
@@ -42,31 +46,49 @@ class CollectionsAppBar extends StatelessWidget implements PreferredSizeWidget {
borderRadius: BorderRadius.circular(40).r,
),
child: Center(
child: AppTypography(
'2213',
type: Regular12px(),
color: AppColors.body_text,
child: StreamBuilder<List<Collection>>(
stream: getIt<CollectionsInterface>().watchCollectionsList(),
builder: (context, snapshot) {
return _buildCount(snapshot.data?.length ?? 0);
},
),
),
),
],
),
actions: <Widget>[
AppBarIconButton(icon: Assets.icons.typeSearch, onTap: () {}),
AppBarIconButton(icon: Assets.icons.typeDownload, onTap: () {}),
AppBarIconButton(
icon: Assets.icons.typeSort,
onTap: () {
showCuperModalBottomSheet(
context: context,
height: 424.h,
builder: (BuildContext context) => const FiltersDialog(),
AppDebug(
builder: (context, isDebug) {
if (!isDebug) return SizedBox();
return Row(
children: [
AppBarIconButton(icon: Assets.icons.typeSearch, onTap: () {}),
AppBarIconButton(icon: Assets.icons.typeDownload, onTap: () {}),
AppBarIconButton(
icon: Assets.icons.typeSort,
onTap: () {
showCuperModalBottomSheet(
context: context,
height: 424.h,
builder: (BuildContext context) => const FiltersDialog(),
);
},
),
],
);
},
),
],
);
}
Widget _buildCount(int count) {
return AppTypography(
'$count',
type: Regular12px(),
color: AppColors.body_text,
);
}
}
class AppBarIconButton extends StatelessWidget {

41
lib/screens/collections/widgets/collections_filters.dart
View File

@@ -1,9 +1,12 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:remever/common/resources.dart';
import 'package:remever/common/widgets/typography.dart';
import 'package:remever/common/widgets/wspace.dart';
import 'package:remever/components/extensions/context.dart';
import 'package:remever/components/extensions/state.dart';
import 'package:remever/widgets/debug/app_debug.dart';
class CollectionsFilters extends StatefulWidget {
const CollectionsFilters({super.key});
@@ -15,22 +18,28 @@ class CollectionsFilters extends StatefulWidget {
class _CollectionsFiltersState extends State<CollectionsFilters> {
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 28).r,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
_buildFilterButton(AppColors.white, 'Все', () {
safeSetState(() {});
}),
_buildFilterButton(AppColors.gray_bg, 'Публичные', () {
safeSetState(() {});
}),
_buildFilterButton(AppColors.gray_bg, 'Подписки', () {
safeSetState(() {});
}),
],
),
return AppDebug(
builder: (context, isDebug) {
if (!isDebug) return HSpace(20);
return Padding(
padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 28).r,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
_buildFilterButton(AppColors.white, 'Все', () {
safeSetState(() {});
}),
_buildFilterButton(AppColors.gray_bg, 'Публичные', () {
safeSetState(() {});
}),
_buildFilterButton(AppColors.gray_bg, 'Подписки', () {
safeSetState(() {});
}),
],
),
);
},
);
}