diff --git a/.gitignore b/.gitignore index a4c7838..e1601d1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /build /captures .externalNativeBuild +.apk + diff --git a/app/build.gradle b/app/build.gradle index dd8736c..6a3a1b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,33 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + productFlavors { + dev { + applicationId "jp.juggler.fadownloader.dev" + } + rc { + applicationId "jp.juggler.fadownloader" + } + } + + + // Generate Signed APK のファイル名を変更 + applicationVariants.all { variant -> + if (variant.buildType.name.equals("release")) { + variant.outputs.each { output -> + if (output.outputFile != null && output.outputFile.name.endsWith('.apk')) { + // Rename APK + def versionCode = defaultConfig.versionCode + def versionName = defaultConfig.versionName + def flavor = variant.flavorName + def date = new java.text.SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date()) + def newName = "jp.juggler.fadownloader-${versionCode}-${versionName}-${date}-${flavor}.apk" + output.outputFile = new File((String) output.outputFile.parent, (String) newName) + } + } + } + } } dependencies { diff --git a/app/src/dev/AndroidManifest.xml b/app/src/dev/AndroidManifest.xml new file mode 100644 index 0000000..62d2516 --- /dev/null +++ b/app/src/dev/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/dev/java/config/BuildVariant.java b/app/src/dev/java/config/BuildVariant.java new file mode 100644 index 0000000..f01cca6 --- /dev/null +++ b/app/src/dev/java/config/BuildVariant.java @@ -0,0 +1,6 @@ +package config; + +public class BuildVariant{ + public static final String DATA_PROVIDER_AUTHORITY="jp.juggler.fadownloader.data.dev"; +} + diff --git a/app/src/dev/res/values/strings.xml b/app/src/dev/res/values/strings.xml new file mode 100644 index 0000000..2862d9b --- /dev/null +++ b/app/src/dev/res/values/strings.xml @@ -0,0 +1,3 @@ + + (dev)FA Downloader + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a7ed86a..39902c6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ - @@ -11,7 +12,7 @@ - - @@ -41,7 +36,7 @@ - FA Downloader FlashAir URL Local Folder Repeat Interval @@ -78,4 +77,5 @@ ファイル確認中 %s ファイル取得中 %s スレッド終了 + FlashAir更新ステータスのデータエラー diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d9c4c76..ed42278 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,4 @@ - FA Downloader FlashAir URL Local Folder Repeat Interval @@ -78,5 +77,5 @@ FILE %s DOWNLOADING: %s thread stopped - parse error. (FlashAir update status) + FlashAir update status data error diff --git a/app/src/rc/AndroidManifest.xml b/app/src/rc/AndroidManifest.xml new file mode 100644 index 0000000..98f79b3 --- /dev/null +++ b/app/src/rc/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/rc/java/config/BuildVariant.java b/app/src/rc/java/config/BuildVariant.java new file mode 100644 index 0000000..9647f8d --- /dev/null +++ b/app/src/rc/java/config/BuildVariant.java @@ -0,0 +1,6 @@ +package config; + +public class BuildVariant{ + public static final String DATA_PROVIDER_AUTHORITY="jp.juggler.fadownloader.data"; +} + diff --git a/app/src/rc/res/values/strings.xml b/app/src/rc/res/values/strings.xml new file mode 100644 index 0000000..260f634 --- /dev/null +++ b/app/src/rc/res/values/strings.xml @@ -0,0 +1,3 @@ + + FA Downloader + diff --git a/ic_launcher-512.png b/ic_launcher-512.png new file mode 100644 index 0000000..614d3e1 Binary files /dev/null and b/ic_launcher-512.png differ diff --git a/play-store-bg.jpg b/play-store-bg.jpg new file mode 100644 index 0000000..659fb8a Binary files /dev/null and b/play-store-bg.jpg differ diff --git a/play-store-promo.jpg b/play-store-promo.jpg new file mode 100644 index 0000000..c83935c Binary files /dev/null and b/play-store-promo.jpg differ