изменены переменные окружения, скрипты, инструкция упрощена

iska9der · iska9der · commit 7edd480cde6b · 2025-06-21T01:37:20.000+03:00
diff --git a/.env.example b/.env.example
@@ -1,3 +1,3 @@
-ENV=prod
+ENV=prod # prod, dev, test
 CONTACT_EMAIL=example@gmail.com
 CONTACT_TG=username
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -43,7 +43,7 @@ jobs:
         flutter-version-file: pubspec.yaml
 
     - name: Configure .env
-      run: echo "$ENV_B64" | base64 --decode > .env
+      run: echo "$ENV_B64" | base64 --decode > .env.prod
       env:
         ENV_B64: ${{ secrets.ENV_B64 }}
 
@@ -67,7 +67,7 @@ jobs:
         flutter pub run build_runner build
 
     - name: Build APKs
-      run: flutter build apk --release --split-per-abi --dart-define-from-file .env
+      run: flutter build apk --release --split-per-abi --dart-define-from-file .env.prod
 
     - name: Archive APK
       uses: actions/upload-artifact@v4
@@ -80,4 +80,4 @@ jobs:
       run: |
         rm -f android/app/keystore.jks
         rm -f android/key.properties
-        rm -f .env
+        rm -f .env.prod
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -57,7 +57,7 @@ jobs:
         flutter-version-file: pubspec.yaml
 
     - name: Configure .env
-      run: echo "$ENV_B64" | base64 --decode > .env
+      run: echo "$ENV_B64" | base64 --decode > .env.prod
       env:
         ENV_B64: ${{ secrets.ENV_B64 }}
 
@@ -81,7 +81,7 @@ jobs:
         flutter pub run build_runner build
 
     - name: Build APKs
-      run: flutter build apk --release --split-per-abi --dart-define-from-file .env
+      run: flutter build apk --release --split-per-abi --dart-define-from-file .env.prod
 
     - name: Move and rename APKs
       run: |
@@ -124,4 +124,4 @@ jobs:
       run: |
         rm -f android/app/keystore.jks
         rm -f android/key.properties
-        rm -f .env
+        rm -f .env.prod
diff --git a/.gitignore b/.gitignore
@@ -62,5 +62,5 @@ app.*.map.json
 release
 
 # Env files
-.env*.local
-.env
+.env*
+!.env.example
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "type": "dart",
             "args": [
                 "--dart-define-from-file",
-                ".env"
+                ".env.prod"
             ]
         },
         {
@@ -20,7 +20,7 @@
             "flutterMode": "profile",
             "args": [
                 "--dart-define-from-file",
-                ".env"
+                ".env.prod"
             ]
         },
         {
@@ -30,7 +30,7 @@
             "flutterMode": "release",
             "args": [
                 "--dart-define-from-file",
-                ".env"
+                ".env.prod"
             ]
         },
         {
@@ -43,7 +43,7 @@
                 "--web-port",
                 "63080",
                 "--dart-define-from-file",
-                ".env",
+                ".env.prod",
                 "--web-browser-flag",
                 "--disable-web-security",
             ]
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -10,7 +10,7 @@
         "--release",
         "--split-per-abi",
         "--dart-define-from-file",
-        ".env"
+        ".env.prod"
       ],
       "group": "build",
       "problemMatcher": [],
diff --git a/INSTRUCTIONS.md b/INSTRUCTIONS.md
@@ -1,28 +1,20 @@
-## Pre-build
+## Конфигурация
 
-```
-flutter pub get
-```
+1. Создать файл `.env.prod` в корне проекта. Пример можно посмотреть в `.env.example`
 
-```
-if (Platform.isIOS)  {
-    cd ios && pod install && cd ..
-}
-```
+## Сборка
 
+apk
 ```
-flutter pub run build_runner build --delete-conflicting-outputs
+sh scripts/build.sh env=prod --no-runner
 ```
 
-## Build
-
-apk
 ```
-flutter build apk --release --dart-define-from-file .env --split-per-abi
+--env - определяет окружение для сборки
+--no-runner - пропустить запуск build_runner
 ```
 
