Liftoff app master

.github/workflows/main.yml

@@ -18,10 +18,10 @@ jobs:
 
       - uses: subosito/flutter-action@v1
         with:
-          channel: "stable"
+          flutter-version: '3.16.0'
 
       - name: Disable telemetry
-        run: flutter --disable-telemetry
+        run: flutter --disable-analytics
 
       - name: Get dependencies
         run: flutter pub get
@@ -55,35 +55,15 @@ jobs:
 
       - uses: subosito/flutter-action@v1
         with:
-          channel: "stable"
-
-      - name: Generate debug keystore (Pull Request)
-        if: github.event_name == 'pull_request'
-        run: keytool -genkey -v -keystore /home/runner/work/liftoff/liftoff/android/app/key.jks -alias androiddebugkey -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Debug,O=Android,C=US"
+          flutter-version: '3.16.0'
 
       - name: Android build (Pull Request)
         if: github.event_name == 'pull_request'
-        env:
-          ANDROID_KEY_ALIAS: androiddebugkey
-          ANDROID_KEY_PASSWORD: android
-          ANDROID_STORE_PATH: key.jks
-          ANDROID_STORE_PASSWORD: android
-        run: flutter build apk --split-per-abi --release --target lib/main_prod.dart --flavor preview
-
-      - name: Inject keystore
-        working-directory: android/app
-        if: github.event_name != 'pull_request'
-        run: |
-          echo "${{ secrets.SIGNING_KEY }}" | base64 -d | tee key.jks >/dev/null
+        run: flutter build apk --release --target lib/main_prod.dart --flavor preview
 
       - name: Android build (Master Branch)
         if: github.event_name != 'pull_request'
-        env:
-          ANDROID_KEY_ALIAS: ${{ secrets.ALIAS }}
-          ANDROID_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-          ANDROID_STORE_PATH: key.jks
-          ANDROID_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-        run: flutter build apk --split-per-abi --release --target lib/main_prod.dart --flavor preview
+        run: flutter build apk --release --target lib/main_prod.dart 
 
       - uses: actions/upload-artifact@v2
         with:

.gitignore

@@ -26,7 +26,7 @@
 /build/
 lib/l10n/gen
 # We regenerate this every time due to logic in Podfile `post_install` section.
-/ios/Podfile.lock
+ios/Podfile.lock
 
 # Web related
 lib/generated_plugin_registrant.dart

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.10.10 - 2023-07-29
+- Fixed issues with video player
+- Show thumbnails in full height cards
+- Fixed list view refresh
+- Updated defaults for themes
+- Remove duplicates from infinite scroll
+
 ## v0.10.9 - 2023-07-14
 - More design tweaks (zachatrocity)
 - Improvements to swipe actions (shocklateboy92)

CONTRIBUTING.md

@@ -12,10 +12,12 @@ Everything is formatted with `dart format` (no flags) and linted with `flutter a
 
 ## Translations
 
-### Weblate
+We intend to eventually use Weblate to allow you to contribute translation strings to Liftoff, but in the meantime you can look at the files in /assets/i10n -- intl_en.arb is our master file, which contains all the strings that should be translated, and the others are translation files contributed by our users. If you want to add or update a translation file before we get Weblate up and running, you can create an issue in GitHub with the translation file attached and we can add it into the build.
 
-Lemmy devs are kindly hosting liftoff translation strings on their [Weblate instance](https://weblate.yerbamate.ml/projects/liftoff/liftoff/). Feel free to contribute strings there, we regularly sync string changes with Weblate.
+<!-- ### Weblate
 
+Lemmy devs are kindly hosting liftoff translation strings on their [Weblate instance](https://weblate.yerbamate.ml/projects/liftoff/liftoff/). Feel free to contribute strings there, we regularly sync string changes with Weblate.
+-->
 We use flutter's native file format for translations: ARB, which itself uses the ICU message syntax. In most cases you will be able to deduce the syntax based on the source string. Here are 3 important examples:
 
 1. Placeholders

assets/l10n/intl_en.arb

@@ -705,5 +705,15 @@
   "comment_tag_you": "YOU",
   "@comment_tag_you": {},
   "code_of_conduct_clickthrough": "By accessing the Lemmy network using Liftoff! you agree to adhere to our Code of Conduct",
-  "@code_of_conduct_clickthrough": {}
-}
+  "@code_of_conduct_clickthrough": {},
+  "instance_filter": "Instance filter",
+  "@instance_filter": {},
+  "instance_filter_explanation": "A list of terms in names of instances you wish to block from all your post feeds. A good start is: nsfw porn yiff",
+  "@instance_filter_explanation": {},
+  "instance_filter_add": "Add term",
+  "@instance_filter_add": {},
+  "instance_filter_none": "No filters chosen",
+  "@instance_filter_none": {},
+  "sensitive_content": "Sensitive Content",
+  "@sensitive_content": {}
+}

fastlane/metadata/android/en-US/changelogs/32.txt

@@ -0,0 +1,5 @@
+- Show thumbnails in full height cards
+- Fixed list view refresh
+- Updated defaults for themes
+- Remove duplicates from infinite scroll
+

ios/Runner.xcodeproj/project.pbxproj

@@ -376,6 +376,7 @@
 			baseConfigurationReference = E1A6772F7FB9970AB1AB2682 /* Pods-Runner.debug-prod.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				BUNDLE_NAME = "Liftoff!";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
@@ -465,6 +466,7 @@
 			baseConfigurationReference = 1DDB765AC59CE6BE74A0D52A /* Pods-Runner.release-prod.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				BUNDLE_NAME = "Liftoff!";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
@@ -554,6 +556,7 @@
 			baseConfigurationReference = DC3DFF228D52D7ED36CDD540 /* Pods-Runner.profile-dev.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				BUNDLE_NAME = "Liftoff! DEV";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
@@ -702,6 +705,7 @@
 			baseConfigurationReference = 6AE5AC98872EE326B6FB9182 /* Pods-Runner.debug-dev.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				BUNDLE_NAME = "Liftoff! DEV";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
@@ -740,6 +744,7 @@
 			baseConfigurationReference = 7E657A51BD7C018DCF5B54AD /* Pods-Runner.release-dev.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				BUNDLE_NAME = "Liftoff! DEV";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;

ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -1,6 +1,7 @@
 {
   "images" : [
     {
+      "filename" : "app_icon_monochrome.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -15,6 +16,7 @@
       "scale" : "1x"
     },
     {
+      "filename" : "app_icon_monochrome 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -29,6 +31,7 @@
       "scale" : "2x"
     },
     {
+      "filename" : "app_icon_monochrome 2.png",
       "idiom" : "universal",
       "scale" : "3x"
     },

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -36,6 +36,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="666.66668701171875" height="1333.3333740234375"/>
+        <image name="LaunchImage" width="500" height="500"/>
     </resources>
 </document>

ios/Runner/Info.plist

@@ -54,11 +54,11 @@
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen.storyboard</string>
+	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiresFullScreen</key>
-	<true/>
+	<false/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

lib/hooks/stores.dart

@@ -16,7 +16,7 @@ V useStore<S extends Store, V>(V Function(S value) selector) {
   useEffect(() {
     return autorun((_) {
       state.value = selector(store);
-    });
+    }).call;
   }, []);
 
   return state.value;

lib/pages/communities_tab.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'dart:async';
 
 import 'package:collection/collection.dart';