Skip to content

Commit

Permalink
Upgrade flutter version
Browse files Browse the repository at this point in the history
  • Loading branch information
hazarbelge committed Mar 9, 2023
1 parent a5fd53e commit 5d325bc
Show file tree
Hide file tree
Showing 13 changed files with 371 additions and 229 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

env:
flutter_version: "3.3.5"
flutter_version: "3.7.5"

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
branches: [ master ]

env:
flutter_version: "3.3.5"
flutter_version: "3.7.5"

jobs:
test:
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.8.0'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
6 changes: 4 additions & 2 deletions lib/core/theme/icons.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ class ThemeIcons {
'assets/icons/app_icon.svg',
height: height,
width: width,
color: color,
colorBlendMode: BlendMode.srcATop,
colorFilter: ColorFilter.mode(
color ?? Colors.black,
BlendMode.srcATop,
),
semanticsLabel: '',
);
}
Expand Down
15 changes: 7 additions & 8 deletions lib/core/theme/style.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class Style {

static final ThemeData lightTheme = ThemeData(
brightness: Brightness.light,
backgroundColor: ThemeColors.backgroundColor,
scaffoldBackgroundColor: ThemeColors.scaffoldBackgroundColor,
primaryColor: ThemeColors.primaryColor,
appBarTheme: const AppBarTheme(
Expand Down Expand Up @@ -43,11 +42,6 @@ class Style {
unselectedLabelStyle: TextStyle(fontSize: 11.5, overflow: TextOverflow.ellipsis),
type: BottomNavigationBarType.fixed,
),
colorScheme: ColorScheme.fromSwatch(
brightness: Brightness.light,
accentColor: ThemeColors.secondaryColor,
errorColor: ThemeColors.errorColor,
),
pageTransitionsTheme: _pageTransitionsTheme,
textTheme: GoogleFonts.rubikTextTheme(
ThemeData.light().textTheme.copyWith(),
Expand All @@ -62,12 +56,16 @@ class Style {
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
), colorScheme: ColorScheme.fromSwatch(
brightness: Brightness.light,
accentColor: ThemeColors.secondaryColor,
errorColor: ThemeColors.errorColor,
backgroundColor: ThemeColors.backgroundColor
),
);

static final ThemeData darkTheme = ThemeData(
brightness: Brightness.dark,
backgroundColor: ThemeColors.backgroundColorDark,
scaffoldBackgroundColor: ThemeColors.scaffoldBackgroundColorDark,
primaryColor: ThemeColors.primaryColorDark,
appBarTheme: const AppBarTheme(
Expand All @@ -91,6 +89,7 @@ class Style {
brightness: Brightness.dark,
accentColor: ThemeColors.secondaryColorDark,
errorColor: ThemeColors.errorColor,
backgroundColor: ThemeColors.backgroundColorDark,
),
pageTransitionsTheme: _pageTransitionsTheme,
textTheme: GoogleFonts.rubikTextTheme(
Expand All @@ -111,7 +110,6 @@ class Style {

static final ThemeData blackTheme = ThemeData(
brightness: Brightness.dark,
backgroundColor: ThemeColors.backgroundColorDark,
scaffoldBackgroundColor: ThemeColors.scaffoldBackgroundColorDark,
primaryColor: ThemeColors.primaryColorDark,
appBarTheme: const AppBarTheme(
Expand All @@ -135,6 +133,7 @@ class Style {
brightness: Brightness.dark,
accentColor: ThemeColors.secondaryColorDark,
errorColor: ThemeColors.errorColor,
backgroundColor: ThemeColors.backgroundColorDark,
),
pageTransitionsTheme: _pageTransitionsTheme,
textTheme: GoogleFonts.rubikTextTheme(
Expand Down
11 changes: 11 additions & 0 deletions lib/core/utils/connectivity_util.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ class ConnectivityUtil {
}
debugPrint("ConnectivityResult: Internet Connection With VPN.");
break;
case ConnectivityResult.other:
if (noConnection) {
try {
Navigator.pop(Get.overlayContext!);
noConnection = false;
} catch (e) {
debugPrint("GetUntilMethodOnOtherConnectionError: $e");
}
}
debugPrint("ConnectivityResult: Internet Connection With Other.");
break;
case ConnectivityResult.none:
debugPrint("ConnectivityResult: No Internet Connection.");
try {
Expand Down
4 changes: 2 additions & 2 deletions lib/features/detail/tabs/overview.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Overview extends GetView<OverviewController> {
Obx(
() => Text(
controller.flag.value ? "${controller.visibleText.value}..." : controller.visibleText.value + controller.invisibleText.value,
style: textTheme.bodyText2!.copyWith(
style: textTheme.bodyMedium!.copyWith(
color: Get.isDarkMode ? Colors.white : Colors.black45,
fontSize: 16.0,
),
Expand All @@ -47,7 +47,7 @@ class Overview extends GetView<OverviewController> {
children: <Widget>[
Text(
controller.flag.value ? 'details.more'.tr : 'details.less'.tr,
style: textTheme.bodyText2!.copyWith(fontSize: 16.0, color: Get.isDarkMode ? Colors.orange : Colors.blue),
style: textTheme.bodyMedium!.copyWith(fontSize: 16.0, color: Get.isDarkMode ? Colors.orange : Colors.blue),
),
Icon(
Icons.keyboard_arrow_down,
Expand Down
2 changes: 0 additions & 2 deletions lib/network/url.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//import 'url_key_secret.dart';

class Url {
//API key
static const String apiKey = "YOUR.API_KEY";
Expand Down
10 changes: 5 additions & 5 deletions lib/ui/widgets/custom_widgets/custom_dropdown_textfield.dart
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ class _DropDownTextFieldState extends State<DropDownTextField> with TickerProvid
}
}

_listTileTextStyle = (widget.listTextStyle ?? Theme.of(context).textTheme.subtitle1)!;
_listTileTextStyle = (widget.listTextStyle ?? Theme.of(context).textTheme.titleMedium)!;
_listTileHeight = _textWidgetSize("dummy Text", _listTileTextStyle).height + _listPadding.top + _listPadding.bottom;
_maxListItem = widget.dropDownItemCount;

Expand Down Expand Up @@ -470,7 +470,7 @@ class _DropDownTextFieldState extends State<DropDownTextField> with TickerProvid
Future<void> _showOverlay() async {
_controller.forward();
_isExpanded = true;
final OverlayState? overlay = Overlay.of(context);
final OverlayState overlay = Overlay.of(context);
final RenderBox renderBox = context.findRenderObject()! as RenderBox;
final Size size = renderBox.size;
_offset = renderBox.localToGlobal(Offset.zero);
Expand Down Expand Up @@ -527,11 +527,11 @@ class _DropDownTextFieldState extends State<DropDownTextField> with TickerProvid
builder: buildOverlay,
))),
);
overlay?.insert(_isScrollPadding ? _entry2! : _entry!);
overlay.insert(_isScrollPadding ? _entry2! : _entry!);
}

void _openOutSideClickOverlay(BuildContext context) {
final OverlayState? overlay2 = Overlay.of(context);
final OverlayState overlay2 = Overlay.of(context);
_barrierOverlay = OverlayEntry(builder: (BuildContext context) {
final Size size = MediaQuery.of(context).size;
return GestureDetector(
Expand All @@ -545,7 +545,7 @@ class _DropDownTextFieldState extends State<DropDownTextField> with TickerProvid
),
);
});
overlay2?.insert(_barrierOverlay!);
overlay2.insert(_barrierOverlay!);
}

void hideOverlay() {
Expand Down
2 changes: 1 addition & 1 deletion macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import FlutterMacOS
import Foundation

import connectivity_plus
import path_provider_macos
import path_provider_foundation
import sqflite
import url_launcher_macos

Expand Down
Loading

0 comments on commit 5d325bc

Please sign in to comment.