From eccce9b1d95a45eef964f7fea8bdb79e3c1e429f Mon Sep 17 00:00:00 2001 From: John Wesley Date: Mon, 11 Dec 2023 10:45:43 -0500 Subject: [PATCH] Fix issues with android build --- android/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- flutter_01.png | 0 flutter_02.png | 0 lib/main.dart | 4 +- lib/src/entries/entries_screen.dart | 79 ++++++++++--------- pubspec.lock | 26 +++--- pubspec.yaml | 2 +- 8 files changed, 63 insertions(+), 54 deletions(-) delete mode 100644 flutter_01.png delete mode 100644 flutter_02.png diff --git a/android/build.gradle b/android/build.gradle index f7eb7f6..9a2a406 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.8.22' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:8.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c472b9..8bc9958 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/flutter_01.png b/flutter_01.png deleted file mode 100644 index e69de29..0000000 diff --git a/flutter_02.png b/flutter_02.png deleted file mode 100644 index e69de29..0000000 diff --git a/lib/main.dart b/lib/main.dart index 5954d84..cfe0af6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,8 +4,10 @@ import 'src/app.dart'; import 'src/settings/settings_controller.dart'; void main() async { - final settingsController = SettingsController(); + WidgetsFlutterBinding.ensureInitialized(); + // Load user settings + final settingsController = SettingsController(); await settingsController.loadSettings(); runApp(MyApp(settingsController: settingsController)); diff --git a/lib/src/entries/entries_screen.dart b/lib/src/entries/entries_screen.dart index 683ab2d..ee41276 100644 --- a/lib/src/entries/entries_screen.dart +++ b/lib/src/entries/entries_screen.dart @@ -63,42 +63,49 @@ class _EntriesViewState extends State { child: CustomScrollView( slivers: [ SliverToBoxAdapter( - child: DropdownButton( - value: sort, - onChanged: (newSort) { - if (newSort != null) { - setState(() { - sort = newSort; - _pagingController.refresh(); - }); - } - }, - items: const [ - DropdownMenuItem( - value: 'hot', - child: Text('Hot'), - ), - DropdownMenuItem( - value: 'top', - child: Text('Top'), - ), - DropdownMenuItem( - value: 'newest', - child: Text('Newest'), - ), - DropdownMenuItem( - value: 'active', - child: Text('Active'), - ), - DropdownMenuItem( - value: 'commented', - child: Text('Commented'), - ), - DropdownMenuItem( - value: 'oldest', - child: Text('Oldest'), - ), - ], + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + DropdownButton( + value: sort, + onChanged: (newSort) { + if (newSort != null) { + setState(() { + sort = newSort; + _pagingController.refresh(); + }); + } + }, + items: const [ + DropdownMenuItem( + value: 'hot', + child: Text('Hot'), + ), + DropdownMenuItem( + value: 'top', + child: Text('Top'), + ), + DropdownMenuItem( + value: 'newest', + child: Text('Newest'), + ), + DropdownMenuItem( + value: 'active', + child: Text('Active'), + ), + DropdownMenuItem( + value: 'commented', + child: Text('Commented'), + ), + DropdownMenuItem( + value: 'oldest', + child: Text('Oldest'), + ), + ], + ), + ], + ), ), ), PagedSliverList( diff --git a/pubspec.lock b/pubspec.lock index 0b7cd2e..e2da110 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" fake_async: dependency: transitive description: @@ -185,10 +185,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" nested: dependency: transitive description: @@ -334,18 +334,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -366,10 +366,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -454,10 +454,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -475,5 +475,5 @@ packages: source: hosted version: "1.0.3" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" diff --git a/pubspec.yaml b/pubspec.yaml index 8ed5124..215e8bd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ name: interstellar # Prevent accidental publishing to pub.dev. publish_to: 'none' -version: 1.0.0+1 +version: 0.0.1+1 environment: sdk: '>=3.1.0 <4.0.0'