Skip to content

Commit

Permalink
folders updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonerxdev
sonerxdev committed Sep 29, 2021
1 parent 4bc6508 commit b01f2dd
Show file tree
Hide file tree
Showing 9 changed files with 197 additions and 168 deletions.
4 changes: 2 additions & 2 deletions lib/main.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:animation_library/smartCarApp/bottom_nav_bar.dart';
import 'package:animation_library/smartCarApp/models/home_controller.dart';
import 'package:animation_library/smartScooterApp/models/home_controller.dart';
import 'package:animation_library/smartScooterApp/screens/bottom_nav_bar.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

Expand Down
49 changes: 0 additions & 49 deletions lib/smartCarApp/animation_classes.dart
View file

This file was deleted.

19 changes: 0 additions & 19 deletions lib/smartCarApp/profile_page.dart
View file

This file was deleted.

0 lib/smartCarApp/models/home_controller.dart → ...artScooterApp/models/home_controller.dart
View file
File renamed without changes.
155 changes: 73 additions & 82 deletions lib/smartCarApp/battery_page.dart → ...smartScooterApp/screens/battery_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
import 'package:animation_library/core/base_state.dart';
import 'package:animation_library/core/constants.dart';
import 'package:animation_library/smartCarApp/home_page.dart';
import 'package:animation_library/smartCarApp/models/home_controller.dart';
import 'package:animation_library/smartScooterApp/models/home_controller.dart';
import 'package:animation_library/smartScooterApp/screens/home_page.dart';
import 'package:animation_library/widgets/chart_1.dart';
import 'package:animation_library/widgets/chart_2.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:percent_indicator/circular_percent_indicator.dart';
import 'package:provider/provider.dart';

class BatteryPage extends StatefulWidget {
BatteryPage({Key? key}) : super(key: key);
class BatteryPage extends StatelessWidget {
const BatteryPage({Key? key}) : super(key: key);

@override
_BatteryPageState createState() => _BatteryPageState();
}

class _BatteryPageState extends State<BatteryPage> {
@override
Widget build(BuildContext context) {
final _homeController = Provider.of<HomeController>(context);
Expand Down Expand Up @@ -127,90 +122,86 @@ class _BatteryPageState extends State<BatteryPage> {
Container(
padding: context.insetsAll(0.03),
decoration: boxDecoration(),
child: Column(
child: Row(
children: [
Row(
Column(
children: [
Column(
children: [
Text(
"Battery",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 17,
color: Colors.white,
fontWeight: FontWeight.w400,
),
),
Text(
"Battery",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 17,
color: Colors.white,
fontWeight: FontWeight.w400,
),
Text(
"%86",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 23,
color: textColor,
fontWeight: FontWeight.bold,
),
),
),
],
),
SizedBox(
width: context.dynamicWidth(0.05),
),
),
Column(
children: [
Text(
"Distance",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 17,
color: Colors.white,
fontWeight: FontWeight.w400,
),
),
Text(
"%86",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 23,
color: textColor,
fontWeight: FontWeight.bold,
),
Text(
"28.3 km",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 23,
color: textColor,
fontWeight: FontWeight.bold,
),
),
),
),
],
),
SizedBox(
width: context.dynamicWidth(0.05),
),
Column(
children: [
Text(
"Distance",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 17,
color: Colors.white,
fontWeight: FontWeight.w400,
),
],
),
),
SizedBox(
width: context.dynamicWidth(0.05),
Text(
"28.3 km",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 23,
color: textColor,
fontWeight: FontWeight.bold,
),
),
),
Column(
children: [
Text(
"Duration",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 17,
color: Colors.white,
fontWeight: FontWeight.w400,
),
),
],
),
SizedBox(
width: context.dynamicWidth(0.05),
),
Column(
children: [
Text(
"Duration",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 17,
color: Colors.white,
fontWeight: FontWeight.w400,
),
Text(
"2 hour",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 23,
color: textColor,
fontWeight: FontWeight.bold,
),
),
),
),
Text(
"2 hour",
style: GoogleFonts.yantramanav(
textStyle: TextStyle(
fontSize: 23,
color: textColor,
fontWeight: FontWeight.bold,
),
],
),
),
],
)
),
],
),
),
Expand All @@ -222,4 +213,4 @@ class _BatteryPageState extends State<BatteryPage> {
),
);
}
}
}
11 changes: 6 additions & 5 deletions lib/smartCarApp/bottom_nav_bar.dart → ...artScooterApp/screens/bottom_nav_bar.dart
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import 'package:animation_library/core/base_state.dart';
import 'package:animation_library/core/constants.dart';
import 'package:animation_library/smartCarApp/home_page.dart';
import 'package:animation_library/smartCarApp/battery_page.dart';
import 'package:animation_library/smartCarApp/models/home_controller.dart';
import 'package:animation_library/smartCarApp/profile_page.dart';
import 'package:animation_library/smartCarApp/location_page.dart';

import 'package:animation_library/smartScooterApp/models/home_controller.dart';
import 'package:animation_library/smartScooterApp/screens/battery_page.dart';
import 'package:animation_library/smartScooterApp/screens/home_page.dart';
import 'package:animation_library/smartScooterApp/screens/location_page.dart';

import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

Expand Down
11 changes: 3 additions & 8 deletions lib/smartCarApp/home_page.dart → lib/smartScooterApp/screens/home_page.dart
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
import 'package:animation_library/core/base_state.dart';
import 'package:animation_library/core/constants.dart';
import 'package:animation_library/smartCarApp/models/home_controller.dart';
import 'package:animation_library/smartScooterApp/models/home_controller.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:provider/provider.dart';
import 'package:flutter_svg/flutter_svg.dart';

class HomePage extends StatefulWidget {
HomePage({Key? key}) : super(key: key);
class HomePage extends StatelessWidget {
const HomePage({Key? key}) : super(key: key);

@override
_HomePageState createState() => _HomePageState();
}

class _HomePageState extends State<HomePage> {
@override
Widget build(BuildContext context) {
final _homeController = Provider.of<HomeController>(context);
Expand Down

0 comments on commit b01f2dd

Please sign in to comment.