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

migrated some views over to app compat text styles

This commit is contained in:
Daniel Gultsch 2018-02-28 22:18:33 +01:00
parent 562622393e
commit 71beb92dd3
12 changed files with 23 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
View File

@ -127,10 +127,6 @@ public abstract class OmemoActivity extends XmppActivity {
CompoundButton.OnCheckedChangeListener CompoundButton.OnCheckedChangeListener
onCheckedChangeListener) { onCheckedChangeListener) {
ContactKeyBinding binding = DataBindingUtil.inflate(getLayoutInflater(), R.layout.contact_key, keys, true); ContactKeyBinding binding = DataBindingUtil.inflate(getLayoutInflater(), R.layout.contact_key, keys, true);
if (Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509) {
binding.key.setOnClickListener(v -> showX509Certificate(account, fingerprint));
binding.keyType.setOnClickListener(v -> showX509Certificate(account, fingerprint));
}
binding.tglTrust.setVisibility(View.VISIBLE); binding.tglTrust.setVisibility(View.VISIBLE);
registerForContextMenu(binding.getRoot()); registerForContextMenu(binding.getRoot());
binding.getRoot().setTag(R.id.TAG_ACCOUNT, account); binding.getRoot().setTag(R.id.TAG_ACCOUNT, account);
@ -214,37 +210,6 @@ public abstract class OmemoActivity extends XmppActivity {
builder.create().show(); builder.create().show();
} }
private void showX509Certificate(Account account, String fingerprint) {
X509Certificate x509Certificate = account.getAxolotlService().getFingerprintCertificate(fingerprint);
if (x509Certificate != null) {
showCertificateInformationDialog(CryptoHelper.extractCertificateInformation(x509Certificate));
} else {
Toast.makeText(this, R.string.certificate_not_found, Toast.LENGTH_SHORT).show();
}
}
private void showCertificateInformationDialog(Bundle bundle) {
View view = getLayoutInflater().inflate(R.layout.certificate_information, null);
final String not_available = getString(R.string.certicate_info_not_available);
TextView subject_cn = (TextView) view.findViewById(R.id.subject_cn);
TextView subject_o = (TextView) view.findViewById(R.id.subject_o);
TextView issuer_cn = (TextView) view.findViewById(R.id.issuer_cn);
TextView issuer_o = (TextView) view.findViewById(R.id.issuer_o);
TextView sha1 = (TextView) view.findViewById(R.id.sha1);
subject_cn.setText(bundle.getString("subject_cn", not_available));
subject_o.setText(bundle.getString("subject_o", not_available));
issuer_cn.setText(bundle.getString("issuer_cn", not_available));
issuer_o.setText(bundle.getString("issuer_o", not_available));
sha1.setText(bundle.getString("sha1", not_available));
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.certificate_information);
builder.setView(view);
builder.setPositiveButton(R.string.ok, null);
builder.create().show();
}
@Override @Override
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
ScanActivity.onRequestPermissionResult(this, requestCode, grantResults); ScanActivity.onRequestPermissionResult(this, requestCode, grantResults);

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

@ -162,9 +162,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/battery_optimizations_enabled" android:text="@string/battery_optimizations_enabled"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/os_optimization_body" android:id="@+id/os_optimization_body"
@ -174,8 +172,7 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/battery_optimizations_enabled_explained" android:text="@string/battery_optimizations_enabled_explained"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textSize="?attr/TextSizeBody"/>
<Button <Button
android:id="@+id/os_optimization_disable" android:id="@+id/os_optimization_disable"
@ -599,18 +596,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/other_devices" android:text="@string/other_devices"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textSize="?attr/TextSizeHeadline" android:layout_margin="@dimen/list_padding"/>
android:layout_margin="@dimen/list_padding"
android:textStyle="bold"/>
<LinearLayout <LinearLayout
android:id="@+id/other_device_keys" android:id="@+id/other_device_keys"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:divider="?android:dividerHorizontal" android:orientation="vertical"/>
android:orientation="vertical"
android:showDividers="middle"></LinearLayout>
<Button <Button
android:id="@+id/clear_devices" android:id="@+id/clear_devices"

3
src/main/res/layout/captcha.xml
View File

@ -16,9 +16,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:textColor="?attr/color_text_primary"
android:textColorHint="?attr/color_text_secondary"
android:textSize="?attr/TextSizeBody"
android:hint="@string/captcha_hint"> android:hint="@string/captcha_hint">
<requestFocus /> <requestFocus />

88
src/main/res/layout/certificate_information.xml
View File

