diff --git a/android/app/build.gradle b/android/app/build.gradle
index 19e9b19a..7201a53b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -81,7 +81,5 @@ flutter {
}
dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- // Workmanager
- // implementation 'androidx.work:work-runtime-ktx:2.7.1'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
diff --git a/android/build.gradle b/android/build.gradle
index fde7724a..dc79e569 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,6 +1,6 @@
buildscript {
ext {
- kotlin_version = '1.6.21'
+ kotlin_version = '1.7.10'
}
repositories {
@@ -9,7 +9,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.1.2'
+ classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
diff --git a/android/gradle.properties b/android/gradle.properties
index 66e4d9ab..7614ad11 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
# Without this line there may be crashes on Android 6.0 devices apparently.
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index cc5527d7..cfe88f69 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d1ea88d2..600786bc 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -6,8 +6,15 @@ PODS:
- Flutter
- flutter_secure_storage (6.0.0):
- Flutter
- - path_provider_ios (0.0.1):
+ - FMDB (2.7.5):
+ - FMDB/standard (= 2.7.5)
+ - FMDB/standard (2.7.5)
+ - path_provider_foundation (0.0.1):
- Flutter
+ - FlutterMacOS
+ - sqflite (0.0.2):
+ - Flutter
+ - FMDB (>= 2.7.5)
- url_launcher_ios (0.0.1):
- Flutter
- workmanager (0.0.1):
@@ -18,10 +25,15 @@ DEPENDENCIES:
- Flutter (from `Flutter`)
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
- - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+ - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
+ - sqflite (from `.symlinks/plugins/sqflite/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- workmanager (from `.symlinks/plugins/workmanager/ios`)
+SPEC REPOS:
+ trunk:
+ - FMDB
+
EXTERNAL SOURCES:
app_links:
:path: ".symlinks/plugins/app_links/ios"
@@ -31,8 +43,10 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_local_notifications/ios"
flutter_secure_storage:
:path: ".symlinks/plugins/flutter_secure_storage/ios"
- path_provider_ios:
- :path: ".symlinks/plugins/path_provider_ios/ios"
+ path_provider_foundation:
+ :path: ".symlinks/plugins/path_provider_foundation/ios"
+ sqflite:
+ :path: ".symlinks/plugins/sqflite/ios"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"
workmanager:
@@ -43,8 +57,10 @@ SPEC CHECKSUMS:
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
- path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
- url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+ FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+ path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
+ sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+ url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index dbc68c15..091b2f55 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -207,6 +207,7 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -260,6 +261,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 03de4938..cb75688a 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -71,5 +71,7 @@
CADisableMinimumFrameDurationOnPhone
+ UIApplicationSupportsIndirectInputEvents
+
diff --git a/lib/activity/activity_providers.dart b/lib/activity/activities_providers.dart
similarity index 51%
rename from lib/activity/activity_providers.dart
rename to lib/activity/activities_providers.dart
index c4538d5c..d4a9ff85 100644
--- a/lib/activity/activity_providers.dart
+++ b/lib/activity/activities_providers.dart
@@ -1,86 +1,20 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:otraku/activity/activity_models.dart';
+import 'package:otraku/common/pagination.dart';
import 'package:otraku/home/home_provider.dart';
import 'package:otraku/utils/api.dart';
import 'package:otraku/utils/graphql.dart';
-import 'package:otraku/common/pagination.dart';
import 'package:otraku/utils/options.dart';
-/// Toggles an activity like and returns an error if unsuccessful.
-Future