Skip to content

Commit 92fd1de

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/249-allow-hiding-of-calendar-events
2 parents c218aea + bcbd3cc commit 92fd1de

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed
Loading

lib/homeComponent/view/contactCard/contact_card_loading_view.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ContactCardLoadingView extends StatelessWidget {
2323
children: [
2424
ShimmerView(
2525
child: PlaceholderText(
26-
text: "max.mustermann@tum.de",
26+
text: "StudentCard".toUpperCase(),
2727
style: Theme.of(context).textTheme.bodySmall?.copyWith(
2828
color: Colors.grey,
2929
fontWeight: FontWeight.w700,
@@ -36,14 +36,11 @@ class ContactCardLoadingView extends StatelessWidget {
3636
style: Theme.of(context).textTheme.headlineSmall,
3737
),
3838
),
39-
const ShimmerView(
40-
child: PlaceholderText(text: "go43hum"),
41-
),
4239
const ShimmerView(
4340
child: PlaceholderText(text: "max.mustermann@tum.de"),
4441
),
4542
const ShimmerView(
46-
child: PlaceholderText(text: "max.mustermann@tum.de"),
43+
child: PlaceholderText(text: "go42tum"),
4744
),
4845
],
4946
),

lib/homeComponent/view/contactCard/contact_card_view.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,10 @@ class _ContactCardViewState extends ConsumerState<ContactCardView> {
8989
data.email,
9090
maxLines: 1,
9191
),
92-
Text(
93-
profile.tumID ?? "go42tum",
94-
),
92+
if (profile.tumID != null)
93+
Text(
94+
profile.tumID!,
95+
),
9596
],
9697
),
9798
),

lib/main.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ class _CampusAppState extends ConsumerState<CampusApp>
170170
void firebaseCallback() {
171171
if (!kDebugMode) {
172172
final remoteConfig = FirebaseRemoteConfig.instance;
173-
remoteConfig.fetchAndActivate();
174173
remoteConfig.fetchAndActivate().then((value) {
175174
if (value) {
176175
_handleFirebaseValues(

0 commit comments

Comments
 (0)