Fix "More table" layout

Retain "More table" visibility on screen orientation change

3 files changed, 61 insertions, 13 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index ae23336ae..142683c04 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -517,6 +517,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,
@@ -582,6 +585,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();
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 5d8016b33..cfa07f65a 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -235,6 +235,7 @@
                 <TableLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:shrinkColumns="0"
                     android:stretchColumns="1">
 
                     <TableRow
@@ -247,7 +248,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_session_established"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/session_est"
@@ -255,6 +258,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
+                            android:paddingLeft="4dp"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded" />
                     </TableRow>
@@ -265,6 +269,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">
 
@@ -277,7 +282,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_pep"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/server_info_pep"
@@ -285,6 +292,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
+                            android:paddingLeft="4dp"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded" />
                     </TableRow>
@@ -298,7 +306,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_blocking"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/server_info_blocking"
@@ -306,6 +316,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
+                            android:paddingLeft="4dp"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded" />
                     </TableRow>
@@ -319,7 +330,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_stream_management"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/server_info_sm"
@@ -327,6 +340,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
+                            android:paddingLeft="4dp"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded" />
                     </TableRow>
@@ -340,7 +354,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_roster_version"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/server_info_roster_version"
@@ -348,6 +364,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
+                            android:paddingLeft="4dp"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded" />
                     </TableRow>
@@ -361,7 +378,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_carbon_messages"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/server_info_carbons"
@@ -369,6 +388,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
+                            android:paddingLeft="4dp"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded" />
                     </TableRow>
@@ -382,7 +402,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_mam"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/server_info_mam"
@@ -390,6 +412,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
+                            android:paddingLeft="4dp"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded" />
                     </TableRow>
@@ -403,7 +426,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_csi"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/server_info_csi"
@@ -411,6 +436,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
+                            android:paddingLeft="4dp"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded" />
                     </TableRow>
@@ -425,7 +451,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_push"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/server_info_push"
@@ -433,6 +461,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
+                            android:paddingLeft="4dp"
                             android:textSize="?attr/TextSizeBody"/>
                     </TableRow>
                     <TableRow
@@ -444,7 +473,9 @@
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_http_upload"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textSize="?attr/TextSizeBody"
+                            android:singleLine="true"
+                            android:ellipsize="end"/>
 
                         <TextView
                             android:id="@+id/server_info_http_upload"
@@ -452,8 +483,8 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded" />
+                            android:paddingLeft="4dp"
+                            android:textSize="?attr/TextSizeBody"/>
 
                     </TableRow>
                 </TableLayout>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 2cc2576b5..df7737ea0 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -199,6 +199,8 @@
         android:orientation="vertical"
         android:padding="@dimen/infocard_padding"
         android:id="@+id/muc_info_more"
+        android:shrinkColumns="0"
+  			android:stretchColumns="1"
         android:visibility="gone">
 
 
@@ -216,13 +218,16 @@
                                android:layout_height="wrap_content"
                                android:text="@string/server_info_mam"
                                android:textColor="@color/black87"
-                               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="@color/black87"
                                android:textSize="?attr/TextSizeBody" />
                </TableRow>