Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,6 @@ SPEC CHECKSUMS:
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
TweetNacl: 3abf4d1d2082b0114e7a67410e300892448951e6

PODFILE CHECKSUM: fd03b9b6cdc465d56cc516cb052d645e1a9c1dff
PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b

COCOAPODS: 1.12.1
40 changes: 0 additions & 40 deletions lib/vaahextendflutter/base/base_stateful.dart

This file was deleted.

28 changes: 0 additions & 28 deletions lib/vaahextendflutter/base/base_stateless.dart

This file was deleted.

59 changes: 0 additions & 59 deletions lib/vaahextendflutter/helpers/responsive.dart

This file was deleted.

38 changes: 18 additions & 20 deletions lib/vaahextendflutter/helpers/styles.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import 'package:flutter/material.dart';

import './responsive.dart';

class TextStyles {
const TextStyles._();

Expand Down Expand Up @@ -142,27 +140,27 @@ class TextStyles {
};

static final _fontSizes = <TextSize, double>{
TextSize.size0: 10.0.spExt,
TextSize.size1: 12.0.spExt,
TextSize.size2: 14.0.spExt,
TextSize.size3: 15.0.spExt,
TextSize.size4: 16.0.spExt,
TextSize.size5: 18.0.spExt,
TextSize.size6: 21.0.spExt,
TextSize.size7: 24.0.spExt,
TextSize.size8: 27.0.spExt,
TextSize.size0: 10.0,
TextSize.size1: 12.0,
TextSize.size2: 14.0,
TextSize.size3: 15.0,
TextSize.size4: 16.0,
TextSize.size5: 18.0,
TextSize.size6: 21.0,
TextSize.size7: 24.0,
TextSize.size8: 27.0,
};

static final _lineHeights = <TextSize, double>{
TextSize.size0: 14.0.spExt,
TextSize.size1: 16.0.spExt,
TextSize.size2: 19.0.spExt,
TextSize.size3: 20.0.spExt,
TextSize.size4: 21.0.spExt,
TextSize.size5: 24.0.spExt,
TextSize.size6: 27.0.spExt,
TextSize.size7: 30.0.spExt,
TextSize.size8: 33.0.spExt,
TextSize.size0: 14.0,
TextSize.size1: 16.0,
TextSize.size2: 19.0,
TextSize.size3: 20.0,
TextSize.size4: 21.0,
TextSize.size5: 24.0,
TextSize.size6: 27.0,
TextSize.size7: 30.0,
TextSize.size8: 33.0,
};
}

Expand Down
4 changes: 1 addition & 3 deletions lib/views/pages/home.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';

import '../../vaahextendflutter/base/base_stateful.dart';
import '../../vaahextendflutter/env.dart';
import '../../vaahextendflutter/services/notification/internal/notification_view.dart';
import 'ui/index.dart';
Expand All @@ -21,7 +20,7 @@ class HomePage extends StatefulWidget {
State<HomePage> createState() => _HomePageState();
}

class _HomePageState extends BaseStateful<HomePage> {
class _HomePageState extends State<HomePage> {
@override
void initState() {
super.initState();
Expand All @@ -30,7 +29,6 @@ class _HomePageState extends BaseStateful<HomePage> {

@override
Widget build(BuildContext context) {
super.build(context);
return Scaffold(
appBar: AppBar(
actions: const [
Expand Down
5 changes: 1 addition & 4 deletions lib/views/pages/not_found.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:flutter/material.dart';

import '../../vaahextendflutter/base/base_stateless.dart';

class NotFoundPage extends BaseStateless {
class NotFoundPage extends StatelessWidget {
static const String routePath = '/page-not-found';

static Route<void> route() {
Expand All @@ -16,7 +14,6 @@ class NotFoundPage extends BaseStateless {

@override
Widget build(BuildContext context) {
super.build(context);
return Scaffold(
appBar: AppBar(),
body: const Center(
Expand Down
5 changes: 1 addition & 4 deletions lib/views/pages/permission_denied.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:flutter/material.dart';

import '../../vaahextendflutter/base/base_stateless.dart';

class PermissionDeniedPage extends BaseStateless {
class PermissionDeniedPage extends StatelessWidget {
static const String routePath = '/permission-denied';

static Route<void> route() {
Expand All @@ -16,7 +14,6 @@ class PermissionDeniedPage extends BaseStateless {

@override
Widget build(BuildContext context) {
super.build(context);
return Scaffold(
appBar: AppBar(),
body: const Center(
Expand Down
4 changes: 1 addition & 3 deletions lib/views/pages/ui/index.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import './components/buttons/buttons.dart';
import './components/inputs/inputs.dart';
import './components/themecolors.dart';
import '../../../vaahextendflutter/app_theme.dart';
import '../../../vaahextendflutter/base/base_stateful.dart';
import '../../../vaahextendflutter/helpers/constants.dart';

class UIPage extends StatefulWidget {
Expand All @@ -23,10 +22,9 @@ class UIPage extends StatefulWidget {
State<UIPage> createState() => _UIPageState();
}

class _UIPageState extends BaseStateful<UIPage> {
class _UIPageState extends State<UIPage> {
@override
Widget build(BuildContext context) {
super.build(context);
return Scaffold(
backgroundColor: AppTheme.colors['black']?.shade100,
appBar: AppBar(
Expand Down
8 changes: 0 additions & 8 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -358,14 +358,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.7"
flutter_screenutil:
dependency: "direct main"
description:
name: flutter_screenutil
sha256: "8e049ecdc1a62c90e6bf0e9c8398ace8dde81b92889c70cfe06281d79d59113a"
url: "https://pub.dev"
source: hosted
version: "5.6.1"
flutter_test:
dependency: "direct dev"
description: flutter
Expand Down
6 changes: 2 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: vaahflutter
description: VaahFlutter, essentials for every app.

publish_to: 'none' # Remove this line if you wish to publish to pub.dev
publish_to: "none" # Remove this line if you wish to publish to pub.dev

version: 1.0.0+1

Expand Down Expand Up @@ -31,7 +31,6 @@ dependencies:
get_storage: ^2.0.3
fluttertoast: ^8.1.3
file_picker: ^5.2.5
flutter_screenutil: ^5.6.1
# Firebase
firebase_dynamic_links: ^5.0.16
firebase_core: ^2.7.1
Expand All @@ -49,7 +48,6 @@ dev_dependencies:
build_runner: ^2.3.3

flutter:

# below line allows you use Material Icons in application
uses-material-design: true

Expand All @@ -70,4 +68,4 @@ flutter:
# fonts:
# - asset: fonts/TrajanPro.ttf
# - asset: fonts/TrajanPro_Bold.ttf
# weight: 700
# weight: 700