mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-25 17:27:45 +00:00
Merge branch 'closed-groups-ui' into private-group-chat
This commit is contained in:
commit
ea28bd2e6f
@ -158,6 +158,9 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name="org.thoughtcrime.securesms.loki.redesign.activities.CreatePrivateChatActivity"
|
android:name="org.thoughtcrime.securesms.loki.redesign.activities.CreatePrivateChatActivity"
|
||||||
android:screenOrientation="portrait" />
|
android:screenOrientation="portrait" />
|
||||||
|
<activity
|
||||||
|
android:name="org.thoughtcrime.securesms.loki.redesign.activities.CreateClosedGroupActivity"
|
||||||
|
android:screenOrientation="portrait" />
|
||||||
<activity
|
<activity
|
||||||
android:name="org.thoughtcrime.securesms.loki.redesign.activities.JoinPublicChatActivity"
|
android:name="org.thoughtcrime.securesms.loki.redesign.activities.JoinPublicChatActivity"
|
||||||
android:screenOrientation="portrait"
|
android:screenOrientation="portrait"
|
||||||
|
6
res/drawable/ic_circle.xml
Normal file
6
res/drawable/ic_circle.xml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<vector android:height="24dp" android:viewportHeight="15"
|
||||||
|
android:viewportWidth="15" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<path android:fillColor="#00000000"
|
||||||
|
android:pathData="M7.5,7.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
|
||||||
|
android:strokeColor="#FFFFFF" android:strokeWidth="1"/>
|
||||||
|
</vector>
|
30
res/layout/activity_create_closed_group.xml
Normal file
30
res/layout/activity_create_closed_group.xml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@drawable/default_session_background"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
style="@style/SmallSessionEditText"
|
||||||
|
android:id="@+id/nameEditText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/large_spacing"
|
||||||
|
android:layout_marginTop="@dimen/medium_spacing"
|
||||||
|
android:layout_marginRight="@dimen/large_spacing"
|
||||||
|
android:layout_marginBottom="@dimen/large_spacing"
|
||||||
|
android:hint="Enter a group name" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1px"
|
||||||
|
android:background="@color/separator" />
|
||||||
|
|
||||||
|
<android.support.v7.widget.RecyclerView
|
||||||
|
android:id="@+id/recyclerView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
@ -40,13 +40,27 @@
|
|||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
android:layout_marginLeft="64dp" />
|
android:layout_marginLeft="64dp" />
|
||||||
|
|
||||||
<ImageView
|
<LinearLayout
|
||||||
android:id="@+id/joinPublicChatButton"
|
android:layout_width="wrap_content"
|
||||||
android:layout_width="24dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="24dp"
|
android:orientation="horizontal"
|
||||||
android:src="@drawable/ic_globe"
|
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_centerVertical="true" />
|
android:layout_centerVertical="true">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/createClosedGroupButton"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:src="@drawable/ic_group_white_24dp" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/joinPublicChatButton"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_marginLeft="@dimen/medium_spacing"
|
||||||
|
android:src="@drawable/ic_globe" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
53
res/layout/view_user.xml
Normal file
53
res/layout/view_user.xml
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@drawable/conversation_view_background"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/contentView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:padding="@dimen/medium_spacing">
|
||||||
|
|
||||||
|
<org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView
|
||||||
|
android:id="@+id/profilePictureView"
|
||||||
|
android:layout_width="@dimen/medium_profile_picture_size"
|
||||||
|
android:layout_height="@dimen/medium_profile_picture_size" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/nameTextView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/medium_spacing"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:textSize="@dimen/medium_font_size"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:text="Spiderman" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_weight="1" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/tickImageView"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_marginLeft="@dimen/medium_spacing"
|
||||||
|
android:src="@drawable/ic_circle" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1px"
|
||||||
|
android:background="@color/separator" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
10
res/menu/menu_create_closed_group.xml
Normal file
10
res/menu/menu_create_closed_group.xml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:title="Done"
|
||||||
|
android:id="@+id/createClosedGroupButton"
|
||||||
|
app:showAsAction="always" />
|
||||||
|
|
||||||
|
</menu>
|
@ -0,0 +1,93 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.redesign.activities
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.support.v4.app.LoaderManager
|
||||||
|
import android.support.v4.content.Loader
|
||||||
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
|
import android.view.Menu
|
||||||
|
import android.view.MenuItem
|
||||||
|
import android.widget.Toast
|
||||||
|
import kotlinx.android.synthetic.main.activity_linked_devices.*
|
||||||
|
import kotlinx.android.synthetic.main.view_user.*
|
||||||
|
import network.loki.messenger.R
|
||||||
|
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
|
||||||
|
import org.thoughtcrime.securesms.mms.GlideApp
|
||||||
|
|
||||||
|
class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
|
||||||
|
private var members = listOf<String>()
|
||||||
|
set(value) { field = value; createClosedGroupAdapter.members = value }
|
||||||
|
|
||||||
|
private val createClosedGroupAdapter by lazy {
|
||||||
|
val result = CreateClosedGroupAdapter(this)
|
||||||
|
result.glide = GlideApp.with(this)
|
||||||
|
result.memberClickListener = this
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
private val selectedMembers: Set<String>
|
||||||
|
get() { return createClosedGroupAdapter.selectedMembers }
|
||||||
|
|
||||||
|
// region Lifecycle
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
|
||||||
|
super.onCreate(savedInstanceState, isReady)
|
||||||
|
setContentView(R.layout.activity_create_closed_group)
|
||||||
|
supportActionBar!!.title = "New Closed Group"
|
||||||
|
recyclerView.adapter = createClosedGroupAdapter
|
||||||
|
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||||
|
LoaderManager.getInstance(this).initLoader(0, null, this)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||||
|
menuInflater.inflate(R.menu.menu_create_closed_group, menu)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
// region Updating
|
||||||
|
override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
|
||||||
|
return CreateClosedGroupLoader(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
|
||||||
|
update(members)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onLoaderReset(loader: Loader<List<String>>) {
|
||||||
|
update(listOf())
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun update(members: List<String>) {
|
||||||
|
this.members = members
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
// region Interaction
|
||||||
|
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
|
val id = item.itemId
|
||||||
|
when(id) {
|
||||||
|
R.id.createClosedGroupButton -> createClosedGroup()
|
||||||
|
else -> { /* Do nothing */ }
|
||||||
|
}
|
||||||
|
return super.onOptionsItemSelected(item)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onMemberClick(member: String) {
|
||||||
|
createClosedGroupAdapter.onMemberClick(member)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun createClosedGroup() {
|
||||||
|
val name = nameTextView.text.trim()
|
||||||
|
if (name.isEmpty()) {
|
||||||
|
return Toast.makeText(this, "Please enter a group name", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
if (name.length >= 64) {
|
||||||
|
return Toast.makeText(this, "Please enter a shorter group name", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
val selectedMembers = this.selectedMembers
|
||||||
|
if (selectedMembers.count() < 2) {
|
||||||
|
return Toast.makeText(this, "Please pick at least 2 group members", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
// TODO: Create group
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
}
|
@ -0,0 +1,48 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.redesign.activities
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.support.v7.widget.RecyclerView
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import org.thoughtcrime.securesms.loki.redesign.views.UserView
|
||||||
|
import org.thoughtcrime.securesms.mms.GlideRequests
|
||||||
|
|
||||||
|
class CreateClosedGroupAdapter(private val context: Context) : RecyclerView.Adapter<CreateClosedGroupAdapter.ViewHolder>() {
|
||||||
|
lateinit var glide: GlideRequests
|
||||||
|
val selectedMembers = mutableSetOf<String>()
|
||||||
|
var members = listOf<String>()
|
||||||
|
set(value) { field = value; notifyDataSetChanged() }
|
||||||
|
var memberClickListener: MemberClickListener? = null
|
||||||
|
|
||||||
|
class ViewHolder(val view: UserView) : RecyclerView.ViewHolder(view)
|
||||||
|
|
||||||
|
override fun getItemCount(): Int {
|
||||||
|
return members.size
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
|
||||||
|
val view = UserView(context)
|
||||||
|
return ViewHolder(view)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
|
||||||
|
val member = members[position]
|
||||||
|
viewHolder.view.setOnClickListener { memberClickListener?.onMemberClick(member) }
|
||||||
|
val isSelected = selectedMembers.contains(member)
|
||||||
|
viewHolder.view.bind(member, isSelected, glide)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun onMemberClick(member: String) {
|
||||||
|
if (selectedMembers.contains(member)) {
|
||||||
|
selectedMembers.remove(member)
|
||||||
|
} else {
|
||||||
|
selectedMembers.add(member)
|
||||||
|
}
|
||||||
|
val index = members.indexOf(member)
|
||||||
|
notifyItemChanged(index)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interface MemberClickListener {
|
||||||
|
|
||||||
|
fun onMemberClick(member: String)
|
||||||
|
}
|
@ -0,0 +1,33 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.redesign.activities
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import org.thoughtcrime.securesms.database.DatabaseFactory
|
||||||
|
import org.thoughtcrime.securesms.util.AsyncLoader
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences
|
||||||
|
import org.whispersystems.signalservice.loki.messaging.LokiThreadFriendRequestStatus
|
||||||
|
|
||||||
|
class CreateClosedGroupLoader(context: Context) : AsyncLoader<List<String>>(context) {
|
||||||
|
|
||||||
|
override fun loadInBackground(): List<String> {
|
||||||
|
val threadDatabase = DatabaseFactory.getThreadDatabase(context)
|
||||||
|
val lokiThreadDatabase = DatabaseFactory.getLokiThreadDatabase(context)
|
||||||
|
val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
|
||||||
|
val deviceLinks = DatabaseFactory.getLokiAPIDatabase(context).getPairingAuthorisations(userHexEncodedPublicKey)
|
||||||
|
val userLinkedDeviceHexEncodedPublicKeys = deviceLinks.flatMap {
|
||||||
|
listOf( it.primaryDevicePublicKey.toLowerCase(), it.secondaryDevicePublicKey.toLowerCase() )
|
||||||
|
}.toMutableSet()
|
||||||
|
userLinkedDeviceHexEncodedPublicKeys.add(userHexEncodedPublicKey.toLowerCase())
|
||||||
|
val cursor = threadDatabase.conversationList
|
||||||
|
val reader = threadDatabase.readerFor(cursor)
|
||||||
|
val result = mutableListOf<String>()
|
||||||
|
while (reader.next != null) {
|
||||||
|
val thread = reader.current
|
||||||
|
if (thread.recipient.isGroupRecipient) { continue }
|
||||||
|
if (lokiThreadDatabase.getFriendRequestStatus(thread.threadId) != LokiThreadFriendRequestStatus.FRIENDS) { continue }
|
||||||
|
val hexEncodedPublicKey = thread.recipient.address.toString().toLowerCase()
|
||||||
|
if (userLinkedDeviceHexEncodedPublicKeys.contains(hexEncodedPublicKey)) { continue }
|
||||||
|
result.add(hexEncodedPublicKey)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
@ -83,6 +83,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
|
|||||||
profileButton.hexEncodedPublicKey = hexEncodedPublicKey
|
profileButton.hexEncodedPublicKey = hexEncodedPublicKey
|
||||||
profileButton.update()
|
profileButton.update()
|
||||||
profileButton.setOnClickListener { openSettings() }
|
profileButton.setOnClickListener { openSettings() }
|
||||||
|
createClosedGroupButton.setOnClickListener { createClosedGroup() }
|
||||||
joinPublicChatButton.setOnClickListener { joinPublicChat() }
|
joinPublicChatButton.setOnClickListener { joinPublicChat() }
|
||||||
// Set up seed reminder view
|
// Set up seed reminder view
|
||||||
val isMasterDevice = (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == null)
|
val isMasterDevice = (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == null)
|
||||||
@ -182,6 +183,11 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
|
|||||||
show(intent)
|
show(intent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun createClosedGroup() {
|
||||||
|
val intent = Intent(this, CreateClosedGroupActivity::class.java)
|
||||||
|
show(intent)
|
||||||
|
}
|
||||||
|
|
||||||
private fun joinPublicChat() {
|
private fun joinPublicChat() {
|
||||||
val intent = Intent(this, JoinPublicChatActivity::class.java)
|
val intent = Intent(this, JoinPublicChatActivity::class.java)
|
||||||
show(intent)
|
show(intent)
|
||||||
|
@ -0,0 +1,52 @@
|
|||||||
|
package org.thoughtcrime.securesms.loki.redesign.views
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.util.AttributeSet
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.widget.LinearLayout
|
||||||
|
import kotlinx.android.synthetic.main.view_conversation.view.profilePictureView
|
||||||
|
import kotlinx.android.synthetic.main.view_user.view.*
|
||||||
|
import network.loki.messenger.R
|
||||||
|
import org.thoughtcrime.securesms.database.Address
|
||||||
|
import org.thoughtcrime.securesms.mms.GlideRequests
|
||||||
|
import org.thoughtcrime.securesms.recipients.Recipient
|
||||||
|
|
||||||
|
class UserView : LinearLayout {
|
||||||
|
var user: String? = null
|
||||||
|
|
||||||
|
// region Lifecycle
|
||||||
|
constructor(context: Context) : super(context) {
|
||||||
|
setUpViewHierarchy()
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
|
||||||
|
setUpViewHierarchy()
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
|
||||||
|
setUpViewHierarchy()
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
|
||||||
|
setUpViewHierarchy()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun setUpViewHierarchy() {
|
||||||
|
val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
|
||||||
|
val contentView = inflater.inflate(R.layout.view_user, null)
|
||||||
|
addView(contentView)
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
|
// region Updating
|
||||||
|
fun bind(user: String, isSelected: Boolean, glide: GlideRequests) {
|
||||||
|
profilePictureView.hexEncodedPublicKey = user
|
||||||
|
profilePictureView.additionalHexEncodedPublicKey = null
|
||||||
|
profilePictureView.isRSSFeed = false
|
||||||
|
profilePictureView.glide = glide
|
||||||
|
profilePictureView.update()
|
||||||
|
nameTextView.text = Recipient.from(context, Address.fromSerialized(user), false).name ?: "Unknown Contact"
|
||||||
|
tickImageView.setImageResource(if (isSelected) R.drawable.ic_circle_check else R.drawable.ic_circle)
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user