Skip to content

Commit

Permalink
Update gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
jck9007 committed Jul 19, 2024
1 parent b3ebfcc commit 7ffe2c2
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 21 deletions.
13 changes: 0 additions & 13 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
buildscript {
ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
Expand Down
19 changes: 12 additions & 7 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,21 @@ pluginManagement {
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}
settings.ext.flutterSdkPath = flutterSdkPath()
}()

includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

plugins {
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

include ":app"
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.9.10" apply false
}

apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
include ":app"
1 change: 1 addition & 0 deletions lib/src/ui/dialogs/new_session_confirm_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class NewSessionConfirmDialog extends StatelessWidget {
const styleField = TextStyle(fontSize: 14);

return AlertDialog(
backgroundColor: Colors.white,
contentPadding: const EdgeInsets.all(0),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(Constants.padding)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class _LoginTabPageState extends State<LoginTabContent> {
indicatorColor: Constants.darkBlueColor,
indicatorWeight: 3,
tabs: tabs,
dividerColor: Colors.white,
),
iconTheme: const IconThemeData(
color: Colors.black,
Expand Down
2 changes: 2 additions & 0 deletions lib/src/ui/utils/dialogs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ void showLoadingDialog(BuildContext context) {
context: context,
builder: (context) {
return AlertDialog(
backgroundColor: Colors.white,
content: Padding(
padding: const EdgeInsets.only(top: Constants.paddingSmall),
child: Row(
Expand Down Expand Up @@ -39,6 +40,7 @@ void showConfirmationDialog(BuildContext context, {
context: context,
builder: (context) {
return Dialog(
backgroundColor: Colors.white,
child: Padding(
padding: const EdgeInsets.fromLTRB(20, 20, 20, 8),
child: Wrap(
Expand Down
1 change: 1 addition & 0 deletions lib/src/ui/widgets/bottom_navigation_bar_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
unselectedItemColor: Colors.grey,
showUnselectedLabels: true,
type: BottomNavigationBarType.fixed,
backgroundColor: Colors.white,
items: [
BottomNavigationBarItem(
icon: const Icon(Icons.map),
Expand Down
1 change: 1 addition & 0 deletions lib/src/ui/widgets/mapaton/activities_draggable.dart
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ class _ActivitiesDraggableState extends State<ActivitiesDraggable> {
);
},
child: Chip(
backgroundColor: Colors.white,
label: Row(
children: [
Text(_selectedCategory),
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies:
# google_maps_flutter: ^2.5.0
http: ^1.1.0
image_picker: ^1.0.4
intl: ^0.18.1
intl: ^0.19.0
location: ^6.0.2
mapbox_gl: ^0.16.0
path: ^1.8.3
Expand Down

0 comments on commit 7ffe2c2

Please sign in to comment.