Skip to content

Commit

Permalink
refactor: Update interaction_result_container.dart to use Column inst…
Browse files Browse the repository at this point in the history
…ead of ListView for better UI layout
  • Loading branch information
MoErn878 committed Jun 11, 2024
1 parent ad17eec commit 15051aa
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,29 @@ class InteractionResultContainer extends StatelessWidget {
BuildContext context, List<String> messages) {
return isThereInteraction(messages)
? _buildNoInteractionWidget(context)
: ListView.builder(
itemBuilder: (context, index) {
return Text(
messages[index],
: Column(
children: [
const SizedBox(height: 16.0),
Text(
'The following interactions were found:',
style: AppTextStyle.headlineMedium(context),
textAlign: TextAlign.center,
);
},
itemCount: messages.length,
shrinkWrap: true,
),
const SizedBox(height: 32.0),
ListView.builder(
itemBuilder: (context, index) {
return Text(
messages[index],
style: AppTextStyle.headlineMedium(context).copyWith(
color: context.colorScheme.error,
),
textAlign: TextAlign.center,
);
},
itemCount: messages.length,
shrinkWrap: true,
),
],
);
}

Expand Down
2 changes: 0 additions & 2 deletions lib/features/main/main/ui/main_screen.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import 'package:custom_navigation_bar/custom_navigation_bar.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:pharmalink/core/routes/app_router.dart';
import 'package:pharmalink/features/404/connection_lost_widget.dart';
import '../../../../core/Blocs/connection/bloc/network_cubit.dart';
Expand Down
12 changes: 1 addition & 11 deletions lib/main_development.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'pharmalink_app.dart';
import 'init.dart';
import 'package:device_preview_screenshot/device_preview_screenshot.dart';

const kReleaseMode = false;

Expand All @@ -10,14 +9,5 @@ void main() async {
await init();

// run the app
runApp(
DevicePreview(
enabled: !kReleaseMode,
tools: const [
...DevicePreview.defaultTools,
DevicePreviewScreenshot(),
],
builder: (context) => const PharmalinkApp(isReleaseMode:kReleaseMode), // Wrap your app
),
);
runApp(const PharmalinkApp());
}
8 changes: 1 addition & 7 deletions lib/pharmalink_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,12 @@ import 'package:pharmalink/features/main/chat/logic/cubit/chat_cubit.dart';
import 'core/Blocs/connection/bloc/network_event.dart';
import 'core/routes/app_router.dart';
import 'features/access/auth/logic/cubit/auth_cubit.dart';
import 'package:device_preview/device_preview.dart';

final appRouter = AppRouter();

class PharmalinkApp extends StatelessWidget {
final bool isReleaseMode;
const PharmalinkApp({
super.key,
this.isReleaseMode = false,
});

@override
Expand Down Expand Up @@ -47,15 +44,12 @@ class PharmalinkApp extends StatelessWidget {
final localeState = context.watch<LocaleCubit>().state;
final themeState = context.watch<ThemeCubit>().state;
return MaterialApp.router(
builder: !isReleaseMode ? DevicePreview.appBuilder : null,
supportedLocales: AppLocalizationsSetup.supportedLocales,
localizationsDelegates:
AppLocalizationsSetup.localizationsDelegates,
localeResolutionCallback:
AppLocalizationsSetup.localeResolutionCallback,
locale: !isReleaseMode
? DevicePreview.locale(context)
: localeState.locale,
locale: localeState.locale,
title: appTitle,
theme: AppTheme.lightTheme(),
darkTheme: AppTheme.darkTheme(),
Expand Down

0 comments on commit 15051aa

Please sign in to comment.