Skip to content

GitLab

Commit 14cbf4be authored by Sai Srinivas's avatar Sai Srinivas
Browse files

17-11-2025 font styles and icons

parent 6f73c3f4
Hide whitespace changes
Inline Side-by-side
android/app/build.gradle.kts
View file @ 14cbf4be
import java.util.Properties
import java.io.FileInputStream
plugins {
id("com.android.application")
id("kotlin-android")
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id("dev.flutter.flutter-gradle-plugin")
}
val localProperties = Properties()
val localPropertiesFile = rootProject.file("local.properties")
if (localPropertiesFile.exists()) {
FileInputStream(localPropertiesFile).use { stream ->
localProperties.load(stream)
}
}
val keystoreProperties = Properties()
val keystorePropertiesFile = rootProject.file("key.properties")
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
}
android {
namespace = "in.webgrid.genservices"
compileSdk = flutter.compileSdkVersion
......@@ -29,12 +43,19 @@ android {
versionCode = flutter.versionCode
versionName = flutter.versionName
}
signingConfigs {
create("release") {
keyAlias = keystoreProperties["keyAlias"] as String
keyPassword = keystoreProperties["keyPassword"] as String
storeFile = keystoreProperties["storeFile"]?.let { file(it) }
storePassword = keystoreProperties["storePassword"] as String
}
}
buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
}
}
}
......
assets/svg/tick3_ic.svg
View file @ 14cbf4be
......@@ -4,13 +4,13 @@
<path d="M8.60467 3.34546L5.30024 6.64993L3.99206 5.34168L3.08325 6.2504L5.30024 8.46739L9.5134 4.25425L8.60467 3.34546Z" fill="white"/>
<defs>
<linearGradient id="paint0_linear_139_2102" x1="6.05231" y1="10.7833" x2="6.05231" y2="-2.36507" gradientUnits="userSpaceOnUse">
<stop stop-color="#008301"/>
<stop stop-color="#A4A4A4"/>
<stop offset="0.6393" stop-color="#2BB02E"/>
<stop offset="1" stop-color="#3FC442"/>
</linearGradient>
<linearGradient id="paint1_linear_139_2102" x1="8.12288" y1="12.5618" x2="0.783855" y2="-2.50266" gradientUnits="userSpaceOnUse">
<stop offset="0.2486" stop-color="#777777"/>
<stop offset="0.9279" stop-color="#777777"/>
<stop offset="0.2486" stop-color="#A4A4A4"/>
<stop offset="0.9279" stop-color="#A4A4A4"/>
</linearGradient>
</defs>
</svg>
genservices.jks 0 → 100644
View file @ 14cbf4be
File added
lib/Models/scheduleListResponse.dart
View file @ 14cbf4be
......@@ -34,9 +34,11 @@ class AllScheduleServices {
String? complaintType;
String? comType;
String? status;
String? amc;
String? warranty;
AllScheduleServices(
{this.id, this.dueDate, this.complaintType, this.comType, this.status});
{this.id, this.dueDate, this.complaintType, this.comType, this.status, this.amc, this.warranty});
AllScheduleServices.fromJson(Map<String, dynamic> json) {
id = json['id'];
......@@ -44,6 +46,8 @@ class AllScheduleServices {
complaintType = json['complaint_type'];
comType = json['com_type'];
status = json['status'];
amc = json['amc'];
warranty = json['warranty'];
}
Map<String, dynamic> toJson() {
......@@ -53,6 +57,8 @@ class AllScheduleServices {
data['complaint_type'] = this.complaintType;
data['com_type'] = this.comType;
data['status'] = this.status;
data['amc'] = this.amc;
data['warranty'] = this.warranty;
return data;
}
}
lib/Screens/generatorDetailsScreen.dart
View file @ 14cbf4be
......@@ -245,7 +245,7 @@ class _GeneratordetailsscreenState extends State<Generatordetailsscreen> {
},
stretchTriggerOffset: 300.0,
backgroundColor: Color(0xFF4076FF),
expandedHeight: detailsProvider.showMoreDetails?screenHeight*0.62:screenHeight*0.211,
expandedHeight: detailsProvider.showMoreDetails?screenHeight*0.62:screenHeight*0.26,
flexibleSpace: FlexibleSpaceBar(
stretchModes: const [
StretchMode.zoomBackground,
......@@ -295,7 +295,7 @@ class _GeneratordetailsscreenState extends State<Generatordetailsscreen> {
],
),
SizedBox(height: 10,),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 10,
......@@ -304,138 +304,168 @@ class _GeneratordetailsscreenState extends State<Generatordetailsscreen> {
child: Column(
children: [
// Product Info Row
Row(
children: [
Expanded(
flex: 5,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
RichText(
text: TextSpan(
style: const TextStyle(
fontFamily: 'Poppins',
color: Color(0xFF48F3FF),
fontSize: 12,
),
children: [
TextSpan(text: "#${data.hashId!}"),
TextSpan(
text: " | Engine: ${data.engine!}",
Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0),
child: Row(
children: [
Expanded(
flex: 5,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
RichText(
text: TextSpan(
style: const TextStyle(
fontFamily: 'Poppins',
height: 2.5,
color: Color(0xFF48F3FF),
fontSize: 13,
),
],
),
),
Text(
data.prodName!,
maxLines: 2,
style: const TextStyle(
color: Colors.white,
fontSize: 14,
children: [
TextSpan(text: "#${data.hashId!}"),
TextSpan(
text: " | Engine: ${data.engine!}",
),
],
),
),
),
if (data.amc != "0") ...[
Row(
mainAxisSize: MainAxisSize.min,
children: [
SvgPicture.asset(
"assets/svg/tick_ic.svg",
height: 15,
color:
data.amc == "1"
? AppColors.greenICBg
: AppColors.subtitleText,
Padding(
padding: const EdgeInsets.symmetric(vertical: 3.0),
child: Text(
data.prodName!,
maxLines: 2,
style: const TextStyle(
height: 1.5,
color: Colors.white,
fontSize: 14,
),
const SizedBox(width: 4),
Text(
"AMC ",
style: TextStyle(
fontSize: 15,
fontFamily: "PoppinsBold",
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700,
color:
data.amc == "1"
? AppColors.greenICBg
: AppColors.subtitleText,
),
),
),
if (data.amc != "0") ...[
SizedBox(height: 5,),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 4,
),
Text(
"Protected",
style: TextStyle(
fontSize: 15,
fontFamily: "PoppinsBold",
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700,
color:
data.amc == "1"
? AppColors.normalText
: AppColors.subtitleText,
),
decoration: BoxDecoration(
gradient:
data.amc == "1"
? AppColors.greenStripGradient
: AppColors.fadeGradient,
borderRadius: BorderRadius.circular(12),
),
const SizedBox(width: 4),
if (data.amc == "2")
const Icon(
Icons.info_outline,
color: Colors.red,
size: 15,
),
],
),
],
if (data.warranty != "0") ...[
Row(
mainAxisSize: MainAxisSize.min,
children: [
Row(
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
SvgPicture.asset(
"assets/svg/tick2_ic.svg",
"assets/svg/tick_ic.svg",
height: 15,
color:
data.warranty == "1"
? AppColors.warning
: AppColors
.subtitleText,
data.amc == "1"
? Color(0xFF00BC56)
: AppColors.subtitleText,
),
const SizedBox(width: 6),
const SizedBox(width: 4),
Text(
"Warranty",
"AMC ",
style: TextStyle(
fontSize: 15,
fontFamily: "PoppinsBold",
fontSize: 12,
fontFamily: "HemiHead",
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700,
color:
data.warranty == "1"
data.amc == "1"
? Color(0xFF00BC56)
: AppColors.subtitleText,
),
),
Text(
"PROTECTED",
style: TextStyle(
fontSize: 12,
fontFamily: "HemiHead",
fontStyle: FontStyle.italic,
color:
data.amc == "1"
? AppColors.normalText
: AppColors
.subtitleText,
: AppColors.subtitleText,
),
),
SizedBox(width: 6),
if (data.warranty == "2")
const SizedBox(width: 4),
if (data.amc == "2")
const Icon(
Icons.info_outline,
Icons.error_outline,
color: Colors.red,
size: 15,
),
],
),
],
),
),
],
if (data.warranty != "0") ...[
SizedBox(height: 5,),
Row(
mainAxisSize: MainAxisSize.min,
children: [
Container(
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 4,
),
decoration: BoxDecoration(
gradient:
data.warranty == "1"
? AppColors.yellowStripGradient
: AppColors.fadeGradient,
borderRadius: BorderRadius.circular(12),
),
child: Row(
children: [
SvgPicture.asset(
data.warranty == "1"
? "assets/svg/tick2_ic.svg":
"assets/svg/tick3_ic.svg",
height: 15,
),
const SizedBox(width: 6),
Text(
"WARRANTY",
style: TextStyle(
fontSize: 12,
fontFamily: "HemiHead",
fontStyle: FontStyle.italic,
color:
data.warranty == "1"
? AppColors.normalText
: AppColors
.nearDarkText,
),
),
SizedBox(width: 6),
if (data.warranty == "2")
const Icon(
Icons.error_outline,
color: Colors.red,
size: 15,
),
],
),
),
],
),
],
],
],
),
),
),
Expanded(
flex: 2,
child: Image.network(
data.prodImg!,
fit: BoxFit.scaleDown,
Expanded(
flex: 2,
child: Image.network(
data.prodImg!,
fit: BoxFit.scaleDown,
),
),
),
],
],
),
),
// Show More Details
......@@ -868,7 +898,7 @@ class _GeneratordetailsscreenState extends State<Generatordetailsscreen> {
const SizedBox(width: 4),
if (data.amc == "2")
const Icon(
Icons.info_outline,
Icons.error_outline,
color: Colors.red,
size: 15,
),
......@@ -896,33 +926,30 @@ class _GeneratordetailsscreenState extends State<Generatordetailsscreen> {
Row(
children: [
SvgPicture.asset(
"assets/svg/tick2_ic.svg",
height: 15,
color:
data.warranty == "1"
? AppColors.warning
: AppColors
.subtitleText,
? "assets/svg/tick2_ic.svg":
"assets/svg/tick3_ic.svg",
height: 15,
),
const SizedBox(width: 6),
Text(
"Warranty",
style: TextStyle(
fontSize: 15,
fontSize: 12,
fontFamily: "PoppinsBold",
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700,
color:
data.warranty == "1"
? AppColors.normalText
: AppColors
.subtitleText,
: Color(0xFF969696),
),
),
SizedBox(width: 6),
if (data.warranty == "2")
const Icon(
Icons.info_outline,
Icons.error_outline,
color: Colors.red,
size: 15,
),
......@@ -937,7 +964,7 @@ class _GeneratordetailsscreenState extends State<Generatordetailsscreen> {
),
Spacer(),
Container(
padding: EdgeInsets.symmetric(vertical: 3, horizontal: 5),
padding: EdgeInsets.symmetric(vertical: 5, horizontal: 8),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color:
......@@ -953,7 +980,7 @@ class _GeneratordetailsscreenState extends State<Generatordetailsscreen> {
color:
data.status == "Scheduled"
? AppColors.success
: AppColors.error,
: AppColors.nearDarkText,
),
),
),
......
lib/Screens/scheduleListScreen.dart
View file @ 14cbf4be
......@@ -309,10 +309,12 @@ class _ScheduleListScreenState extends State<ScheduleListScreen> {
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (data[j].status ==
"Scheduled") ...[
......@@ -323,6 +325,7 @@ class _ScheduleListScreenState extends State<ScheduleListScreen> {
],
SizedBox(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (data[j].status ==
"Completed") ...[
......@@ -355,14 +358,129 @@ class _ScheduleListScreenState extends State<ScheduleListScreen> {
),
),
),
if (data[j].amc != "0") ...[
SizedBox(height: 5,),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 5,
vertical: 4,
),
decoration: BoxDecoration(
gradient:
data[j].amc == "1"
? AppColors.greenStripGradient
: AppColors.fadeGradient,
borderRadius: BorderRadius.circular(12),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
SvgPicture.asset(
"assets/svg/tick_ic.svg",
height: 15,
color:
data[j].amc == "1"
? AppColors.greenICBg
: AppColors.subtitleText,
),
const SizedBox(width: 4),
Text(
"AMC ",
style: TextStyle(
fontSize: 12,
fontFamily: "PoppinsBold",
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700,
color:
data[j].amc == "1"
? AppColors.greenICBg
: AppColors.subtitleText,
),
),
Text(
"Protected",
style: TextStyle(
fontSize: 12,
fontFamily: "PoppinsBold",
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700,
color:
data[j].amc == "1"
? AppColors.normalText
: AppColors.subtitleText,
),
),
const SizedBox(width: 4),
if (data[j].amc == "2")
const Icon(
Icons.info_outline,
color: Colors.red,
size: 15,
),
],
),
),
],
if (data[j].warranty != "0") ...[
SizedBox(height: 5,),
Container(
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 4,
),
decoration: BoxDecoration(
gradient:
data[j].warranty == "1"
? AppColors.yellowStripGradient
: AppColors.fadeGradient,
borderRadius: BorderRadius.circular(12),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Row(
children: [
SvgPicture.asset(
data[j].warranty == "1"
? "assets/svg/tick2_ic.svg":
"assets/svg/tick3_ic.svg",
height: 15,
),
const SizedBox(width: 6),
Text(
"Warranty",
style: TextStyle(
fontSize: 12,
fontFamily: "PoppinsBold",
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700,
color:
data[j].warranty == "1"
? AppColors.normalText
: Color(0xFF969696),
),
),
SizedBox(width: 6),
if (data[j].warranty == "2")
const Icon(
Icons.info_outline,
color: Colors.red,
size: 15,
),
],
),
],
),
),
],
],
),
),
Spacer(),
Container(
padding: EdgeInsets.symmetric(
vertical: 3,
horizontal: 5,
vertical: 5,
horizontal: 8,
),
decoration: BoxDecoration(
borderRadius:
......@@ -382,7 +500,7 @@ class _ScheduleListScreenState extends State<ScheduleListScreen> {
"Scheduled"
? AppColors
.success
: AppColors.error,
: AppColors.nearDarkText,
),
),
),
......
lib/Utility/AppColors.dart
View file @ 14cbf4be
......@@ -71,7 +71,7 @@ class AppColors {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
AppColors.subtitleText,
Color(0xFFD7D7D7),
Color(0x00FFFFFF),
],
);
......@@ -85,21 +85,21 @@ class AppColors {
],
);
static const LinearGradient yellowStripGradient = LinearGradient(
static LinearGradient yellowStripGradient = LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Color(0xFFFFEF96),
Color(0xFFFFFFFF),
Color(0xFFFFEF96).withOpacity(0.0),
],
);
static const LinearGradient greenStripGradient = LinearGradient(
static LinearGradient greenStripGradient = LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Color(0xFFE5FFE1),
Color(0xFFFFFFFF),
Color(0xFFE5FFE1).withOpacity(0.0),
],
);
......
pubspec.yaml
View file @ 14cbf4be
......@@ -115,6 +115,10 @@ flutter:
fonts:
- asset: fonts/Poppins-ExtraLight.ttf
- family: HemiHead
fonts:
- asset: fonts/hemi_head.ttf
#
# For details regarding fonts from package dependencies,
# see https://flutter.dev/to/font-from-package
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment