sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2028 from Mishiranu/feature-more-tables 

Fix "Server info" table layout
This commit is contained in:
Daniel Gultsch 2016-09-20 16:43:51 +02:00 committed by GitHub
parent 5790d4c4ab 9aaa5b78f4
commit de7c0c5121
4 changed files with 73 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View File

@ -519,6 +519,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener); this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener);
this.mCancelButton.setOnClickListener(this.mCancelButtonClickListener); this.mCancelButton.setOnClickListener(this.mCancelButtonClickListener);
this.mMoreTable = (TableLayout) findViewById(R.id.server_info_more); this.mMoreTable = (TableLayout) findViewById(R.id.server_info_more);
if (savedInstanceState != null && savedInstanceState.getBoolean("showMoreTable")) {
changeMoreTableVisibility(true);
}
final OnCheckedChangeListener OnCheckedShowConfirmPassword = new OnCheckedChangeListener() { final OnCheckedChangeListener OnCheckedShowConfirmPassword = new OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(final CompoundButton buttonView, public void onCheckedChanged(final CompoundButton buttonView,
@ -584,6 +587,15 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
return super.onCreateOptionsMenu(menu); 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 @Override
protected void onStart() { protected void onStart() {
super.onStart(); super.onStart();
@ -628,6 +640,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
if (mAccount != null) { if (mAccount != null) {
savedInstanceState.putString("account", mAccount.getJid().toBareJid().toString()); savedInstanceState.putString("account", mAccount.getJid().toBareJid().toString());
savedInstanceState.putBoolean("initMode", mInitMode); savedInstanceState.putBoolean("initMode", mInitMode);
savedInstanceState.putBoolean("showMoreTable", mMoreTable.getVisibility() == View.VISIBLE);
} }
super.onSaveInstanceState(savedInstanceState); super.onSaveInstanceState(savedInstanceState);
} }
@ -695,8 +708,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
startActivity(showBlocklistIntent); startActivity(showBlocklistIntent);
break; break;
case R.id.action_server_info_show_more: case R.id.action_server_info_show_more:
mMoreTable.setVisibility(item.isChecked() ? View.GONE : View.VISIBLE); changeMoreTableVisibility(!item.isChecked());
item.setChecked(!item.isChecked());
break; break;
case R.id.action_change_password_on_server: case R.id.action_change_password_on_server:
gotoChangePassword(null); gotoChangePassword(null);
@ -720,6 +732,10 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
private void changeMoreTableVisibility(boolean visible) {
mMoreTable.setVisibility(visible ? View.VISIBLE : View.GONE);
}
private void gotoChangePassword(String newPassword) { private void gotoChangePassword(String newPassword) {
final Intent changePasswordIntent = new Intent(this, ChangePasswordActivity.class); final Intent changePasswordIntent = new Intent(this, ChangePasswordActivity.class);
changePasswordIntent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().toString()); changePasswordIntent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().toString());

52
src/main/res/layout/activity_edit_account.xml
View File

@ -221,6 +221,7 @@
<TableLayout <TableLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:shrinkColumns="0"
android:stretchColumns="1"> android:stretchColumns="1">
<TableRow <TableRow
@ -233,13 +234,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_session_established" android:text="@string/server_info_session_established"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/session_est" android:id="@+id/session_est"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded"/>
@ -250,6 +254,7 @@
android:id="@+id/server_info_more" android:id="@+id/server_info_more"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:shrinkColumns="0"
android:stretchColumns="1" android:stretchColumns="1"
android:visibility="gone"> android:visibility="gone">
@ -262,13 +267,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_pep" android:text="@string/server_info_pep"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/server_info_pep" android:id="@+id/server_info_pep"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded"/>
@ -283,13 +291,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_blocking" android:text="@string/server_info_blocking"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/server_info_blocking" android:id="@+id/server_info_blocking"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded"/>
@ -304,13 +315,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_stream_management" android:text="@string/server_info_stream_management"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/server_info_sm" android:id="@+id/server_info_sm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded"/>
@ -325,13 +339,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_roster_version" android:text="@string/server_info_roster_version"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/server_info_roster_version" android:id="@+id/server_info_roster_version"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded"/>
@ -346,13 +363,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_carbon_messages" android:text="@string/server_info_carbon_messages"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/server_info_carbons" android:id="@+id/server_info_carbons"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded"/>
@ -367,13 +387,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_mam" android:text="@string/server_info_mam"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/server_info_mam" android:id="@+id/server_info_mam"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded"/>
@ -388,13 +411,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_csi" android:text="@string/server_info_csi"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/server_info_csi" android:id="@+id/server_info_csi"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded"/>
@ -409,13 +435,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_push" android:text="@string/server_info_push"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/server_info_push" android:id="@+id/server_info_push"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"/>
</TableRow> </TableRow>
@ -428,13 +457,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_http_upload" android:text="@string/server_info_http_upload"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end"/>
<TextView <TextView
android:id="@+id/server_info_http_upload" android:id="@+id/server_info_http_upload"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody"/>
</TableRow> </TableRow>

6
src/main/res/layout/activity_muc_details.xml
View File

@ -141,6 +141,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/muc_info_more" android:id="@+id/muc_info_more"
android:shrinkColumns="0"
android:stretchColumns="1" android:stretchColumns="1"
android:visibility="gone"> android:visibility="gone">
@ -153,13 +154,16 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/server_info_mam" android:text="@string/server_info_mam"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody"
android:singleLine="true"
android:ellipsize="end" />
<TextView <TextView
android:id="@+id/muc_info_mam" android:id="@+id/muc_info_mam"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingLeft="4dp"
android:textColor="?attr/color_text_primary" android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody" />
</TableRow> </TableRow>

16
src/main/res/values-ru/strings.xml
View File

@ -191,17 +191,17 @@
<string name="muc_details_conference">Конференция</string> <string name="muc_details_conference">Конференция</string>
<string name="muc_details_other_members">Другие участники</string> <string name="muc_details_other_members">Другие участники</string>
<string name="server_info_show_more">Информация о сервере</string> <string name="server_info_show_more">Информация о сервере</string>
<string name="server_info_mam">XEP-0313: Сохранение сообщений в архив</string> <string name="server_info_mam">XEP-0313: Архив сообщений</string>
<string name="server_info_carbon_messages">Дублирование сообщений</string> <string name="server_info_carbon_messages">XEP-0280: Дублиров. сообщений</string>
<string name="server_info_csi">XEP-0352: Индикатор Состояния Клиента</string> <string name="server_info_csi">XEP-0352: Состояние клиента</string>
<string name="server_info_blocking">XEP-0191: Команда Блокирования</string> <string name="server_info_blocking">XEP-0191: Команда блокирования</string>
<string name="server_info_roster_version">XEP-0237: Управление версиями списков</string> <string name="server_info_roster_version">XEP-0237: Версии списков</string>
<string name="server_info_stream_management">XEP-0198: Управление потоками</string> <string name="server_info_stream_management">XEP-0198: Управление потоками</string>
<string name="server_info_pep">XEP-0163: PEP (Аватары / OMEMO)</string> <string name="server_info_pep">XEP-0163: PEP (Аватары / OMEMO)</string>
<string name="server_info_http_upload">XEP-0363: Загрузка файлов по HTTP</string> <string name="server_info_http_upload">XEP-0363: Загрузка по HTTP</string>
<string name="server_info_push">XEP-0357: Push уведомления</string> <string name="server_info_push">XEP-0357: Push уведомления</string>
<string name="server_info_available">доступен</string> <string name="server_info_available">доступно</string>
<string name="server_info_unavailable">недоступен</string> <string name="server_info_unavailable">недоступно</string>
<string name="missing_public_keys">Отсутствие анонсирования открытых ключей</string> <string name="missing_public_keys">Отсутствие анонсирования открытых ключей</string>
<string name="last_seen_now">Присутствие: только что</string> <string name="last_seen_now">Присутствие: только что</string>
<string name="last_seen_min">Присутствие: 1 минуту назад</string> <string name="last_seen_min">Присутствие: 1 минуту назад</string>