Skip to content

update 1.1.1+26 #74

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.

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

Merged
merged 64 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
2ecb949
Merge pull request #53 from Onix-Systems/main
cozvtieg9 Mar 6, 2024
967e58a
Feat/documentation (#57)
cozvtieg9 Apr 15, 2024
e6afe9d
feat(Fastlane): Added documentation
Onix-Ivan Apr 24, 2024
ea680fc
temp
Onix-Ivan Apr 25, 2024
4e7f0ea
feat(Fastlane): Added Fastlane files generator service
Onix-Ivan May 1, 2024
bbdcbf8
feat(Fastlane): Added logic
Onix-Ivan May 3, 2024
7181856
fix(Fastlane): Removed clean line from flavorizr makefile
Onix-Ivan May 3, 2024
f6ea8bb
feat(Fastlane): Added logic for skipping documentation and fastlane g…
Onix-Ivan May 3, 2024
a5ce744
feat(Fastlane): Updated INSTALL_INSTRUCTION
Onix-Ivan May 6, 2024
b8522bd
fix(flavors): command run fix
fedorenkoalex May 6, 2024
2f41623
fix(flavors): command run fix
fedorenkoalex May 6, 2024
b6507d2
fix(flavors): command run fix
fedorenkoalex May 6, 2024
9a20126
fix(flavors): command run fix
fedorenkoalex May 6, 2024
115eb1f
fix(docs): fixed flavr documentation
fedorenkoalex May 6, 2024
9107c47
feat(Fastlane): Fixed bug with copying files, added error output
Onix-Ivan May 6, 2024
34a3df4
Merge branch 'feature/fastlane_documentation' of github.com:Onix-Syst…
Onix-Ivan May 6, 2024
2c1df63
feat(Fastlane): Added .gitignore file instructions
Onix-Ivan May 8, 2024
1d0d032
fix(Fastlane): Fixed async call issue with writeAsStringSync method
Onix-Ivan May 8, 2024
10cd67c
fix(Fastlane): Updated fastlane instructions
Onix-Ivan May 8, 2024
252fe3f
fix(Fastlane): Updated Android Appfile
Onix-Ivan May 8, 2024
01cedaa
fix(Fastlane): Updated Fastfile android and ios
Onix-Ivan May 8, 2024
fc9985e
feat(version): fixed version check
fedorenkoalex May 9, 2024
7d2d7ce
feat(Fastlane): Updated .gitignore
Onix-Ivan May 9, 2024
3c84c0e
Merge branch 'feature/fastlane_documentation' of github.com:Onix-Syst…
Onix-Ivan May 9, 2024
5574d79
Merge pull request #60 from Onix-Systems/feature/fastlane_documentation
cozvtieg9 May 9, 2024
e9dee10
feat(L10n): commited
Onix-Ivan May 9, 2024
71a8e8c
Merge branch 'dev' of github.com:Onix-Systems/onix-flutter-project-ge…
Onix-Ivan May 9, 2024
228fa98
fix(Fastlane): Fixed bugs with Fastlane generation utils
Onix-Ivan May 9, 2024
2d1fc8a
fix(Fastlane): Removed default flavor from fastlane line command
Onix-Ivan May 9, 2024
36820dd
fix(Fastlane): Added extra space
Onix-Ivan May 9, 2024
78b4623
Merge pull request #62 from Onix-Systems/fix/fastlane
cozvtieg9 May 10, 2024
ac592af
feat(Services): Services refactoring
cozvtieg9 May 15, 2024
38b743f
feat(Platforms): Update PlatformList screen (#64)
Coloud1 May 21, 2024
f131cc6
Merge remote-tracking branch 'origin/main' into dev
fedorenkoalex May 21, 2024
23bf19c
fix(Flavors Field): Fixed bug with multi spacing.Added TextInputForma…
Coloud1 May 22, 2024
fe4785b
feat(issues/67): added util to generate Android signing for project
fedorenkoalex May 24, 2024
c8769c9
feat(issues/67): added util to generate Android signing for project
fedorenkoalex May 24, 2024
5ddabbc
fix(clean): removed fvm
cozvtieg9 May 24, 2024
e4fa7ec
feat(error_handling): error handling fo signing generation
fedorenkoalex May 24, 2024
066774f
Merge branch 'feat/update_26' of https://github.com/Onix-Systems/onix…
fedorenkoalex May 24, 2024
dcae9a9
feat(error_handling): error handling fo signing generation
fedorenkoalex May 24, 2024
b5d4848
feat(error_handling): error handling fo signing generation
fedorenkoalex May 24, 2024
f370eca
feat(UI): procedure, names, settings and screens UI update
fedorenkoalex May 24, 2024
b041d79
feat(UI): procedure, names, settings and screens UI update
fedorenkoalex May 24, 2024
11474aa
feat(UI): procedure, names, settings and screens UI update
fedorenkoalex May 24, 2024
5929d32
feat(UI): procedure, names, settings and screens UI update
fedorenkoalex May 24, 2024
7b04a16
fix(Update 26): fixed bug with generate signing key for non mobile pl…
Onix-Ivan May 26, 2024
a65ec71
feat(UI): added fingerprint dialog
fedorenkoalex May 27, 2024
4f53407
Merge branch 'feat/update_26' of https://github.com/Onix-Systems/onix…
fedorenkoalex May 27, 2024
948bc43
feat(UI): adjusted colors
fedorenkoalex May 27, 2024
be1dd5a
feat(UI): color scheme and theming
fedorenkoalex May 28, 2024
f984aef
fix(UI) - fixed input filtering regexes for components names, color d…
dzen1984 Jun 5, 2024
6ddbb0f
Feat/update 26 (#68)
cozvtieg9 Jun 5, 2024
693439e
Merge remote-tracking branch 'origin/main' into dev
fedorenkoalex Jun 5, 2024
375e6e0
feat(sync_main): 1.1.1+26
fedorenkoalex Jun 5, 2024
1612926
feat(sync_main): 1.1.1+26
fedorenkoalex Jun 5, 2024
999adec
feat(sync_main): 1.1.1+26
fedorenkoalex Jun 5, 2024
280f2f0
feat(update_26/addons): removed freezed from data components
fedorenkoalex Jun 12, 2024
ae3cde2
feat(update_26/addons): removed freezed from data components
fedorenkoalex Jun 12, 2024
29684c7
feat(update_26/addons): removed freezed from data components
fedorenkoalex Jun 12, 2024
5c0a3bf
feat(update_26/addons): removed freezed from data components
fedorenkoalex Jun 12, 2024
fccd53c
Merge remote-tracking branch 'origin/dev' into feat/update_26
fedorenkoalex Jun 12, 2024
cce3028
feat(update_26/addons): sync with dev
fedorenkoalex Jun 12, 2024
7183a57
Merge pull request #73 from Onix-Systems/feat/update_26
cozvtieg9 Jun 12, 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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@ app.*.map.json

# generator config
.gen_config.json
/release/
/release/
/.fvm/
4 changes: 4 additions & 0 deletions assets/signing/signing.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
STORE_FILE=./signing/upload-keystore.jks
STORE_PASSWORD={signing_password}
KEY_ALIAS=upload
KEY_PASSWORD={signing_password}
43 changes: 31 additions & 12 deletions bricks/flutter_clean_base/hooks/post_gen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const flavorizrInjectKey = '#{flavorizer_injection_config}';
void run(HookContext context) async {
name = context.vars['project_name'].toString().toSnakeCase;


if (!context.vars['platforms'].contains('android')) {
await Process.run('rm', ['-rf', '$name/android']);
}
Expand Down Expand Up @@ -377,10 +378,14 @@ $flavor:
Future<void> injectFlavors(HookContext context) async {
///START:Flavorizer config injection
final isFlavorized = context.vars['flavorizr'] as bool;
final isIOsEnabled = context.vars['platforms'].contains('ios') as bool;
final isAndroidEnabled = context.vars['platforms'].contains('android') as bool;
final isMacOsEnabled = context.vars['platforms'].contains('macos') as bool;
File pubspecFile = File('$name/pubspec.yaml');
if (!pubspecFile.existsSync()) return;
String pubspecFileContent = await pubspecFile.readAsString();
if (isFlavorized) {

final flavors = (context.vars['flavors'] as List)
.map(
(e) => e as String,
Expand All @@ -396,21 +401,33 @@ Future<void> injectFlavors(HookContext context) async {
lines.add(' flavors:');
for (String flavor in flavors) {
final packageSuffix = flavor.toLowerCase() == 'prod' ? '' : '.$flavor';
final nameSuffix = flavor.toLowerCase() == 'prod' ? '' : ' $flavor';
final nameSuffix = flavor.toLowerCase() == 'prod' ? '' : ' ${flavor.toTitleCase}';
lines.add(' $flavor:');
lines.add(' app:');
lines.add(' name: "$name$nameSuffix"');
lines.add('');
lines.add(' android:');
lines.add(' applicationId: "$org.$name$packageSuffix"');
lines.add(
' icon: "flavor_assets/$flavor/launcher_icons/ic_launcher.png"');
lines.add('');
lines.add(' ios:');
lines.add(' bundleId: "$org.$name$packageSuffix"');
lines.add(
' icon: "flavor_assets/$flavor/launcher_icons/ic_launcher.png"');
lines.add(' name: "${name.toTitleCase}$nameSuffix"');
lines.add('');
if(isAndroidEnabled){
lines.add(' android:');
lines.add(' applicationId: "$org.$name$packageSuffix"');
lines.add(
' icon: "flavor_assets/$flavor/launcher_icons/ic_launcher.png"');
lines.add('');
}
if(isIOsEnabled){
lines.add(' ios:');
lines.add(' bundleId: "$org.$name$packageSuffix"');
lines.add(
' icon: "flavor_assets/$flavor/launcher_icons/ic_launcher.png"');
lines.add('');
}
if(isMacOsEnabled){
lines.add(' macos:');
lines.add(' bundleId: "$org.$name$packageSuffix"');
lines.add(
' icon: "flavor_assets/$flavor/launcher_icons/ic_launcher.png"');
lines.add('');
}

lines.add('');
}
final flavorLines = lines.join('\n');
Expand Down Expand Up @@ -657,4 +674,6 @@ extension Case on String {
String get toCamelCase => ReCase(this).camelCase;

String get toPascalCase => ReCase(this).pascalCase;

String get toTitleCase => ReCase(this).titleCase;
}
60 changes: 27 additions & 33 deletions lib/app/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:loader_overlay/loader_overlay.dart';
import 'package:onix_flutter_bricks/app/bloc/app_bloc_imports.dart';
import 'package:onix_flutter_bricks/core/app/localization/generated/l10n.dart';
import 'package:onix_flutter_bricks/core/arch/bloc/base_block_state.dart';
import 'package:onix_flutter_bricks/core/router/app_router.dart';
import 'package:onix_flutter_bricks/presentation/style/theme/theme_imports.dart';

Expand All @@ -15,46 +13,42 @@ class App extends StatefulWidget {
State<App> createState() => _AppState();
}

class _AppState extends BaseState<AppScreenState, AppBloc, AppSR, App> {
class _AppState extends State<App> {
Locale? locale;

@override
Widget buildWidget(BuildContext context) {
Widget build(BuildContext context) {
AppRouter.init();
return GlobalLoaderOverlay(
useDefaultLoading: true,
overlayColor: Colors.black.withOpacity(0.5),
child: blocConsumer(
stateListener: (state) {
return MaterialApp.router(
debugShowCheckedModeBanner: false,
builder: (context, widget) {
return MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaler: TextScaler.noScaling,
),
child: widget ?? const SizedBox(),
);
},
scrollBehavior: const CupertinoScrollBehavior(),
title: '',
theme: createLightTheme(),
darkTheme: createDarkTheme(),
themeMode: ThemeMode.dark,
routeInformationProvider: AppRouter.router.routeInformationProvider,
routeInformationParser: AppRouter.router.routeInformationParser,
routerDelegate: AppRouter.router.routerDelegate,
locale: locale,
localizationsDelegates: const [
S.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
],
supportedLocales: S.delegate.supportedLocales,
onGenerateTitle: (context) => S.of(context).title,
child: MaterialApp.router(
debugShowCheckedModeBanner: false,
builder: (context, widget) {
return MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaler: TextScaler.noScaling,
),
child: widget ?? const SizedBox(),
);
},
scrollBehavior: const CupertinoScrollBehavior(),
title: '',
theme: createLightTheme(),
darkTheme: createDarkTheme(),
themeMode: ThemeMode.dark,
routeInformationProvider: AppRouter.router.routeInformationProvider,
routeInformationParser: AppRouter.router.routeInformationParser,
routerDelegate: AppRouter.router.routerDelegate,
locale: locale,
localizationsDelegates: const [
S.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
GlobalCupertinoLocalizations.delegate,
],
supportedLocales: S.delegate.supportedLocales,
onGenerateTitle: (context) => S.of(context).title,
),
);
}
Expand Down
19 changes: 0 additions & 19 deletions lib/app/bloc/app_bloc.dart

This file was deleted.

2 changes: 0 additions & 2 deletions lib/app/bloc/app_bloc_imports.dart

This file was deleted.

17 changes: 0 additions & 17 deletions lib/app/bloc/app_models.dart

This file was deleted.

Loading