Merge pull request #80 from tri-star/feature/WS-2-image-cache

WS-2：詳細画面でメモリ不足でアプリが落ちないように対処する
tri-star · Nov 12, 2023 · 439f375 · 439f375
2 parents bf05957 + 787dc2d
commit 439f375
Show file tree

Hide file tree

Showing 28 changed files with 1,211 additions and 240 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,6 @@ jobs:
       - env:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
         run: |
-          mkdir -p ./android/app/src/flavors/dev
-          echo $GOOGLE_SERVICES_JSON > ./android/app/src/flavors/dev/google-services.json
+          mkdir -p ./android/app/src/dev
+          echo $GOOGLE_SERVICES_JSON > ./android/app/src/dev/google-services.json
       - run: flutter build apk --dart-define-from-file=dart_defines/dev.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -30,5 +30,14 @@
                 "--debug"
             ]
         },
+        {
+            "name": "strollog(Prod profile)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile",
+            "args": [
+                "--dart-define-from-file=dart_defines/prod.json",
+            ]
+        },
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,12 @@
 {
     "eslint.format.enable": true,
     "eslint.run": "onType",
+    "eslint.validate": [
+        "javascript",
+        "typescript",
+    ],
+    "eslint.workingDirectories": [
+        "functions"
+    ],
     "dart.flutterSdkPath": ".fvm/flutter_sdk"
 }
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -25,7 +25,7 @@ if (flutterVersionName == null) {
 def googleMapsApiKey = localProperties.getProperty("google.maps_api_key_$flavor")
 
 task selectGoogleServicesJson(type: Copy) {
-    from "src/flavors/$flavor/google-services.json"
+    from "src/$flavor/google-services.json"
     into './'
 }
 

diff --git a/dart_defines/dev.json b/dart_defines/dev.json
@@ -2,5 +2,7 @@
     "flavor": "dev",
     "appName": "WalkShare(dev)",
     "appIdSuffix": ".dev",
-    "googleReversedClientId": "com.googleusercontent.apps.1054866575514-9302f0i3b6bkjm5rg9535hc64uuvks63"
+    "googleReversedClientId": "com.googleusercontent.apps.1054866575514-9302f0i3b6bkjm5rg9535hc64uuvks63",
+    "projectId": "walkshare-dev-46242",
+    "region": "us-central1"
 }
diff --git a/firebase.json b/firebase.json
@@ -29,4 +29,4 @@
   "storage": {
     "rules": "storage.rules"
   }
-}
+}
diff --git a/functions/.eslintrc.js b/functions/.eslintrc.js
@@ -15,11 +15,11 @@ module.exports = {
   ],
   parser: "@typescript-eslint/parser",
   parserOptions: {
-    project: ["functions/tsconfig.json", "functions/tsconfig.dev.json"],
+    project: ["tsconfig.json", "tsconfig.dev.json"],
     sourceType: "module",
   },
   ignorePatterns: [
-    "functions/lib/**/*", // Ignore built files.
+    "lib/**/*", // Ignore built files.
   ],
   plugins: [
     "@typescript-eslint",
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,4 +29,4 @@ @@
       "storage": {
         "rules": "storage.rules"
       }
-    }
+    }