Skip to content

Commit

Permalink
Removed some paddings x2
Browse files Browse the repository at this point in the history
  • Loading branch information
Wolfteam committed Feb 5, 2021
1 parent 3b2277b commit 87f38e4
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 64 deletions.
79 changes: 38 additions & 41 deletions lib/presentation/elements/elements_page.dart
Expand Up @@ -14,53 +14,50 @@ class ElementsPage extends StatelessWidget {
return Scaffold(
appBar: AppBar(title: Text(s.elements)),
body: SafeArea(
child: Container(
padding: Styles.edgeInsetAll10,
child: CustomScrollView(
slivers: [
SliverPadding(
padding: Styles.edgeInsetAll5,
sliver: SliverList(
delegate: SliverChildListDelegate.fixed(
[
Text(
s.elementalDebuffs,
style: theme.textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold),
),
Text(s.elementalDebuffsExplained)
],
),
),
),
SliverElementDebuffs(),
SliverPadding(
padding: Styles.edgeInsetAll5,
sliver: SliverList(
delegate: SliverChildListDelegate.fixed([
child: CustomScrollView(
slivers: [
SliverPadding(
padding: Styles.edgeInsetAll10,
sliver: SliverList(
delegate: SliverChildListDelegate.fixed(
[
Text(
s.elementalReactions,
s.elementalDebuffs,
style: theme.textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold),
),
Text(s.elementalReactionsExplained),
]),
Text(s.elementalDebuffsExplained)
],
),
),
SliverElementReactions(),
SliverPadding(
padding: Styles.edgeInsetAll5,
sliver: SliverList(
delegate: SliverChildListDelegate.fixed([
Text(
s.elementalResonances,
style: theme.textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold),
),
Text(s.elementalResonancesExplained),
]),
),
),
SliverElementDebuffs(),
SliverPadding(
padding: Styles.edgeInsetAll10,
sliver: SliverList(
delegate: SliverChildListDelegate.fixed([
Text(
s.elementalReactions,
style: theme.textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold),
),
Text(s.elementalReactionsExplained),
]),
),
),
SliverElementReactions(),
SliverPadding(
padding: Styles.edgeInsetAll10,
sliver: SliverList(
delegate: SliverChildListDelegate.fixed([
Text(
s.elementalResonances,
style: theme.textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold),
),
Text(s.elementalResonancesExplained),
]),
),
SliverElementResonances(),
],
),
),
SliverElementResonances(),
],
),
),
);
Expand Down
42 changes: 19 additions & 23 deletions lib/presentation/today_materials/materials_page.dart
Expand Up @@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:genshindb/application/bloc.dart';
import 'package:genshindb/generated/l10n.dart';
import 'package:genshindb/presentation/shared/loading.dart';
import 'package:genshindb/presentation/shared/styles.dart';

import 'widgets/sliver_character_ascension_materials.dart';
import 'widgets/sliver_weapon_ascension_materials.dart';
Expand All @@ -20,32 +19,29 @@ class MaterialsPage extends StatelessWidget {
loaded: (charsMaterials, weaponMaterials) => Scaffold(
appBar: AppBar(title: Text(s.materials)),
body: SafeArea(
child: Container(
padding: Styles.edgeInsetAll10,
child: CustomScrollView(
slivers: [
SliverPadding(
padding: Styles.edgeInsetAll5,
sliver: SliverToBoxAdapter(
child: Text(
s.forCharacters,
style: theme.textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold),
),
child: CustomScrollView(
slivers: [
SliverPadding(
padding: const EdgeInsets.only(left: 10, top: 10),
sliver: SliverToBoxAdapter(
child: Text(
s.forCharacters,
style: theme.textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold),
),
),
SliverCharacterAscensionMaterials(charAscMaterials: charsMaterials),
SliverPadding(
padding: Styles.edgeInsetAll5,
sliver: SliverToBoxAdapter(
child: Text(
s.forWeapons,
style: theme.textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold),
),
),
SliverCharacterAscensionMaterials(charAscMaterials: charsMaterials),
SliverPadding(
padding: const EdgeInsets.only(left: 10, top: 10),
sliver: SliverToBoxAdapter(
child: Text(
s.forWeapons,
style: theme.textTheme.subtitle1.copyWith(fontWeight: FontWeight.bold),
),
),
SliverWeaponAscensionMaterials(weaponAscMaterials: weaponMaterials),
],
),
),
SliverWeaponAscensionMaterials(weaponAscMaterials: weaponMaterials),
],
),
),
),
Expand Down

0 comments on commit 87f38e4

Please sign in to comment.