Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor

This commit is contained in:
tateisu 2019-10-24 05:13:51 +09:00
parent 3c5283e32a
commit 4ee646687a
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
View File

@ -15,7 +15,6 @@ import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.provider.MediaStore import android.provider.MediaStore
import android.provider.Settings
import android.text.Editable import android.text.Editable
import android.text.SpannableString import android.text.SpannableString
import android.text.TextWatcher import android.text.TextWatcher
@ -607,20 +606,19 @@ class ActAccountSetting
R.id.btnFields -> sendFields() R.id.btnFields -> sendFields()
R.id.btnNotificationStyleEdit -> if(Build.VERSION.SDK_INT >= 26) { R.id.btnNotificationStyleEdit ->
val channel = NotificationHelper.createNotificationChannel(this, account,NotificationHelper.TRACKING_NAME_DEFAULT) NotificationHelper.openNotificationChannelSetting(
val intent = Intent("android.settings.CHANNEL_NOTIFICATION_SETTINGS") this,
intent.putExtra(Settings.EXTRA_CHANNEL_ID, channel.id) account,
intent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName) NotificationHelper.TRACKING_NAME_DEFAULT
startActivity(intent) )
}
R.id.btnNotificationStyleEditReply -> if(Build.VERSION.SDK_INT >= 26) { R.id.btnNotificationStyleEditReply ->
val channel = NotificationHelper.createNotificationChannel(this, account,NotificationHelper.TRACKING_NAME_REPLY) NotificationHelper.openNotificationChannelSetting(
val intent = Intent("android.settings.CHANNEL_NOTIFICATION_SETTINGS") this,
intent.putExtra(Settings.EXTRA_CHANNEL_ID, channel.id) account,
intent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName) NotificationHelper.TRACKING_NAME_REPLY
startActivity(intent) )
}
} }
} }

26
app/src/main/java/jp/juggler/subwaytooter/util/NotificationHelper.kt
View File

@ -4,6 +4,9 @@ import android.annotation.TargetApi
import android.app.NotificationChannel import android.app.NotificationChannel
import android.app.NotificationManager import android.app.NotificationManager
import android.content.Context import android.content.Context
import android.content.Intent
import android.os.Build
import android.provider.Settings
import jp.juggler.subwaytooter.R import jp.juggler.subwaytooter.R
import jp.juggler.subwaytooter.table.SavedAccount import jp.juggler.subwaytooter.table.SavedAccount
@ -17,7 +20,11 @@ object NotificationHelper {
internal const val TRACKING_NAME_REPLY = "reply" internal const val TRACKING_NAME_REPLY = "reply"
@TargetApi(26) @TargetApi(26)
fun createNotificationChannel(context : Context, account : SavedAccount,trackingName:String) =when(trackingName) { fun createNotificationChannel(
context : Context,
account : SavedAccount,
trackingName : String
) = when(trackingName) {
"" -> createNotificationChannel( "" -> createNotificationChannel(
context, context,
account.acct, // id account.acct, // id
@ -42,7 +49,8 @@ object NotificationHelper {
, description : String? // The user-visible description of the channel. , description : String? // The user-visible description of the channel.
, importance : Int , importance : Int
) : NotificationChannel { ) : NotificationChannel {
val notification_manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager? val notification_manager =
context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager?
?: throw NotImplementedError("missing NotificationManager system service") ?: throw NotImplementedError("missing NotificationManager system service")
var channel : NotificationChannel? = null var channel : NotificationChannel? = null
@ -62,4 +70,18 @@ object NotificationHelper {
return channel return channel
} }
fun openNotificationChannelSetting(
context : Context,
account : SavedAccount,
trackingName : String
) {
if(Build.VERSION.SDK_INT >= 26) {
val channel = createNotificationChannel(context, account, trackingName)
val intent = Intent("android.settings.CHANNEL_NOTIFICATION_SETTINGS")
intent.putExtra(Settings.EXTRA_CHANNEL_ID, channel.id)
intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
context.startActivity(intent)
}
}
} }