Minor refactoring
Niels Andriesse
3 years ago
parent
cf3f0fbe57
commit
6b3aa86324
@ -1,73 +1,74 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<merge xmlns:android="http://schemas.android.com/apk/res/android"
|
<merge
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:context="org.thoughtcrime.securesms.loki.views.OpenGroupInvitationView">
|
tools:context="org.thoughtcrime.securesms.loki.views.OpenGroupInvitationView">
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/audio_widget_container"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:clickable="false"
|
|
||||||
android:focusable="false"
|
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal"
|
android:paddingHorizontal="@dimen/medium_spacing"
|
||||||
android:padding="8dp"
|
android:orientation="horizontal">
|
||||||
tools:ignore="MissingConstraints" >
|
|
||||||
|
|
||||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<ImageButton
|
||||||
android:id="@+id/join_open_group"
|
android:id="@+id/join_open_group_button"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="48dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="48dp"
|
||||||
android:clickable="true"
|
android:background="@drawable/circle_tintable"
|
||||||
android:focusable="true"
|
android:backgroundTint="#00E076"
|
||||||
android:layout_margin="4dp"
|
|
||||||
android:contentDescription="@string/open_group_invitation_view__join_accessibility_description"
|
android:contentDescription="@string/open_group_invitation_view__join_accessibility_description"
|
||||||
app:srcCompat="@drawable/ic_add_white_original_24dp" />
|
app:srcCompat="@drawable/ic_add_white_original_24dp" />
|
||||||
|
|
||||||
<ImageView
|
<RelativeLayout
|
||||||
android:id="@+id/open_group_icon"
|
android:id="@+id/open_group_icon_image_view_container"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
android:clickable="false"
|
android:background="@drawable/circle_tintable"
|
||||||
android:visibility="gone"
|
android:backgroundTint="#00E076">
|
||||||
android:layout_margin="4dp"
|
|
||||||
android:contentDescription="@string/open_group_invitation_view__join_accessibility_description"
|
<ImageView
|
||||||
android:src="@drawable/ic_globe" />
|
android:id="@+id/open_group_icon_image_view"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:contentDescription="@string/open_group_invitation_view__join_accessibility_description"
|
||||||
|
android:src="@drawable/ic_globe" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="6dp"
|
android:layout_marginStart="@dimen/small_spacing"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/group_name"
|
android:id="@+id/name_text_view"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/Signal.Text.Caption"
|
android:textStyle="bold"
|
||||||
android:fontFamily="sans-serif-medium"
|
|
||||||
android:textSize="@dimen/large_font_size"
|
android:textSize="@dimen/large_font_size"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
tools:text="Open group" />
|
tools:text="Open group" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/open_group_invitation_text"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/Signal.Text.Body"
|
android:textSize="@dimen/small_font_size"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:text="@string/open_group_invitation_view__open_group_invitation" />
|
android:text="@string/open_group_invitation_view__open_group_invitation" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/group_url"
|
android:id="@+id/url_text_view"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="@style/Signal.Text.Caption"
|
android:textSize="@dimen/small_font_size"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
tools:text="http://1.1.1.1" />
|
tools:text="http://1.1.1.1" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</merge>
|
</merge>
|
||||||
@ -1,42 +1,37 @@
|
|||||||
package org.session.libsession.messaging.messages.visible
|
package org.session.libsession.messaging.messages.visible
|
||||||
|
|
||||||
import org.session.libsession.messaging.messages.control.ControlMessage
|
|
||||||
import org.session.libsignal.service.internal.push.SignalServiceProtos
|
import org.session.libsignal.service.internal.push.SignalServiceProtos
|
||||||
import org.session.libsignal.utilities.logging.Log
|
import org.session.libsignal.utilities.logging.Log
|
||||||
|
|
||||||
class OpenGroupInvitation() {
|
class OpenGroupInvitation() {
|
||||||
|
var url: String? = null
|
||||||
|
var name: String? = null
|
||||||
|
|
||||||
var groupUrl: String? = null;
|
fun isValid(): Boolean {
|
||||||
var groupName: String? = null;
|
return (url != null && name != null)
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val TAG = "OpenGroupInvitation"
|
const val TAG = "OpenGroupInvitation"
|
||||||
|
|
||||||
fun fromProto(proto: SignalServiceProtos.DataMessage.OpenGroupInvitation): OpenGroupInvitation? {
|
fun fromProto(proto: SignalServiceProtos.DataMessage.OpenGroupInvitation): OpenGroupInvitation {
|
||||||
val groupUrl = proto.url
|
return OpenGroupInvitation(proto.url, proto.name)
|
||||||
val groupName = proto.name
|
|
||||||
return OpenGroupInvitation(groupUrl, groupName)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(url: String?, serverName: String?): this() {
|
constructor(url: String?, serverName: String?): this() {
|
||||||
this.groupUrl = url
|
this.url = url
|
||||||
this.groupName = serverName
|
this.name = serverName
|
||||||
}
|
|
||||||
|
|
||||||
fun isValid(): Boolean {
|
|
||||||
return (groupUrl != null && groupName != null)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun toProto(): SignalServiceProtos.DataMessage.OpenGroupInvitation? {
|
fun toProto(): SignalServiceProtos.DataMessage.OpenGroupInvitation? {
|
||||||
val openGroupInvitationProto = SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder()
|
val openGroupInvitationProto = SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder()
|
||||||
openGroupInvitationProto.url = groupUrl
|
openGroupInvitationProto.url = url
|
||||||
openGroupInvitationProto.name = groupName
|
openGroupInvitationProto.name = name
|
||||||
|
|
||||||
return try {
|
return try {
|
||||||
openGroupInvitationProto.build()
|
openGroupInvitationProto.build()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.w(TAG, "Couldn't construct open group invitation proto from: $this")
|
Log.w(TAG, "Couldn't construct open group invitation proto from: $this.")
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue