Dev (#113)

* upd readme

* fixed screens

* upd screens

* upd

* upd

* upd

* upd

* upd

* upd

* upd version

* added images for nashstore

* issue-103

updated links handling

* issue-103

* issue-105

* d

* d

* d

* d

* d

* d

* в

* d

* d

* d

* d

* d

* d

* d

* d

* d

* d

* s

* d

* d

* d

* d

* d

* d

* d

* d

* d

* d

* d

* d

* r

* d

* issue-105

* issue-109

* issue-110 ci

* d

.github/workflows/test.yaml

@@ -5,5 +5,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - uses: subosito/flutter-action@v2.8.0
-    - run: flutter test
+    - uses: subosito/flutter-action@v2.10.0
+    - run: flutter pub get
+    - run: flutter test --platform=chrome

.gitignore

@@ -45,3 +45,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+README.local.md

README.md

@@ -25,6 +25,15 @@ this command opens chrome window with the app in debug mode
 
 for more commands, see [flutter documentation](https://docs.flutter.dev/get-started/test-drive?tab=terminal)  
 
+### Building
+
+when building for a new release (substitute correct build number):  
+`flutter build apk --build-number=4 --build-name=4.0.0`
+
+
+Install release app on device:  
+`flutter run --release`
+
 ### Test  
 
 [how to run integration test in browser](https://docs.flutter.dev/testing/integration-tests#running-in-a-browser)
@@ -33,9 +42,10 @@ this command runs specific integration test
 `flutter drive --driver integration_test/driver.dart --target integration_test/full_test.dart --no-dds`  
 
 this command runs cpecific widget/unit test  
-`flutter test test/data/data_source_test.dart`  
-
+`flutter test test/layers/data/data_source_test.dart`  
 
+if there's an error because of dart:html, use this
+`flutter test --platform chrome`
 
 
 ## Data sources 

android/app/src/main/AndroidManifest.xml

@@ -42,4 +42,26 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+    <!-- Provide required visibility configuration for API level 30 and above -->
+    <queries>
+        <!-- If your app checks for SMS support -->
+        <!-- <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="sms" />
+        </intent> -->
+        <!-- If your app checks for call support -->
+        <!-- <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="tel" />
+        </intent> -->
+
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="file" />
+        </intent>
+    </queries>
 </manifest>

integration_test/full_test.dart

@@ -1,21 +1,26 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_simple_dependency_injection/injector.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
-import 'package:the_elder_scrolls_alchemy_client/data/data_source.dart';
-import 'package:the_elder_scrolls_alchemy_client/main.dart';
-import 'package:the_elder_scrolls_alchemy_client/widgets/components/cards/effect/effect_big.dart';
-import 'package:the_elder_scrolls_alchemy_client/widgets/components/cards/effect/effect_small.dart';
-import 'package:the_elder_scrolls_alchemy_client/widgets/components/cards/ingredient/ingredient_big.dart';
-import 'package:the_elder_scrolls_alchemy_client/widgets/components/search_field.dart';
+import 'package:the_elder_scrolls_alchemy_client/app.dart';
+import 'package:the_elder_scrolls_alchemy_client/di_container.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/data/resources/constant.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/presentation/widgets/components/cards/effect/effect_big.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/presentation/widgets/components/cards/effect/effect_small.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/presentation/widgets/components/cards/ingredient/ingredient_big.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/presentation/widgets/components/search_field.dart';
 
 void main() {
+  final dependencyInjectionContainer = DependencyInjectionContainer().initialise(Injector());
+  final app = dependencyInjectionContainer.get<TheElderScrollsAlchemyClientApp>();
+
   group('general', () {
     final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized() as IntegrationTestWidgetsFlutterBinding;
 
     binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.fullyLive;
 
     testWidgets('Scrolling test', (tester) async {
-      await tester.pumpWidget(MyApp());
+      await tester.pumpWidget(app);
 
       await tester.tap(find.text('Effects'));
       await tester.pump();
@@ -32,7 +37,7 @@ void main() {
     });
 
     testWidgets('Test inkwell works as a link', (tester) async {
-      await tester.pumpWidget(MyApp());
+      await tester.pumpWidget(app);
 
       await tester.tap(find.text('Effects'));
       await tester.pump();
@@ -53,17 +58,24 @@ void main() {
 
   group('home page', () {
     testWidgets('Change game', (tester) async {
-      await tester.pumpWidget(MyApp());
+      await tester.pumpWidget(app);
       expect(find.text('Skyrim Alchemy'), findsOneWidget);
 
       await tester.tap(find.text('Effects'));
       await tester.pump();
-
       expect(find.text('Cure Disease'), findsOneWidget);
 
       await tester.tap(find.byType(PopupMenuButton));
       await tester.pump();
-      await tester.tap(find.text(DataSource.gameNameMorrowind));
+      await tester.tap(find.text(Constant.gameNameOblivion));
+      await tester.pump();
+      await tester.tap(find.text('Effects'));
+      await tester.pump();
+      expect(find.text('Shock Shield'), findsOneWidget);
+
+      await tester.tap(find.byType(PopupMenuButton));
+      await tester.pump();
+      await tester.tap(find.text(Constant.gameNameMorrowind));
       await tester.pump();
 
       await tester.tap(find.text('Effects'));
@@ -75,7 +87,7 @@ void main() {
 
   group('search', () {
     testWidgets('search', (tester) async {
-      await tester.pumpWidget(MyApp());
+      await tester.pumpWidget(app);
       await tester.tap(find.text('Effects'));
       await tester.pump();
 
@@ -96,4 +108,26 @@ void main() {
       expect(find.byType(EffectCardSmall), findsOneWidget);
     });
   });
+
+  group('left panel', () {
+    testWidgets('items are marked as selected', (tester) async {
+      await tester.pumpWidget(app);
+      await tester.pump();
+
+      final navigationRailFinder = find.byType(NavigationRail);
+      expect(navigationRailFinder, findsOneWidget);
+      NavigationRail navigationRail = tester.firstWidget(navigationRailFinder);
+      expect(navigationRail.selectedIndex, 0);
+
+      await tester.tap(find.text('Effects'));
+      await tester.pump();
+
+      expect(navigationRail.selectedIndex, 1);
+
+      await tester.tap(find.text('Ingredients'));
+      await tester.pump();
+
+      expect(navigationRail.selectedIndex, 2);
+    });
+  });
 }

ios/Runner/Info.plist

@@ -2,6 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+	<string>sms</string>
+	<string>tel</string>
+	<string>https</string>
+	<string>file</string>
+	</array>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>

lib/app.dart

@@ -0,0 +1,90 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/data/resources/constant.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/presentation/widgets/app_widget.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/state_management/app_state.dart';
+
+class TheElderScrollsAlchemyClientApp extends StatelessWidget {
+  const TheElderScrollsAlchemyClientApp({Key? key}) : super(key: key);
+
+  static Future<String> getSavedGameName() async {
+    String? gameNameFromPreferences = await getGameNameFromPreferences();
+    if (gameNameFromPreferences == null) {
+      return Constant.fallbackGameName;
+    }
+    return gameNameFromPreferences;
+  }
+
+  static String getLocaleLanguageCode(BuildContext context) {
+    return Localizations.localeOf(context).languageCode;
+  }
+
+  static Future<String> getSavedLanguageCode() async {
+    String? languageCodeFromPreferences = await getLanguageCodeFromPreferences();
+    if (languageCodeFromPreferences == null) {
+      return Constant.fallbackLanguage;
+    }
+    return languageCodeFromPreferences;
+  }
+
+  static Future<String?> getLanguageCodeFromPreferences() async {
+    final prefs = await SharedPreferences.getInstance();
+    final String? languageCode = prefs.getString('languageCode');
+
+    return languageCode;
+  }
+
+  static Future<String?> getGameNameFromPreferences() async {
+    final prefs = await SharedPreferences.getInstance();
+    final String? gameName = prefs.getString('gameName');
+
+    return gameName;
+  }
+
+  AppState setStateFromUrl() {
+    String savedGameName = Constant.fallbackGameName;
+    String savedLanguage = Constant.fallbackLanguage;
+    TheElderScrollsAlchemyClientApp.getSavedGameName().then((value) => savedGameName = value);
+    TheElderScrollsAlchemyClientApp.getSavedLanguageCode().then((value) => savedLanguage = value);
+
+    String chosenTab = Constant.tabHome;
+    String objectName = '';
+
+    if (kIsWeb) {
+      final segments = Uri.base.pathSegments;
+
+      if (segments.length == 2 || segments.length == 3) {
+        savedGameName = segments[0];
+
+        chosenTab = segments[1];
+
+        if (segments.length > 2) {
+          objectName = segments[2];
+        }
+      }
+    }
+
+    return AppState(
+      gameName: savedGameName,
+      language: savedLanguage,
+      chosenTab: chosenTab,
+      chosenEffectName: chosenTab == Constant.tabEffects ? objectName : '',
+      chosenIngredientName: chosenTab == Constant.tabIngredients ? objectName : '',
+      urlPath: Uri.base.path,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final state = setStateFromUrl();
+
+    final blocProvider = BlocProvider(
+      create: (_) => state,
+      child: const AppWidget(),
+    );
+
+    return blocProvider;
+  }
+}

lib/di_container.dart

@@ -0,0 +1,21 @@
+import 'package:flutter_simple_dependency_injection/injector.dart';
+import 'package:the_elder_scrolls_alchemy_client/app.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/business_logic/services/settings_manager.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/state_management/app_state.dart';
+import 'package:the_elder_scrolls_alchemy_client/layers/state_management/custom_navigator.dart';
+import 'package:the_elder_scrolls_alchemy_client/router.dart';
+
+class DependencyInjectionContainer {
+  Injector initialise(Injector injector) {
+    injector.map<SettingsManager>((injector) => SettingsManager(), isSingleton: true);
+
+    injector.map<AppState>((injector) => AppState(), isSingleton: true);
+
+    injector.map<TheElderScrollsAlchemyClientApp>(
+      (injector) => TheElderScrollsAlchemyClientApp(),
+      isSingleton: true,
+    );
+
+    return injector;
+  }
+}

lib/helpers/link_launcher.dart

@@ -0,0 +1,9 @@
+import 'package:url_launcher/url_launcher.dart';
+
+class LinkLauncher {
+  static Future<void> launch({required String url}) async {
+    if (!await launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication)) {
+      throw Exception('Could not launch $url');
+    }
+  }
+}

lib/l10n/app_en.arb

@@ -16,6 +16,7 @@
   "ingredientWeight":"weight",
   "ingredientText": "description",
   "ingredientHarvestProbability":"harvest probability",
+  "ingredientOrigin":"origin",
 
   "ingredientsByEffectNoIngredients" :"no ingredients",
   "ingredientsByEffectInPosition": "In position",
@@ -30,6 +31,6 @@
   "homePageChangeGame":"Change game",
   "homePageChangeLanguage": "Change language",
   "homePageDescription": "The Library of Alchemy Effects and Ingredients from 'The Elder Scrolls'.",
-  "homePageDataOriginDescription": "The data are taken from open sources, such as en.uesp.net .",
+  "homePageDataOriginDescription": "The data are taken from open sources, such as en.uesp.net, and are licensed under the Creative Commons by-sa license",
   "homeNavigation":"Home"
 }

lib/l10n/app_ru.arb

@@ -16,6 +16,7 @@
   "ingredientWeight":"вес",
   "ingredientText": "описание",
   "ingredientHarvestProbability":"вероятность сбора",
+  "ingredientOrigin":"источник",
 
   "ingredientsByEffectNoIngredients" :"нет ингредиентов",
   "ingredientsByEffectInPosition": "В позиции",
@@ -29,6 +30,6 @@
   "homePageChangeGame":"Изменить игру",
   "homePageChangeLanguage": "Изменить язык",
   "homePageDescription": "Справочник алхимических эффектов и ингредиентов из 'Древних свитков'.",
-  "homePageDataOriginDescription": "Данные взяты из открытых источников, напр. en.uesp.net .",
+  "homePageDataOriginDescription": "Данные взяты из открытых источников, напр. en.uesp.net, и лицензированы Creative Commons by-sa",
   "homeNavigation":"Домой"
 }