Skip to content

Commit d531d52

Browse files
author
therealbluepandabear
committed
Rename 'Find and Replace' to 'Replace Color'.
1 parent 6236038 commit d531d52

19 files changed

Lines changed: 32 additions & 48 deletions

File tree

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ class CanvasActivityTopAppMenuTests {
3535
onView(withText(R.string.activityCanvasTopAppMenu_clear_canvas_str)).check(matches(isDisplayed()))
3636
}
3737

38-
@Test
39-
fun checkFindAndReplaceItemIsDisplayed() {
40-
onView(withText(R.string.activityCanvasTopAppMenu_find_and_replace_str)).check(matches(isDisplayed()))
41-
}
4238

4339
@Test
4440
fun checkNewColorPaletteItemIsDisplayed() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class CanvasActivity :
2828
CanvasFragmentListener,
2929
ColorPaletteColorPickerListener,
3030
ColorPickerFragmentListener,
31-
FindAndReplaceFragmentListener,
31+
ReplaceColorFragmentListener,
3232
ToolsFragmentListener,
3333
FiltersFragmentListener,
3434
ColorPalettesFragmentListener,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fun CanvasActivity.onMenuItemSelected(item: MenuItem): Boolean {
106106
onClearCanvasOptionsItemSelected()
107107
}
108108

