Skip to content

Commit 3dd9b09

Browse files
UI Improvements & Gradle Upgrade
2 parents 419014f + 5bb0233 commit 3dd9b09

File tree

13 files changed

+77
-147
lines changed

13 files changed

+77
-147
lines changed

android/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx/
89

910
# Remember to never publicly share your keystore.
1011
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app

android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if (flutterVersionName == null) {
3030

3131
android {
3232
namespace = "es.opentransportmallorca.via"
33-
compileSdk = 34
33+
compileSdk = 35
3434
ndkVersion = "27.0.12077973"
3535

3636
kotlin {
@@ -46,7 +46,7 @@ android {
4646
defaultConfig {
4747
applicationId = "es.opentransportmallorca.via"
4848
minSdk = 23
49-
targetSdk = 34
49+
targetSdk = 35
5050
versionCode = flutterVersionCode.toInteger()
5151
versionName = flutterVersionName
5252
}

android/app/src/main/AndroidManifest.xml

-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<meta-data
3333
android:name="flutterEmbedding"
3434
android:value="2" />
35-
36-
<meta-data
37-
android:name="io.flutter.embedding.android.EnableImpeller"
38-
android:value="false" />
3935
</application>
4036
<queries>
4137
<intent>

android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

android/settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version '8.7.0' apply false
21+
id "com.android.application" version '8.8.0' apply false
2222
id "org.jetbrains.kotlin.android" version "1.9.23" apply false
2323
}
2424

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

ios/Runner/Info.plist

-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
<string>UIInterfaceOrientationLandscapeLeft</string>
5151
<string>UIInterfaceOrientationLandscapeRight</string>
5252
</array>
53-
<key>FLTEnableImpeller</key>
54-
<false />
5553
<key>ITSAppUsesNonExemptEncryption</key>
5654
<false/>
5755
</dict>

lib/components/bottom_sheets/station/station_view.dart

+1
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ class StationSheet extends StatelessWidget {
152152
width: 3)
153153
: null),
154154
child: Card(
155+
color: Theme.of(context).colorScheme.surfaceContainerHigh,
155156
child: Padding(
156157
padding: const EdgeInsets.all(4.0),
157158
child: ListTile(

lib/screens/nearby/nearby_view.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ class NearbyStops extends StatelessWidget {
3131
);
3232
}
3333

34+
final cardColor = Theme.of(context).colorScheme.surfaceContainer;
35+
3436
return RefreshIndicator(
3537
onRefresh: viewModel.loadStations,
3638
child: Column(
@@ -51,7 +53,6 @@ class NearbyStops extends StatelessWidget {
5153
LocationPermission.whileInUse)
5254
Expanded(
5355
child: ListView.builder(
54-
shrinkWrap: true,
5556
itemCount: viewModel.nearbyStations.length,
5657
itemBuilder: (context, index) {
5758
final station = viewModel.nearbyStations[index];
@@ -65,8 +66,7 @@ class NearbyStops extends StatelessWidget {
6566
.round();
6667
}
6768
return Card(
68-
surfaceTintColor:
69-
Theme.of(context).colorScheme.tertiary,
69+
color: cardColor,
7070
child: ListTile(
7171
shape: RoundedRectangleBorder(
7272
borderRadius: BorderRadius.circular(10),

lib/screens/routes/routes_view.dart

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ class RoutesScreen extends StatelessWidget {
2020
return const Center(child: CircularProgressIndicator());
2121
}
2222

23+
final cardColor = Theme.of(context).colorScheme.surfaceContainer;
24+
2325
final lines = viewModel.filteredLines;
2426
final searchQuery = viewModel.searchQuery;
2527

@@ -53,6 +55,7 @@ class RoutesScreen extends StatelessWidget {
5355
final tileIcon = _getIconForLine(line);
5456

5557
return Card(
58+
color: cardColor,
5659
child: ListTile(
5760
shape: RoundedRectangleBorder(
5861
borderRadius: BorderRadius.circular(10),

lib/screens/stations/stations_view.dart

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class StationsScreen extends StatelessWidget {
1616
create: (_) => StationsViewModel(),
1717
child: Consumer<StationsViewModel>(
1818
builder: (context, viewModel, _) {
19+
final cardColor = Theme.of(context).colorScheme.surfaceContainer;
1920
final stations = viewModel.filteredStations;
2021
return Column(
2122
children: [
@@ -69,6 +70,7 @@ class StationsScreen extends StatelessWidget {
6970
itemBuilder: (context, index) {
7071
final station = stations[index];
7172
return Card(
73+
color: cardColor,
7274
child: ListTile(
7375
title: Text(station.name,
7476
style: const TextStyle(fontSize: 18)),

0 commit comments

Comments
 (0)