mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-27 19:22:15 -05:00
Fix "More table" layout
Retain "More table" visibility on screen orientation change
This commit is contained in:
parent
7eac903277
commit
18ab826413
@ -519,6 +519,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
|
||||
this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener);
|
||||
this.mCancelButton.setOnClickListener(this.mCancelButtonClickListener);
|
||||
this.mMoreTable = (TableLayout) findViewById(R.id.server_info_more);
|
||||
if (savedInstanceState != null && savedInstanceState.getBoolean("showMoreTable")) {
|
||||
changeMoreTableVisibility(true);
|
||||
}
|
||||
final OnCheckedChangeListener OnCheckedShowConfirmPassword = new OnCheckedChangeListener() {
|
||||
@Override
|
||||
public void onCheckedChanged(final CompoundButton buttonView,
|
||||
@ -584,6 +587,15 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPrepareOptionsMenu(Menu menu) {
|
||||
final MenuItem showMoreInfo = menu.findItem(R.id.action_server_info_show_more);
|
||||
if (showMoreInfo.isVisible()) {
|
||||
showMoreInfo.setChecked(mMoreTable.getVisibility() == View.VISIBLE);
|
||||
}
|
||||
return super.onPrepareOptionsMenu(menu);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStart() {
|
||||
super.onStart();
|
||||
@ -628,6 +640,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
|
||||
if (mAccount != null) {
|
||||
savedInstanceState.putString("account", mAccount.getJid().toBareJid().toString());
|
||||
savedInstanceState.putBoolean("initMode", mInitMode);
|
||||
savedInstanceState.putBoolean("showMoreTable", mMoreTable.getVisibility() == View.VISIBLE);
|
||||
}
|
||||
super.onSaveInstanceState(savedInstanceState);
|
||||
}
|
||||
@ -695,8 +708,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
|
||||
startActivity(showBlocklistIntent);
|
||||
break;
|
||||
case R.id.action_server_info_show_more:
|
||||
mMoreTable.setVisibility(item.isChecked() ? View.GONE : View.VISIBLE);
|
||||
item.setChecked(!item.isChecked());
|
||||
changeMoreTableVisibility(!item.isChecked());
|
||||
break;
|
||||
case R.id.action_change_password_on_server:
|
||||
gotoChangePassword(null);
|
||||
@ -720,6 +732,10 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
|
||||
private void changeMoreTableVisibility(boolean visible) {
|
||||
mMoreTable.setVisibility(visible ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
|
||||
private void gotoChangePassword(String newPassword) {
|
||||
final Intent changePasswordIntent = new Intent(this, ChangePasswordActivity.class);
|
||||
changePasswordIntent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().toString());
|
||||
|
@ -221,6 +221,7 @@
|
||||
<TableLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:shrinkColumns="0"
|
||||
android:stretchColumns="1">
|
||||
|
||||
<TableRow
|
||||
@ -233,13 +234,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_session_established"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/session_est"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
@ -250,6 +254,7 @@
|
||||
android:id="@+id/server_info_more"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:shrinkColumns="0"
|
||||
android:stretchColumns="1"
|
||||
android:visibility="gone">
|
||||
|
||||
@ -262,13 +267,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_pep"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_pep"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
@ -283,13 +291,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_blocking"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_blocking"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
@ -304,13 +315,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_stream_management"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_sm"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
@ -325,13 +339,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_roster_version"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_roster_version"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
@ -346,13 +363,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_carbon_messages"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_carbons"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
@ -367,13 +387,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_mam"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_mam"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
@ -388,13 +411,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_csi"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_csi"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
@ -409,13 +435,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_push"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_push"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
</TableRow>
|
||||
@ -428,13 +457,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_http_upload"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/server_info_http_upload"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody"/>
|
||||
</TableRow>
|
||||
|
@ -141,6 +141,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/muc_info_more"
|
||||
android:shrinkColumns="0"
|
||||
android:stretchColumns="1"
|
||||
android:visibility="gone">
|
||||
|
||||
@ -153,13 +154,16 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/server_info_mam"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/muc_info_mam"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:paddingLeft="4dp"
|
||||
android:textColor="?attr/color_text_primary"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
</TableRow>
|
||||
|
Loading…
Reference in New Issue
Block a user