Skip to content

Commit ce2aa9f

Browse files
committed
minor padding adjustments
1 parent 5b61da9 commit ce2aa9f

File tree

3 files changed

+23
-13
lines changed

3 files changed

+23
-13
lines changed

lib/screens/checkin.screen.dart

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,13 @@ class CheckinScreen extends StatelessWidget {
8484
color: (item.isChecked) ? Get.theme.primaryColor : Get.theme.disabledColor,
8585
),
8686
Expanded(
87-
child: Text(item.name,
88-
textAlign: TextAlign.center,
89-
style: Get.theme.textTheme.subtitle2
90-
.apply(color: (item.isChecked) ? Get.theme.primaryColor : Get.theme.disabledColor)),
87+
child: Padding(
88+
padding: const EdgeInsets.symmetric(horizontal: 4),
89+
child: Text(item.name,
90+
textAlign: TextAlign.center,
91+
style: Get.theme.textTheme.subtitle2
92+
.apply(color: (item.isChecked) ? Get.theme.primaryColor : Get.theme.disabledColor)),
93+
),
9194
),
9295
Checkbox(
9396
activeColor: Get.theme.primaryColor,

lib/screens/fhir/fhir.screen.dart

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:get/get.dart';
55
import 'package:symptom_tracker/screens/fhir/fhir.dart';
66
import 'package:symptom_tracker/screens/fhir/firebase.dart';
77
import 'package:symptom_tracker/screens/fhir/sandbox.dart';
8+
import 'package:symptom_tracker/screens/screens.dart';
89
import 'package:symptom_tracker/services/services.dart';
910

1011
import 'package:symptom_tracker/shared/shared.dart';
@@ -17,6 +18,9 @@ class FhirScreen extends StatelessWidget {
1718
child: Scaffold(
1819
appBar: SharedAppBar(
1920
title: 'FHIR',
21+
actions: [
22+
IconButton(icon: Icon(Icons.close), onPressed: () => Get.offAll(HomeScreen())),
23+
],
2024
),
2125
body: _buildBody(),
2226
bottomNavigationBar: TabBar(tabs: [
@@ -33,15 +37,16 @@ class FhirScreen extends StatelessWidget {
3337
child: Column(
3438
children: <Widget>[
3539
_firebaseStream(),
36-
SizedBox(height: 24),
3740
Expanded(
3841
child: Container(
3942
color: Get.theme.unselectedWidgetColor,
40-
child: TabBarView(children: [
41-
SandboxView(),
42-
FirebaseView(),
43-
FhirView(),
44-
]),
43+
child: TabBarView(
44+
children: [
45+
SandboxView(),
46+
FirebaseView(),
47+
FhirView(),
48+
],
49+
),
4550
),
4651
),
4752
],
@@ -55,7 +60,7 @@ class FhirScreen extends StatelessWidget {
5560
child: GetBuilder<FirebaseService>(
5661
init: FirebaseService(),
5762
builder: (fbService) => StreamBuilder(
58-
stream: fbService.fbHelloStream,
63+
stream: fbService.fbStreamHello,
5964
builder: (context, snapshot) {
6065
if (!snapshot.hasData) {
6166
return CircularProgressIndicator();

lib/screens/fhir/sandbox.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ class SandboxView extends StatelessWidget {
66
Widget build(BuildContext context) {
77
return Column(
88
children: <Widget>[
9-
Text('Obligatory FHIR Puns:', style: Get.theme.textTheme.headline4),
10-
SizedBox(height: 24),
9+
Padding(
10+
padding: const EdgeInsets.symmetric(vertical: 24),
11+
child: Text('Obligatory FHIR Puns:', style: Get.theme.textTheme.headline4),
12+
),
1113
_sandbox(),
1214
],
1315
);

0 commit comments

Comments
 (0)