ProgressDialogのdeprecated警告表示の対策
This commit is contained in:
parent
ac12007723
commit
8ceeb787a5
|
@ -1,7 +1,6 @@
|
||||||
package jp.juggler.subwaytooter
|
package jp.juggler.subwaytooter
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.app.ProgressDialog
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.graphics.Typeface
|
import android.graphics.Typeface
|
||||||
|
@ -32,6 +31,7 @@ import android.widget.TextView
|
||||||
|
|
||||||
import com.jrummyapps.android.colorpicker.ColorPickerDialog
|
import com.jrummyapps.android.colorpicker.ColorPickerDialog
|
||||||
import com.jrummyapps.android.colorpicker.ColorPickerDialogListener
|
import com.jrummyapps.android.colorpicker.ColorPickerDialogListener
|
||||||
|
import jp.juggler.subwaytooter.dialog.ProgressDialogEx
|
||||||
|
|
||||||
import org.apache.commons.io.IOUtils
|
import org.apache.commons.io.IOUtils
|
||||||
import org.apache.commons.io.output.FileWriterWithEncoding
|
import org.apache.commons.io.output.FileWriterWithEncoding
|
||||||
|
@ -862,7 +862,7 @@ class ActAppSetting : AppCompatActivity()
|
||||||
private fun exportAppData() {
|
private fun exportAppData() {
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
val progress = ProgressDialog(this)
|
val progress = ProgressDialogEx(this)
|
||||||
|
|
||||||
val task = @SuppressLint("StaticFieldLeak")
|
val task = @SuppressLint("StaticFieldLeak")
|
||||||
object : AsyncTask<Void, String, File?>() {
|
object : AsyncTask<Void, String, File?>() {
|
||||||
|
|
|
@ -3,7 +3,6 @@ package jp.juggler.subwaytooter
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
import android.app.ProgressDialog
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.content.pm.PackageManager
|
import android.content.pm.PackageManager
|
||||||
|
@ -62,6 +61,7 @@ import jp.juggler.subwaytooter.dialog.DlgTextInput
|
||||||
import jp.juggler.subwaytooter.table.AcctColor
|
import jp.juggler.subwaytooter.table.AcctColor
|
||||||
import jp.juggler.subwaytooter.table.SavedAccount
|
import jp.juggler.subwaytooter.table.SavedAccount
|
||||||
import jp.juggler.subwaytooter.dialog.ActionsDialog
|
import jp.juggler.subwaytooter.dialog.ActionsDialog
|
||||||
|
import jp.juggler.subwaytooter.dialog.ProgressDialogEx
|
||||||
import jp.juggler.subwaytooter.view.ColumnStripLinearLayout
|
import jp.juggler.subwaytooter.view.ColumnStripLinearLayout
|
||||||
import jp.juggler.subwaytooter.view.GravitySnapHelper
|
import jp.juggler.subwaytooter.view.GravitySnapHelper
|
||||||
import jp.juggler.subwaytooter.view.MyEditText
|
import jp.juggler.subwaytooter.view.MyEditText
|
||||||
|
@ -2018,7 +2018,7 @@ class ActMain : AppCompatActivity()
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
val progress = ProgressDialog(this)
|
val progress = ProgressDialogEx(this)
|
||||||
|
|
||||||
val task = @SuppressLint("StaticFieldLeak") object : AsyncTask<Void, String, ArrayList<Column>?>() {
|
val task = @SuppressLint("StaticFieldLeak") object : AsyncTask<Void, String, ArrayList<Column>?>() {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import android.Manifest
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
import android.app.ProgressDialog
|
|
||||||
import android.content.ContentValues
|
import android.content.ContentValues
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
|
@ -53,13 +52,10 @@ import java.util.Locale
|
||||||
import jp.juggler.subwaytooter.api.entity.TootAttachment
|
import jp.juggler.subwaytooter.api.entity.TootAttachment
|
||||||
import jp.juggler.subwaytooter.api.entity.TootStatus
|
import jp.juggler.subwaytooter.api.entity.TootStatus
|
||||||
import jp.juggler.subwaytooter.api.entity.parseItem
|
import jp.juggler.subwaytooter.api.entity.parseItem
|
||||||
import jp.juggler.subwaytooter.dialog.AccountPicker
|
import jp.juggler.subwaytooter.dialog.*
|
||||||
import jp.juggler.subwaytooter.dialog.DlgDraftPicker
|
|
||||||
import jp.juggler.subwaytooter.dialog.DlgTextInput
|
|
||||||
import jp.juggler.subwaytooter.table.AcctColor
|
import jp.juggler.subwaytooter.table.AcctColor
|
||||||
import jp.juggler.subwaytooter.table.PostDraft
|
import jp.juggler.subwaytooter.table.PostDraft
|
||||||
import jp.juggler.subwaytooter.table.SavedAccount
|
import jp.juggler.subwaytooter.table.SavedAccount
|
||||||
import jp.juggler.subwaytooter.dialog.ActionsDialog
|
|
||||||
import jp.juggler.subwaytooter.span.MyClickableSpan
|
import jp.juggler.subwaytooter.span.MyClickableSpan
|
||||||
import jp.juggler.subwaytooter.span.MyClickableSpanClickCallback
|
import jp.juggler.subwaytooter.span.MyClickableSpanClickCallback
|
||||||
import jp.juggler.subwaytooter.util.*
|
import jp.juggler.subwaytooter.util.*
|
||||||
|
@ -1701,7 +1697,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba
|
||||||
private fun restoreDraft(draft : JSONObject) {
|
private fun restoreDraft(draft : JSONObject) {
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
val progress = ProgressDialog(this)
|
val progress = ProgressDialogEx(this)
|
||||||
|
|
||||||
val task = @SuppressLint("StaticFieldLeak")
|
val task = @SuppressLint("StaticFieldLeak")
|
||||||
object : AsyncTask<Void, String, String?>() {
|
object : AsyncTask<Void, String, String?>() {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package jp.juggler.subwaytooter.api
|
package jp.juggler.subwaytooter.api
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.ProgressDialog
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.os.AsyncTask
|
import android.os.AsyncTask
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
|
@ -11,6 +10,7 @@ import java.lang.ref.WeakReference
|
||||||
import java.text.NumberFormat
|
import java.text.NumberFormat
|
||||||
|
|
||||||
import jp.juggler.subwaytooter.App1
|
import jp.juggler.subwaytooter.App1
|
||||||
|
import jp.juggler.subwaytooter.dialog.ProgressDialogEx
|
||||||
import jp.juggler.subwaytooter.table.SavedAccount
|
import jp.juggler.subwaytooter.table.SavedAccount
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -30,8 +30,8 @@ class TootTaskRunner @JvmOverloads constructor(
|
||||||
companion object {
|
companion object {
|
||||||
|
|
||||||
const val PROGRESS_NONE = - 1
|
const val PROGRESS_NONE = - 1
|
||||||
const val PROGRESS_SPINNER = ProgressDialog.STYLE_SPINNER
|
const val PROGRESS_SPINNER = ProgressDialogEx.STYLE_SPINNER
|
||||||
const val PROGRESS_HORIZONTAL = ProgressDialog.STYLE_HORIZONTAL
|
const val PROGRESS_HORIZONTAL = ProgressDialogEx.STYLE_HORIZONTAL
|
||||||
|
|
||||||
private val percent_format : NumberFormat by lazy {
|
private val percent_format : NumberFormat by lazy {
|
||||||
val v = NumberFormat.getPercentInstance()
|
val v = NumberFormat.getPercentInstance()
|
||||||
|
@ -73,7 +73,7 @@ class TootTaskRunner @JvmOverloads constructor(
|
||||||
private val client : TootApiClient
|
private val client : TootApiClient
|
||||||
private val task : MyTask
|
private val task : MyTask
|
||||||
private val info = ProgressInfo()
|
private val info = ProgressInfo()
|
||||||
private var progress : ProgressDialog? = null
|
private var progress : ProgressDialogEx? = null
|
||||||
private var progress_prefix : String? = null
|
private var progress_prefix : String? = null
|
||||||
|
|
||||||
private val refContext : WeakReference<Context>
|
private val refContext : WeakReference<Context>
|
||||||
|
@ -153,7 +153,7 @@ class TootTaskRunner @JvmOverloads constructor(
|
||||||
if(progress_style != PROGRESS_NONE) {
|
if(progress_style != PROGRESS_NONE) {
|
||||||
val context = refContext.get()
|
val context = refContext.get()
|
||||||
if(context != null && context is Activity) {
|
if(context != null && context is Activity) {
|
||||||
val progress = ProgressDialog(context)
|
val progress = ProgressDialogEx(context)
|
||||||
this.progress = progress
|
this.progress = progress
|
||||||
progress.setCancelable(true)
|
progress.setCancelable(true)
|
||||||
progress.setOnCancelListener { task.cancel(true) }
|
progress.setOnCancelListener { task.cancel(true) }
|
||||||
|
|
|
@ -2,7 +2,6 @@ package jp.juggler.subwaytooter.dialog
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
import android.app.ProgressDialog
|
|
||||||
import android.graphics.Bitmap
|
import android.graphics.Bitmap
|
||||||
import android.os.AsyncTask
|
import android.os.AsyncTask
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
@ -27,7 +26,7 @@ object DlgQRCode {
|
||||||
|
|
||||||
private fun makeQrCode(activity : ActMain, size : Int, url : String, callback : QrCodeCallback) {
|
private fun makeQrCode(activity : ActMain, size : Int, url : String, callback : QrCodeCallback) {
|
||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
val progress = ProgressDialog(activity)
|
val progress = ProgressDialogEx(activity)
|
||||||
val task = object : AsyncTask<Void, Void, Bitmap?>() {
|
val task = object : AsyncTask<Void, Void, Bitmap?>() {
|
||||||
|
|
||||||
override fun doInBackground(vararg params : Void) : Bitmap? {
|
override fun doInBackground(vararg params : Void) : Bitmap? {
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
@file:Suppress("DEPRECATION")
|
||||||
|
|
||||||
|
package jp.juggler.subwaytooter.dialog
|
||||||
|
|
||||||
|
import android.app.ProgressDialog
|
||||||
|
import android.content.Context
|
||||||
|
|
||||||
|
class ProgressDialogEx( context: Context) :ProgressDialog(context){
|
||||||
|
companion object {
|
||||||
|
const val STYLE_SPINNER = ProgressDialog.STYLE_SPINNER
|
||||||
|
const val STYLE_HORIZONTAL = ProgressDialog.STYLE_HORIZONTAL
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue