@@ -65,7 +65,6 @@ import org.schabi.newpipe.util.external_communication.ShareUtils
6565import java.text.SimpleDateFormat
6666import java.util.Date
6767import java.util.Locale
68- import java.util.function.Supplier
6968
7069class SubscriptionFragment : BaseStateFragment <SubscriptionState >() {
7170 private var _binding : FragmentSubscriptionBinding ? = null
@@ -89,6 +88,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
8988 @State
9089 @JvmField
9190 var itemsListState: Parcelable ? = null
91+
9292 @State
9393 @JvmField
9494 var feedGroupsListState: Parcelable ? = null
@@ -143,7 +143,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
143143 // -- Import --
144144 val importSubMenu = menu.addSubMenu(R .string.import_from)
145145
146- addMenuItem (importSubMenu, R .string.previous_export) { onImportPreviousSelected() }
146+ addMenuItemToSubmenu (importSubMenu, R .string.previous_export) { onImportPreviousSelected() }
147147 .setIcon(R .drawable.ic_backup)
148148
149149 val services = requireContext().resources.getStringArray(R .array.service_list)
@@ -156,7 +156,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
156156 val supportedSources = subscriptionExtractor.supportedSources
157157 if (supportedSources.isEmpty()) continue
158158
159- addMenuItem (importSubMenu, serviceName) {
159+ addMenuItemToSubmenu (importSubMenu, serviceName) {
160160 onImportFromServiceSelected(service.serviceId)
161161 }
162162 .setIcon(ServiceHelper .getIcon(service.serviceId))
@@ -171,38 +171,35 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
171171 // -- Export --
172172 val exportSubMenu = menu.addSubMenu(R .string.export_to)
173173
174- addMenuItem (exportSubMenu, R .string.file) { onExportSelected() }
174+ addMenuItemToSubmenu (exportSubMenu, R .string.file) { onExportSelected() }
175175 .setIcon(R .drawable.ic_save)
176176 }
177177
178- private fun addMenuItem (
178+ private fun addMenuItemToSubmenu (
179179 subMenu : SubMenu ,
180180 @StringRes title : Int ,
181181 onClick : Runnable
182182 ): MenuItem {
183- return addMenuItem({ subMenu.add(title) } , onClick)
183+ return setClickListenerToMenuItem( subMenu.add(title), onClick)
184184 }
185185
186- private fun addMenuItem (
186+ private fun addMenuItemToSubmenu (
187187 subMenu : SubMenu ,
188188 title : String ,
189189 onClick : Runnable
190190 ): MenuItem {
191- return addMenuItem({ subMenu.add(title) } , onClick)
191+ return setClickListenerToMenuItem( subMenu.add(title), onClick)
192192 }
193193
194- private fun addMenuItem (
195- menuItemSupplier : Supplier < MenuItem > ,
194+ private fun setClickListenerToMenuItem (
195+ menuItem : MenuItem ,
196196 onClick : Runnable
197197 ): MenuItem {
198- val item = menuItemSupplier.get()
199-
200- item.setOnMenuItemClickListener { _ ->
198+ menuItem.setOnMenuItemClickListener { _ ->
201199 onClick.run ()
202200 true
203201 }
204-
205- return item
202+ return menuItem
206203 }
207204
208205 private fun onImportFromServiceSelected (serviceId : Int ) {
0 commit comments