Skip to content

Commit

Permalink
Merge pull request #21 from haithemnini/development
Browse files Browse the repository at this point in the history
Launching a First Version 1.0.0 Done ✅
  • Loading branch information
haithemnini authored Mar 16, 2024
2 parents af8d53c + 91d1e47 commit 3b489be
Show file tree
Hide file tree
Showing 271 changed files with 12,986 additions and 4,183 deletions.
105 changes: 105 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "daily_expense_tracker_app",
"request": "launch",
"type": "dart"
},
{
"name": "daily_expense_tracker_app (profile mode)",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "daily_expense_tracker_app (release mode)",
"request": "launch",
"type": "dart",
"flutterMode": "release"
},
{
"name": "auth_user",
"cwd": "packages\\auth_user",
"request": "launch",
"type": "dart"
},
{
"name": "auth_user (profile mode)",
"cwd": "packages\\auth_user",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "auth_user (release mode)",
"cwd": "packages\\auth_user",
"request": "launch",
"type": "dart",
"flutterMode": "release"
},
{
"name": "db_firestore_client",
"cwd": "packages\\db_firestore_client",
"request": "launch",
"type": "dart"
},
{
"name": "db_firestore_client (profile mode)",
"cwd": "packages\\db_firestore_client",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "db_firestore_client (release mode)",
"cwd": "packages\\db_firestore_client",
"request": "launch",
"type": "dart",
"flutterMode": "release"
},
{
"name": "db_hive_client",
"cwd": "packages\\db_hive_client",
"request": "launch",
"type": "dart"
},
{
"name": "db_hive_client (profile mode)",
"cwd": "packages\\db_hive_client",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "db_hive_client (release mode)",
"cwd": "packages\\db_hive_client",
"request": "launch",
"type": "dart",
"flutterMode": "release"
},
{
"name": "user_service",
"cwd": "packages\\user_service",
"request": "launch",
"type": "dart"
},
{
"name": "user_service (profile mode)",
"cwd": "packages\\user_service",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "user_service (release mode)",
"cwd": "packages\\user_service",
"request": "launch",
"type": "dart",
"flutterMode": "release"
}
]
}
27 changes: 20 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ def flutterVersionName = localProperties.getProperty('flutter.versionName')
if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

android {
namespace "com.example.daily_expense_tracker_app"
Expand Down Expand Up @@ -49,15 +54,23 @@ android {
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
}

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.debug
}
}
signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
buildTypes {
release {
signingConfig signingConfigs.release
}
}

}

flutter {
Expand Down
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:label="daily_expense_tracker_app"
android:label="Daily Expense Tracker"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
android:icon="@mipmap/app_icon">
<activity
android:name=".MainActivity"
android:exported="true"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/app/src/main/res/mipmap-mdpi/app_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
Binary file added assets/icons/app_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/guest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions devtools_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extensions:
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>daily_expense_tracker_app</string>
<string>Daily Expense Tracker</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
55 changes: 38 additions & 17 deletions lib/app/daily_tracker_app.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

import '../core/extensions/extensions.dart';
import '../core/routing/routing.dart';
import '../core/theming/theming.dart';
import '../core/app_injections.dart';
import '../core/helper/helper.dart';
import '../core/router/app_route.dart';
import '../core/styles/app_theme.dart';
import '../features/blocs/auth_bloc/auth_cubit.dart';
import '../features/blocs/main_bloc/main_cubit.dart';
import '../features/blocs/profile_bloc/profile_cubit.dart';
import '../features/blocs/state_bloc/state_cubit.dart';
import '../features/blocs/themes_bloc/themes_cubit.dart';
import '../features/blocs/transaction_bloc/transaction_cubit.dart';

class DailyTrackerApp extends StatelessWidget {
const DailyTrackerApp({
Expand All @@ -15,19 +22,33 @@ class DailyTrackerApp extends StatelessWidget {

@override
Widget build(BuildContext context) {
context.systemUiOverlayStyleConfig();
return ScreenUtilInit(
splitScreenMode: true,
minTextAdapt: true,
designSize: const Size(390, 844),
child: MaterialApp(
title: 'Daily Tracker',
debugShowCheckedModeBanner: false,
theme: Themeing.lightTheme,
darkTheme: Themeing.darkTheme,
themeMode: ThemeMode.light,
initialRoute: RoutesName.home,
onGenerateRoute: _appRouter.generateRoute,
Helper.overlayNavigation(context);
return MultiBlocProvider(
providers: [
BlocProvider(create: (_) => getIt<MainCubit>()),
BlocProvider(create: (_) => getIt<TransactionCubit>()),
BlocProvider(create: (_) => getIt<ProfileCubit>()),
BlocProvider(create: (_) => getIt<StateCubit>()),
BlocProvider(create: (_) => getIt<AuthCubit>()),
BlocProvider(create: (_) => getIt<ThemesCubit>())
],
child: BlocBuilder<ThemesCubit, ThemesState>(
buildWhen: (previous, current) => current is LoadedThemeMode,
builder: (context, state) {
final themeMode = context.read<ThemesCubit>().state.maybeMap(
orElse: () => ThemeMode.system,
loadedThemeMode: (state) => state.themeMode,
);
return MaterialApp(
debugShowCheckedModeBanner: false,
title: 'Daily Tracker',
theme: appTheme,
darkTheme: appThemeDark,
themeMode: themeMode,
initialRoute: RoutesName.home,
onGenerateRoute: _appRouter.generateRoute,
);
},
),
);
}
Expand Down
1 change: 1 addition & 0 deletions lib/bloc_observer.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'dart:developer';

import 'package:bloc/bloc.dart';

class AppBlocObserver extends BlocObserver {
Expand Down
Loading

0 comments on commit 3b489be

Please sign in to comment.