Skip to content

Commit

Permalink
v2 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
arda-copur committed Aug 6, 2024
1 parent 8d8832f commit 590a4c9
Show file tree
Hide file tree
Showing 20 changed files with 474 additions and 354 deletions.
6 changes: 3 additions & 3 deletions lib/feature/services/auth/user_status.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import 'package:fam_works/screens/login_screen.dart';
import 'package:fam_works/screens/rotate_screen.dart';
import 'package:fam_works/views/login_screen.dart';
import 'package:fam_works/views/bottom_view.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart';

Expand All @@ -16,7 +16,7 @@ class UserAuthStatus extends StatelessWidget {
return const Center(child: CircularProgressIndicator());
}
if (snapshot.hasData) {
return MyBottomNavigationBar();
return const BottomView();
} else {
return LoginScreen();
}
Expand Down
42 changes: 42 additions & 0 deletions lib/feature/services/connectivy/connectivy_manager.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import 'dart:async';
import 'package:connectivity_plus/connectivity_plus.dart';

class ConnectivityManager {
final Connectivity _connectivity = Connectivity();
final StreamController<ConnectivityResult> _connectivityStreamController = StreamController<ConnectivityResult>.broadcast();

ConnectivityManager._internal() {
_connectivity.onConnectivityChanged.listen((ConnectivityResult result) {
_connectivityStreamController.add(result);
});
}

static final ConnectivityManager _instance = ConnectivityManager._internal();

factory ConnectivityManager() {
return _instance;
}

Stream<ConnectivityResult> get connectivityStream => _connectivityStreamController.stream;

Future<ConnectivityResult> getCurrentConnectivity() async {
return await _connectivity.checkConnectivity();
}

String getConnectionStatusString(ConnectivityResult result) {
switch (result) {
case ConnectivityResult.wifi:
return 'Bağlantı durumu: Wi-Fi 🌐';
case ConnectivityResult.mobile:
return 'Bağlantı durumu: Mobil Veri 📱';
case ConnectivityResult.none:
return 'Bağlantı durumu: Bağlantı Yok ❌';
default:
return 'Bağlantı durumu: Bilinmiyor ❔';
}
}

void dispose() {
_connectivityStreamController.close();
}
}
14 changes: 7 additions & 7 deletions lib/feature/utils/app_routes.dart
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import 'package:fam_works/screens/create_task_screen.dart';
import 'package:fam_works/screens/home_screen.dart';
import 'package:fam_works/screens/login_screen.dart';
import 'package:fam_works/screens/register_screen.dart';
import 'package:fam_works/screens/rotate_screen.dart';
import 'package:fam_works/views/create_task_screen.dart';
import 'package:fam_works/views/home_view.dart';
import 'package:fam_works/views/login_screen.dart';
import 'package:fam_works/views/register_screen.dart';
import 'package:fam_works/views/bottom_view.dart';
import 'package:flutter/material.dart';

class Routes {
static Map<String, WidgetBuilder> get appRoutes => {
'/login': (context) => LoginScreen(),
'/register': (context) => const RegisterScreen(),
'/home': (context) => const HomeScreen(),
'/home': (context) => const HomeView(),
'/create-task': (context) => CreateTaskScreen(),
'/rotate': (context) => const MyBottomNavigationBar(),
'/rotate': (context) => const BottomView(),
};
}
2 changes: 1 addition & 1 deletion lib/feature/utils/app_styles.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


import 'package:fam_works/screens/create_task_screen.dart';
import 'package:fam_works/views/create_task_screen.dart';
import 'package:flutter/material.dart';

mixin TaskViewStylesMixin on State<CreateTaskScreen> {
Expand Down
Empty file removed lib/models/user_model.dart
Empty file.
150 changes: 0 additions & 150 deletions lib/screens/rotate_screen.dart

This file was deleted.

6 changes: 6 additions & 0 deletions lib/viewmodels/home_vmodel.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import 'package:fam_works/views/home_view.dart';
import 'package:flutter/material.dart';

abstract class HomeViewModel extends State<HomeView> {

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:fam_works/screens/create_activity.screen.dart';
import 'package:fam_works/views/create_activity.screen.dart';
import 'package:flutter/material.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart';
Expand Down
Loading

0 comments on commit 590a4c9

Please sign in to comment.