Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- uses: subosito/flutter-action@v2
with:
flutter-version: '3.38.x'
flutter-version: '3.41.x'
channel: "stable"
cache: true
cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:' # optional, change this to force refresh cache
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
id: output-globals-version
uses: juliangruber/read-file-action@v1
with:
path: lib/src/core/config/app_config.dart
path: lib/src/foundation/config/app_config.dart

# Get just the first line of the app_config.dart file
- name: Get first line of app_config.dart file
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/instances.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ jobs:
cat lemmy-instances.txt piefed-instances.txt | sort | uniq -i > instances.txt

# Convert to a dart file with a map of domain -> platform
cat << EOF > lib/instances.dart
import 'package:thunder/src/core/enums/threadiverse_platform.dart';
const Map<String, ThreadiversePlatform> instances = {
$(awk '{ print " \047"$0"\047: ThreadiversePlatform.lemmy," }' lemmy-instances.txt)
$(awk '{ print " \047"$0"\047: ThreadiversePlatform.piefed," }' piefed-instances.txt)
};
EOF
cat << EOF > lib/src/features/instance/data/constants/known_instances.dart
import 'package:thunder/src/foundation/primitives/primitives.dart';

const Map<String, ThreadiversePlatform> knownInstances = {
$(awk '{ print " \047"$0"\047: ThreadiversePlatform.lemmy," }' lemmy-instances.txt)
$(awk '{ print " \047"$0"\047: ThreadiversePlatform.piefed," }' piefed-instances.txt)
};
EOF

# Put the instances in the Android manifest file
manifestInstances="$(awk '{ print " <data android:host=\""$0"\" />" }' instances.txt)"
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
with:
commit-message: Update instances
title: Update instances
body: This PR is updating `instances.dart`, `AndroidManifest.xml`, `manifest.json` and `content.js` with the latest list of Lemmy and PieFed instances retrieved from fediverse.observer.
body: This PR is updating `known_instances.dart`, `AndroidManifest.xml`, `manifest.json` and `content.js` with the latest list of Lemmy and PieFed instances retrieved from fediverse.observer.
branch: update-instances
delete-branch: true
author: GitHub <noreply@github.com>
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: '3.38.x' # When updating this, also update the corresponding f-droid metadata file
flutter-version: '3.41.x' # When updating this, also update the corresponding f-droid metadata file
channel: 'stable'
cache: true

Expand Down
2 changes: 0 additions & 2 deletions ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>13.0</string>
</dict>
</plist>
9 changes: 6 additions & 3 deletions ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import UIKit
import Flutter
import UIKit

@main
@objc class AppDelegate: FlutterAppDelegate {
@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
override func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
GeneratedPluginRegistrant.register(with: self)
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}

func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
}
}
29 changes: 25 additions & 4 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>com.transistorsoft.fetch</string>
</array>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
Expand Down Expand Up @@ -47,6 +51,27 @@
<string>We need Photos access to allow you to save media.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>We need Photos access to allow you to save media.</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleApplication</key>
<array>
<dict>
<key>UISceneClassName</key>
<string>UIWindowScene</string>
<key>UISceneConfigurationName</key>
<string>flutter</string>
<key>UISceneDelegateClassName</key>
<string>FlutterSceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>Main</string>
</dict>
</array>
</dict>
</dict>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UIBackgroundModes</key>
Expand All @@ -72,10 +97,6 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>com.transistorsoft.fetch</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>
Expand Down
Loading