hardcoresushi
/
AIRA-android
2
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Add contact info on session info pop-up

Browse Source
master
Hardcore Sushi 2 years ago
parent 2f01c86359
commit f5ca518713
Signed by: hardcoresushi
GPG Key ID: 007F84120107191E
4 changed files with 98 additions and 23 deletions
Show Stats Download Patch File Download Diff File

11
app/src/main/java/sushi/hardcore/aira/ChatActivity.kt
Unescape View File

@ -235,6 +235,17 @@ class ChatActivity : ServiceBoundActivity() {
R.string.incoming
})
}
dialogBinding.textIsContact.text = getString(if (contact == null) {
dialogBinding.fieldIsVerified.visibility = View.GONE
R.string.no
} else {
dialogBinding.textIsVerified.text = getString(if (contact.verified) {
R.string.yes
} else {
R.string.no
})
R.string.yes
})
AlertDialog.Builder(this)
.setTitle(sessionName)
.setView(dialogBinding.root)

104
app/src/main/res/layout/dialog_info.xml
Unescape View File

@ -11,53 +11,113 @@
android:layout_width="100dp"
android:layout_height="100dp"
app:textSize="20sp"
android:layout_gravity="center_horizontal"/>
android:layout_gravity="center_horizontal"
android:layout_marginBottom="10dp"/>
<TextView
<LinearLayout
android:id="@+id/online_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/fingerprint"
style="@style/Label"
android:textStyle="bold"/>
android:orientation="vertical">
<TextView
android:id="@+id/text_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/peer_ip"
style="@style/Label"
android:textStyle="bold"/>
<TextView
android:id="@+id/text_ip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/field_value_margin_start"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/connection"
style="@style/Label"
android:textStyle="bold"/>
<TextView
android:id="@+id/text_outgoing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/field_value_margin_start"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/online_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="horizontal"
android:gravity="center_horizontal">
<TextView
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ip"
android:text="@string/is_contact"
style="@style/Label"
android:textStyle="bold"/>
<TextView
android:id="@+id/text_ip"
android:layout_width="match_parent"
android:id="@+id/text_is_contact"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"/>
android:layout_marginStart="@dimen/field_value_margin_start"/>
</LinearLayout>
<LinearLayout
android:id="@+id/field_is_verified"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal">
<TextView
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/connection"
android:text="@string/is_verified"
style="@style/Label"
android:textStyle="bold"/>
<TextView
android:id="@+id/text_outgoing"
android:layout_width="match_parent"
android:id="@+id/text_is_verified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"/>
android:layout_marginStart="@dimen/field_value_margin_start"/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/fingerprint"
style="@style/Label"
android:textStyle="bold"/>
<TextView
android:id="@+id/text_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"/>
</LinearLayout>

1
app/src/main/res/values/dimens.xml
Unescape View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="image_button_size">30dp</dimen>
<dimen name="field_value_margin_start">5sp</dimen>
</resources>

5
app/src/main/res/values/strings.xml
Unescape View File

@ -17,6 +17,7 @@
<string name="file_saved">File saved !</string>
<string name="enter_password">Enter your password:</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="warning">Warning !</string>
<string name="ask_log_out">Do you really want to log out ? (You will no longer receive messages until you login again)</string>
<string name="cancel">Cancel</string>
@ -62,7 +63,7 @@
<string name="share_label">Send with AIRA</string>
<string name="identity_fingerprint">Your identity\'s fingerprint:</string>
<string name="fingerprint">Fingerprint:</string>
<string name="ip">IP:</string>
<string name="peer_ip">Peer IP:</string>
<string name="connection">Connection:</string>
<string name="outgoing">Outgoing</string>
<string name="incoming">Incoming</string>
@ -84,4 +85,6 @@
<string name="security">Security</string>
<string name="use_psec_padding">Use PSEC padding</string>
<string name="psec_padding_summary">PSEC padding obfuscates the length of your messages but uses more network bandwidth.</string>
<string name="is_contact">Is contact:</string>
<string name="is_verified">Is verified:</string>
</resources>

Write Preview
Loading…
Cancel
Save