From 8ceeb787a5c847335c0556506490f1bde3828941 Mon Sep 17 00:00:00 2001 From: tateisu Date: Sat, 13 Jan 2018 15:38:32 +0900 Subject: [PATCH] =?UTF-8?q?ProgressDialog=E3=81=AEdeprecated=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=E8=A1=A8=E7=A4=BA=E3=81=AE=E5=AF=BE=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jp/juggler/subwaytooter/ActAppSetting.kt | 4 ++-- .../main/java/jp/juggler/subwaytooter/ActMain.kt | 4 ++-- .../main/java/jp/juggler/subwaytooter/ActPost.kt | 8 ++------ .../jp/juggler/subwaytooter/api/TootTaskRunner.kt | 10 +++++----- .../jp/juggler/subwaytooter/dialog/DlgQRCode.kt | 3 +-- .../juggler/subwaytooter/dialog/ProgressDialogEx.kt | 13 +++++++++++++ 6 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 app/src/main/java/jp/juggler/subwaytooter/dialog/ProgressDialogEx.kt diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt index a1c525a7..3d588b02 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt @@ -1,7 +1,6 @@ package jp.juggler.subwaytooter import android.annotation.SuppressLint -import android.app.ProgressDialog import android.content.Intent import android.content.SharedPreferences import android.graphics.Typeface @@ -32,6 +31,7 @@ import android.widget.TextView import com.jrummyapps.android.colorpicker.ColorPickerDialog import com.jrummyapps.android.colorpicker.ColorPickerDialogListener +import jp.juggler.subwaytooter.dialog.ProgressDialogEx import org.apache.commons.io.IOUtils import org.apache.commons.io.output.FileWriterWithEncoding @@ -862,7 +862,7 @@ class ActAppSetting : AppCompatActivity() private fun exportAppData() { @Suppress("DEPRECATION") - val progress = ProgressDialog(this) + val progress = ProgressDialogEx(this) val task = @SuppressLint("StaticFieldLeak") object : AsyncTask() { diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt index fa2bef38..3fa96324 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt @@ -3,7 +3,6 @@ package jp.juggler.subwaytooter import android.annotation.SuppressLint import android.app.Activity import android.app.Dialog -import android.app.ProgressDialog import android.content.Intent import android.content.SharedPreferences 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.SavedAccount import jp.juggler.subwaytooter.dialog.ActionsDialog +import jp.juggler.subwaytooter.dialog.ProgressDialogEx import jp.juggler.subwaytooter.view.ColumnStripLinearLayout import jp.juggler.subwaytooter.view.GravitySnapHelper import jp.juggler.subwaytooter.view.MyEditText @@ -2018,7 +2018,7 @@ class ActMain : AppCompatActivity() } @Suppress("DEPRECATION") - val progress = ProgressDialog(this) + val progress = ProgressDialogEx(this) val task = @SuppressLint("StaticFieldLeak") object : AsyncTask?>() { diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt index af96ff02..54276eb4 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt @@ -4,7 +4,6 @@ import android.Manifest import android.annotation.SuppressLint import android.app.Activity import android.app.Dialog -import android.app.ProgressDialog import android.content.ContentValues import android.content.Intent 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.TootStatus import jp.juggler.subwaytooter.api.entity.parseItem -import jp.juggler.subwaytooter.dialog.AccountPicker -import jp.juggler.subwaytooter.dialog.DlgDraftPicker -import jp.juggler.subwaytooter.dialog.DlgTextInput +import jp.juggler.subwaytooter.dialog.* import jp.juggler.subwaytooter.table.AcctColor import jp.juggler.subwaytooter.table.PostDraft import jp.juggler.subwaytooter.table.SavedAccount -import jp.juggler.subwaytooter.dialog.ActionsDialog import jp.juggler.subwaytooter.span.MyClickableSpan import jp.juggler.subwaytooter.span.MyClickableSpanClickCallback import jp.juggler.subwaytooter.util.* @@ -1701,7 +1697,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba private fun restoreDraft(draft : JSONObject) { @Suppress("DEPRECATION") - val progress = ProgressDialog(this) + val progress = ProgressDialogEx(this) val task = @SuppressLint("StaticFieldLeak") object : AsyncTask() { diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/TootTaskRunner.kt b/app/src/main/java/jp/juggler/subwaytooter/api/TootTaskRunner.kt index 6103d332..54cf6264 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/api/TootTaskRunner.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/api/TootTaskRunner.kt @@ -1,7 +1,6 @@ package jp.juggler.subwaytooter.api import android.app.Activity -import android.app.ProgressDialog import android.content.Context import android.os.AsyncTask import android.os.Handler @@ -11,6 +10,7 @@ import java.lang.ref.WeakReference import java.text.NumberFormat import jp.juggler.subwaytooter.App1 +import jp.juggler.subwaytooter.dialog.ProgressDialogEx import jp.juggler.subwaytooter.table.SavedAccount /* @@ -30,8 +30,8 @@ class TootTaskRunner @JvmOverloads constructor( companion object { const val PROGRESS_NONE = - 1 - const val PROGRESS_SPINNER = ProgressDialog.STYLE_SPINNER - const val PROGRESS_HORIZONTAL = ProgressDialog.STYLE_HORIZONTAL + const val PROGRESS_SPINNER = ProgressDialogEx.STYLE_SPINNER + const val PROGRESS_HORIZONTAL = ProgressDialogEx.STYLE_HORIZONTAL private val percent_format : NumberFormat by lazy { val v = NumberFormat.getPercentInstance() @@ -73,7 +73,7 @@ class TootTaskRunner @JvmOverloads constructor( private val client : TootApiClient private val task : MyTask private val info = ProgressInfo() - private var progress : ProgressDialog? = null + private var progress : ProgressDialogEx? = null private var progress_prefix : String? = null private val refContext : WeakReference @@ -153,7 +153,7 @@ class TootTaskRunner @JvmOverloads constructor( if(progress_style != PROGRESS_NONE) { val context = refContext.get() if(context != null && context is Activity) { - val progress = ProgressDialog(context) + val progress = ProgressDialogEx(context) this.progress = progress progress.setCancelable(true) progress.setOnCancelListener { task.cancel(true) } diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgQRCode.kt b/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgQRCode.kt index d24e19a5..5bb5f8f1 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgQRCode.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/DlgQRCode.kt @@ -2,7 +2,6 @@ package jp.juggler.subwaytooter.dialog import android.annotation.SuppressLint import android.app.Dialog -import android.app.ProgressDialog import android.graphics.Bitmap import android.os.AsyncTask import android.view.View @@ -27,7 +26,7 @@ object DlgQRCode { private fun makeQrCode(activity : ActMain, size : Int, url : String, callback : QrCodeCallback) { @Suppress("DEPRECATION") - val progress = ProgressDialog(activity) + val progress = ProgressDialogEx(activity) val task = object : AsyncTask() { override fun doInBackground(vararg params : Void) : Bitmap? { diff --git a/app/src/main/java/jp/juggler/subwaytooter/dialog/ProgressDialogEx.kt b/app/src/main/java/jp/juggler/subwaytooter/dialog/ProgressDialogEx.kt new file mode 100644 index 00000000..63c2f87a --- /dev/null +++ b/app/src/main/java/jp/juggler/subwaytooter/dialog/ProgressDialogEx.kt @@ -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 + } +}