-## Dev
-###### Testing App Links
+###### Тестирование deeplink через терминал
 
 Android
 ```
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -4,6 +4,20 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
+// Dart env variables
+def dartEnvironmentVariables = [];
+if (project.hasProperty('dart-defines')) {
+    dartEnvironmentVariables = project.property('dart-defines')
+            .split(',')
+            .collectEntries { entry ->
+                def pair = new String(entry.decodeBase64(), 'UTF-8').split('=')
+                [(pair.first()): pair.last()]
+            }
+}
+
+def appName = dartEnvironmentVariables.APP_NAME ?: 'Flabr'
+def appIdSuffix = dartEnvironmentVariables.ENV.toString().equalsIgnoreCase('dev') ? '.dev' : ''
+
 // Keystore properties
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
@@ -51,10 +65,12 @@ android {
 
     defaultConfig {
         applicationId = "ru.iska9der.flabr"
+        applicationIdSuffix = appIdSuffix
         minSdk = Math.max(flutter.minSdkVersion, 21)
         targetSdk = 35
         versionCode = flutterVersionCode.toInteger()
         versionName = flutterVersionName
+        resValue "string", "app_name", appName
     }
 
     splits {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- Application -->
    <application
-        android:label="flabr"
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
diff --git a/ios/.gitignore b/ios/.gitignore
@@ -19,6 +19,7 @@ Flutter/App.framework
 Flutter/Flutter.framework
 Flutter/Flutter.podspec
 Flutter/Generated.xcconfig
+Flutter/Environment.xcconfig
 Flutter/ephemeral/
 Flutter/app.flx
 Flutter/app.zip
diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
 #include "Generated.xcconfig"
+#include "Environment.xcconfig"
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
 #include "Generated.xcconfig"
+#include "Environment.xcconfig"
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -4,16 +4,16 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleName</key>
+	<string>$(APP_NAME)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Flabr</string>
+	<string>$(APP_NAME)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>flabr</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/ios/scripts/extract_dart_defines.sh b/ios/scripts/extract_dart_defines.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+SRCROOT="${SRCROOT:-$(pwd)}"
+
+OUTPUT_FILE="${SRCROOT}/Flutter/Environment.xcconfig"
+: > $OUTPUT_FILE
+
+function decode_url() { echo "${*}" | base64 --decode; }
+
+IFS=',' read -r -a define_items <<<"$DART_DEFINES"
+
+for index in "${!define_items[@]}"
+do
+    item=$(decode_url "${define_items[$index]}")
+
+    lowercase_item=$(echo "$item" | tr '[:upper:]' '[:lower:]')
+    if [[ $lowercase_item != flutter* ]]; then
+        echo "$item" >> "$OUTPUT_FILE"
+    fi
+done
diff --git a/lib/core/constants/environment.dart b/lib/core/constants/environment.dart
@@ -1,8 +1,10 @@
 abstract class AppEnvironment {
-  /// варианты: prod, test
-  static const env = String.fromEnvironment(
-    'ENV',
-    defaultValue: 'prod',
+  /// варианты: prod, dev, test
+  static const env = String.fromEnvironment('ENV', defaultValue: 'prod');
+
+  static const appName = String.fromEnvironment(
+    'APP_NAME',
+    defaultValue: 'Flabr',
   );
 
   static const contactEmail = String.fromEnvironment(
diff --git a/lib/data/repository/publication_vote_repository.dart b/lib/data/repository/publication_vote_repository.dart
@@ -12,6 +12,7 @@ abstract class PublicationVoteRepository {
 }
 
 @prod
+@dev
 @LazySingleton(as: PublicationVoteRepository)
 class PublicationVoteRepositoryApi implements PublicationVoteRepository {
   PublicationVoteRepositoryApi(this.service);
diff --git a/lib/presentation/app.dart b/lib/presentation/app.dart
@@ -8,6 +8,7 @@ import 'package:ya_summary/ya_summary.dart';
 
 import '../bloc/settings/settings_cubit.dart';
 import '../core/component/router/app_router.dart';
+import '../core/constants/constants.dart';
 import '../di/di.dart';
 import '../feature/auth/auth.dart';
 import 'extension/extension.dart';
@@ -67,7 +68,7 @@ class ApplicationView extends StatelessWidget {
     );
 
     return MaterialApp.router(
-      title: 'Flabr',
+      title: AppEnvironment.appName,
       // ignore: deprecated_member_use
       useInheritedMediaQuery: true,
       locale: DevicePreview.locale(context),
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,15 +1,50 @@
-flutter pub get
-# flutter pub run build_runner build --delete-conflicting-outputs
-
 FLABRVER=$(yq -r '.version' 'pubspec.yaml' | cut -d '+' -f 1)
+ENV="prod"
+SKIP_RUNNER=false
+
+# Reading arguments
+for argument in "$@"
+do
+  key=$(echo $argument | cut --fields 1 --delimiter='=')
+  value=$(echo $argument | cut --fields 2 --delimiter='=')
+
+  case "$key" in
+    "env")
+      ENV="$value" ;;
+    "--no-runner")
+      SKIP_RUNNER=true ;;
+    *) ;;
+  esac
+done
+
 echo
-echo "Make release builds for v$FLABRVER"
+echo "Flabr v$FLABRVER [$ENV]"
 echo '--------------------------'
 
+
+echo
+echo "Get dependencies"
+echo '---'
+flutter pub get
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  echo
+  echo "Installing iOS dependencies via Pod"
+  echo '---'
+  cd ios && pod install && cd ..
+fi
+
+if [ "$SKIP_RUNNER" = false ]; then
+echo
+echo "Build dependencies"
+echo '---'
+flutter pub run build_runner build --delete-conflicting-outputs
+fi
+
 echo
 echo "Android: build"
 echo '--------------------------'
-flutter build apk --release --split-per-abi --dart-define-from-file .env
+flutter build apk --release --split-per-abi --dart-define-from-file .env.$ENV
 
 rm -rf release
 mkdir release
@@ -25,7 +60,7 @@ echo "Android: done"
 # echo
 # echo "Web: build"
 # echo '--------------------------'
-# flutter build web --release --dart-define-from-file .env
+# flutter build web --release --dart-define-from-file .env.$env
 # cp -R build/web release/web/
 
 # echo
diff --git a/web/index.html b/web/index.html
@@ -19,19 +19,20 @@
 
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="mobile client for habr.com">
+  <meta name="description" content="client for habr.com">
 
   <!-- iOS meta tags & icons -->
   <meta name="mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="flabr">
+  <meta name="apple-mobile-web-app-title" content="Flabr">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
   <!-- Favicon -->
   <link rel="icon" type="image/png" href="favicon.png" />
 
-  <title>flabr</title>
   <link rel="manifest" href="manifest.json">
+
+  <title>Flabr</title>
 </head>
 
 <body>
diff --git a/web/manifest.json b/web/manifest.json
@@ -1,11 +1,11 @@
 {
-    "name": "flabr",
-    "short_name": "flabr",
+    "name": "Flabr",
+    "short_name": "Flabr",
     "start_url": ".",
     "display": "standalone",
     "background_color": "#0175C2",
     "theme_color": "#0175C2",
-    "description": "mobile client for habr.com",
+    "description": "client for habr.com",
     "orientation": "portrait-primary",
     "prefer_related_applications": false,
     "icons": [

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 -ENV=prod
 +ENV=prod # prod, dev, test
 CONTACT_EMAIL=[email protected]
 CONTACT_TG=username
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"type": "dart",`
`11`	`11`	`"args": [`
`12`	`12`	`"--dart-define-from-file",`
`13`		`- ".env"`
	`13`	`+ ".env.prod"`
`14`	`14`	`]`
`15`	`15`	`},`
`16`	`16`	`{`
`@@ -20,7 +20,7 @@`
`20`	`20`	`"flutterMode": "profile",`
`21`	`21`	`"args": [`
`22`	`22`	`"--dart-define-from-file",`
`23`		`- ".env"`
	`23`	`+ ".env.prod"`
`24`	`24`	`]`
`25`	`25`	`},`
`26`	`26`	`{`
`@@ -30,7 +30,7 @@`
`30`	`30`	`"flutterMode": "release",`
`31`	`31`	`"args": [`
`32`	`32`	`"--dart-define-from-file",`
`33`		`- ".env"`
	`33`	`+ ".env.prod"`
`34`	`34`	`]`
`35`	`35`	`},`
`36`	`36`	`{`
`@@ -43,7 +43,7 @@`
`43`	`43`	`"--web-port",`
`44`	`44`	`"63080",`
`45`	`45`	`"--dart-define-from-file",`
`46`		`- ".env",`
	`46`	`+ ".env.prod",`
`47`	`47`	`"--web-browser-flag",`
`48`	`48`	`"--disable-web-security",`
`49`	`49`	`]`