Rename 'Find and Replace' to 'Replace Color'.

app/src/androidTest/java/com/therealbluepandabear/pixapencil/canvasactivity/CanvasActivityTopAppMenuTests.kt

@@ -35,10 +35,6 @@ class CanvasActivityTopAppMenuTests {
         onView(withText(R.string.activityCanvasTopAppMenu_clear_canvas_str)).check(matches(isDisplayed()))
     }
 
-    @Test
-    fun checkFindAndReplaceItemIsDisplayed() {
-        onView(withText(R.string.activityCanvasTopAppMenu_find_and_replace_str)).check(matches(isDisplayed()))
-    }
 
     @Test
     fun checkNewColorPaletteItemIsDisplayed() {

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/CanvasActivity.kt

@@ -28,7 +28,7 @@ class CanvasActivity :
     CanvasFragmentListener,
     ColorPaletteColorPickerListener,
     ColorPickerFragmentListener,
-    FindAndReplaceFragmentListener,
+    ReplaceColorFragmentListener,
     ToolsFragmentListener,
     FiltersFragmentListener,
     ColorPalettesFragmentListener,

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/oncreate/menu/CanvasActivity+onMenuItemSelected.kt

@@ -106,7 +106,7 @@ fun CanvasActivity.onMenuItemSelected(item: MenuItem): Boolean {
             onClearCanvasOptionsItemSelected()
         }
 
-        R.id.activityCanvasTopAppMenu_find_and_replace_item -> {
+        R.id.activityCanvasTopAppMenu_replace_color_item -> {
             onFindAndReplaceOptionsItemSelected()
         }
 

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/onoptionsitemselected/CanvasActivity+onFindAndReplaceOptionsItemSelected.kt

@@ -10,15 +10,15 @@ import com.therealbluepandabear.pixapencil.enums.SnackbarDuration
 import com.therealbluepandabear.pixapencil.extensions.getColors
 import com.therealbluepandabear.pixapencil.extensions.showSnackbar
 //import com.therealbluepandabear.pixapencil.fragments.canvas.pixelGridViewInstance
-import com.therealbluepandabear.pixapencil.fragments.findandreplace.FindAndReplaceFragment
+import com.therealbluepandabear.pixapencil.fragments.replacecolor.ReplaceColorFragment
 
 fun CanvasActivity.onFindAndReplaceOptionsItemSelected() {
     val uniqueColors = binding.activityCanvasPixelGridView.pixelGridViewBitmap.getColors()
 
     if (uniqueColors.isNotEmpty()) {
         supportFragmentManager.commit {
             replace(
-                R.id.activityCanvas_primaryFragmentHost, FindAndReplaceFragment.newInstance(
+                R.id.activityCanvas_primaryFragmentHost, ReplaceColorFragment.newInstance(
                     paramCanvasColors = uniqueColors,
                     paramPixelGridViewBitmapSource = drawPixelGridViewBitmap(),
                     paramTransparentBitmapSource = drawTransparentBackgroundViewBitmap(),

app/src/main/java/com/therealbluepandabear/pixapencil/fragments/findandreplace/FindAndReplaceFragment.kt → app/src/main/java/com/therealbluepandabear/pixapencil/fragments/replacecolor/ReplaceColorFragment.kt

@@ -1,4 +1,4 @@
-package com.therealbluepandabear.pixapencil.fragments.findandreplace
+package com.therealbluepandabear.pixapencil.fragments.replacecolor
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -13,24 +13,24 @@ import com.therealbluepandabear.pixapencil.activities.canvas.CanvasActivity
 import com.therealbluepandabear.pixapencil.adapters.ColorPickerAdapter
 import com.therealbluepandabear.pixapencil.converters.BitmapConverter
 import com.therealbluepandabear.pixapencil.database.AppData
-import com.therealbluepandabear.pixapencil.databinding.FragmentFindAndReplaceBinding
+import com.therealbluepandabear.pixapencil.databinding.FragmentReplaceColorBinding
 import com.therealbluepandabear.pixapencil.extensions.*
 import com.therealbluepandabear.pixapencil.fragments.base.ActivityFragment
 import com.therealbluepandabear.pixapencil.listeners.ColorPickerListener
-import com.therealbluepandabear.pixapencil.listeners.FindAndReplaceFragmentListener
+import com.therealbluepandabear.pixapencil.listeners.ReplaceColorFragmentListener
 import com.therealbluepandabear.pixapencil.utility.constants.StringConstants
 import java.util.ArrayList
 
-class FindAndReplaceFragment : Fragment(), ActivityFragment {
-    private var _binding: FragmentFindAndReplaceBinding? = null
+class ReplaceColorFragment : Fragment(), ActivityFragment {
+    private var _binding: FragmentReplaceColorBinding? = null
 
-    private val binding get(): FragmentFindAndReplaceBinding {
+    private val binding get(): FragmentReplaceColorBinding {
         return _binding!!
     }
 
-    private lateinit var caller: FindAndReplaceFragmentListener
+    private lateinit var caller: ReplaceColorFragmentListener
 
-    override val title: String by lazy { getString(R.string.fragment_find_and_replace_title_in_code_str) }
+    override val title: String by lazy { getString(R.string.fragment_replace_color_title_in_code_str) }
 
     private var colorToFind: Int? = null
     private var colorToReplace: Int? = null
@@ -72,7 +72,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
 
     private fun setupCanvasColorsRecyclerView() {
         binding.fragmentFindAndReplaceCanvasColorsRecyclerView.layoutManager =
-            LinearLayoutManager(this@FindAndReplaceFragment.requireContext()).apply {
+            LinearLayoutManager(this@ReplaceColorFragment.requireContext()).apply {
                 orientation = LinearLayoutManager.HORIZONTAL
             }
 
@@ -89,7 +89,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
 
     private fun setupAvailableColorsRecyclerView() {
         binding.fragmentFindAndReplaceAvailableColorsRecyclerView.layoutManager =
-            LinearLayoutManager(this@FindAndReplaceFragment.requireContext()).apply {
+            LinearLayoutManager(this@ReplaceColorFragment.requireContext()).apply {
                 orientation = LinearLayoutManager.HORIZONTAL
             }
         binding.fragmentFindAndReplaceAvailableColorsRecyclerView.adapter = ColorPickerAdapter(
@@ -104,7 +104,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
         }
     }
 
-    inner class ColorsToFindCaller(val binding: FragmentFindAndReplaceBinding) : ColorPickerListener {
+    inner class ColorsToFindCaller(val binding: FragmentReplaceColorBinding) : ColorPickerListener {
         override fun onColorTapped(colorTapped: Int) {
             colorToFind = colorTapped
 
@@ -114,7 +114,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
         }
     }
 
-    inner class ColorsToReplaceCaller(val binding: FragmentFindAndReplaceBinding) : ColorPickerListener {
+    inner class ColorsToReplaceCaller(val binding: FragmentReplaceColorBinding) : ColorPickerListener {
         override fun onColorTapped(colorTapped: Int) {
             colorToReplace = colorTapped
 
@@ -131,8 +131,8 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
             paramPixelGridViewBitmapSource: Bitmap,
             paramSelectedColorPaletteIndex: Int,
             paramScaledWidth: Int,
-            paramScaledHeight: Int): FindAndReplaceFragment {
-            val fragment = FindAndReplaceFragment()
+            paramScaledHeight: Int): ReplaceColorFragment {
+            val fragment = ReplaceColorFragment()
             fragment.setParams(paramCanvasColors, paramTransparentBitmapSource, paramPixelGridViewBitmapSource, paramSelectedColorPaletteIndex, paramScaledWidth, paramScaledHeight)
 
             return fragment
@@ -141,7 +141,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
-        if (context is FindAndReplaceFragmentListener) caller = context
+        if (context is ReplaceColorFragmentListener) caller = context
         requireActivity().title = title
     }
 
@@ -151,7 +151,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = FragmentFindAndReplaceBinding.inflate(inflater, container, false)
+        _binding = FragmentReplaceColorBinding.inflate(inflater, container, false)
 
         setup()
 

app/src/main/java/com/therealbluepandabear/pixapencil/listeners/FindAndReplaceFragmentListener.kt → app/src/main/java/com/therealbluepandabear/pixapencil/listeners/ReplaceColorFragmentListener.kt

@@ -1,5 +1,5 @@
 package com.therealbluepandabear.pixapencil.listeners
 
-interface FindAndReplaceFragmentListener {
+interface ReplaceColorFragmentListener {
     fun onDoneButtonPressed(colorToFind: Int?, colorToReplace: Int?)
 }

app/src/main/res/layout-land/fragment_find_and_replace.xml → app/src/main/res/layout-land/fragment_replace_color.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".fragments.findandreplace.FindAndReplaceFragment"
+    tools:context=".fragments.replacecolor.ReplaceColorFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     style="@style/defaultFragmentStyle">

app/src/main/res/layout/fragment_find_and_replace.xml → app/src/main/res/layout/fragment_replace_color.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".fragments.findandreplace.FindAndReplaceFragment"
+    tools:context=".fragments.replacecolor.ReplaceColorFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     style="@style/defaultFragmentStyle">

app/src/main/res/menu/activity_canvas_top_app_menu.xml

@@ -7,9 +7,9 @@
         app:showAsAction="ifRoom"
         android:title="@string/activityCanvasTopAppMenu_clear_canvas_str" />
 
-    <item android:id="@+id/activityCanvasTopAppMenu_find_and_replace_item"
+    <item android:id="@+id/activityCanvasTopAppMenu_replace_color_item"
         app:showAsAction="ifRoom"
-        android:title="@string/activityCanvasTopAppMenu_find_and_replace_str" />
+        android:title="@string/activityCanvasTopAppMenu_replace_color_str" />
 
     <item android:id="@+id/activityCanvasTopAppMenu_import_lospec_palette_item"
         app:showAsAction="ifRoom"

app/src/main/res/values-de/strings.xml

@@ -18,7 +18,6 @@
     <string name="fragment_find_and_replace_find_preview_content_description">Vorschau finden</string>
     <string name="fragment_find_and_replace_replace_preview_content_description">Ersetze die Vorschau</string>
     <string name="fragment_new_project_title_in_code_str">Neues Projekt</string>
-    <string name="fragment_find_and_replace_title_in_code_str">Suchen und Ersetzen</string>
     <string name="fragment_color_picker_title_in_code_str">Farbe wählen</string>
     <string name="fragment_new_color_palette_title_in_code_str">Neue Farbpalette</string>
     <string name="fragment_spray_tool_settings_title_in_code_str">Sprühdosen-Einstellungen</string>
@@ -171,7 +170,6 @@
     <string name="spot_light_activity_main_in_code_str">Tippen um ein
 \nneues Projekt zu erstellen</string>
     <string name="activityCanvasTopAppMenu_grid_str">Gitter</string>
-    <string name="activityCanvasTopAppMenu_find_and_replace_str">Suchen und ersetzen</string>
     <string name="square_tool_info_title_in_code_str">Quadrat-Tool-Info</string>
     <string name="activityCanvasTopAppMenu_symmetry_str">Symmetrie</string>
     <string name="dither_tool_info_title_in_code_str">Verschmieren-Tool-Info</string>

app/src/main/res/values-en-rGB/strings.xml

@@ -48,7 +48,7 @@
     <string name="fragment_find_and_replace_find_preview_content_description">Find Preview</string>
     <string name="fragment_find_and_replace_replace_preview_content_description">Replace Preview</string>
     <string name="fragment_new_project_title_in_code_str">New Project</string>
-    <string name="fragment_find_and_replace_title_in_code_str">Find and Replace</string>
+    <string name="fragment_replace_color_title_in_code_str">Find and Replace</string>
     <string name="fragment_color_picker_title_in_code_str">Select Colour</string>
     <string name="fragment_new_color_palette_title_in_code_str">New Colour Palette</string>
     <string name="fragment_spray_tool_settings_title_in_code_str">Spray Tool Settings</string>
@@ -102,7 +102,7 @@
     <string name="activityCanvasTopAppMenu_zoom_out_str">Zoom out</string>
     <string name="activityCanvasTopAppMenu_save_text_str">Save</string>
     <string name="activityCanvasTopAppMenu_grid_str">Grid</string>
-    <string name="activityCanvasTopAppMenu_find_and_replace_str">Find and Replace</string>
+    <string name="activityCanvasTopAppMenu_replace_color_str">Find and Replace</string>
     <string name="activityCanvasTopAppMenu_clear_canvas_str">Clear Canvas</string>
     <string name="activityCanvasTopAppMenu_symmetry_horizontal_str">Horizontal</string>
     <string name="activityCanvasTopAppMenu_symmetry_vertical_str">Vertical</string>

app/src/main/res/values-fr/strings.xml

@@ -19,7 +19,7 @@
     <string name="generic_ok_in_code_str">OK</string>
     <string name="fragment_find_and_replace_replace_preview_content_description">Remplacer l\'aperçu</string>
     <string name="fragment_new_project_title_in_code_str">Nouveau projet</string>
-    <string name="fragment_find_and_replace_title_in_code_str">Rechercher et remplacer</string>
+    <string name="fragment_replace_color_title_in_code_str">Rechercher et remplacer</string>
     <string name="fragmentTools_fill_tool_content_description">Outil de remplissage</string>
     <string name="fragmentNewCanvas_project_name_str">Nom</string>
     <string name="activityCanvasTopAppMenu_rotate_str">Pivoter</string>
@@ -32,7 +32,6 @@
     <string name="activityCanvasTopAppMenu_zoom_out_str">Réduire</string>
     <string name="activityCanvasTopAppMenu_save_text_str">Enregistrer</string>
     <string name="activityCanvasTopAppMenu_grid_str">Grille</string>
-    <string name="activityCanvasTopAppMenu_find_and_replace_str">Trouver et remplacer</string>
     <string name="activityCanvasTopAppMenu_clear_canvas_str">Effacer le canevas</string>
     <string name="activityCanvasTopAppMenu_symmetry_horizontal_str">Horizontal</string>
     <string name="activityCanvasTopAppMenu_symmetry_str">Symétrie</string>

app/src/main/res/values-hr/strings.xml

@@ -49,7 +49,6 @@
     <string name="fragment_find_and_replace_find_preview_content_description">Pregled pretrage</string>
     <string name="fragment_find_and_replace_replace_preview_content_description">Pregled zamjene</string>
     <string name="fragment_new_project_title_in_code_str">Novi projekt</string>
-    <string name="fragment_find_and_replace_title_in_code_str">Traži i zamijeni</string>
     <string name="fragment_color_picker_title_in_code_str">Odaberi boju</string>
     <string name="fragment_new_color_palette_title_in_code_str">Nova paleta boja</string>
     <string name="fragment_spray_tool_settings_title_in_code_str">Postavke sprejanja</string>
@@ -112,7 +111,6 @@
     <string name="activityCanvasTopAppMenu_zoom_out_str">Umanji prikaz</string>
     <string name="activityCanvasTopAppMenu_save_text_str">Spremi</string>
     <string name="activityCanvasTopAppMenu_grid_str">Mreža</string>
-    <string name="activityCanvasTopAppMenu_find_and_replace_str">Traži i zamijeni</string>
     <string name="activityCanvasTopAppMenu_clear_canvas_str">Obriši platno</string>
     <string name="activityCanvasTopAppMenu_symmetry_horizontal_str">Vodoravno</string>
     <string name="activityCanvasTopAppMenu_symmetry_vertical_str">Okomit</string>

app/src/main/res/values-in/strings.xml

@@ -8,7 +8,6 @@
     <string name="fragmentNewColorPalette_width_str">Lebar</string>
     <string name="generic_no_thanks_in_code_str">Tidak, terima kasih</string>
     <string name="fragment_new_project_title_in_code_str">Proyek Baru</string>
-    <string name="fragment_find_and_replace_title_in_code_str">Cari dan Ubah</string>
     <string name="recentCreationsLayout_favoriteButton_content_description">Favoritkan</string>
     <string name="saveFileUnderNewNameAlertLayout_new_name_str">Nama baru</string>
     <string name="fragmentNewColorPalette_color_palette_name_str">Nama Palet Warna</string>

app/src/main/res/values-it/strings.xml

@@ -27,7 +27,6 @@
     <string name="fragment_find_and_replace_find_preview_content_description">Trova Anteprima</string>
     <string name="fragment_find_and_replace_replace_preview_content_description">Rimpiazza Anteprima</string>
     <string name="fragment_new_project_title_in_code_str">Nuovo Progetto</string>
-    <string name="fragment_find_and_replace_title_in_code_str">Trova e Rimpiazza</string>
     <string name="fragment_color_picker_title_in_code_str">Seleziona Colore</string>
     <string name="fragment_new_color_palette_title_in_code_str">Nuova Tavolozza Colori</string>
     <string name="fragment_spray_tool_settings_title_in_code_str">Impostazioni Strumento Spruzzo</string>
@@ -81,7 +80,6 @@
     <string name="activityCanvasTopAppMenu_zoom_out_str">Diminuisci</string>
     <string name="activityCanvasTopAppMenu_save_text_str">Salva</string>
     <string name="activityCanvasTopAppMenu_grid_str">Griglia</string>
-    <string name="activityCanvasTopAppMenu_find_and_replace_str">Trova e Rimpiazza</string>
     <string name="activityCanvasTopAppMenu_clear_canvas_str">Pulisci Tela</string>
     <string name="activityCanvasTopAppMenu_symmetry_horizontal_str">Orizzontale</string>
     <string name="activityCanvasTopAppMenu_symmetry_vertical_str">Verticale</string>

app/src/main/res/values-iw/strings.xml

@@ -53,7 +53,7 @@
     <string name="fragment_find_and_replace_replace_preview_content_description">אַחֲרֵי</string>
 
     <string name="fragment_new_project_title_in_code_str">פרויקט חדש</string>
-    <string name="fragment_find_and_replace_title_in_code_str">תמצא ותחליף צבעים</string>
+    <string name="fragment_replace_color_title_in_code_str">תמצא ותחליף צבעים</string>
     <string name="fragment_color_picker_title_in_code_str">בחר צבע</string>
     <string name="fragment_new_color_palette_title_in_code_str">פלטת צבעים חדשה</string>
     <string name="fragment_spray_tool_settings_title_in_code_str">הגדרות כלי ספריי צבע</string>
@@ -114,7 +114,7 @@
     <string name="activityCanvasTopAppMenu_zoom_out_str">התרחק מהקנבס</string>
     <string name="activityCanvasTopAppMenu_save_text_str">תשמור</string>
     <string name="activityCanvasTopAppMenu_grid_str">הצג רשת פיקסלים</string>
-    <string name="activityCanvasTopAppMenu_find_and_replace_str">תמצא ותחליף צבעים</string>
+    <string name="activityCanvasTopAppMenu_replace_color_str">תמצא ותחליף צבעים</string>
     <string name="activityCanvasTopAppMenu_clear_canvas_str">הסר את תוכן הקנבס</string>
     <string name="activityCanvasTopAppMenu_symmetry_horizontal_str">אופקי</string>
     <string name="activityCanvasTopAppMenu_symmetry_vertical_str">אֲנָכִי</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -20,7 +20,6 @@
     <string name="fragmentNewColorPalette_width_str">Bredde</string>
     <string name="fragmentNewColorPalette_height_str">Høyde</string>
     <string name="fragment_new_project_title_in_code_str">Nytt prosjekt</string>
-    <string name="fragment_find_and_replace_title_in_code_str">Finn og erstatt</string>
     <string name="fragment_color_picker_title_in_code_str">Velg farge</string>
     <string name="fragment_new_color_palette_title_in_code_str">Ny fargepalett</string>
     <string name="fragment_spray_tool_settings_title_in_code_str">Sprayboksverktøyinnstillinger</string>
@@ -61,7 +60,6 @@
     <string name="activityCanvasTopAppMenu_zoom_out_str">Forminsk</string>
     <string name="activityCanvasTopAppMenu_save_text_str">Lagre</string>
     <string name="activityCanvasTopAppMenu_grid_str">Rutenett</string>
-    <string name="activityCanvasTopAppMenu_find_and_replace_str">Finn og erstatt</string>
     <string name="activityCanvasTopAppMenu_symmetry_horizontal_str">Vannrett</string>
     <string name="activityCanvasTopAppMenu_symmetry_vertical_str">Loddrett</string>
     <string name="activityCanvasTopAppMenu_symmetry_str">Symmetri</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -72,7 +72,6 @@
     <string name="colorPalettesLayout_color_palette_item_str">Item da Paleta de Cores</string>
     <string name="fragment_find_and_replace_replace_preview_content_description">Substituir Previsualização</string>
     <string name="fragment_new_project_title_in_code_str">Novo Projeto</string>
-    <string name="fragment_find_and_replace_title_in_code_str">Localizar e Substituir</string>
     <string name="activityCanvasTopAppMenu_pixel_perfect_str">Píxeis Perfeitos</string>
     <string name="activityCanvasTopAppMenu_zoom_in_str">Mais Zoom</string>
     <string name="activityCanvasTopAppMenu_symmetry_quad_str">Quadrilátera</string>
@@ -86,7 +85,6 @@
     <string name="pencil_tool_info_title_in_code_str">Lápis</string>
     <string name="activityCanvasTopAppMenu_rotate_90_anti_clockwise_str">Girar 90° (anti-horário)</string>
     <string name="activityCanvasTopAppMenu_reset_position_str">Redefinir Posição</string>
-    <string name="activityCanvasTopAppMenu_find_and_replace_str">Localizar e Substituir</string>
     <string name="activityCanvasTopAppMenu_symmetry_vertical_str">Vertical</string>
     <string name="activityCanvasTopAppMenu_rotate_90_clockwise_str">Girar 90° (sentido horário)</string>
     <string name="activityCanvasTopAppMenu_rotate_180_str">Girar 180°</string>