DO NOT MERGE: Apps: Layout changes to reset UI (5b286c9d) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt

+0 −17

Original line number	Diff line number	Diff line
		@@ -70,10 +70,6 @@ class ApplicationFragment : Fragment(R.layout.fragment_application) {
		)
		})

		if (args.origin == Origin.GPLAY) {
		binding.toolbar.inflateMenu(R.menu.application_menu)
		}

		val startDestination = findNavController().graph.startDestination
		if (startDestination == R.id.applicationFragment) {
		binding.toolbar.setNavigationOnClickListener {
		@@ -147,19 +143,6 @@ class ApplicationFragment : Fragment(R.layout.fragment_application) {
		applicationViewModel.appStatus.value = it.status
		screenshotsRVAdapter.setData(it.other_images_path)

		if (it.shareUrl.isNotBlank()) {
		binding.toolbar.setOnMenuItemClickListener { menu ->
		when (menu.itemId) {
		R.id.share -> {
		val intent = Intent.createChooser(shareApp(it.name, it.shareUrl), null)
		startActivity(intent)
		true
		}
		else -> false
		}
		}
		}

		// Title widgets
		binding.titleInclude.apply {
		appName.text = it.name

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import foundation.e.apps.api.fused.data.Origin
		import foundation.e.apps.api.fused.data.Status
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.launch
		import kotlinx.coroutines.withContext
		import javax.inject.Inject

		@HiltViewModel

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,8 +63,8 @@ class ApplicationListFragment : Fragment(R.layout.fragment_application_list), Fu
		)
		}

		binding.toolbarTitleTV.text = args.translation
		binding.toolbar.apply {
		title = args.translation
		setNavigationOnClickListener {
		view.findNavController().navigate(R.id.categoriesFragment)
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.provider.BaseColumns
		import android.view.View
		import android.view.inputmethod.InputMethodManager
		import android.widget.ImageView
		import android.widget.LinearLayout
		import androidx.appcompat.widget.SearchView
		import androidx.cursoradapter.widget.CursorAdapter
		import androidx.cursoradapter.widget.SimpleCursorAdapter
		@@ -67,6 +68,7 @@ class SearchFragment :
		private var searchView: SearchView? = null
		private var shimmerLayout: ShimmerFrameLayout? = null
		private var recyclerView: RecyclerView? = null
		private var searchHintLayout: LinearLayout? = null

		override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
		super.onViewCreated(view, savedInstanceState)
		@@ -75,6 +77,7 @@ class SearchFragment :
		searchView = binding.searchView
		shimmerLayout = binding.shimmerLayout
		recyclerView = binding.recyclerView
		searchHintLayout = binding.searchHintLayout.root

		// Setup SearchView
		setHasOptionsMenu(true)
		@@ -130,6 +133,7 @@ class SearchFragment :
		query?.let { text ->
		hideKeyboard(activity as Activity)
		view?.requestFocus()
		searchHintLayout?.visibility = View.GONE
		shimmerLayout?.visibility = View.VISIBLE
		recyclerView?.visibility = View.GONE
		mainActivityViewModel.authData.value?.let { searchViewModel.getSearchResults(text, it) }
		@@ -166,6 +170,7 @@ class SearchFragment :
		searchView = null
		shimmerLayout = null
		recyclerView = null
		searchHintLayout = null
		}

		private fun configureCloseButton(searchView: SearchView) {

+3 −2

Original line number	Diff line number	Diff line
		@@ -3,8 +3,9 @@
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24"
		android:tint="?attr/colorControlNormal">
		android:tint="?attr/colorControlNormal"
		android:autoMirrored="true">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M17.77,3.77l-1.77,-1.77l-10,10l10,10l1.77,-1.77l-8.23,-8.23z"/>
		android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
		</vector>