109-
R.id.activityCanvasTopAppMenu_find_and_replace_item -> {
109+
R.id.activityCanvasTopAppMenu_replace_color_item -> {
110110
onFindAndReplaceOptionsItemSelected()
111111
}
112112

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import com.therealbluepandabear.pixapencil.enums.SnackbarDuration
1010
import com.therealbluepandabear.pixapencil.extensions.getColors
1111
import com.therealbluepandabear.pixapencil.extensions.showSnackbar
1212
//import com.therealbluepandabear.pixapencil.fragments.canvas.pixelGridViewInstance
13-
import com.therealbluepandabear.pixapencil.fragments.findandreplace.FindAndReplaceFragment
13+
import com.therealbluepandabear.pixapencil.fragments.replacecolor.ReplaceColorFragment
1414

1515
fun CanvasActivity.onFindAndReplaceOptionsItemSelected() {
1616
val uniqueColors = binding.activityCanvasPixelGridView.pixelGridViewBitmap.getColors()
1717

1818
if (uniqueColors.isNotEmpty()) {
1919
supportFragmentManager.commit {
2020
replace(
21-
R.id.activityCanvas_primaryFragmentHost, FindAndReplaceFragment.newInstance(
21+
R.id.activityCanvas_primaryFragmentHost, ReplaceColorFragment.newInstance(
2222
paramCanvasColors = uniqueColors,
2323
paramPixelGridViewBitmapSource = drawPixelGridViewBitmap(),
2424
paramTransparentBitmapSource = drawTransparentBackgroundViewBitmap(),

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.therealbluepandabear.pixapencil.fragments.findandreplace
1+
package com.therealbluepandabear.pixapencil.fragments.replacecolor
22

33
import android.content.Context
44
import android.graphics.Bitmap
@@ -13,24 +13,24 @@ import com.therealbluepandabear.pixapencil.activities.canvas.CanvasActivity
1313
import com.therealbluepandabear.pixapencil.adapters.ColorPickerAdapter
1414
import com.therealbluepandabear.pixapencil.converters.BitmapConverter
1515
import com.therealbluepandabear.pixapencil.database.AppData
16-
import com.therealbluepandabear.pixapencil.databinding.FragmentFindAndReplaceBinding
16+
import com.therealbluepandabear.pixapencil.databinding.FragmentReplaceColorBinding
1717
import com.therealbluepandabear.pixapencil.extensions.*
1818
import com.therealbluepandabear.pixapencil.fragments.base.ActivityFragment
1919
import com.therealbluepandabear.pixapencil.listeners.ColorPickerListener
20-
import com.therealbluepandabear.pixapencil.listeners.FindAndReplaceFragmentListener
20+
import com.therealbluepandabear.pixapencil.listeners.ReplaceColorFragmentListener
2121
import com.therealbluepandabear.pixapencil.utility.constants.StringConstants
2222
import java.util.ArrayList
2323

24-
class FindAndReplaceFragment : Fragment(), ActivityFragment {
25-
private var _binding: FragmentFindAndReplaceBinding? = null
24+
class ReplaceColorFragment : Fragment(), ActivityFragment {
25+
private var _binding: FragmentReplaceColorBinding? = null
2626

27-
private val binding get(): FragmentFindAndReplaceBinding {
27+
private val binding get(): FragmentReplaceColorBinding {
2828
return _binding!!
2929
}
3030

31-
private lateinit var caller: FindAndReplaceFragmentListener
31+
private lateinit var caller: ReplaceColorFragmentListener
3232

33-
override val title: String by lazy { getString(R.string.fragment_find_and_replace_title_in_code_str) }
33+
override val title: String by lazy { getString(R.string.fragment_replace_color_title_in_code_str) }
3434

3535
private var colorToFind: Int? = null
3636
private var colorToReplace: Int? = null
@@ -72,7 +72,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
7272

7373
private fun setupCanvasColorsRecyclerView() {
7474
binding.fragmentFindAndReplaceCanvasColorsRecyclerView.layoutManager =
75-
LinearLayoutManager(this@FindAndReplaceFragment.requireContext()).apply {
75+
LinearLayoutManager(this@ReplaceColorFragment.requireContext()).apply {
7676
orientation = LinearLayoutManager.HORIZONTAL
7777
}
7878

@@ -89,7 +89,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
8989

9090
private fun setupAvailableColorsRecyclerView() {
9191
binding.fragmentFindAndReplaceAvailableColorsRecyclerView.layoutManager =
92-
LinearLayoutManager(this@FindAndReplaceFragment.requireContext()).apply {
92+
LinearLayoutManager(this@ReplaceColorFragment.requireContext()).apply {
9393
orientation = LinearLayoutManager.HORIZONTAL
9494
}
9595
binding.fragmentFindAndReplaceAvailableColorsRecyclerView.adapter = ColorPickerAdapter(
@@ -104,7 +104,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
104104
}
105105
}
106106

107-
inner class ColorsToFindCaller(val binding: FragmentFindAndReplaceBinding) : ColorPickerListener {
107+
inner class ColorsToFindCaller(val binding: FragmentReplaceColorBinding) : ColorPickerListener {
108108
override fun onColorTapped(colorTapped: Int) {
109109
colorToFind = colorTapped
110110

@@ -114,7 +114,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
114114
}
115115
}
116116

117-
inner class ColorsToReplaceCaller(val binding: FragmentFindAndReplaceBinding) : ColorPickerListener {
117+
inner class ColorsToReplaceCaller(val binding: FragmentReplaceColorBinding) : ColorPickerListener {
118118
override fun onColorTapped(colorTapped: Int) {
119119
colorToReplace = colorTapped
120120

@@ -131,8 +131,8 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
131131
paramPixelGridViewBitmapSource: Bitmap,
132132
paramSelectedColorPaletteIndex: Int,
133133
paramScaledWidth: Int,
134-
paramScaledHeight: Int): FindAndReplaceFragment {
135-
val fragment = FindAndReplaceFragment()
134+
paramScaledHeight: Int): ReplaceColorFragment {
135+
val fragment = ReplaceColorFragment()
136136
fragment.setParams(paramCanvasColors, paramTransparentBitmapSource, paramPixelGridViewBitmapSource, paramSelectedColorPaletteIndex, paramScaledWidth, paramScaledHeight)
137137

138138
return fragment
@@ -141,7 +141,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
141141

142142
override fun onAttach(context: Context) {
143143
super.onAttach(context)
144-
if (context is FindAndReplaceFragmentListener) caller = context
144+
if (context is ReplaceColorFragmentListener) caller = context
145145
requireActivity().title = title
146146
}
147147

@@ -151,7 +151,7 @@ class FindAndReplaceFragment : Fragment(), ActivityFragment {
151151
}
152152

153153
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
154-
_binding = FragmentFindAndReplaceBinding.inflate(inflater, container, false)
154+
_binding = FragmentReplaceColorBinding.inflate(inflater, container, false)
155155

156156
setup()
157157

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package com.therealbluepandabear.pixapencil.listeners
22

3-
interface FindAndReplaceFragmentListener {
3+
interface ReplaceColorFragmentListener {
44
fun onDoneButtonPressed(colorToFind: Int?, colorToReplace: Int?)
55
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:context=".fragments.findandreplace.FindAndReplaceFragment"
5+
tools:context=".fragments.replacecolor.ReplaceColorFragment"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
88
style="@style/defaultFragmentStyle">

app/src/main/res/layout/fragment_find_and_replace.xml renamed to app/src/main/res/layout/fragment_replace_color.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:context=".fragments.findandreplace.FindAndReplaceFragment"
5+
tools:context=".fragments.replacecolor.ReplaceColorFragment"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
88
style="@style/defaultFragmentStyle">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
app:showAsAction="ifRoom"
88
android:title="@string/activityCanvasTopAppMenu_clear_canvas_str" />
99

10-
<item android:id="@+id/activityCanvasTopAppMenu_find_and_replace_item"
10+
<item android:id="@+id/activityCanvasTopAppMenu_replace_color_item"
1111
app:showAsAction="ifRoom"
12-
android:title="@string/activityCanvasTopAppMenu_find_and_replace_str" />
12+
android:title="@string/activityCanvasTopAppMenu_replace_color_str" />
1313

1414
<item android:id="@+id/activityCanvasTopAppMenu_import_lospec_palette_item"
1515
app:showAsAction="ifRoom"

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<string name="fragment_find_and_replace_find_preview_content_description">Vorschau finden</string>
1919
<string name="fragment_find_and_replace_replace_preview_content_description">Ersetze die Vorschau</string>
2020
<string name="fragment_new_project_title_in_code_str">Neues Projekt</string>
21-
<string name="fragment_find_and_replace_title_in_code_str">Suchen und Ersetzen</string>
2221
<string name="fragment_color_picker_title_in_code_str">Farbe wählen</string>
2322
<string name="fragment_new_color_palette_title_in_code_str">Neue Farbpalette</string>
2423
<string name="fragment_spray_tool_settings_title_in_code_str">Sprühdosen-Einstellungen</string>
@@ -171,7 +170,6 @@
171170
<string name="spot_light_activity_main_in_code_str">Tippen um ein
172171
\nneues Projekt zu erstellen</string>
173172
<string name="activityCanvasTopAppMenu_grid_str">Gitter</string>
174-
<string name="activityCanvasTopAppMenu_find_and_replace_str">Suchen und ersetzen</string>
175173
<string name="square_tool_info_title_in_code_str">Quadrat-Tool-Info</string>
176174
<string name="activityCanvasTopAppMenu_symmetry_str">Symmetrie</string>
177175
<string name="dither_tool_info_title_in_code_str">Verschmieren-Tool-Info</string>

0 commit comments

Comments
 (0)