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

保護されたカラムの閉じるボタン。戻るボタンでカラム設定を閉じる。

This commit is contained in:
tateisu 2017-05-03 08:55:44 +09:00
parent 39afb01965
commit 25db8e83d4
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/jp/juggler/subwaytooter/ActMain.java
View File

@ -229,6 +229,13 @@ public class ActMain extends AppCompatActivity
return;
}
// カラム設定が開いているならカラム設定を閉じる
ColumnViewHolder vh = pager_adapter.getColumnViewHolder( pager.getCurrentItem() );
if( vh.isColumnSettingShown() ){
vh.closeColumnSetting();
return;
}
// カラムが1個以上ある場合は設定に合わせて挙動を変える
switch( pref.getInt( Pref.KEY_BACK_BUTTON_ACTION, 0 ) ){
default:

27
app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java
View File

@ -96,6 +96,7 @@ class ColumnViewHolder implements View.OnClickListener, Column.VisualCallback, S
private View llColumnSetting;
private EditText etRegexFilter;
private TextView tvRegexFilterError;
private View btnColumnClose;
private boolean bSimpleList;
void onPageCreate( View root, int page_idx, int page_count ){
@ -109,7 +110,10 @@ class ColumnViewHolder implements View.OnClickListener, Column.VisualCallback, S
tvColumnName = (TextView) root.findViewById( R.id.tvColumnName );
tvColumnContext = (TextView) root.findViewById( R.id.tvColumnContext );
root.findViewById( R.id.btnColumnClose ).setOnClickListener( this );
btnColumnClose = root.findViewById( R.id.btnColumnClose );
btnColumnClose.setOnClickListener( this );
root.findViewById( R.id.btnColumnReload ).setOnClickListener( this );
root.findViewById( R.id.llColumnHeader ).setOnClickListener( this );
@ -299,6 +303,7 @@ class ColumnViewHolder implements View.OnClickListener, Column.VisualCallback, S
case R.id.cbDontCloseColumn:
column.dont_close = isChecked;
showColumnCloseButton();
activity.saveColumnList();
break;
@ -379,7 +384,7 @@ class ColumnViewHolder implements View.OnClickListener, Column.VisualCallback, S
// }
// };
int acct_pad_lr;
private int acct_pad_lr;
@Override public void onVisualColumn2(){
@ -401,6 +406,15 @@ class ColumnViewHolder implements View.OnClickListener, Column.VisualCallback, S
tvColumnContext.setPaddingRelative( acct_pad_lr, 0, acct_pad_lr, 0 );
tvColumnName.setText( column.getColumnName( false ) );
showColumnCloseButton();
}
private void showColumnCloseButton(){
// カラム保護の状態
btnColumnClose.setEnabled( ! column.dont_close );
btnColumnClose.setAlpha( column.dont_close ? 0.3f : 1f );
}
@Override
@ -495,6 +509,15 @@ class ColumnViewHolder implements View.OnClickListener, Column.VisualCallback, S
}
}
boolean isColumnSettingShown(){
return llColumnSetting.getVisibility() == View.VISIBLE;
}
void closeColumnSetting(){
llColumnSetting.setVisibility( View.GONE );
}
///////////////////////////////////////////////////////////////////
private class HeaderViewHolder implements View.OnClickListener {