-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: display received location messages - default placeholder (WPB-5…
…483) (#2503)
- Loading branch information
1 parent
b7d4a58
commit d75f286
Showing
9 changed files
with
232 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
...com/wire/android/ui/home/conversations/model/messagetypes/location/LocationMessageType.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.ui.home.conversations.model.messagetypes.location | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.style.TextOverflow | ||
| import androidx.compose.ui.unit.sp | ||
| import com.wire.android.R | ||
| import com.wire.android.model.Clickable | ||
| import com.wire.android.ui.common.clickable | ||
| import com.wire.android.ui.common.dimensions | ||
| import com.wire.android.ui.theme.wireColorScheme | ||
| import com.wire.android.ui.theme.wireDimensions | ||
| import com.wire.android.ui.theme.wireTypography | ||
| import com.wire.android.util.ui.PreviewMultipleThemes | ||
|
|
||
| @Composable | ||
| fun LocationMessageContent( | ||
| locationName: String, | ||
| locationUrl: String, | ||
| onLocationClick: Clickable | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .clickable(onLocationClick) | ||
| .padding(top = dimensions().spacing4x) | ||
| .clip(shape = RoundedCornerShape(dimensions().messageAssetBorderRadius)) | ||
| .border( | ||
| width = dimensions().spacing1x, | ||
| color = MaterialTheme.wireColorScheme.secondaryButtonDisabledOutline, | ||
| shape = RoundedCornerShape(dimensions().messageAssetBorderRadius) | ||
| ) | ||
| .background( | ||
| color = MaterialTheme.wireColorScheme.surfaceVariant, | ||
| shape = RoundedCornerShape(dimensions().messageAssetBorderRadius) | ||
| ) | ||
| .height(dimensions().spacing64x), | ||
| verticalArrangement = Arrangement.SpaceEvenly, | ||
| ) { | ||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(PaddingValues(horizontal = dimensions().spacing8x)), | ||
| horizontalArrangement = Arrangement.Start, | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Icon( | ||
| painter = painterResource(id = R.drawable.ic_location), | ||
| contentDescription = stringResource(id = R.string.content_description_location_icon), | ||
| modifier = Modifier.size(MaterialTheme.wireDimensions.wireIconButtonSize) | ||
| ) | ||
| Spacer(modifier = Modifier.width(dimensions().spacing4x)) | ||
| Text( | ||
| text = locationName, | ||
| style = MaterialTheme.wireTypography.body02, | ||
| fontSize = 15.sp, | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis | ||
| ) | ||
| } | ||
| Text( | ||
| text = locationUrl, | ||
| style = MaterialTheme.wireTypography.subline01.copy(color = MaterialTheme.wireColorScheme.secondaryText), | ||
| overflow = TextOverflow.Ellipsis, | ||
| maxLines = 1, | ||
| modifier = Modifier.padding( | ||
| PaddingValues( | ||
| bottom = dimensions().spacing8x, | ||
| start = dimensions().spacing8x, | ||
| end = dimensions().spacing8x | ||
| ) | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| @PreviewMultipleThemes | ||
| fun PreviewLocationMessageContent() { | ||
| LocationMessageContent( | ||
| locationName = "Rapa Nui", | ||
| locationUrl = "https://www.google.com/maps/place/Rapa+Nui", | ||
| onLocationClick = Clickable() | ||
| ) | ||
| } |
49 changes: 49 additions & 0 deletions
49
app/src/main/kotlin/com/wire/android/util/CommonIntentUtil.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.util | ||
|
|
||
| import android.content.ActivityNotFoundException | ||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.net.Uri | ||
| import androidx.core.net.toUri | ||
| import com.wire.android.appLogger | ||
|
|
||
| // geo intent url scheme | ||
| internal const val GEO_INTENT_URL = "geo:0,0?q=%f,%f" | ||
|
|
||
| /** | ||
| * Launches a geo intent with the given latitude and longitude. | ||
| * If no app/activity can be found to handle the [GEO_INTENT_URL], a [fallbackUrl] is used. | ||
| */ | ||
| fun launchGeoIntent( | ||
| latitude: Float, | ||
| longitude: Float, | ||
| placeName: String?, | ||
| fallbackUrl: String, | ||
| context: Context | ||
| ) { | ||
| val geoStringUrl = StringBuilder(String.format(GEO_INTENT_URL, latitude, longitude)) | ||
| if (!placeName.isNullOrEmpty()) geoStringUrl.append("(${Uri.encode(placeName)})") | ||
| try { | ||
| context.startActivity(Intent(Intent.ACTION_VIEW, geoStringUrl.toString().toUri())) | ||
| } catch (e: ActivityNotFoundException) { | ||
| appLogger.e("No activity found to handle geo intent, fallback to url", e) | ||
| context.startActivity(Intent(Intent.ACTION_VIEW, fallbackUrl.toUri())) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule kalium
updated
27 files