Skip to content

Commit 88fc640

Browse files
authored
Merge pull request #288 from CosmicRaptor/main
remove showcaseview due to bugs
2 parents c7d3721 + ee6007d commit 88fc640

File tree

11 files changed

+984
-1041
lines changed

11 files changed

+984
-1041
lines changed

android/app/build.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ if (localPropertiesFile.exists()) {
1616
def keystoreProperties = new Properties()
1717
def keystorePropertiesFile = rootProject.file('key.properties')
1818
if (keystorePropertiesFile.exists()) {
19+
println "Using keystore properties from: ${keystorePropertiesFile.absolutePath}"
1920
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
2021
}
2122

@@ -81,22 +82,16 @@ android {
8182

8283
signingConfigs {
8384
release {
84-
if (keystoreProperties['storeFile']) {
8585
keyAlias keystoreProperties['keyAlias']
8686
keyPassword keystoreProperties['keyPassword']
8787
storeFile file(keystoreProperties['storeFile'])
8888
storePassword keystoreProperties['storePassword']
89-
} else {
90-
println("Skipping release signingConfig: storeFile missing")
91-
}
9289
}
9390
}
9491

9592
buildTypes {
9693
release {
97-
if (keystoreProperties['storeFile']) {
98-
signingConfig signingConfigs.release
99-
}
94+
signingConfig signingConfigs.release
10095
minifyEnabled true
10196
shrinkResources true
10297
}

lib/main.dart

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:flutter/services.dart';
55
import 'package:flutter_riverpod/flutter_riverpod.dart';
66
import 'package:go_router/go_router.dart';
77
import 'package:shared_preferences/shared_preferences.dart';
8-
import 'package:showcaseview/showcaseview.dart';
98
import 'package:tsec_app/new_ui/router.dart';
109
import 'package:tsec_app/services/localnotificationservice.dart';
1110
import 'package:tsec_app/services/sharedprefsfordot.dart';
@@ -145,9 +144,7 @@ class _TSECAppState extends ConsumerState<TSECApp> {
145144
@override
146145
Widget build(BuildContext context) {
147146
// final _themeMode = ref.watch(themeProvider);
148-
return ShowCaseWidget(
149-
builder: (context) => Builder(
150-
builder: (context) => MaterialApp.router(
147+
return MaterialApp.router(
151148
debugShowCheckedModeBanner: false,
152149
builder: (context, child) =>
153150
MediaQuery(data: getTextScale(context), child: child!),
@@ -157,8 +154,6 @@ class _TSECAppState extends ConsumerState<TSECApp> {
157154
title: 'TSEC App',
158155
themeMode: ThemeMode.dark,
159156
darkTheme: darkTheme,
160-
),
161-
),
162-
);
157+
);
163158
}
164159
}

lib/new_ui/screens/attendance_screen/attendance_details_screen.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ class _AttendanceDetailsScreenState extends ConsumerState<AttendanceDetailsScree
4949
),
5050
)
5151
:
52-
Padding(
53-
padding: const EdgeInsets.all(8.0),
54-
child: SingleChildScrollView(
52+
SingleChildScrollView(
53+
child: Padding(
54+
padding: const EdgeInsets.all(8.0),
5555
child: Column(
5656
children: [
5757
Card(
58-
color: commonbgLLightblack,
58+
color: const Color(0xFF2D2D2D),
5959
child: Padding(
6060
padding: const EdgeInsets.all(8.0),
6161
child: Column(
@@ -85,7 +85,7 @@ class _AttendanceDetailsScreenState extends ConsumerState<AttendanceDetailsScree
8585
),
8686
const SizedBox(height: 16,),
8787
Card(
88-
color: commonbgLLightblack,
88+
color: const Color(0xFF2D2D2D),
8989
child: Padding(
9090
padding: const EdgeInsets.all(8.0),
9191
child: Column(
@@ -115,7 +115,7 @@ class _AttendanceDetailsScreenState extends ConsumerState<AttendanceDetailsScree
115115
),
116116
const SizedBox(height: 16,),
117117
Card(
118-
color: commonbgLLightblack,
118+
color: const Color(0xFF2D2D2D),
119119
child: Padding(
120120
padding: const EdgeInsets.all(8.0),
121121
child: Column(

0 commit comments

Comments
 (0)