Merge branch 'master' into release/snapstore

xsoulspace · Mar 14, 2024 · 7a4f25e · 7a4f25e
2 parents 15f7254 + bdf09b2
commit 7a4f25e
Show file tree

Hide file tree

Showing 84 changed files with 2,303 additions and 191 deletions.
diff --git a/.fvmrc b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.19.2"
+  "flutter": "3.19.3"
 }
diff --git a/.github/workflows/release_snapstore.workflow.yml b/.github/workflows/release_snapstore.workflow.yml
@@ -5,9 +5,6 @@ on:
   push:
     branches:
       - release/snapstore
-  workflow_dispatch:
-  workflow_call:
-
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.vscode/common.code-snippets b/.vscode/common.code-snippets
@@ -40,3 +40,5 @@
     "body": "/// ********************************************\n/// *      ${1:TITLE} END\n/// ********************************************"
   }
 }
+
+
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,7 +8,7 @@
       80
     ]
   },
-  "dart.flutterSdkPath": ".fvm/versions/3.19.2",
+  "dart.flutterSdkPath": ".fvm/versions/3.19.3",
   "search.exclude": {
     "**/.fvm": true
   },

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,15 @@
-## 3.20 (next)
+## 3.21 (next)
+
+## 3.20
 
 🧩 Puzzle update 🧩
 
 - feat: app updates now visible in projects
+- feat: new website launched!🚀 https://la.xsoulspace.dev Currently have only two pages, but now it fast, convenient and completely written with Dart with [Jaspr framework](https://github.com/schultek/jaspr) and [Tailwind](https://tailwindcss.com):)
 
-- fix: characters limit layout made more compact and cozy
+- fix: characters limit layout made more compact and cozy.
+- fix: language switcher (didn't work after reloading).
+- fix: vertical bar buttons adapted to fit languages.
 
 ## 3.19
 

diff --git a/configs/envs/prod.sample.json b/configs/envs/prod.sample.json
@@ -4,5 +4,6 @@
   "WIREDASH_PROJECT_ID": "",
   "WIREDASH_PROJECT_SECRET": "",
   "GOOGLE_CLIENT_ID": "",
-  "STORE": "snapstore"
+  "STORE": "snapstore",
+  "TELEGRAM_BOT_TOKEN": ""
 }
diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart
@@ -1,8 +1,5 @@
-import 'dart:async';
-
-import 'package:core/core.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:lastanswer/common_imports.dart';
 import 'package:lastanswer/other/other.dart';
 
 Future<void> bootstrap({

diff --git a/lib/home/widgets/vertical_projects_bar.dart b/lib/home/widgets/vertical_projects_bar.dart
@@ -72,26 +72,25 @@ class BarItem extends StatelessWidget {
   @override
   Widget build(final BuildContext context) => GestureDetector(
         onTap: onTap,
-        child: SizedBox(
-          height: 56,
-          child: Stack(
-            children: [
-              SizedBox(
-                height: 50,
-                child: child,
-              ),
-              Positioned(
-                bottom: 0,
-                right: 0,
-                left: 0,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            SizedBox(
+              height: 50,
+              child: child,
+            ),
+            ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 40),
+              child: FittedBox(
+                fit: BoxFit.fitWidth,
                 child: Text(
                   label,
                   textAlign: TextAlign.center,
                   style: context.textTheme.bodySmall,
                 ),
               ),
-            ],
-          ),
+            ),
+          ],
         ),
       );
 }
diff --git a/lib/settings/settings_screen.dart b/lib/settings/settings_screen.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:lastanswer/_library/widgets/widgets.dart';
 import 'package:lastanswer/common_imports.dart';
 import 'package:lastanswer/other/feedback.dart';
@@ -13,7 +14,7 @@ class SettingsScreen extends HookWidget {
     void onBack() => Navigator.pop(context);
     final screenLayout = ScreenLayout.of(context);
     final isAccountViewVisible =
-        context.read<PurchasesNotifier>().isAdSupported;
+        kDebugMode || context.read<PurchasesNotifier>().isAdSupported;
     final appFeaturesNotifier = context.watch<AppFeaturesNotifier>();
     final tabsViews = [
       const GeneralSettingsView(),

diff --git a/lib/settings/views/supporter_view/supporter_view_web.dart b/lib/settings/views/supporter_view/supporter_view_web.dart
@@ -7,6 +7,7 @@ class SupportAppView extends StatelessWidget {
   @override
   Widget build(final BuildContext context) {
     final purhasesNotifier = context.watch<PurchasesNotifier>();
+    final adsNotifier = context.watch<AdsNotifier>();
     final purchasesAdsService = context.watch<PurchasesAdsService>();
     final isAdLoaded = purchasesAdsService.isLoaded;
     final l10n = context.l10n;
@@ -15,14 +16,17 @@ class SupportAppView extends StatelessWidget {
           ? [
               Text(l10n.adPleaseNote),
               const Gap(24),
-              FilledButton.tonal(
-                onPressed: isAdLoaded
-                    ? () async => purhasesNotifier.watchAd(context)
-                    : null,
-                child: isAdLoaded
-                    ? Text(l10n.watchAd)
-                    : const UiCircularProgress(),
-              ),
+              if (adsNotifier.isAllowedToWatchRewarded)
+                FilledButton.tonal(
+                  onPressed: isAdLoaded
+                      ? () async => purhasesNotifier.watchAd(context)
+                      : null,
+                  child: isAdLoaded
+                      ? Text(l10n.watchAd)
+                      : const UiCircularProgress(),
+                )
+              else
+                const Text('Rewards ended. But, please come back tomorrow:)'),
             ]
           : [],
     );