From 62ff817c9507ac4aae26ec21536982d163f2f093 Mon Sep 17 00:00:00 2001 From: yuta Date: Tue, 18 Oct 2011 14:21:33 +0900 Subject: [PATCH] =?utf8?q?=E6=95=B4=E7=90=86=E3=81=BB=E3=81=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- AndroidManifest.xml | 2 +- res/layout/callconfirm_content.xml | 13 ++++++++++--- res/values/strings.xml | 4 ++-- .../callconfirm/{ => activity}/MainPreference.java | 5 +++-- .../callconfirm/activity/confirm/CallConfirm.java | 13 ++++++++----- .../activity/confirm/ConfirmOption.java | 2 +- .../activity/confirm/ConfirmScreen.java | 22 +++++++++++++--------- .../activity/confirm/ConfirmService.java | 2 +- .../activity/confirm/MissedCallSelector.java | 2 +- .../activity/list/AllowListActivity.java | 3 +-- .../activity/{ => list}/BaseActivity.java | 2 +- .../activity/list/BlockHistoryActivity.java | 3 +-- .../activity/list/BlockListActivity.java | 3 +-- .../activity/list/EditNumberActivity.java | 3 +-- .../list}/adapter/AllowListAdapter.java | 2 +- .../list}/adapter/BlockHistoryAdapter.java | 2 +- .../list}/adapter/BlockListAdapter.java | 2 +- .../list}/adapter/EditNumberAdapter.java | 2 +- .../list}/fragment/AllowListFragment.java | 10 +++++----- .../list}/fragment/BlockHistoryFragment.java | 8 ++++---- .../list}/fragment/BlockListFragment.java | 10 +++++----- .../list}/fragment/EditNumberFragment.java | 10 +++++----- .../list/fragment}/dialog/AllowListEditDialog.java | 2 +- .../fragment}/dialog/AllowListRemoveAllDialog.java | 2 +- .../fragment}/dialog/AllowListRemoveDialog.java | 2 +- .../fragment}/dialog/BaseRemoveConfirmDialog.java | 2 +- .../dialog/BlockHistoryRemoveAllDialog.java | 2 +- .../fragment}/dialog/BlockHistoryRemoveDialog.java | 2 +- .../list/fragment}/dialog/BlockListEditDialog.java | 2 +- .../fragment}/dialog/BlockListRemoveAllDialog.java | 2 +- .../fragment}/dialog/BlockListRemoveDialog.java | 2 +- .../fragment}/dialog/EditNumberEditDialog.java | 2 +- .../dialog/EditNumberRemoveAllDialog.java | 2 +- .../fragment}/dialog/EditNumberRemoveDialog.java | 2 +- 34 files changed, 80 insertions(+), 69 deletions(-) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity}/MainPreference.java (96%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/activity/{ => list}/BaseActivity.java (95%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list}/adapter/AllowListAdapter.java (93%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list}/adapter/BlockHistoryAdapter.java (94%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list}/adapter/BlockListAdapter.java (94%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list}/adapter/EditNumberAdapter.java (94%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list}/fragment/AllowListFragment.java (84%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list}/fragment/BlockHistoryFragment.java (87%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list}/fragment/BlockListFragment.java (86%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list}/fragment/EditNumberFragment.java (84%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/AllowListEditDialog.java (95%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/AllowListRemoveAllDialog.java (87%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/AllowListRemoveDialog.java (90%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/BaseRemoveConfirmDialog.java (90%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/BlockHistoryRemoveAllDialog.java (88%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/BlockHistoryRemoveDialog.java (90%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/BlockListEditDialog.java (95%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/BlockListRemoveAllDialog.java (87%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/BlockListRemoveDialog.java (90%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/EditNumberEditDialog.java (95%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/EditNumberRemoveAllDialog.java (87%) rename src/jp/gr/java_conf/ofnhwx/callconfirm/{ => activity/list/fragment}/dialog/EditNumberRemoveDialog.java (90%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0d471d6..dafe565 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionCode="55"> - + diff --git a/res/layout/callconfirm_content.xml b/res/layout/callconfirm_content.xml index 46a3abf..f89d49b 100755 --- a/res/layout/callconfirm_content.xml +++ b/res/layout/callconfirm_content.xml @@ -5,9 +5,16 @@ android:padding="6dp" android:layout_width="fill_parent" android:layout_height="wrap_content"> - + + + + Show confirm dialog Show a confirmation dialog before calling. - 許可リストを使う - 許可リストに登録されている番号に発信する場合、確認を表示しない + Use allow list + Disable a confirmation dialog if call number is registered in the allow list. Disable if screen lock Disable a confirmation dialog if screen is locked. Disable if Bluetooth enabled diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/MainPreference.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/MainPreference.java similarity index 96% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/MainPreference.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/MainPreference.java index 86b032f..648146c 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/MainPreference.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/MainPreference.java @@ -1,8 +1,9 @@ -package jp.gr.java_conf.ofnhwx.callconfirm; +package jp.gr.java_conf.ofnhwx.callconfirm.activity; -import jp.gr.java_conf.ofnhwx.callconfirm.activity.BaseActivity; +import jp.gr.java_conf.ofnhwx.callconfirm.R; import jp.gr.java_conf.ofnhwx.callconfirm.activity.confirm.DialerActivity; import jp.gr.java_conf.ofnhwx.callconfirm.activity.confirm.MissedCallActivity; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.BaseActivity; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Param; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Utility; import jp.gr.java_conf.ofnhwx.olib.ErrorReporter; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/CallConfirm.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/CallConfirm.java index 289a3aa..e1b2b9e 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/CallConfirm.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/CallConfirm.java @@ -1,7 +1,7 @@ package jp.gr.java_conf.ofnhwx.callconfirm.activity.confirm; import jp.gr.java_conf.ofnhwx.callconfirm.R; -import jp.gr.java_conf.ofnhwx.callconfirm.activity.BaseActivity; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.BaseActivity; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Param; import jp.gr.java_conf.ofnhwx.olib.ErrorReporter; import jp.gr.java_conf.ofnhwx.olib.utils.OPreference; @@ -57,11 +57,14 @@ public class CallConfirm extends Activity { } public static final void show(Context context, String number, String uri) { - String scheme = uri == null ? null : Uri.parse(uri).getScheme(); - if (OPreference.getInstance(context).getBoolean(R.string.key_use_service, false)) { - startService(context, number, scheme); - return; + // Schemeの取得 + String scheme; + if (uri == null) { + scheme = null; + } else { + scheme = Uri.parse(uri).getScheme(); } + // Activityの起動 Intent activity = new Intent(context, CallConfirm.class); activity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); activity.putExtra(Intent.EXTRA_PHONE_NUMBER, PhoneNumberUtils.stripSeparators(number)); diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmOption.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmOption.java index 510fb76..5f33e61 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmOption.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmOption.java @@ -1,7 +1,7 @@ package jp.gr.java_conf.ofnhwx.callconfirm.activity.confirm; import jp.gr.java_conf.ofnhwx.callconfirm.R; -import jp.gr.java_conf.ofnhwx.callconfirm.adapter.EditNumberAdapter; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.adapter.EditNumberAdapter; import jp.gr.java_conf.ofnhwx.callconfirm.provider.EditNumber; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import jp.gr.java_conf.ofnhwx.callconfirm.utility.info.AllowListInfo; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmScreen.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmScreen.java index dbb8530..adb40f2 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmScreen.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmScreen.java @@ -33,6 +33,7 @@ import android.widget.Button; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.ProgressBar; import android.widget.TextView; /** @@ -56,6 +57,7 @@ public class ConfirmScreen implements OnClickListener, OnKeyListener, private LinearLayout mainView ; private TextView titleView ; private ImageView lineView ; + private ProgressBar progress ; private ImageView photoView ; private TextView nameView ; private TextView numberView; @@ -78,15 +80,16 @@ public class ConfirmScreen implements OnClickListener, OnKeyListener, // LayoutInflater inflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); rootView = (LinearLayout)inflater.inflate(R.layout.callconfirm, null, false); - frameView = (FrameLayout) rootView.findViewById(R.id.callconfirm_frame ); - mainView = (LinearLayout)rootView.findViewById(R.id.callconfirm_main ); - titleView = (TextView) rootView.findViewById(R.id.callconfirm_title ); - lineView = (ImageView) rootView.findViewById(R.id.callconfirm_line ); - photoView = (ImageView) rootView.findViewById(R.id.callconfirm_photo ); - nameView = (TextView) rootView.findViewById(R.id.callconfirm_name ); - numberView = (TextView) rootView.findViewById(R.id.callconfirm_number); - positive = (Button) rootView.findViewById(R.id.positive); - negative = (Button) rootView.findViewById(R.id.negative); + frameView = (FrameLayout )rootView.findViewById(R.id.callconfirm_frame ); + mainView = (LinearLayout)rootView.findViewById(R.id.callconfirm_main ); + titleView = (TextView )rootView.findViewById(R.id.callconfirm_title ); + lineView = (ImageView )rootView.findViewById(R.id.callconfirm_line ); + progress = (ProgressBar )rootView.findViewById(R.id.callconfirm_progress); + photoView = (ImageView )rootView.findViewById(R.id.callconfirm_photo ); + nameView = (TextView )rootView.findViewById(R.id.callconfirm_name ); + numberView = (TextView )rootView.findViewById(R.id.callconfirm_number ); + positive = (Button )rootView.findViewById(R.id.positive); + negative = (Button )rootView.findViewById(R.id.negative); customizeViews(); } @@ -261,6 +264,7 @@ public class ConfirmScreen implements OnClickListener, OnKeyListener, lineView.setImageResource(android.R.drawable.divider_horizontal_dark); break; } + progress.setLayoutParams(new FrameLayout.LayoutParams((int)photoSize, (int)photoSize)); photoView.setImageBitmap(OBitmapUtils.decodeResource(context, R.drawable.contact_noimage, photoSize)); // 見た目の設定2 titleView .setText(R.string.callconfirm_title); diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmService.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmService.java index bf12b14..354e793 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmService.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/ConfirmService.java @@ -1,7 +1,7 @@ package jp.gr.java_conf.ofnhwx.callconfirm.activity.confirm; -import jp.gr.java_conf.ofnhwx.callconfirm.MainPreference; import jp.gr.java_conf.ofnhwx.callconfirm.R; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.MainPreference; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Param; import jp.gr.java_conf.ofnhwx.olib.compatibility.OService; import jp.gr.java_conf.ofnhwx.olib.utils.OPreference; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/MissedCallSelector.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/MissedCallSelector.java index be9213b..2cdfd3d 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/MissedCallSelector.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/confirm/MissedCallSelector.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import jp.gr.java_conf.ofnhwx.callconfirm.R; -import jp.gr.java_conf.ofnhwx.callconfirm.activity.BaseActivity; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.BaseActivity; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Utility; import jp.gr.java_conf.ofnhwx.callconfirm.utility.info.ContactInfo; import jp.gr.java_conf.ofnhwx.olib.utils.OBitmapUtils; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/AllowListActivity.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/AllowListActivity.java index f6fb380..3d5503f 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/AllowListActivity.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/AllowListActivity.java @@ -1,7 +1,6 @@ package jp.gr.java_conf.ofnhwx.callconfirm.activity.list; -import jp.gr.java_conf.ofnhwx.callconfirm.activity.BaseActivity; -import jp.gr.java_conf.ofnhwx.callconfirm.fragment.AllowListFragment; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.AllowListFragment; import android.os.Bundle; /** diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/BaseActivity.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BaseActivity.java similarity index 95% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/activity/BaseActivity.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BaseActivity.java index 2a45477..87fe02f 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/BaseActivity.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BaseActivity.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.activity; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list; import java.util.HashMap; import java.util.Map; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BlockHistoryActivity.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BlockHistoryActivity.java index fd2c62d..402751c 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BlockHistoryActivity.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BlockHistoryActivity.java @@ -1,7 +1,6 @@ package jp.gr.java_conf.ofnhwx.callconfirm.activity.list; -import jp.gr.java_conf.ofnhwx.callconfirm.activity.BaseActivity; -import jp.gr.java_conf.ofnhwx.callconfirm.fragment.BlockHistoryFragment; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.BlockHistoryFragment; import android.content.Intent; import android.os.Bundle; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BlockListActivity.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BlockListActivity.java index e5222e7..bc1560e 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BlockListActivity.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/BlockListActivity.java @@ -1,7 +1,6 @@ package jp.gr.java_conf.ofnhwx.callconfirm.activity.list; -import jp.gr.java_conf.ofnhwx.callconfirm.activity.BaseActivity; -import jp.gr.java_conf.ofnhwx.callconfirm.fragment.BlockListFragment; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.BlockListFragment; import android.os.Bundle; /** diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/EditNumberActivity.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/EditNumberActivity.java index d1629ba..46ee1c7 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/EditNumberActivity.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/EditNumberActivity.java @@ -1,7 +1,6 @@ package jp.gr.java_conf.ofnhwx.callconfirm.activity.list; -import jp.gr.java_conf.ofnhwx.callconfirm.activity.BaseActivity; -import jp.gr.java_conf.ofnhwx.callconfirm.fragment.EditNumberFragment; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.EditNumberFragment; import android.os.Bundle; /** diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/AllowListAdapter.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/AllowListAdapter.java similarity index 93% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/AllowListAdapter.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/AllowListAdapter.java index 5693c8d..d3d0de7 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/AllowListAdapter.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/AllowListAdapter.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.adapter; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.adapter; import jp.gr.java_conf.ofnhwx.callconfirm.R; import jp.gr.java_conf.ofnhwx.callconfirm.provider.AllowList; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/BlockHistoryAdapter.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/BlockHistoryAdapter.java similarity index 94% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/BlockHistoryAdapter.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/BlockHistoryAdapter.java index 466707d..0d85821 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/BlockHistoryAdapter.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/BlockHistoryAdapter.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.adapter; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.adapter; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/BlockListAdapter.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/BlockListAdapter.java similarity index 94% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/BlockListAdapter.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/BlockListAdapter.java index 7a96240..a614afc 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/BlockListAdapter.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/BlockListAdapter.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.adapter; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.adapter; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/EditNumberAdapter.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/EditNumberAdapter.java similarity index 94% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/EditNumberAdapter.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/EditNumberAdapter.java index 9b41e37..3e254a0 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/adapter/EditNumberAdapter.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/adapter/EditNumberAdapter.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.adapter; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.adapter; import jp.gr.java_conf.ofnhwx.callconfirm.R; import jp.gr.java_conf.ofnhwx.callconfirm.provider.EditNumber; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/AllowListFragment.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/AllowListFragment.java similarity index 84% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/AllowListFragment.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/AllowListFragment.java index ebf4db7..40c35ba 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/AllowListFragment.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/AllowListFragment.java @@ -1,10 +1,10 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.fragment; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment; import jp.gr.java_conf.ofnhwx.callconfirm.R; -import jp.gr.java_conf.ofnhwx.callconfirm.adapter.AllowListAdapter; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.AllowListEditDialog; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.AllowListRemoveAllDialog; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.AllowListRemoveDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.adapter.AllowListAdapter; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.AllowListEditDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.AllowListRemoveAllDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.AllowListRemoveDialog; import jp.gr.java_conf.ofnhwx.callconfirm.provider.AllowList; import jp.gr.java_conf.ofnhwx.olib.base.BaseListFragmentC; import android.database.Cursor; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/BlockHistoryFragment.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/BlockHistoryFragment.java similarity index 87% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/BlockHistoryFragment.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/BlockHistoryFragment.java index 9cc5070..2993e66 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/BlockHistoryFragment.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/BlockHistoryFragment.java @@ -1,9 +1,9 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.fragment; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment; import jp.gr.java_conf.ofnhwx.callconfirm.R; -import jp.gr.java_conf.ofnhwx.callconfirm.adapter.BlockHistoryAdapter; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.BlockHistoryRemoveAllDialog; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.BlockHistoryRemoveDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.adapter.BlockHistoryAdapter; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.BlockHistoryRemoveAllDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.BlockHistoryRemoveDialog; import jp.gr.java_conf.ofnhwx.callconfirm.provider.BlockList; import jp.gr.java_conf.ofnhwx.olib.base.BaseListFragmentC; import android.content.Intent; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/BlockListFragment.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/BlockListFragment.java similarity index 86% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/BlockListFragment.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/BlockListFragment.java index d031393..81a8430 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/BlockListFragment.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/BlockListFragment.java @@ -1,11 +1,11 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.fragment; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment; import jp.gr.java_conf.ofnhwx.callconfirm.R; import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.BlockHistoryActivity; -import jp.gr.java_conf.ofnhwx.callconfirm.adapter.BlockListAdapter; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.BlockListEditDialog; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.BlockListRemoveAllDialog; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.BlockListRemoveDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.adapter.BlockListAdapter; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.BlockListEditDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.BlockListRemoveAllDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.BlockListRemoveDialog; import jp.gr.java_conf.ofnhwx.callconfirm.provider.BlockList; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import jp.gr.java_conf.ofnhwx.olib.base.BaseListFragmentC; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/EditNumberFragment.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/EditNumberFragment.java similarity index 84% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/EditNumberFragment.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/EditNumberFragment.java index 3b6d257..70deb32 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/fragment/EditNumberFragment.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/EditNumberFragment.java @@ -1,10 +1,10 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.fragment; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment; import jp.gr.java_conf.ofnhwx.callconfirm.R; -import jp.gr.java_conf.ofnhwx.callconfirm.adapter.EditNumberAdapter; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.EditNumberEditDialog; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.EditNumberRemoveAllDialog; -import jp.gr.java_conf.ofnhwx.callconfirm.dialog.EditNumberRemoveDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.adapter.EditNumberAdapter; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.EditNumberEditDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.EditNumberRemoveAllDialog; +import jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog.EditNumberRemoveDialog; import jp.gr.java_conf.ofnhwx.callconfirm.provider.EditNumber; import jp.gr.java_conf.ofnhwx.olib.base.BaseListFragmentC; import android.database.Cursor; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/AllowListEditDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/AllowListEditDialog.java similarity index 95% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/AllowListEditDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/AllowListEditDialog.java index 6f0defa..719d769 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/AllowListEditDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/AllowListEditDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.provider.AllowList; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/AllowListRemoveAllDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/AllowListRemoveAllDialog.java similarity index 87% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/AllowListRemoveAllDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/AllowListRemoveAllDialog.java index 33f6337..c84a6f8 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/AllowListRemoveAllDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/AllowListRemoveAllDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import android.content.DialogInterface; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/AllowListRemoveDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/AllowListRemoveDialog.java similarity index 90% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/AllowListRemoveDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/AllowListRemoveDialog.java index 96f76ef..dd4303d 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/AllowListRemoveDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/AllowListRemoveDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Param; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BaseRemoveConfirmDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BaseRemoveConfirmDialog.java similarity index 90% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BaseRemoveConfirmDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BaseRemoveConfirmDialog.java index 096e284..633833d 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BaseRemoveConfirmDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BaseRemoveConfirmDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.R; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Param; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockHistoryRemoveAllDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockHistoryRemoveAllDialog.java similarity index 88% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockHistoryRemoveAllDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockHistoryRemoveAllDialog.java index 323f84e..a4b1fcf 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockHistoryRemoveAllDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockHistoryRemoveAllDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import android.content.DialogInterface; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockHistoryRemoveDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockHistoryRemoveDialog.java similarity index 90% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockHistoryRemoveDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockHistoryRemoveDialog.java index ab0dc17..1e5b04c 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockHistoryRemoveDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockHistoryRemoveDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Param; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockListEditDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockListEditDialog.java similarity index 95% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockListEditDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockListEditDialog.java index 36261ba..756a019 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockListEditDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockListEditDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.provider.BlockList; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockListRemoveAllDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockListRemoveAllDialog.java similarity index 87% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockListRemoveAllDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockListRemoveAllDialog.java index 9c3b553..055abad 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockListRemoveAllDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockListRemoveAllDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import android.content.DialogInterface; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockListRemoveDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockListRemoveDialog.java similarity index 90% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockListRemoveDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockListRemoveDialog.java index c2ebbd7..4babc82 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/BlockListRemoveDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/BlockListRemoveDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Param; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/EditNumberEditDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/EditNumberEditDialog.java similarity index 95% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/EditNumberEditDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/EditNumberEditDialog.java index 6f07649..40d9c20 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/EditNumberEditDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/EditNumberEditDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.provider.EditNumber; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/EditNumberRemoveAllDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/EditNumberRemoveAllDialog.java similarity index 87% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/EditNumberRemoveAllDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/EditNumberRemoveAllDialog.java index 6fb2d12..e4c3a21 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/EditNumberRemoveAllDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/EditNumberRemoveAllDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import android.content.DialogInterface; diff --git a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/EditNumberRemoveDialog.java b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/EditNumberRemoveDialog.java similarity index 90% rename from src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/EditNumberRemoveDialog.java rename to src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/EditNumberRemoveDialog.java index c1f40c8..118e0e5 100755 --- a/src/jp/gr/java_conf/ofnhwx/callconfirm/dialog/EditNumberRemoveDialog.java +++ b/src/jp/gr/java_conf/ofnhwx/callconfirm/activity/list/fragment/dialog/EditNumberRemoveDialog.java @@ -1,4 +1,4 @@ -package jp.gr.java_conf.ofnhwx.callconfirm.dialog; +package jp.gr.java_conf.ofnhwx.callconfirm.activity.list.fragment.dialog; import jp.gr.java_conf.ofnhwx.callconfirm.utility.DB; import jp.gr.java_conf.ofnhwx.callconfirm.utility.Param; -- 2.11.4.GIT