@ -1,88 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/certificate_subject"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeHeadline"/>
<TextView
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/certificate_cn"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/subject_cn"
android:textColor="?attr/color_text_secondary"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/certificate_o"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/subject_o"
android:textColor="?attr/color_text_secondary"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_marginTop="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/certificate_issuer"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeHeadline"/>
<TextView
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/certificate_cn"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/issuer_cn"
android:textColor="?attr/color_text_secondary"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/certificate_o"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/issuer_o"
android:textColor="?attr/color_text_secondary"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_marginTop="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/certificate_sha1"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/sha1"
android:textColor="?attr/color_text_secondary"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace"
android:fontFamily="monospace"/>
</LinearLayout>

5
src/main/res/layout/contact.xml
View File

@ -50,10 +50,7 @@
android:id="@+id/key" android:id="@+id/key"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="monospace" android:textAppearance="@style/TextAppearance.Conversations.Fingerprint"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace"
android:visibility="gone"/> android:visibility="gone"/>
</LinearLayout> </LinearLayout>

8
src/main/res/layout/contact_key.xml
View File

@ -19,13 +19,10 @@
android:id="@+id/key" android:id="@+id/key"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:fontFamily="monospace" android:fontFamily="monospace"
android:longClickable="true" android:longClickable="true"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.Conversations.Fingerprint"/>
android:textSize="?attr/TextSizeBody"
android:typeface="monospace"/>
<TextView <TextView
android:id="@+id/key_type" android:id="@+id/key_type"
@ -34,8 +31,7 @@
android:clickable="true" android:clickable="true"
android:longClickable="true" android:longClickable="true"
android:maxLines="1" android:maxLines="1"
android:textColor="?attr/color_text_secondary" android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
android:textSize="?attr/TextSizeInfo"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

3
src/main/res/layout/dialog_block_contact.xml
View File

@ -12,8 +12,7 @@
android:id="@+id/text" android:id="@+id/text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="?attr/TextSizeBody" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textColor="?attr/color_text_primary"/>
<CheckBox <CheckBox
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:id="@+id/report_spam" android:id="@+id/report_spam"

7
src/main/res/layout/dialog_clear_history.xml
View File

@ -11,10 +11,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?attr/color_text_primary" android:layout_marginBottom="8dp"
android:paddingBottom="8dp" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:text="@string/clear_histor_msg" android:text="@string/clear_histor_msg"/>
android:textSize="?attr/TextSizeBody" />
<CheckBox <CheckBox
android:id="@+id/end_conversation_checkbox" android:id="@+id/end_conversation_checkbox"

13
src/main/res/layout/magic_create.xml
View File

@ -28,32 +28,27 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pick_your_username" android:text="@string/pick_your_username"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/magic_create_text" android:text="@string/magic_create_text"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textSize="?attr/TextSizeBody"/>
<EditText <EditText
android:id="@+id/username" android:id="@+id/username"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:hint="@string/username_hint" android:hint="@string/username_hint"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"/>
android:textSize="?attr/TextSizeBody"/>
<TextView <TextView
android:id="@+id/full_jid" android:id="@+id/full_jid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/your_full_jid_will_be" android:text="@string/your_full_jid_will_be"
android:textColor="?attr/color_text_secondary" android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textSize="?attr/TextSizeInfo"
android:visibility="invisible"/> android:visibility="invisible"/>
<Button <Button
android:id="@+id/create_account" android:id="@+id/create_account"

3
src/main/res/layout/presence_template.xml
View File

@ -21,8 +21,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/presence_status_message" android:id="@+id/presence_status_message"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textSize="?attr/TextSizeBody"/>
<TextView <TextView
android:id="@+id/status" android:id="@+id/status"
android:layout_width="wrap_content" android:layout_width="wrap_content"

7
src/main/res/layout/welcome.xml
View File

@ -28,16 +28,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/welcome_header" android:text="@string/welcome_header"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/welcome_text" android:text="@string/welcome_text"
android:textColor="?attr/color_text_primary" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
android:textSize="?attr/TextSizeBody"/>
<Button <Button
android:id="@+id/create_account" android:id="@+id/create_account"
style="?android:attr/borderlessButtonStyle" style="?android:attr/borderlessButtonStyle"

4
src/main/res/values/styles.xml
View File

@ -2,6 +2,10 @@
<style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1"> <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1">
<item name="android:textColor">?android:textColorSecondary</item> <item name="android:textColor">?android:textColorSecondary</item>
</style> </style>
<style name="TextAppearance.Conversations.Fingerprint" parent="TextAppearance.AppCompat.Body1">
<item name="android:fontFamily">monospace</item>
<item name="android:typeface">monospace</item>
</style>
<style name="InputLabel" parent="TextAppearance.AppCompat.Caption"> <style name="InputLabel" parent="TextAppearance.AppCompat.Caption">
<item name="android:paddingBottom">@dimen/input_label_vertical_spacing</item> <item name="android:paddingBottom">@dimen/input_label_vertical_spacing</item>
<item name="android:paddingLeft">@dimen/input_label_horizontal_spacing</item> <item name="android:paddingLeft">@dimen/input_label_horizontal_spacing</item>