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

Restructuring package structure #9

Merged
merged 1 commit into from
May 8, 2024
Merged

Restructuring package structure #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 0 additions & 25 deletions lib/app/di.dart
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions lib/app/olpaka_app.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get_it/get_it.dart';
import 'package:olpaka/app/router.dart';
import 'package:olpaka/core/router.dart';
import 'package:olpaka/core/state/theme_manager.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/settings/ThemeManager.dart';
import 'package:olpaka/settings/view_model.dart';
import 'package:stacked/stacked.dart';

class OlpakaApp extends StatelessWidget {
Expand Down
48 changes: 48 additions & 0 deletions lib/core/di.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import 'package:dio/dio.dart';
import 'package:get_it/get_it.dart';
import 'package:olpaka/core/http_client.dart';
import 'package:olpaka/core/state/model_manager.dart';
import 'package:olpaka/core/state/theme_manager.dart';
import 'package:olpaka/feature/chat/di.dart';
import 'package:olpaka/feature/home/di.dart';
import 'package:olpaka/feature/models/di.dart';
import 'package:olpaka/feature/onboarding/di.dart';
import 'package:olpaka/feature/settings/di.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/core/preferences.dart';
import 'package:pretty_dio_logger/pretty_dio_logger.dart';
import 'package:shared_preferences/shared_preferences.dart';

import 'ollama/repository.dart';

void registerModules() {
final l = GetIt.instance;
l.registerSingletonAsync<Preferences>(
() async => PreferenceDefault(await SharedPreferences.getInstance()));
l.registerLazySingleton(() => ThemeManager(l.get()));
l.registerFactory(() => S.current);

l.registerFactory(() {
final client = Dio();
client.options.baseUrl = "http://localhost:11434/api";
client.interceptors.add(
PrettyDioLogger(
requestHeader: true,
requestBody: true,
responseBody: true,
responseHeader: true,
error: true,
compact: true,
maxWidth: 90),
);
return client;
});
l.registerFactory(() => HttpClient(l.get()));
l.registerFactory(() => OllamaRepository(l.get()));
l.registerLazySingleton(() => ModelManager(l.get()));
registerOnboarding();
registerHome();
registerChat();
registerModels();
registerSettings();
}
0 lib/app/http_client.dart → lib/core/http_client.dart
View file
Open in desktop
File renamed without changes.
0 lib/app/logger.dart → lib/core/logger.dart
View file
Open in desktop
File renamed without changes.
0 lib/ollama/model.dart → lib/core/ollama/model.dart
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions lib/ollama/repository.dart → lib/core/ollama/repository.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import 'dart:convert';
import 'dart:core';

import 'package:olpaka/app/http_client.dart';
import 'package:olpaka/app/logger.dart';
import 'package:olpaka/ollama/model.dart';
import 'package:olpaka/core/http_client.dart';
import 'package:olpaka/core/logger.dart';

import 'model.dart';

class OllamaRepository {
final HttpClient _client;
Expand Down
2 changes: 1 addition & 1 deletion lib/preferences/preferences.dart → lib/core/preferences.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:olpaka/settings/view_model.dart';
import 'package:olpaka/core/state/theme_manager.dart';
import 'package:shared_preferences/shared_preferences.dart';

abstract class Preferences {
Expand Down
4 changes: 2 additions & 2 deletions lib/app/router.dart → lib/core/router.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:go_router/go_router.dart';
import 'package:olpaka/home/view.dart';
import 'package:olpaka/onboarding/view.dart';
import 'package:olpaka/feature/home/view.dart';
import 'package:olpaka/feature/onboarding/view.dart';

final router = GoRouter(
routes: [
Expand Down
4 changes: 2 additions & 2 deletions lib/ollama/model_manager.dart → lib/core/state/model_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import 'dart:async';

import 'package:flutter/foundation.dart';
import 'package:olpaka/ollama/model.dart';
import 'package:olpaka/ollama/repository.dart';
import 'package:olpaka/core/ollama/model.dart';
import 'package:olpaka/core/ollama/repository.dart';

class ModelManager with ChangeNotifier{

Expand Down
7 changes: 5 additions & 2 deletions lib/settings/ThemeManager.dart → lib/core/state/theme_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:flutter/cupertino.dart';
import 'package:olpaka/preferences/preferences.dart';
import 'package:olpaka/settings/view_model.dart';
import 'package:olpaka/core/preferences.dart';

class ThemeManager with ChangeNotifier {
final Preferences _preferences;
Expand All @@ -21,3 +20,7 @@ class ThemeManager with ChangeNotifier {
notifyListeners();
}
}

enum OlpakaThemeMode { system, dark, light }

enum OlpakaThemeColor { olpaka, blue, green, orange, red, purple, grey }
2 changes: 1 addition & 1 deletion lib/chat/di.dart → lib/feature/chat/di.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:get_it/get_it.dart';
import 'package:olpaka/chat/view_model.dart';
import 'package:olpaka/feature/chat/view_model.dart';

registerChat() {
final l = GetIt.instance;
Expand Down
2 changes: 1 addition & 1 deletion lib/chat/view.dart → lib/feature/chat/view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:get_it/get_it.dart';
import 'package:markdown_widget/markdown_widget.dart';
import 'package:olpaka/chat/view_model.dart';
import 'package:olpaka/feature/chat/view_model.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:stacked/stacked.dart';

Expand Down
4 changes: 2 additions & 2 deletions lib/chat/view_model.dart → lib/feature/chat/view_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'dart:async';

import 'package:olpaka/core/ollama/repository.dart';
import 'package:olpaka/core/state/model_manager.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/ollama/model_manager.dart';
import 'package:olpaka/ollama/repository.dart';
import 'package:stacked/stacked.dart';

class ChatViewModel extends BaseViewModel {
Expand Down
3 changes: 1 addition & 2 deletions lib/home/di.dart → lib/feature/home/di.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

import 'package:get_it/get_it.dart';
import 'package:olpaka/home/view_model.dart';
import 'package:olpaka/feature/home/view_model.dart';

registerHome(){
final l = GetIt.instance;
Expand Down
8 changes: 4 additions & 4 deletions lib/home/view.dart → lib/feature/home/view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:get_it/get_it.dart';
import 'package:olpaka/chat/view.dart';
import 'package:olpaka/feature/chat/view.dart';
import 'package:olpaka/feature/home/view_model.dart';
import 'package:olpaka/feature/models/view.dart';
import 'package:olpaka/feature/settings/view.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/home/view_model.dart';
import 'package:olpaka/models/view.dart';
import 'package:olpaka/settings/view.dart';
import 'package:stacked/stacked.dart';

class HomeView extends StatelessWidget {
Expand Down
0 lib/home/view_model.dart → lib/feature/home/view_model.dart
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions lib/models/di.dart → lib/feature/models/di.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

import 'package:get_it/get_it.dart';
import 'package:olpaka/models/view_model.dart';
import 'package:olpaka/feature/models/view_model.dart';

registerModels() {
final l = GetIt.instance;
Expand Down
2 changes: 1 addition & 1 deletion lib/models/view.dart → lib/feature/models/view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get_it/get_it.dart';
import 'package:olpaka/feature/models/view_model.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/models/view_model.dart';
import 'package:stacked/stacked.dart';

class ModelsScreen extends StatelessWidget {
Expand Down
4 changes: 2 additions & 2 deletions lib/models/view_model.dart → lib/feature/models/view_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import 'dart:async';
import 'dart:math';

import 'package:intl/intl.dart';
import 'package:olpaka/core/ollama/repository.dart';
import 'package:olpaka/core/state/model_manager.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/ollama/model_manager.dart';
import 'package:olpaka/ollama/repository.dart';
import 'package:stacked/stacked.dart';

class ModelsViewModel extends BaseViewModel {
Expand Down
2 changes: 1 addition & 1 deletion lib/onboarding/di.dart → lib/feature/onboarding/di.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:get_it/get_it.dart';
import 'package:olpaka/onboarding/view_model.dart';
import 'package:olpaka/feature/onboarding/view_model.dart';

registerOnboarding() {
final l = GetIt.instance;
Expand Down
2 changes: 1 addition & 1 deletion lib/onboarding/view.dart → lib/feature/onboarding/view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:get_it/get_it.dart';
import 'package:go_router/go_router.dart';
import 'package:markdown_widget/markdown_widget.dart';
import 'package:olpaka/feature/onboarding/view_model.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/onboarding/view_model.dart';
import 'package:stacked/stacked.dart';
import 'package:url_launcher/url_launcher_string.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/onboarding/view_model.dart → lib/feature/onboarding/view_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:async';

import 'package:olpaka/core/ollama/repository.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/ollama/repository.dart';
import 'package:stacked/stacked.dart';

class OnboardingViewModel extends BaseViewModel {
Expand Down
2 changes: 1 addition & 1 deletion lib/settings/di.dart → lib/feature/settings/di.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:get_it/get_it.dart';
import 'package:olpaka/settings/view_model.dart';
import 'package:olpaka/feature/settings/view_model.dart';

registerSettings() {
final l = GetIt.instance;
Expand Down
3 changes: 2 additions & 1 deletion lib/settings/view.dart → lib/feature/settings/view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get_it/get_it.dart';
import 'package:olpaka/core/state/theme_manager.dart';
import 'package:olpaka/feature/settings/view_model.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/settings/view_model.dart';
import 'package:stacked/stacked.dart';

class SettingsScreen extends StatelessWidget {
Expand Down
6 changes: 1 addition & 5 deletions lib/settings/view_model.dart → lib/feature/settings/view_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:olpaka/settings/ThemeManager.dart';
import 'package:olpaka/core/state/theme_manager.dart';
import 'package:stacked/stacked.dart';

class SettingsViewModel extends BaseViewModel {
Expand Down Expand Up @@ -34,7 +34,3 @@ class SettingsState {
this.themeColor = OlpakaThemeColor.olpaka,
]);
}

enum OlpakaThemeMode { system, dark, light }

enum OlpakaThemeColor { olpaka, blue, green, orange, red, purple, grey }
2 changes: 1 addition & 1 deletion lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:olpaka/generated/l10n.dart';
import 'package:olpaka/app/di.dart';
import 'package:olpaka/core/di.dart';
import 'package:olpaka/app/olpaka_app.dart';

void main() async {
Expand Down
29 changes: 0 additions & 29 deletions lib/ollama/di.dart
View file
Open in desktop

This file was deleted.