dev版もビルドが通るようにした

tateisu · Mar 5, 2017 · 21d65d0 · 21d65d0
1 parent 39448c5
commit 21d65d0
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,12 +19,11 @@ android {
     }
 
     productFlavors {
+        rc {
+        }
         dev {
             applicationId "jp.juggler.fadownloader.dev"
         }
-        rc {
-            applicationId "jp.juggler.fadownloader"
-        }
     }
 
 

diff --git a/app/src/dev/google-services.json b/app/src/dev/google-services.json
@@ -0,0 +1,73 @@
+{
+  "project_info": {
+    "project_number": "694255757125",
+    "firebase_url": "https://fadownloader-a5167.firebaseio.com",
+    "project_id": "fadownloader-a5167",
+    "storage_bucket": "fadownloader-a5167.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:694255757125:android:c7de29d7c6639aca",
+        "android_client_info": {
+          "package_name": "jp.juggler.fadownloader"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "694255757125-emlsgvh237g3sr13ia92r70m08qkc16i.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCQYPC9qts5KMMc8_-9d79M9VwJsn1jkjE"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:694255757125:android:f9517ec2916e849b",
+        "android_client_info": {
+          "package_name": "jp.juggler.fadownloader.dev"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "694255757125-emlsgvh237g3sr13ia92r70m08qkc16i.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCQYPC9qts5KMMc8_-9d79M9VwJsn1jkjE"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/app/src/dev/res/values/strings.xml b/app/src/dev/res/values/strings.xml
@@ -1,3 +1,7 @@
-<resources>
-    <string name="app_name" translatable="false">(dev)FA Downloader</string>
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+
+    >
+    <string name="app_name" translatable="false" tools:ignore="MissingTranslation">(dev)FA Downloader</string>
+    <string name="banner_ad_unit_id" translatable="false" tools:ignore="MissingTranslation">ca-app-pub-5890454442862024/7301745198</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
 <resources>
-    <string name="banner_ad_unit_id">ca-app-pub-5890454442862024/8139349992</string>
 
     <string name="flashair_url">FlashAir URL</string>
 
@@ -12,7 +11,7 @@
     <string name="file_type_desc">(delimited by spaces, "*" for wildcard) </string>
     <string name="app_permission_required">app permission required</string>
     <string name="request_permission">request</string>
-    <string name="cancel">cancel</string>
+    <string name="cancel">Cancel</string>
     <string name="setting">setting</string>
     <string name="dotdotdot">…</string>
     <string name="not_selected">(not selected)</string>
@@ -22,7 +21,7 @@
     <string name="file_type_empty">missing file type.</string>
     <string name="log_clear">clear log</string>
     <string name="question">\?</string>
-    <string name="close">close</string>
+    <string name="close">Close</string>
     <string name="help_repeat_interval_text">Repeat IntervalにはREPEAT時の巡回間隔を秒数で指定します。\nデフォルトは30です。\nFlashAirは無線LANにアクセスがない場合に自動的に電源を切るタイムアウト(デフォルト300秒)が存在するため、それより少ない数字を指定することをオススメします。\n</string>
     <string name="help_file_type_text">File type には、転送するファイルの拡張子を指定します。\n空白で区切って複数書けます。\n* はワイルドカードとして解釈されます。\nデフォルトは「.jp*」です</string>
     <string name="help_flashair_url_text">FlashAir URL には、スマホからFlashAirにアクセスする際に使うFlashAir URLを指定してください。\nデフォルトは「http://flashair/」です。\n末尾の / を忘れないでね。 \nなお、サブフォルダを指定してもうまく動きません。</string>

diff --git a/app/google-services.json → app/src/rc/google-services.json b/app/google-services.json → app/src/rc/google-services.json
diff --git a/app/src/rc/res/values/strings.xml b/app/src/rc/res/values/strings.xml
@@ -1,3 +1,8 @@
-<resources>
-    <string name="app_name" translatable="false">FA Downloader</string>
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    >
+    <string name="app_name" translatable="false" tools:ignore="MissingTranslation">FA Downloader</string>
+    <string name="banner_ad_unit_id" translatable="false" tools:ignore="MissingTranslation">ca-app-pub-5890454442862024/8139349992</string>
+
+
 </resources>
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,12 +19,11 @@ android { @@
         }
         productFlavors {
+            rc {
+            }
             dev {
                 applicationId "jp.juggler.fadownloader.dev"
             }
-            rc {
-                applicationId "jp.juggler.fadownloader"
-            }
         }
@@ Expand Down @@