gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove use of LayoutInflater.from(Context)

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2024-06-19 17:06:09 +02:00
parent 6fd725e8be
commit 0a24f043b8
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
11 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt
View File

@ -98,7 +98,7 @@ class CreateConversationDialogFragment : DialogFragment() {
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
binding = DialogCreateConversationBinding.inflate(LayoutInflater.from(context)) binding = DialogCreateConversationBinding.inflate(layoutInflater)
val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context)
.setTitle(resources.getString(R.string.create_conversation)) .setTitle(resources.getString(R.string.create_conversation))

2
app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt
View File

@ -68,7 +68,7 @@ class RenameConversationDialogFragment : DialogFragment() {
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
binding = DialogRenameConversationBinding.inflate(LayoutInflater.from(context)) binding = DialogRenameConversationBinding.inflate(layoutInflater)
val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context)
.setTitle(resources.getString(R.string.nc_rename)) .setTitle(resources.getString(R.string.nc_rename))

2
app/src/main/java/com/nextcloud/talk/polls/ui/PollCreateDialogFragment.kt
View File

@ -57,7 +57,7 @@ class PollCreateDialogFragment : DialogFragment(), PollCreateOptionsItemListener
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
binding = DialogPollCreateBinding.inflate(LayoutInflater.from(context)) binding = DialogPollCreateBinding.inflate(layoutInflater)
val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context)
.setView(binding.root) .setView(binding.root)

2
app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt
View File

@ -61,7 +61,7 @@ class PollMainDialogFragment : DialogFragment() {
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
binding = DialogPollMainBinding.inflate(LayoutInflater.from(context)) binding = DialogPollMainBinding.inflate(layoutInflater)
val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context).setView(binding.root) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context).setView(binding.root)

7
app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
View File

@ -37,12 +37,13 @@ import com.nextcloud.talk.ui.StatusDrawable;
import com.nextcloud.talk.ui.theme.ViewThemeUtils; import com.nextcloud.talk.ui.theme.ViewThemeUtils;
import com.nextcloud.talk.users.UserManager; import com.nextcloud.talk.users.UserManager;
import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.DisplayUtils;
import com.nextcloud.talk.utils.CapabilitiesUtil; import com.nextcloud.talk.utils.CapabilitiesUtil;
import com.nextcloud.talk.utils.DisplayUtils;
import java.net.CookieManager; import java.net.CookieManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import javax.inject.Inject; import javax.inject.Inject;
@ -94,7 +95,7 @@ public class ChooseAccountDialogFragment extends DialogFragment {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
binding = DialogChooseAccountBinding.inflate(LayoutInflater.from(requireContext())); binding = DialogChooseAccountBinding.inflate(getLayoutInflater());
dialogView = binding.getRoot(); dialogView = binding.getRoot();
return new MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create(); return new MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create();
@ -103,7 +104,7 @@ public class ChooseAccountDialogFragment extends DialogFragment {
@Override @Override
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this); Objects.requireNonNull(NextcloudTalkApplication.Companion.getSharedApplication()).getComponentApplication().inject(this);
User user = userManager.getCurrentUser().blockingGet(); User user = userManager.getCurrentUser().blockingGet();
themeViews(); themeViews();

2
app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt
View File

@ -53,7 +53,7 @@ class ChooseAccountShareToDialogFragment : DialogFragment() {
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
binding = DialogChooseAccountShareToBinding.inflate(LayoutInflater.from(requireContext())) binding = DialogChooseAccountShareToBinding.inflate(layoutInflater)
dialogView = binding!!.root dialogView = binding!!.root
return MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create() return MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create()
} }

2
app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt
View File

@ -56,7 +56,7 @@ class DateTimePickerFragment : DialogFragment() {
lateinit var viewThemeUtils: ViewThemeUtils lateinit var viewThemeUtils: ViewThemeUtils
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
binding = DialogDateTimePickerBinding.inflate(LayoutInflater.from(context)) binding = DialogDateTimePickerBinding.inflate(layoutInflater)
dialogView = binding.root dialogView = binding.root
viewModel = (requireActivity() as ChatActivity).chatViewModel viewModel = (requireActivity() as ChatActivity).chatViewModel
arguments?.let { arguments?.let {

2
app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt
View File

@ -45,7 +45,7 @@ class FileAttachmentPreviewFragment : DialogFragment() {
filesList = it.getStringArrayList(FILES_TO_UPLOAD_ARG)!! filesList = it.getStringArrayList(FILES_TO_UPLOAD_ARG)!!
} }
binding = DialogFileAttachmentPreviewBinding.inflate(LayoutInflater.from(context)) binding = DialogFileAttachmentPreviewBinding.inflate(layoutInflater)
return MaterialAlertDialogBuilder(requireContext()).setView(binding.root).create() return MaterialAlertDialogBuilder(requireContext()).setView(binding.root).create()
} }

2
app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
View File

@ -40,7 +40,7 @@ class FilterConversationFragment : DialogFragment() {
@Inject @Inject
lateinit var arbitraryStorageManager: ArbitraryStorageManager lateinit var arbitraryStorageManager: ArbitraryStorageManager
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
binding = DialogFilterConversationBinding.inflate(LayoutInflater.from(context)) binding = DialogFilterConversationBinding.inflate(layoutInflater)
dialogView = binding.root dialogView = binding.root
filterState = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { filterState = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
arguments?.getSerializable(FILTER_STATE_ARG, HashMap::class.java) as HashMap<String, Boolean> arguments?.getSerializable(FILTER_STATE_ARG, HashMap::class.java) as HashMap<String, Boolean>

2
app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
View File

@ -155,7 +155,7 @@ class SetStatusDialogFragment :
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
binding = DialogSetStatusBinding.inflate(LayoutInflater.from(context)) binding = DialogSetStatusBinding.inflate(layoutInflater)
val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context).setView(binding.root) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context).setView(binding.root)
viewThemeUtils.dialog.colorMaterialAlertDialogBackground(binding.root.context, dialogBuilder) viewThemeUtils.dialog.colorMaterialAlertDialogBackground(binding.root.context, dialogBuilder)

2
app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java
View File

@ -83,7 +83,7 @@ public class SortingOrderDialogFragment extends DialogFragment implements View.O
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
binding = SortingOrderFragmentBinding.inflate(LayoutInflater.from(requireContext())); binding = SortingOrderFragmentBinding.inflate(getLayoutInflater());
dialogView = binding.getRoot(); dialogView = binding.getRoot();
return new MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create(); return new MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create();