srctree

Robin Linden parent 155afe5c 761c33dd
Use a saner way of creating bundles

atox/src/main/kotlin/MainActivity.kt added: 7, removed: 5, total 2

@@ -6,6 +6,7 @@ import android.os.Bundle

import android.util.Log

import androidx.appcompat.app.AppCompatActivity

import androidx.appcompat.app.AppCompatDelegate

import androidx.core.os.bundleOf

import androidx.navigation.fragment.findNavController

import javax.inject.Inject

import ltd.evilcorp.atox.di.ViewModelFactory

@@ -41,7 +42,7 @@ class MainActivity : AppCompatActivity() {

supportFragmentManager.findFragmentById(R.id.nav_host_fragment)?.findNavController()?.navigate(

R.id.action_contactListFragment_to_addContactFragment,

Bundle().apply { putString("toxId", data.drop(SCHEME.length)) }

bundleOf("toxId" to data.drop(SCHEME.length))

)

}

atox/src/main/kotlin/ui/contactlist/ContactListFragment.kt added: 7, removed: 5, total 2

@@ -18,6 +18,7 @@ import androidx.appcompat.app.ActionBarDrawerToggle

import androidx.appcompat.app.AlertDialog

import androidx.core.content.getSystemService

import androidx.core.content.res.ResourcesCompat

import androidx.core.os.bundleOf

import androidx.core.view.GravityCompat

import androidx.core.view.updatePadding

import androidx.fragment.app.viewModels

@@ -287,11 +288,11 @@ class ContactListFragment :

private fun openChat(contact: Contact) = findNavController().navigate(

R.id.action_contactListFragment_to_chatFragment,

Bundle().apply { putString(CONTACT_PUBLIC_KEY, contact.publicKey) }

bundleOf(CONTACT_PUBLIC_KEY to contact.publicKey)

)

private fun openFriendRequest(friendRequest: FriendRequest) = findNavController().navigate(

R.id.action_contactListFragment_to_friendRequestFragment,

Bundle().apply { putString(FRIEND_REQUEST_PUBLIC_KEY, friendRequest.publicKey) }

bundleOf(FRIEND_REQUEST_PUBLIC_KEY to friendRequest.publicKey)

)

}