Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pipeline #103

Merged
merged 4 commits into from
Dec 3, 2024
Merged

Fix pipeline #103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0503d6e
Fix pipeline
cp-sneha-s Dec 3, 2024
5430112
Fix pipeline
cp-sneha-s Dec 3, 2024
5814e17
Show leave by start date
cp-sneha-s Dec 3, 2024
d9a9b9b
Fix unit test
cp-sneha-s Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/android_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: set up JDK 1.8
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 17.0.6
cache: 'gradle'
cp-sneha-s marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
APKSIGN_KEY_PASS: ${{ secrets.APKSIGN_KEY_PASS }}

- name: Upload APK Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ProjectUnity APK
path: ProjectUnity*.apk
Expand All @@ -70,10 +70,10 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: set up JDK 1.8
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 17.0.6
cache: 'gradle'
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
APKSIGN_KEY_PASS: ${{ secrets.APKSIGN_KEY_PASS }}

- name: Upload AAB Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ProjectUnity AAB
path: app-release.aab
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/android_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: set up JDK 1.8
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 17.0.6
cache: 'gradle'
cp-sneha-s marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -27,8 +27,6 @@ jobs:
channel: 'stable'
cache: true

- uses: actions/checkout@v2

- name: Set up ruby env
uses: ruby/setup-ruby@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions lib/style/colors.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@ final ThemeData materialThemeDataDark = _materialDarkTheme.copyWith(
primaryColor: primaryColor,
scaffoldBackgroundColor: surfaceDarkColor,
dividerColor: outlineDarkColor,
colorScheme: _materialLightTheme.colorScheme.copyWith(
colorScheme: _materialDarkTheme.colorScheme.copyWith(
onPrimary: primaryColor,
onSecondary: textSecondaryDarkColor,
surface: surfaceDarkColor,
onSurface: textPrimaryDarkColor),
appBarTheme: _materialLightTheme.appBarTheme.copyWith(
appBarTheme: _materialDarkTheme.appBarTheme.copyWith(
backgroundColor: surfaceDarkColor,
titleTextStyle: AppTextStyle.style20,
foregroundColor: textPrimaryDarkColor,
centerTitle: true),
popupMenuTheme: _materialLightTheme.popupMenuTheme.copyWith(
popupMenuTheme: _materialDarkTheme.popupMenuTheme.copyWith(
surfaceTintColor: surfaceDarkColor,
color: surfaceDarkColor,
),
Expand Down
64 changes: 34 additions & 30 deletions lib/ui/user/leaves/apply_leave/widget/picker_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,46 @@ class DatePickerCard extends StatelessWidget {
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: context.colorScheme.containerHigh))),
child: InkWell(
borderRadius: BorderRadius.circular(12),
onTap: onPress,
child: Padding(
padding: const EdgeInsets.all(12),
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
SvgPicture.asset(
Assets.images.icCalendar,
colorFilter: ColorFilter.mode(
context.colorScheme.textSecondary, BlendMode.srcIn),
),
const SizedBox(
width: 10,
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
child: Builder(
builder: (context) {
return InkWell(
borderRadius: BorderRadius.circular(12),
onTap: onPress,
child: Padding(
padding: const EdgeInsets.all(12),
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(
title,
style: AppTextStyle.style14
.copyWith(color: context.colorScheme.textSecondary),
SvgPicture.asset(
Assets.images.icCalendar,
colorFilter: ColorFilter.mode(
context.colorScheme.textSecondary, BlendMode.srcIn),
),
const SizedBox(
height: 5,
width: 10,
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
title,
style: AppTextStyle.style14
.copyWith(color: context.colorScheme.textSecondary),
),
const SizedBox(
height: 5,
),
Text(localization.date_format_yMMMd(date),
style: AppTextStyle.style18.copyWith(
color: context.colorScheme.textPrimary,
textBaseline: TextBaseline.alphabetic)),
],
),
Text(localization.date_format_yMMMd(date),
style: AppTextStyle.style18.copyWith(
color: context.colorScheme.textPrimary,
textBaseline: TextBaseline.alphabetic)),
],
),
],
),
),
),
);
}
),
));
}
Expand Down
8 changes: 7 additions & 1 deletion lib/ui/widget/date_time_picker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import 'package:flutter/material.dart';
import 'package:projectunity/data/core/extensions/context_extension.dart';
import 'package:projectunity/data/core/extensions/date_time.dart';
import 'package:projectunity/ui/admin/forms/create_form/create_form.dart';

Future<DateTime?> pickDate(
{required BuildContext context, required DateTime initialDate}) async {
DateTime? pickDate = await showDatePicker(
context: context,
barrierColor: context.colorScheme.surface,
initialDate: initialDate,
firstDate: DateTime(1990),
lastDate: DateTime(DateTime.now().futureDateSelectionYear),
Expand All @@ -15,6 +18,9 @@ Future<DateTime?> pickDate(
Future<TimeOfDay?> pickTime(
{required BuildContext context, required TimeOfDay initialTime}) async {
TimeOfDay? time =
await showTimePicker(context: context, initialTime: initialTime);
await showTimePicker(
context: context, initialTime: initialTime,
barrierColor: context.colorScheme.surface,
);
return time;
}
Loading