TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 10:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Customize main toolbar

Browse Source
This commit is contained in:
Niels Andriesse
2020-01-06 12:07:55 +11:00
parent ed20a96ed0
commit 1616e841da
5 changed files with 103 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
View File

@@ -14,8 +14,6 @@ import android.support.v4.content.Loader
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.support.v7.widget.helper.ItemTouchHelper
import android.view.Menu
import android.view.MenuItem
import kotlinx.android.synthetic.main.activity_home.*
import network.loki.messenger.R
import org.thoughtcrime.securesms.ApplicationContext
@@ -42,9 +40,15 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
// Set content view
setContentView(R.layout.activity_home)
// Set title
supportActionBar!!.title = "Messages"
setSupportActionBar(toolbar)
// Set up Glide
glide = GlideApp.with(this)
// Set up toolbar buttons
profileButton.glide = glide
profileButton.hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this)
profileButton.update()
profileButton.setOnClickListener { openSettings() }
joinPublicChatButton.setOnClickListener { joinPublicChat() }
// Set up recycler view
val cursor = DatabaseFactory.getThreadDatabase(this).conversationList
val homeAdapter = HomeAdapter(this, cursor)
@@ -85,22 +89,6 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
}
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.menu_home, menu)
return true
}
// endregion
// region Interaction
override fun onOptionsItemSelected(item: MenuItem): Boolean {
val id = item.itemId
when (id) {
R.id.joinPublicChatItem -> joinPublicChat()
else -> { /* Do nothing */ }
}
return super.onOptionsItemSelected(item)
}
override fun onConversationClick(view: ConversationView) {
val thread = view.thread ?: return
openConversation(thread)
@@ -121,6 +109,10 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
push(intent)
}
private fun openSettings() {
// TODO: Implement
}
private fun createPrivateChat() {
val intent = Intent(this, CreatePrivateChatActivity::class.java)
startActivity(intent)

4
src/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@@ -22,7 +22,6 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.annimon.stream.function.Consumer;
@@ -34,7 +33,6 @@ import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.GroupRecordContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.SystemContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.TransparentContactPhoto;
import org.thoughtcrime.securesms.database.Address;
@@ -477,7 +475,7 @@ public class Recipient implements RecipientModifiedListener {
}
public synchronized @Nullable ContactPhoto getContactPhoto() {
if (isLocalNumber) return new ProfileContactPhoto(address, String.valueOf(TextSecurePreferences.getProfileAvatarId(context)));
if (isLocalNumber && profileAvatar != null) return new ProfileContactPhoto(address, String.valueOf(TextSecurePreferences.getProfileAvatarId(context)));
else if (isGroupRecipient() && groupAvatarId != null) return new GroupRecordContactPhoto(address, groupAvatarId);
else if (systemContactPhoto != null) return new SystemContactPhoto(address, systemContactPhoto, 0);
else if (profileAvatar != null) return new ProfileContactPhoto(address, profileAvatar);