diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.java b/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.java index a990db57..a9175db2 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.java +++ b/app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.java @@ -33,6 +33,8 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O Switch swDontConfirmBeforeCloseColumn; Switch swPriorLocalURL; + Switch swDisableFastScroller; + Spinner spBackButtonAction; static final int BACK_ASK_ALWAYS =0; @@ -50,6 +52,10 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O swPriorLocalURL = (Switch) findViewById( R.id.swPriorLocalURL ); swPriorLocalURL.setOnCheckedChangeListener( this ); + swDisableFastScroller = (Switch) findViewById( R.id.swDisableFastScroller ); + swDisableFastScroller.setOnCheckedChangeListener( this ); + + spBackButtonAction = (Spinner) findViewById( R.id.spBackButtonAction ); spBackButtonAction.setOnItemSelectedListener( this ); @@ -69,7 +75,7 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O swDontConfirmBeforeCloseColumn.setChecked( pref.getBoolean( Pref.KEY_DONT_CONFIRM_BEFORE_CLOSE_COLUMN, false ) ); swPriorLocalURL.setChecked( pref.getBoolean( Pref.KEY_PRIOR_LOCAL_URL, false ) ); - + swDisableFastScroller.setChecked( pref.getBoolean( Pref.KEY_DISABLE_FAST_SCROLLER, false ) ); spBackButtonAction.setSelection( pref.getInt(Pref.KEY_BACK_BUTTON_ACTION,0) ); load_busy = false; @@ -80,6 +86,7 @@ public class ActAppSetting extends AppCompatActivity implements CompoundButton.O pref.edit() .putBoolean( Pref.KEY_DONT_CONFIRM_BEFORE_CLOSE_COLUMN, swDontConfirmBeforeCloseColumn.isChecked() ) .putBoolean( Pref.KEY_PRIOR_LOCAL_URL, swPriorLocalURL.isChecked() ) + .putBoolean( Pref.KEY_DISABLE_FAST_SCROLLER, swDisableFastScroller.isChecked() ) .putInt( Pref.KEY_BACK_BUTTON_ACTION, spBackButtonAction.getSelectedItemPosition() ) .apply(); } diff --git a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java index d481293e..36da71a4 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java +++ b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java @@ -102,6 +102,8 @@ public class ColumnViewHolder implements View.OnClickListener, Column.VisualCall etSearch = (EditText) root.findViewById( R.id.etSearch ); cbResolve = (CheckBox) root.findViewById( R.id.cbResolve ); + listView.setFastScrollEnabled( !Pref.pref(activity).getBoolean( Pref.KEY_DISABLE_FAST_SCROLLER,false) ); + if( column.type != Column.TYPE_SEARCH ){ llSearch.setVisibility( View.GONE ); }else{ diff --git a/app/src/main/java/jp/juggler/subwaytooter/Pref.java b/app/src/main/java/jp/juggler/subwaytooter/Pref.java index a6662324..cf1c5265 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/Pref.java +++ b/app/src/main/java/jp/juggler/subwaytooter/Pref.java @@ -15,5 +15,6 @@ public class Pref { public static final String KEY_DONT_CONFIRM_BEFORE_CLOSE_COLUMN ="DontConfirmBeforeCloseColumn"; public static final String KEY_BACK_BUTTON_ACTION ="back_button_action"; public static final String KEY_PRIOR_LOCAL_URL = "prior_local_url"; + public static final String KEY_DISABLE_FAST_SCROLLER = "disable_fast_scroller"; } diff --git a/app/src/main/res/layout/act_app_setting.xml b/app/src/main/res/layout/act_app_setting.xml index af9fa7b7..1894fb75 100644 --- a/app/src/main/res/layout/act_app_setting.xml +++ b/app/src/main/res/layout/act_app_setting.xml @@ -73,6 +73,22 @@ android:scrollbarStyle="outsideOverlay" + + + + + + + + + + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b1a896ed..75f0f883 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -154,4 +154,5 @@ カラム一覧を開く 戻るボタンの動作 添付画像を開く時に自タンスURLを重視 + FastScrollerを無効にする(アプリ再起動が必要) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5ec7757d..84246d14 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -153,4 +153,5 @@ open column list back button action prior local URL when open attachment + disable fast scroller (app restart required)