Skip to content

#121 feat to organize files and update dependencies #139

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

Merged
ChandruWritesCode merged 2 commits into from
Jul 30, 2026
Merged

#121 feat to organize files and update dependencies #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9289f0
file structure clean up
ChandruWritesCode Jul 30, 2026
efd8879
repo for local DB cache created
ChandruWritesCode Jul 30, 2026
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
Empty file added mobile/lib/cache/database/repository/repo.dart
View file
Open in desktop
Empty file.
0 mobile/lib/services/db_services.dart → .../cache/database/services/db_services.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion mobile/lib/controllers/auth.dart → mobile/lib/controllers/auth_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:url_launcher/url_launcher.dart';
import 'package:app_links/app_links.dart';
import 'package:mobile/models/user.dart';
import '../core/constants.dart';
import '../services/auth.dart';
import '../services/auth_service.dart';

class AuthState extends ChangeNotifier {
final AuthService _authService = AuthService();
Expand Down
14 changes: 7 additions & 7 deletions mobile/lib/controllers/chat.dart → mobile/lib/controllers/chat_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import 'dart:async';
import 'dart:convert';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart';
import 'package:mobile/controllers/auth.dart';
import 'package:mobile/controllers/auth_state.dart';
import 'package:mobile/models/group.dart';
import 'package:mobile/models/inbox_item.dart';
import 'package:mobile/pages/chat_details_page.dart';
import 'package:mobile/services/db_services.dart';
import 'package:mobile/pages/chat/chat_details_page.dart';
import 'package:mobile/cache/database/services/db_services.dart';
import 'package:sqflite_sqlcipher/sqflite.dart';
import 'package:uuid/uuid.dart';
import '../models/message.dart';
import '../models/conversation.dart';
import '../services/api.dart';
import '../services/ws.dart';
import '../services/auth.dart';
import '../services/api_services.dart';
import '../services/ws_service.dart';
import '../services/auth_service.dart';

class ChatController extends ChangeNotifier with WidgetsBindingObserver {
final ApiService _api = ApiService();
Expand Down Expand Up @@ -843,7 +843,7 @@ class ChatController extends ChangeNotifier with WidgetsBindingObserver {
}

final String cleanSenderId = incomingMsg.senderId.trim().toLowerCase();
final String? myId = _user.currentUser?.id?.trim().toLowerCase();
final String? myId = _user.currentUser?.id.trim().toLowerCase();
final bool isMe = (cleanSenderId == 'me' || cleanSenderId == myId);

_updateLocalInboxState(
Expand Down
10 changes: 5 additions & 5 deletions mobile/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import 'package:mobile/providers/group_controller_provider.dart';
import 'package:mobile/themes/theme_provider.dart';
import 'package:provider/provider.dart';
import 'core/constants.dart';
import 'controllers/auth.dart';
import 'controllers/chat.dart';
import 'services/auth.dart';
import 'pages/login_page.dart';
import 'pages/home_page.dart';
import 'controllers/auth_state.dart';
import 'controllers/chat_controller.dart';
import 'services/auth_service.dart';
import 'pages/auth/login_page.dart';
import 'pages/home/home_page.dart';

void main() async {
WidgetsFlutterBinding.ensureInitialized();
Expand Down
6 changes: 3 additions & 3 deletions mobile/lib/pages/login_page.dart → mobile/lib/pages/auth/login_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import 'dart:ui';

import 'package:flutter/material.dart';
import 'package:flutter_animate/flutter_animate.dart';
import 'package:mobile/pages/settings%20pages/appearance.dart';
import 'package:mobile/pages/settings/appearance.dart';
import 'package:provider/provider.dart';
import '../core/constants.dart';
import '../controllers/auth.dart';
import '../../core/constants.dart';
import '../../controllers/auth_state.dart';

class LoginPage extends StatefulWidget {
const LoginPage({super.key});
Expand Down
6 changes: 3 additions & 3 deletions mobile/lib/pages/chat_details_page.dart → mobile/lib/pages/chat/chat_details_page.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:ui';

import 'package:flutter/material.dart';
import 'package:mobile/controllers/auth.dart';
import 'package:mobile/controllers/chat.dart';
import 'package:mobile/pages/chat_page.dart';
import 'package:mobile/controllers/auth_state.dart';
import 'package:mobile/controllers/chat_controller.dart';
import 'package:mobile/pages/chat/chat_page.dart';
import 'package:mobile/providers/group_controller_provider.dart';
import 'package:provider/provider.dart';

Expand Down
9 changes: 4 additions & 5 deletions mobile/lib/pages/chat_page.dart → mobile/lib/pages/chat/chat_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:intl/intl.dart';
import 'package:mobile/controllers/auth.dart';
import 'package:mobile/models/message.dart';
import 'package:mobile/pages/chat_details_page.dart';
import 'package:mobile/controllers/auth_state.dart';
import 'package:mobile/pages/chat/chat_details_page.dart';
import 'package:provider/provider.dart';
import 'package:mobile/widgets/chat_screen_modular_widgets.dart';
import 'package:mobile/controllers/chat.dart';
import 'package:mobile/widgets/chat_page_widgets.dart';
import 'package:mobile/controllers/chat_controller.dart';
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';

class ChatPage extends StatefulWidget {
Expand Down
10 changes: 5 additions & 5 deletions mobile/lib/pages/home_page.dart → mobile/lib/pages/home/home_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:mobile/controllers/chat.dart';
import 'package:mobile/pages/settings_page.dart';
import 'package:mobile/services/auth.dart';
import 'package:mobile/widgets/custom_cards.dart';
import 'package:mobile/controllers/chat_controller.dart';
import 'package:mobile/pages/settings/settings_page.dart';
import 'package:mobile/services/auth_service.dart';
import 'package:mobile/widgets/home_page_widgets.dart';
import 'package:provider/provider.dart';
import 'new_chat_page.dart';
import '../new chat/new_chat_page.dart';

class HomePage extends StatefulWidget {
const HomePage({super.key});
Expand Down
8 changes: 4 additions & 4 deletions mobile/lib/pages/new_chat_page.dart → mobile/lib/pages/new chat/new_chat_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'dart:async';
import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:mobile/pages/select_contact_page.dart';
import 'package:mobile/pages/settings_page.dart';
import 'package:mobile/pages/new%20chat/select_contact_page.dart';
import 'package:mobile/pages/settings/settings_page.dart';
import 'package:provider/provider.dart';
import 'package:mobile/controllers/chat.dart';
import 'chat_page.dart';
import 'package:mobile/controllers/chat_controller.dart';
import '../chat/chat_page.dart';

class NewChatPage extends StatefulWidget {
const NewChatPage({super.key});
Expand Down
4 changes: 2 additions & 2 deletions mobile/lib/pages/select_contact_page.dart → ...b/pages/new chat/select_contact_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'dart:async';
import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:mobile/controllers/chat.dart';
import 'package:mobile/pages/chat_page.dart';
import 'package:mobile/controllers/chat_controller.dart';
import 'package:mobile/pages/chat/chat_page.dart';
import 'package:mobile/providers/group_controller_provider.dart';
import 'package:provider/provider.dart';

Expand Down
4 changes: 2 additions & 2 deletions ...le/lib/pages/settings pages/accounts.dart → mobile/lib/pages/settings/accounts.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:flutter/services.dart';
import 'package:mobile/controllers/auth.dart';
import 'package:mobile/controllers/chat.dart';
import 'package:mobile/controllers/auth_state.dart';
import 'package:mobile/controllers/chat_controller.dart';
import 'package:mobile/main.dart';
import 'package:mobile/providers/group_controller_provider.dart';
import 'package:provider/provider.dart';
Expand Down
0 .../lib/pages/settings pages/appearance.dart → mobile/lib/pages/settings/appearance.dart
View file
Open in desktop
File renamed without changes.
0 ...lib/pages/settings pages/chats_media.dart → mobile/lib/pages/settings/chats_media.dart
View file
Open in desktop
File renamed without changes.
0 .../lib/pages/settings pages/help_about.dart → mobile/lib/pages/settings/help_about.dart
View file
Open in desktop
File renamed without changes.
0 ...ettings pages/notifications_settings.dart → ...ages/settings/notifications_settings.dart
View file
Open in desktop
File renamed without changes.
0 ...ages/settings pages/privacy_security.dart → .../lib/pages/settings/privacy_security.dart
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions mobile/lib/pages/settings_page.dart → mobile/lib/pages/settings/settings_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import 'dart:ui';

import 'package:flutter/material.dart';
import 'package:mobile/controllers/auth.dart';
import 'package:mobile/pages/settings%20pages/accounts.dart';
import 'package:mobile/pages/settings%20pages/appearance.dart';
import 'package:mobile/pages/settings%20pages/chats_media.dart';
import 'package:mobile/pages/settings%20pages/help_about.dart';
import 'package:mobile/pages/settings%20pages/notifications_settings.dart';
import 'package:mobile/pages/settings%20pages/privacy_security.dart';
import 'package:mobile/controllers/auth_state.dart';
import 'package:mobile/pages/settings/accounts.dart';
import 'package:mobile/pages/settings/appearance.dart';
import 'package:mobile/pages/settings/chats_media.dart';
import 'package:mobile/pages/settings/help_about.dart';
import 'package:mobile/pages/settings/notifications_settings.dart';
import 'package:mobile/pages/settings/privacy_security.dart';
import 'package:provider/provider.dart';
import 'package:qr_flutter/qr_flutter.dart';

Expand Down
2 changes: 1 addition & 1 deletion mobile/lib/providers/group_controller_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:dio/dio.dart';
import 'package:flutter/widgets.dart';
import 'package:mobile/models/group.dart';
import 'package:mobile/services/api.dart';
import 'package:mobile/services/api_services.dart';

class GroupController extends ChangeNotifier {
final Map<String, Map<String, String>> _selectedContacts = {};
Expand Down
4 changes: 2 additions & 2 deletions mobile/lib/services/api.dart → mobile/lib/services/api_services.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:dio/dio.dart';
import '../core/constants.dart';
import '../controllers/auth.dart';
import 'auth.dart';
import '../controllers/auth_state.dart';
import 'auth_service.dart';

class ApiService {
final Dio _dio = Dio();
Expand Down
0 mobile/lib/services/auth.dart → mobile/lib/services/auth_service.dart
View file
Open in desktop
File renamed without changes.
0 mobile/lib/services/ws.dart → mobile/lib/services/ws_service.dart
View file
Open in desktop
File renamed without changes.
0 .../widgets/chat_screen_modular_widgets.dart → mobile/lib/widgets/chat_page_widgets.dart
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions mobile/lib/widgets/custom_cards.dart → mobile/lib/widgets/home_page_widgets.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:mobile/controllers/auth.dart';
import 'package:mobile/controllers/chat.dart';
import 'package:mobile/controllers/auth_state.dart';
import 'package:mobile/controllers/chat_controller.dart';
import 'package:provider/provider.dart';
import '../models/inbox_item.dart';
import '../pages/chat_page.dart';
import '../pages/chat/chat_page.dart';

class CustomChatCard extends StatelessWidget {
final InboxItem conversation;
Expand Down
8 changes: 4 additions & 4 deletions mobile/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ packages:
dependency: "direct main"
description:
name: dio
sha256: ea2bad3c89a27635ce2d85cce4d6b199da49a5a48ec77b03e45b65a3b90922b0
sha256: "0df44ebba85e503958eb75d07eedd3c86275a58c1d3eda2f2ce8f0a2c3abbb3c"
url: "https://pub.dev"
source: hosted
version: "5.10.0"
version: "5.11.0"
dio_web_adapter:
dependency: transitive
description:
Expand Down Expand Up @@ -489,15 +489,15 @@ packages:
source: hosted
version: "2.2.0"
path:
dependency: transitive
dependency: "direct main"
description:
name: path
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
path_provider:
dependency: "direct main"
dependency: transitive
description:
name: path_provider
sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825
Expand Down
6 changes: 3 additions & 3 deletions mobile/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@ dependencies:
launcher_name: ^1.0.2
flutter_launcher_icons: ^0.14.4
flutter_secure_storage: ^10.3.1
dio: ^5.10.0
flutter_markdown_plus: ^1.0.7
dio: ^5.11.0
flutter_markdown_plus: ^1.0.12
intl: ^0.20.3
qr_flutter: ^4.1.0
flutter_animate: ^4.5.2
url_launcher: ^6.3.2
app_links: ^7.2.1
sqflite_sqlcipher: ^3.4.0
path_provider: ^2.1.6
connectivity_plus: ^7.3.1
uuid: ^4.6.0
shared_preferences: ^2.5.5
scrollable_positioned_list: ^0.3.8
path: ^1.9.1

launcher_name:
default: "Elephant"
Expand Down
Loading