Skip to content
Merged

Dev #10

Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 5 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
name: Android Build and Artifact

on:
push:
branches:
- main
- dev

jobs:
build:
name: Android Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: "17"
distribution: "zulu"
cache: "gradle"

- uses: subosito/flutter-action@v2
with:
channel: "stable"
cache: true

- name: Set up Flutter
run: flutter pub get

- name: Build APKs
run: flutter build apk --release --split-per-abi

- name: Setup Android SDK
uses: android-actions/setup-android@v3
- name: Install build tools
run: |
echo "y" | sdkmanager "build-tools;33.0.0" "platforms;android-33"
- uses: ilharp/sign-android-release@v1
name: Sign app APK
with:
Expand All @@ -40,21 +38,18 @@ jobs:
keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
buildToolsVersion: 33.0.0

- name: Archive arm64-v8a
uses: actions/upload-artifact@v4
with:
name: android-arm64-v8a
path: |
build/app/outputs/flutter-apk/app-arm64-v8a-release-signed.apk

- name: Archive armeabi-v7a
uses: actions/upload-artifact@v4
with:
name: android-armeabi-v7a
path: |
build/app/outputs/flutter-apk/*-armeabi-v7a-release-signed.apk

- name: Archive x86_64
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.1.0" apply false
id "com.android.application" version "8.2.1" apply false
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
}

Expand Down
1 change: 1 addition & 0 deletions assets/translations/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"proceed": "Proceed",
"delete": "Delete",
"cancel": "Cancel",
"undo": "Undo",

"manage": "Manage",
"configuration": "Configuration",
Expand Down
1 change: 1 addition & 0 deletions assets/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"proceed": "Continuer",
"delete": "Supprimer",
"cancel": "Annuler",
"undo": "Défaire",

"manage": "Gérer",
"configuration": "Configuration",
Expand Down
50 changes: 50 additions & 0 deletions lib/app.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import 'package:dynamic_color/dynamic_color.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:timetable/features/navigation/bottom_navigation.dart';
import 'package:timetable/shared/widgets/eager_initilization.dart';
import 'package:timetable/core/utils/theme_helper.dart';
import 'package:timetable/features/settings/providers/settings.dart';
import 'package:timetable/shared/providers/themes.dart';

/// The main class of the application.
class TimetableApp extends ConsumerWidget {
const TimetableApp({super.key});

@override
Widget build(BuildContext context, WidgetRef ref) {
final theme = ref.watch(themeProvider);
final monetTheming = ref.watch(settingsProvider).monetTheming;
final appThemeColor = ref.watch(settingsProvider).appThemeColor;
final Brightness systemBrightness =
MediaQuery.of(context).platformBrightness;

return DynamicColorBuilder(
builder: (
ColorScheme? lightDynamic,
ColorScheme? darkDynamic,
) {
return MaterialApp(
localizationsDelegates: context.localizationDelegates,
supportedLocales: context.supportedLocales,
locale: context.locale,
title: 'Timetable',
color: Colors.white,
theme: ThemeData(
colorScheme: ThemeHelper.getColorScheme(
monetTheming: monetTheming,
theme: theme,
systemBrightness: systemBrightness,
lightDynamic: lightDynamic,
darkDynamic: darkDynamic,
appThemeColor: appThemeColor,
),
useMaterial3: true,
),
home: const EagerInitialization(child: BottomNavigation()),
);
},
);
}
}
100 changes: 0 additions & 100 deletions lib/components/settings/customize_timetable.dart

This file was deleted.

59 changes: 0 additions & 59 deletions lib/components/settings/language_options.dart

This file was deleted.

Loading