Skip to content
Snippets Groups Projects
Commit 8de0eead authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Normalize tv browser icon names and favorite icon names

parent ebec0d43
No related branches found
No related tags found
1 merge request!1625Update the libs
Showing
with 15 additions and 15 deletions
......@@ -391,9 +391,9 @@ class FileBrowserFragmentUITest : BaseUITest() {
onView(withRecyclerView(R.id.network_list).atPosition(0)).perform(click())
onView(withId(R.id.ml_menu_save))
.check(matches(withActionIconDrawable(R.drawable.ic_menu_bookmark_outline_w)))
.check(matches(withActionIconDrawable(R.drawable.ic_menu_favorite_outline)))
.perform(click())
.check(matches(withActionIconDrawable(R.drawable.ic_menu_bookmark_w)))
.check(matches(withActionIconDrawable(R.drawable.ic_menu_favorite)))
onView(isRoot()).perform(pressBack())
onView(isRoot()).perform(pressBack())
......@@ -414,9 +414,9 @@ class FileBrowserFragmentUITest : BaseUITest() {
onView(withRecyclerView(R.id.network_list).atPosition(3)).perform(click())
onView(withId(R.id.ml_menu_save))
.check(matches(withActionIconDrawable(R.drawable.ic_menu_bookmark_w)))
.check(matches(withActionIconDrawable(R.drawable.ic_menu_favorite)))
.perform(click())
.check(matches(withActionIconDrawable(R.drawable.ic_menu_bookmark_outline_w)))
.check(matches(withActionIconDrawable(R.drawable.ic_menu_favorite_outline)))
onView(isRoot()).perform(pressBack())
......
......@@ -267,7 +267,7 @@ abstract class BaseBrowserTvFragment<T> : Fragment(), BrowserFragmentInterface,
private fun setupDisplayIcon() {
binding.imageButtonDisplay.setImageResource(if (inGrid) R.drawable.ic_fabtvmini_list else R.drawable.ic_fabtvmini_grid)
binding.displayButton.setImageResource(if (inGrid) R.drawable.ic_list else R.drawable.ic_grid)
binding.displayButton.setImageResource(if (inGrid) R.drawable.ic_tv_browser_list else R.drawable.ic_tv_browser_grid)
binding.displayDescription.setText(if (inGrid) R.string.display_in_list else R.string.display_in_grid)
binding.displayButton.contentDescription = getString(if (inGrid) R.string.display_in_list else R.string.display_in_grid)
binding.imageButtonDisplay.contentDescription = getString(if (inGrid) R.string.display_in_list else R.string.display_in_grid)
......
......@@ -201,9 +201,9 @@ class FileBrowserTvFragment : BaseBrowserTvFragment<MediaLibraryItem>(), PathAda
animationDelegate.setVisibility(binding.imageButtonFavorite, View.VISIBLE)
animationDelegate.setVisibility(binding.favoriteDescription, View.VISIBLE)
favExists = (currentItem as? MediaWrapper)?.let { browserFavRepository.browserFavExists(it.uri) } ?: false
binding.favoriteButton.setImageResource(if (favExists) R.drawable.ic_favorite else R.drawable.ic_favorite_outline)
binding.favoriteButton.setImageResource(if (favExists) R.drawable.ic_tv_browser_favorite else R.drawable.ic_tv_browser_favorite_outline)
binding.favoriteButton.contentDescription = getString(if (favExists) R.string.favorites_remove else R.string.favorites_add)
binding.imageButtonFavorite.setImageResource(if (favExists) R.drawable.ic_fabtvmini_bookmark else R.drawable.ic_fabtvmini_bookmark_outline)
binding.imageButtonFavorite.setImageResource(if (favExists) R.drawable.ic_fabtvmini_favorite else R.drawable.ic_fabtvmini_favorite_outline)
binding.imageButtonFavorite.contentDescription = getString(if (favExists) R.string.favorites_remove else R.string.favorites_add)
}
binding.favoriteButton.setOnClickListener(favoriteClickListener)
......@@ -277,9 +277,9 @@ class FileBrowserTvFragment : BaseBrowserTvFragment<MediaLibraryItem>(), PathAda
}
}
favExists = browserFavRepository.browserFavExists(mw.uri)
binding.favoriteButton.setImageResource(if (favExists) R.drawable.ic_favorite else R.drawable.ic_favorite_outline)
binding.favoriteButton.setImageResource(if (favExists) R.drawable.ic_tv_browser_favorite else R.drawable.ic_tv_browser_favorite_outline)
binding.favoriteButton.contentDescription = getString(if (favExists) R.string.favorites_remove else R.string.favorites_add)
binding.imageButtonFavorite.setImageResource(if (favExists) R.drawable.ic_fabtvmini_bookmark else R.drawable.ic_fabtvmini_bookmark_outline)
binding.imageButtonFavorite.setImageResource(if (favExists) R.drawable.ic_fabtvmini_favorite else R.drawable.ic_fabtvmini_favorite_outline)
binding.imageButtonFavorite.contentDescription = getString(if (favExists) R.string.favorites_remove else R.string.favorites_add)
}
}
......
......@@ -72,7 +72,7 @@
android:background="@color/transparent"
app:layout_constraintEnd_toStartOf="@+id/sortButton"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_grid"
app:srcCompat="@drawable/ic_tv_browser_grid"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageButton
......@@ -86,7 +86,7 @@
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@id/displayButton"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_bookmark"
app:srcCompat="@drawable/ic_tv_browser_favorite"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageButton
......@@ -98,7 +98,7 @@
android:background="@color/transparent"
android:elevation="6dp"
android:contentDescription="@string/sortby"
app:srcCompat="@drawable/ic_sort"
app:srcCompat="@drawable/ic_tv_browser_sort"
app:layout_constraintEnd_toStartOf="@+id/headerButton"
app:layout_constraintTop_toTopOf="parent" />
......@@ -111,7 +111,7 @@
android:background="@color/transparent"
android:elevation="6dp"
android:contentDescription="@string/jump_to"
app:srcCompat="@drawable/ic_jumptoheader"
app:srcCompat="@drawable/ic_tv_browser_jumptoheader"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -152,7 +152,7 @@
android:layout_marginBottom="8dp"
android:elevation="6dp"
android:nextFocusDown="@id/imageButtonHeader"
app:srcCompat="@drawable/ic_fabtvmini_bookmark"
app:srcCompat="@drawable/ic_fabtvmini_favorite"
app:layout_constraintBottom_toBottomOf="@+id/imageButtonSort"
app:layout_constraintEnd_toEndOf="@+id/imageButtonSort"
app:layout_constraintStart_toStartOf="@+id/imageButtonSort"
......@@ -185,7 +185,7 @@
app:layout_constraintEnd_toEndOf="@+id/imageButtonHeader"
app:layout_constraintStart_toStartOf="@+id/imageButtonHeader"
app:layout_constraintTop_toTopOf="@+id/imageButtonHeader"
app:srcCompat="@drawable/ic_fabtvmini_bookmark" />
app:srcCompat="@drawable/ic_fabtvmini_favorite" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/imageButtonHeader"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment