Skip to content

Commit c39e5ca

Browse files
adalpariadalpari
committed
Merge branch 'trunk' into feat/CMM-885-support-HE-attachments
# Conflicts: # WordPress/src/main/java/org/wordpress/android/support/aibot/ui/AIBotConversationDetailScreen.kt # WordPress/src/main/java/org/wordpress/android/support/he/repository/HESupportRepository.kt # WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt # WordPress/src/main/java/org/wordpress/android/support/he/ui/TicketMainContentView.kt # WordPress/src/main/java/org/wordpress/android/support/he/util/HEConversationUtils.kt # WordPress/src/main/res/values/strings.xml
2 parents f15af11 + d3b46bf commit c39e5ca

File tree

7 files changed

+25
-15
lines changed

7 files changed

+25
-15
lines changed

‎WordPress/src/main/java/org/wordpress/android/support/aibot/ui/AIBotConversationDetailScreen.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import androidx.compose.ui.Alignment
4545
import androidx.compose.ui.Modifier
4646
import androidx.compose.ui.platform.LocalResources
4747
import androidx.compose.ui.res.stringResource
48+
import androidx.compose.ui.semantics.clearAndSetSemantics
4849
import androidx.compose.ui.semantics.contentDescription
4950
import androidx.compose.ui.semantics.heading
5051
import androidx.compose.ui.semantics.semantics
@@ -206,7 +207,7 @@ private fun WelcomeHeader(userName: String) {
206207
modifier = Modifier
207208
.fillMaxWidth()
208209
.padding(vertical = 8.dp)
209-
.semantics(mergeDescendants = true) {
210+
.clearAndSetSemantics {
210211
contentDescription = welcomeDescription
211212
},
212213
colors = CardDefaults.cardColors(
@@ -293,7 +294,7 @@ private fun ChatInputBar(
293294
@Composable
294295
private fun MessageBubble(message: BotMessage, resources: android.content.res.Resources) {
295296
val timestamp = formatRelativeTime(message.date, resources)
296-
val author = stringResource(if (message.isWrittenByUser) R.string.ai_bot_you else R.string.ai_bot_odie)
297+
val author = stringResource(if (message.isWrittenByUser) R.string.ai_bot_you else R.string.ai_bot_support_bot)
297298
val messageDescription = "$author, $timestamp. ${message.formattedText}"
298299

299300
Row(
@@ -321,7 +322,7 @@ private fun MessageBubble(message: BotMessage, resources: android.content.res.Re
321322
)
322323
)
323324
.padding(12.dp)
324-
.semantics(mergeDescendants = true) {
325+
.clearAndSetSemantics {
325326
contentDescription = messageDescription
326327
}
327328
) {

‎WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.wordpress.android.support.he.ui
22

33
import android.content.res.Configuration.UI_MODE_NIGHT_YES
4-
import androidx.compose.foundation.Image
54
import androidx.compose.foundation.background
65
import androidx.compose.foundation.clickable
76
import androidx.compose.foundation.gestures.detectTransformGestures
@@ -60,6 +59,7 @@ import androidx.compose.ui.platform.LocalContext
6059
import androidx.compose.ui.platform.LocalResources
6160
import androidx.compose.ui.res.painterResource
6261
import androidx.compose.ui.res.stringResource
62+
import androidx.compose.ui.semantics.clearAndSetSemantics
6363
import androidx.compose.ui.semantics.contentDescription
6464
import androidx.compose.ui.semantics.heading
6565
import androidx.compose.ui.semantics.semantics
@@ -247,7 +247,7 @@ private fun ConversationHeader(
247247
modifier = Modifier
248248
.fillMaxWidth()
249249
.padding(vertical = 8.dp)
250-
.semantics(mergeDescendants = true) {
250+
.clearAndSetSemantics {
251251
contentDescription = headerDescription
252252
},
253253
horizontalArrangement = Arrangement.SpaceBetween,
@@ -320,7 +320,7 @@ private fun MessageItem(
320320
shape = RoundedCornerShape(8.dp)
321321
)
322322
.padding(16.dp)
323-
.semantics(mergeDescendants = true) {
323+
.clearAndSetSemantics {
324324
contentDescription = messageDescription
325325
}
326326
) {

‎WordPress/src/main/java/org/wordpress/android/support/he/ui/TicketMainContentView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ fun TicketMainContentView(
135135
.height(48.dp)
136136
.semantics { contentDescription = addScreenshotsLabel },
137137
shape = RoundedCornerShape(12.dp),
138-
enabled = enabled && !maxImagesReached,
138+
enabled = enabled,
139139
border = BorderStroke(
140140
width = 1.dp,
141-
color = if (enabled && !maxImagesReached) {
141+
color = if (enabled) {
142142
MaterialTheme.colorScheme.outline
143143
} else {
144144
MaterialTheme.colorScheme.outline.copy(alpha = 0.5f)

‎WordPress/src/main/res/drawable/app_icon_monochromatic.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:height="108dp"
3+
android:width="108dp"
4+
android:viewportHeight="108.0"
5+
android:viewportWidth="108.0">
6+
<path
7+
android:fillColor="@android:color/white"
8+
android:pathData="M54 22c-17.6 0-32 14.4-32 32s14.4 32 32 32 32-14.4 32-32-14.4-32-32-32zM25.2 54c0-4.2 0.9-8.1 2.5-11.7l13.7 37.6C31.8 75.2 25.2 65.4 25.2 54zM54 82.8c-2.8 0-5.5-0.4-8.1-1.2l8.6-25.1 8.8 24.2c0.1 0.2 0.2 0.3 0.3 0.4-3 1.1-6.3 1.7-9.6 1.7zm4-42.3c1.7-0.1 3.3-0.3 3.3-0.3 1.6-0.2 1.4-2.5-0.2-2.4 0 0-4.7 0.4-7.7 0.4-2.8 0-7.6-0.4-7.6-0.4-1.6-0.1-1.7 2.3-0.2 2.4 0 0 1.5 0.2 3 0.3l4.5 12.3-6.3 18.9-10.5-31.2c1.7-0.1 3.3-0.3 3.3-0.3 1.5-0.2 1.4-2.5-0.2-2.4 0 0-4.7 0.4-7.7 0.4h-1.9c5.1-7.8 14-13 24-13 7.5 0 14.3 2.9 19.4 7.6h-0.4c-2.8 0-4.8 2.5-4.8 5.1 0 2.4 1.4 4.4 2.8 6.7 1.1 1.9 2.4 4.4 2.4 7.9 0 2.5-0.7 5.6-2.2 9.3l-2.9 9.6L58 40.5zm21.2-0.3c2.2 4.1 3.5 8.8 3.5 13.8 0.1 10.6-5.7 19.9-14.2 24.9l8.8-25.4c1.6-4.1 2.2-7.4 2.2-10.3-0.1-1.1-0.1-2.1-0.3-3z" >
9+
</path>
10+
</vector>

‎WordPress/src/main/res/mipmap-anydpi/app_icon.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
3-
<adaptive-icon
4-
xmlns:android="http://schemas.android.com/apk/res/android" >
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
53
<background android:drawable="@drawable/app_icon_background"/>
64
<foreground android:drawable="@drawable/app_icon_foreground"/>
5+
<monochrome android:drawable="@drawable/app_icon_monochromatic"/>
76
</adaptive-icon>

‎WordPress/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5131,7 +5131,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
51315131
<string name="ai_bot_empty_conversations_message">Start a new conversation to get help with your WordPress site or account.</string>
51325132
<string name="ai_bot_empty_conversations_button">Start conversation</string>
51335133
<string name="ai_bot_you">You</string>
5134-
<string name="ai_bot_odie" translatable="false">Odie</string>
5134+
<string name="ai_bot_support_bot">Support Bot</string>
51355135

51365136
<!-- AI Bot Support - Conversation Detail Screen -->
51375137
<string name="ai_bot_send_button_content_description">Send</string>

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
agp = '8.7.3'
3-
airbnb-lottie = '6.6.10'
3+
airbnb-lottie = '6.7.0'
44
android-desugar = '2.1.5'
55
android-installreferrer = '2.2'
66
android-security-lint = '1.0.3'
@@ -36,7 +36,7 @@ androidx-test-main = '1.7.0'
3636
androidx-test-uiautomator = '2.3.0'
3737
androidx-viewpager2 = '1.1.0'
3838
androidx-webkit = '1.14.0'
39-
androidx-work = '2.10.5'
39+
androidx-work = '2.11.0'
4040
apache-commons-text = '1.14.0'
4141
apache-http-client-android = '4.3.5.1'
4242
assertj = '3.27.6'
@@ -51,7 +51,7 @@ checkstyle = '10.17.0'
5151
coil = '2.7.0'
5252
commons-fileupload = '1.5'
5353
detekt = '1.23.8'
54-
dependency-analysis = '3.3.0'
54+
dependency-analysis = '3.4.0'
5555
facebook-react = '0.73.3'
5656
facebook-shimmer = '0.5.0'
5757
fastlane-screengrab = '2.1.1'

0 commit comments

Comments
 (0)