From 25db8e83d4db499d4dfb52de8a9744899d01c402 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Wed, 3 May 2017 08:55:44 +0900
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E8=AD=B7=E3=81=95=E3=82=8C=E3=81=9F?=
 =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=A0=E3=81=AE=E9=96=89=E3=81=98=E3=82=8B?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=80=82=E6=88=BB=E3=82=8B=E3=83=9C?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=81=A7=E3=82=AB=E3=83=A9=E3=83=A0=E8=A8=AD?=
 =?UTF-8?q?=E5=AE=9A=E3=82=92=E9=96=89=E3=81=98=E3=82=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jp/juggler/subwaytooter/ActMain.java |  7 +++++
 .../subwaytooter/ColumnViewHolder.java        | 27 +++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.java b/app/src/main/java/jp/juggler/subwaytooter/ActMain.java
index b7be066b..74d48dcf 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.java
@@ -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:
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java
index 93717a4a..a1b0b02e 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java
@@ -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 {