Skip to content

Commit e41d1b7

Browse files
committed
refactor: Rename to harmonize with iOS
1 parent f088dda commit e41d1b7

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/VoiceUI.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ interface VoiceUI {
88
val formatterSuggestion: (String) -> String
99

1010
enum class Title(val resource: Int) {
11-
Search(R.string.voice_title_search),
12-
Listen(R.string.voice_title_listen),
11+
Listen(R.string.voice_title_listening),
1312
Error(R.string.voice_title_error)
1413
}
1514

1615
enum class Subtitle(val resource: Int) {
1716
Error(R.string.voice_subtitle_error),
18-
Listen(R.string.voice_subtitle_listen)
17+
Listen(R.string.voice_subtitle_listening)
1918
}
2019

2120
fun setOnClickListenerClose(onClickListener: View.OnClickListener)

ui/src/main/res/layout/voice_input.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
android:layout_width="0dp"
6363
app:layout_constraintBottom_toTopOf="@id/subtitle"
6464
android:layout_height="wrap_content"
65-
android:text="@string/voice_title_listen"
65+
android:text="@string/voice_title_listening"
6666
android:textAppearance="?attr/textAppearanceHeadline6"
6767
app:layout_constraintEnd_toEndOf="parent"
6868
android:layout_marginStart="24dp"
@@ -77,7 +77,7 @@
7777
android:textAppearance="?attr/textAppearanceBody1"
7878
android:layout_height="wrap_content"
7979
android:layout_marginTop="24dp"
80-
android:text="@string/voice_subtitle_listen"
80+
android:text="@string/voice_subtitle_listening"
8181
app:layout_constraintBottom_toTopOf="@id/microphone"
8282
app:layout_constraintEnd_toEndOf="@id/title"
8383
app:layout_constraintStart_toStartOf="@id/title"
@@ -110,7 +110,7 @@
110110
android:textAppearance="?attr/textAppearanceSubtitle2"
111111
android:textSize="16sp"
112112
android:visibility="invisible"
113-
android:text="@string/voice_hint"
113+
android:text="@string/voice_hint_error"
114114
app:layout_constraintTop_toBottomOf="@id/microphone"
115115
app:layout_constraintBottom_toBottomOf="parent"
116116
android:layout_width="wrap_content"

ui/src/main/res/layout/voice_permission.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
android:id="@+id/positive"
6767
app:layout_constraintStart_toStartOf="parent"
6868
app:layout_constraintEnd_toEndOf="parent"
69-
android:text="@string/permission_positive_button"
69+
android:text="@string/permission_allow_text"
7070
android:background="@drawable/button_positive_background_ripple"
7171
android:layout_marginStart="24dp"
7272
android:textSize="16sp"
@@ -82,7 +82,7 @@
8282
<android.support.v7.widget.AppCompatButton
8383
android:id="@+id/negative"
8484
android:layout_marginTop="16dp"
85-
android:text="@string/permission_negative_button"
85+
android:text="@string/permission_reject_text"
8686
android:background="@drawable/button_negative_background_ripple"
8787
android:textSize="16sp"
8888
android:textAllCaps="false"

ui/src/main/res/values/strings.xml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
<resources>
2-
<string name="voice_title_search">Searching for:</string>
2+
<!--TODO: Rename voice_ to input_ -->
3+
<string name="voice_title_listening">Listening…</string>
4+
<string name="voice_subtitle_listening">Say something like:</string>
35
<string name="voice_title_error">Sorry, we didn\'t quite get that.</string>
4-
<string name="voice_title_listen">Listening…</string>
5-
<string name="voice_hint">Try again</string>
6-
<string name="voice_subtitle_listen">Say something like:</string>
76
<string name="voice_subtitle_error">Try repeating your request.</string>
8-
<string name="voice_suggestion_html_format"><![CDATA[&#8226;\t\t\t%s<br/>]]></string>
9-
<string name="voice_search_rationale">Voice search requires this permission.</string>
7+
<string name="voice_hint_error">Try again</string>
8+
9+
<string name="permission_title">You can use voice search to find products.</string>
10+
<string name="permission_subtitle">May we access your device’s microphone to enable voice search?</string>
11+
<string name="permission_allow_text">Allow microphone access</string>
12+
<string name="permission_reject_text">No</string>
13+
1014
<string name="voice_search_disabled_rationale">To use voice search you need to allow recording.</string>
11-
<string name="voice_search_button_enable">Give permission</string>
15+
<string name="permission_enable_text">Give permission</string>
1216
<string name="voice_search_disabled_instructions">On the next screen, tap Permissions then Microphone.</string>
13-
<string name="permission_positive_button">Allow microphone access</string>
14-
<string name="permission_negative_button">No</string>
15-
<string name="permission_subtitle">May we access your device’s microphone to enable voice search?</string>
16-
<string name="permission_title">You can use voice search to find products.</string>
17+
<string name="voice_search_rationale">Voice search requires this permission.</string>
18+
19+
<!-- Not intended to be overridden by user app. -->
20+
<string name="voice_suggestion_html_format"><![CDATA[&#8226;\t\t\t%s<br/>]]></string>
1721
</resources>

0 commit comments

Comments
 (0)