Merge branch 'master' into release

shoma2da · Apr 15, 2016 · e238246 · e238246
2 parents c9deb41 + 3f363ad
commit e238246
Show file tree

Hide file tree

Showing 214 changed files with 2,248 additions and 168 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.hatenablog.shoma2da.android.timer"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 111
-        versionName "1.1.4"
+        versionCode 112
+        versionName "2.0.0"
     }
     signingConfigs {
         release {
@@ -44,14 +44,18 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.google.android.gms:play-services-ads:8.4.0'
     compile 'com.google.android.gms:play-services-analytics:8.4.0'
+    compile 'com.android.support:design:23.2.1'
+    compile 'com.android.support:appcompat-v7:23.2.1'
+    compile 'com.android.support:preference-v14:23.2.1'
     compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
         transitive = true;
     }
     compile 'com.parse.bolts:bolts-android:1.+'
     compile 'com.parse:parse-android:1.+'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile 'com.jakewharton.timber:timber:4.1.0'
-    compile 'co.meyasuba.android.sdk:meyasubaco-sdk:0.+'
+    compile 'co.meyasuba.android.sdk:meyasubaco-sdk:0.8.0'
+
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.+'

diff --git a/app/libs/appc_cloud_2.0.1.jar b/app/libs/appc_cloud_2.0.1.jar
diff --git a/...a2da/android/timer/v1_2/AppInitializer.kt → ...oma2da/android/timer/v2/AppInitializer.kt b/...a2da/android/timer/v1_2/AppInitializer.kt → ...oma2da/android/timer/v2/AppInitializer.kt
@@ -1,4 +1,4 @@
-package com.hatenablog.shoma2da.android.timer.v1_2
+package com.hatenablog.shoma2da.android.timer.v2
 
 import timber.log.Timber
 

diff --git a/.../shoma2da/android/timer/v1_2/Injection.kt → ...og/shoma2da/android/timer/v2/Injection.kt b/.../shoma2da/android/timer/v1_2/Injection.kt → ...og/shoma2da/android/timer/v2/Injection.kt
@@ -1,7 +1,7 @@
-package com.hatenablog.shoma2da.android.timer.v1_2
+package com.hatenablog.shoma2da.android.timer.v2
 
 import android.content.Context
-import com.hatenablog.shoma2da.android.timer.v1_2.log.Logger
+import com.hatenablog.shoma2da.android.timer.v2.log.Logger
 
 class Injection {
 

diff --git a/app/src/debug/res/drawable-xxhdpi/ic_launcher.png b/app/src/debug/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,32 +19,32 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:name=".v1_2.TimerApplication"
-        android:theme="@android:style/Theme.Holo.Light" >
+        android:name=".v2.TimerApplication"
+        android:theme="@style/TimerTheme" >
         <activity
-            android:name=".v1_2.entrypoint.presentation.activity.MainActivity"
+            android:name=".v2.entrypoint.presentation.activity.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".v1_2.entrypoint.presentation.activity.CountdownActivity"
+        <activity android:name=".v2.entrypoint.presentation.activity.CountdownActivity"
             android:launchMode="singleTask"
             android:configChanges="orientation|screenSize"
             />
-        <activity android:name=".v1_2.entrypoint.presentation.activity.SettingActivity"
-            android:parentActivityName=".v1_2.entrypoint.presentation.activity.MainActivity"
+        <activity android:name=".v2.entrypoint.presentation.activity.SettingActivity"
+            android:parentActivityName=".v2.entrypoint.presentation.activity.MainActivity"
             >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".v1_2.entrypoint.presentation.activity.MainActivity" />
+                android:value=".v2.entrypoint.presentation.activity.MainActivity" />
         </activity>
 
-        <service android:name=".v1_2.domain.countdown.CountdownService" />
-        <service android:name=".v1_2.domain.notificationlauncher.NotificationLauncherService" />
+        <service android:name=".v2.domain.countdown.CountdownService" />
+        <service android:name=".v2.domain.notificationlauncher.NotificationLauncherService" />
 
-        <receiver android:name=".v1_2.entrypoint.receiver.BootCompletedReceiver" android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
+        <receiver android:name=".v2.entrypoint.receiver.BootCompletedReceiver" android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
                 <action android:name="android.intent.action.PACKAGE_CHANGED"/>

diff --git a/...atenablog/shoma2da/android/timer/v1_2/entrypoint/presentation/activity/SettingActivity.kt b/...atenablog/shoma2da/android/timer/v1_2/entrypoint/presentation/activity/SettingActivity.kt
diff --git a/...da/android/timer/v1_2/TimerApplication.kt → ...a2da/android/timer/v2/TimerApplication.kt b/...da/android/timer/v1_2/TimerApplication.kt → ...a2da/android/timer/v2/TimerApplication.kt
@@ -1,8 +1,8 @@
-package com.hatenablog.shoma2da.android.timer.v1_2
+package com.hatenablog.shoma2da.android.timer.v2
 
 import android.app.Application
 import co.meyasuba.android.sdk.Meyasubaco
-import com.hatenablog.shoma2da.android.timer.v1_2.log.Logger
+import com.hatenablog.shoma2da.android.timer.v2.log.Logger
 import com.parse.Parse
 import com.parse.ParseInstallation
 

diff --git a/...v1_2/domain/countdown/CountdownService.kt → ...r/v2/domain/countdown/CountdownService.kt b/...v1_2/domain/countdown/CountdownService.kt → ...r/v2/domain/countdown/CountdownService.kt
@@ -1,15 +1,15 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.domain.countdown
+package com.hatenablog.shoma2da.android.timer.v2.domain.countdown
 
 import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.os.IBinder
 import android.os.PowerManager
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.library.remaintime.RemainTime
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.remaintime.RemainTimeCounter
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.library.remaintime.CountdownNotification
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.notificationlauncher.NotificationLauncherService
-import com.hatenablog.shoma2da.android.timer.v1_2.entrypoint.presentation.activity.CountdownActivity
+import com.hatenablog.shoma2da.android.timer.v2.domain.library.remaintime.RemainTime
+import com.hatenablog.shoma2da.android.timer.v2.domain.remaintime.RemainTimeCounter
+import com.hatenablog.shoma2da.android.timer.v2.domain.library.remaintime.CountdownNotification
+import com.hatenablog.shoma2da.android.timer.v2.domain.notificationlauncher.NotificationLauncherService
+import com.hatenablog.shoma2da.android.timer.v2.entrypoint.presentation.activity.CountdownActivity
 
 class CountdownService : Service() {
 

diff --git a/...brary/remaintime/CountdownNotification.kt → ...brary/remaintime/CountdownNotification.kt b/...brary/remaintime/CountdownNotification.kt → ...brary/remaintime/CountdownNotification.kt
@@ -1,4 +1,4 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.domain.library.remaintime
+package com.hatenablog.shoma2da.android.timer.v2.domain.library.remaintime
 
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -8,7 +8,7 @@ import android.content.Intent
 import android.graphics.BitmapFactory
 import android.support.v4.app.NotificationCompat
 import com.hatenablog.shoma2da.android.timer.R
-import com.hatenablog.shoma2da.android.timer.v1_2.entrypoint.presentation.activity.CountdownActivity
+import com.hatenablog.shoma2da.android.timer.v2.entrypoint.presentation.activity.CountdownActivity
 
 class CountdownNotification(val service: Service) {
 

diff --git a/...2/domain/library/remaintime/RemainTime.kt → ...2/domain/library/remaintime/RemainTime.kt b/...2/domain/library/remaintime/RemainTime.kt → ...2/domain/library/remaintime/RemainTime.kt
@@ -1,6 +1,6 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.domain.library.remaintime
+package com.hatenablog.shoma2da.android.timer.v2.domain.library.remaintime
 
-import com.hatenablog.shoma2da.android.timer.v1_2.util.extensions.format
+import com.hatenablog.shoma2da.android.timer.v2.util.extensions.format
 import java.io.Serializable
 
 class RemainTime(val minutes:Int, val seconds:Int) : Serializable {

diff --git a/...n/notificationlauncher/NotificationIds.kt → ...n/notificationlauncher/NotificationIds.kt b/...n/notificationlauncher/NotificationIds.kt → ...n/notificationlauncher/NotificationIds.kt
@@ -1,4 +1,4 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.domain.notificationlauncher
+package com.hatenablog.shoma2da.android.timer.v2.domain.notificationlauncher
 
 class NotificationIds {
 

diff --git a/...onlauncher/NotificationLauncherService.kt → ...onlauncher/NotificationLauncherService.kt b/...onlauncher/NotificationLauncherService.kt → ...onlauncher/NotificationLauncherService.kt
@@ -1,4 +1,4 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.domain.notificationlauncher
+package com.hatenablog.shoma2da.android.timer.v2.domain.notificationlauncher
 
 import android.app.Service
 import android.content.Intent

diff --git a/...in/please_review/PleaseReviewCondition.kt → ...in/please_review/PleaseReviewCondition.kt b/...in/please_review/PleaseReviewCondition.kt → ...in/please_review/PleaseReviewCondition.kt
@@ -1,4 +1,4 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.domain.please_review
+package com.hatenablog.shoma2da.android.timer.v2.domain.please_review
 
 import android.content.SharedPreferences
 

diff --git a/...1_2/domain/please_review/ReviewRequest.kt → .../v2/domain/please_review/ReviewRequest.kt b/...1_2/domain/please_review/ReviewRequest.kt → .../v2/domain/please_review/ReviewRequest.kt
@@ -1,8 +1,8 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.domain.please_review
+package com.hatenablog.shoma2da.android.timer.v2.domain.please_review
 
 import android.app.Activity
 import android.preference.PreferenceManager
-import com.hatenablog.shoma2da.android.timer.v1_2.entrypoint.presentation.dialog.PleaseReviewDialog
+import com.hatenablog.shoma2da.android.timer.v2.entrypoint.presentation.dialog.PleaseReviewDialog
 
 class ReviewRequest {
     fun show(activity: Activity) {

diff --git a/..._2/domain/remaintime/RemainTimeCounter.kt → ...v2/domain/remaintime/RemainTimeCounter.kt b/..._2/domain/remaintime/RemainTimeCounter.kt → ...v2/domain/remaintime/RemainTimeCounter.kt
@@ -1,6 +1,6 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.domain.remaintime
+package com.hatenablog.shoma2da.android.timer.v2.domain.remaintime
 
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.library.remaintime.RemainTime
+import com.hatenablog.shoma2da.android.timer.v2.domain.library.remaintime.RemainTime
 import kotlin.concurrent.timer
 
 class RemainTimeCounter(val time: RemainTime) {

diff --git a/...tlin/com/hatenablog/shoma2da/android/timer/v2/domain/setting/NotificationLengthSetting.kt b/...tlin/com/hatenablog/shoma2da/android/timer/v2/domain/setting/NotificationLengthSetting.kt
@@ -0,0 +1,21 @@
+package com.hatenablog.shoma2da.android.timer.v2.domain.setting
+
+import android.content.Context
+import android.preference.PreferenceManager
+
+class NotificationLengthSetting(val context:Context) {
+
+    companion object {
+        fun load(context: Context): NotificationLengthSetting {
+            return NotificationLengthSetting(context)
+        }
+    }
+
+    fun action(callback:(isLimitLess:Boolean, length:Int) -> Unit) {
+        val pref = PreferenceManager.getDefaultSharedPreferences(context) ?: return
+
+        val length = Integer.parseInt(pref.getString("notification_length", "-1"))
+        val isLimitLess = (length == -1)
+        callback.invoke(isLimitLess, length)
+    }
+}
diff --git a/...tionlauncher/NotificationMethodSetting.kt → ...main/setting/NotificationMethodSetting.kt b/...tionlauncher/NotificationMethodSetting.kt → ...main/setting/NotificationMethodSetting.kt
@@ -1,4 +1,4 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.domain.notificationlauncher
+package com.hatenablog.shoma2da.android.timer.v2.domain.setting
 
 import android.content.Context
 import android.preference.PreferenceManager

diff --git a/...resentation/activity/CountdownActivity.kt → ...resentation/activity/CountdownActivity.kt b/...resentation/activity/CountdownActivity.kt → ...resentation/activity/CountdownActivity.kt
@@ -1,17 +1,15 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.entrypoint.presentation.activity
+package com.hatenablog.shoma2da.android.timer.v2.entrypoint.presentation.activity
 
 import android.app.Activity
-import android.app.AlertDialog
 import android.app.Dialog
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
+import android.content.*
 import android.content.res.Configuration
 import android.media.MediaPlayer
 import android.os.Bundle
 import android.os.Vibrator
 import android.preference.PreferenceManager
+import android.support.v7.app.AlertDialog
+import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import android.view.*
 import android.view.View.OnClickListener
@@ -20,15 +18,20 @@ import android.widget.TextView
 import com.google.android.gms.ads.AdListener
 import com.google.android.gms.ads.AdView
 import com.hatenablog.shoma2da.android.timer.R
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.countdown.CountdownService
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.library.remaintime.RemainTime
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.notificationlauncher.NotificationMethodSetting
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.please_review.PleaseReviewCondition
-import com.hatenablog.shoma2da.android.timer.v1_2.util.extensions.getLogger
-import com.hatenablog.shoma2da.android.timer.v1_2.util.extensions.isSilentMode
-import com.hatenablog.shoma2da.android.timer.v1_2.util.extensions.load
-
-public class CountdownActivity : Activity() {
+import com.hatenablog.shoma2da.android.timer.v2.domain.countdown.CountdownService
+import com.hatenablog.shoma2da.android.timer.v2.domain.library.remaintime.RemainTime
+import com.hatenablog.shoma2da.android.timer.v2.domain.please_review.PleaseReviewCondition
+import com.hatenablog.shoma2da.android.timer.v2.domain.setting.NotificationLengthSetting
+import com.hatenablog.shoma2da.android.timer.v2.domain.setting.NotificationMethodSetting
+import com.hatenablog.shoma2da.android.timer.v2.util.extensions.getLogger
+import com.hatenablog.shoma2da.android.timer.v2.util.extensions.isSilentMode
+import com.hatenablog.shoma2da.android.timer.v2.util.extensions.load
+import com.hatenablog.shoma2da.android.timer.v2.util.extensions.tweet
+import java.util.concurrent.TimeUnit
+import kotlin.concurrent.thread
+import kotlin.concurrent.timer
+
+public class CountdownActivity : AppCompatActivity() {
 
     companion object {
         val TIME_PARAM_NAME = "time_param"
@@ -202,6 +205,21 @@ public class CountdownActivity : Activity() {
                     }
                 )
 
+                NotificationLengthSetting.load(this).action { isLimitLess, length ->
+                    if (isLimitLess) {
+                        return@action
+                    }
+
+                    thread {
+                        Thread.sleep(length * 1000L)
+
+                        if (player.isPlaying) {
+                            player.stop()
+                        }
+                        vibrator.cancel()
+                    }
+                }
+
                 //Analytics
                 val logger = application.getLogger()
                 logger.sendEvent("timer", "finish")
@@ -224,6 +242,21 @@ public class CountdownActivity : Activity() {
                 dialogLayout.findViewById(R.id.button_ok).setOnClickListener {
                     stopNotification(player, vibrator)
                 }
+                val pref = PreferenceManager.getDefaultSharedPreferences(this);
+                if (pref.getBoolean("already_click_share_button", false)) {
+                    dialogLayout.findViewById(R.id.button_share).visibility = View.GONE
+                }
+                dialogLayout.findViewById(R.id.button_share).setOnClickListener {
+                    pref.edit().putBoolean("already_click_share_button", true).apply();
+
+                    application.tweet("タイマーはこれぐらいの簡単さがちょうど良いかも! %23瞬間タイマー", "https://play.google.com/store/apps/details?id=com.hatenablog.shoma2da.android.timer&hl=ja&utm_source=app_share&utm_medium=app&utm_campaign=app_share")
+                    logger.sendEvent("timer", "share")
+
+                    if (player.isPlaying) {
+                        player.stop()
+                    }
+                    vibrator.cancel()
+                }
                 dialog.setContentView(dialogLayout)
 
                 //広告読み込み

diff --git a/...int/presentation/activity/MainActivity.kt → ...int/presentation/activity/MainActivity.kt b/...int/presentation/activity/MainActivity.kt → ...int/presentation/activity/MainActivity.kt
@@ -1,19 +1,17 @@
-package com.hatenablog.shoma2da.android.timer.v1_2.entrypoint.presentation.activity
+package com.hatenablog.shoma2da.android.timer.v2.entrypoint.presentation.activity
 
-import android.app.Activity
 import android.content.Intent
-import android.media.AudioManager
 import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import co.meyasuba.android.sdk.Meyasubaco
 import com.hatenablog.shoma2da.android.timer.R
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.notificationlauncher.NotificationLauncherService
-import com.hatenablog.shoma2da.android.timer.v1_2.domain.please_review.ReviewRequest
-import com.hatenablog.shoma2da.android.timer.v1_2.util.extensions.getAudioManager
-import com.hatenablog.shoma2da.android.timer.v1_2.util.extensions.getLogger
+import com.hatenablog.shoma2da.android.timer.v2.domain.notificationlauncher.NotificationLauncherService
+import com.hatenablog.shoma2da.android.timer.v2.domain.please_review.ReviewRequest
+import com.hatenablog.shoma2da.android.timer.v2.util.extensions.getLogger
 
-class MainActivity : Activity() {
+class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstance : Bundle?) {
         super.onCreate(savedInstance)

diff --git a/.../hatenablog/shoma2da/android/timer/v2/entrypoint/presentation/activity/SettingActivity.kt b/.../hatenablog/shoma2da/android/timer/v2/entrypoint/presentation/activity/SettingActivity.kt
@@ -0,0 +1,25 @@
+package com.hatenablog.shoma2da.android.timer.v2.entrypoint.presentation.activity
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import com.hatenablog.shoma2da.android.timer.R
+import com.hatenablog.shoma2da.android.timer.v2.entrypoint.presentation.fragment.SettingFragment
+import com.hatenablog.shoma2da.android.timer.v2.util.extensions.getLogger
+
+class SettingActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstance : Bundle?) {
+        super.onCreate(savedInstance)
+
+        fragmentManager.beginTransaction()
+                .replace(android.R.id.content, SettingFragment()).commit();
+
+        //Analytics
+        val logger = application.getLogger()
+        logger.sendScreenLog("SettingActivity")
+
+        setTitle(R.string.setting)
+        actionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+
+}