gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

backup

Browse source
This commit is contained in:
Emin 2024-07-12 10:39:40 +05:00
parent bba8edbf48
commit 2400c21819
43 changed files with 2883 additions and 2435 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -87,7 +87,7 @@ def getCommitMessage() {
def osName = System.properties['os.name'].toLowerCase()
project.ext.appId = 'tj.tourism.rebus'
project.ext.appName = 'Organic Maps'
project.ext.appName = 'Tourism'
java {
toolchain {

2
android/app/src/main/java/app/tourism/AuthActivity.kt
View file

@ -28,7 +28,7 @@ class AuthActivity : ComponentActivity() {
super.onCreate(savedInstanceState)
lifecycleScope.launch {
placesRepository.downloadAllDataIfFirstTime()
placesRepository.downloadAllData()
}
enableEdgeToEdge(
statusBarStyle = SystemBarStyle.dark(resources.getColor(R.color.black_primary)),

15
android/app/src/main/java/app/tourism/MainActivity.kt
View file

@ -70,12 +70,15 @@ class MainActivity : ComponentActivity() {
lifecycleScope.launch {
profileVM.profileDataResource.collectLatest {
if (it is Resource.Success) {
it.data?.language?.let { lang ->
changeSystemAppLanguage(this@MainActivity, lang)
userPreferences.setLanguage(lang)
}
it.data?.theme?.let { theme ->
themeVM.setTheme(theme)
it.data?.apply {
language?.let { lang ->
changeSystemAppLanguage(this@MainActivity, lang)
userPreferences.setLanguage(lang)
}
theme?.let { theme ->
themeVM.setTheme(theme)
}
userPreferences.setUserId(id.toString())
}
}
if (it is Resource.Error) {

13
android/app/src/main/java/app/tourism/data/db/Database.kt
View file

@ -8,13 +8,22 @@ import app.tourism.data.db.dao.HashesDao
import app.tourism.data.db.dao.PlacesDao
import app.tourism.data.db.dao.ReviewsDao
import app.tourism.data.db.entities.CurrencyRatesEntity
import app.tourism.data.db.entities.FavoriteToSyncEntity
import app.tourism.data.db.entities.HashEntity
import app.tourism.data.db.entities.PlaceEntity
import app.tourism.data.db.entities.ReviewEntity
import app.tourism.data.db.entities.ReviewPlannedToPostEntity
@Database(
entities = [PlaceEntity::class, ReviewEntity::class, HashEntity::class, CurrencyRatesEntity::class],
version = 2,
entities = [
PlaceEntity::class,
ReviewEntity::class,
ReviewPlannedToPostEntity::class,
FavoriteToSyncEntity::class,
HashEntity::class,
CurrencyRatesEntity::class
],
version = 8,
exportSchema = false
)
@TypeConverters(Converters::class)

2
android/app/src/main/java/app/tourism/data/db/dao/HashesDao.kt
View file

@ -15,7 +15,7 @@ interface HashesDao {
suspend fun insertHashes(hashes: List<HashEntity>)
@Query("SELECT * FROM hashes WHERE categoryId = :id")
suspend fun getHash(id: Long): HashEntity
suspend fun getHash(id: Long): HashEntity?
@Query("SELECT * FROM hashes")
suspend fun getHashes(): List<HashEntity>

17
android/app/src/main/java/app/tourism/data/db/dao/PlacesDao.kt
View file

@ -1,9 +1,11 @@
package app.tourism.data.db.dao
import androidx.room.Dao
import androidx.room.Delete
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import app.tourism.data.db.entities.FavoriteToSyncEntity
import app.tourism.data.db.entities.PlaceEntity
import kotlinx.coroutines.flow.Flow
@ -19,6 +21,9 @@ interface PlacesDao {
@Query("DELETE FROM places WHERE categoryId = :categoryId")
suspend fun deleteAllPlacesByCategory(categoryId: Long)
@Query("SELECT * FROM places WHERE UPPER(name) LIKE UPPER(:q)")
fun search(q: String= ""): Flow<List<PlaceEntity>>
@Query("SELECT * FROM places WHERE categoryId = :categoryId")
fun getPlacesByCategoryId(categoryId: Long): Flow<List<PlaceEntity>>
@ -29,11 +34,17 @@ interface PlacesDao {
fun getPlaceById(placeId: Long): Flow<PlaceEntity>
@Query("SELECT * FROM places WHERE isFavorite = 1 AND UPPER(name) LIKE UPPER(:q)")
fun getFavoritePlaces(q: String = ""): Flow<List<PlaceEntity>>
fun getFavoritePlacesFlow(q: String = ""): Flow<List<PlaceEntity>>
@Query("SELECT * FROM places WHERE isFavorite = 1 AND UPPER(name) LIKE UPPER(:q)")
fun getFavoritePlaces(q: String = ""): List<PlaceEntity>
@Query("UPDATE places SET isFavorite = :isFavorite WHERE id = :placeId")
suspend fun setFavorite(placeId: Long, isFavorite: Boolean)
@Query("SELECT * FROM places WHERE UPPER(name) LIKE UPPER(:q)")
fun search(q: String= ""): Flow<List<PlaceEntity>>
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun addFavoriteToSync(favoriteToSyncEntity: FavoriteToSyncEntity)
@Query("DELETE FROM favorites_to_sync WHERE placeId = :placeId")
suspend fun removeFavoriteToSync(placeId: Long)
}

22
android/app/src/main/java/app/tourism/data/db/dao/ReviewsDao.kt
View file

@ -6,6 +6,7 @@ import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import app.tourism.data.db.entities.ReviewEntity
import app.tourism.data.db.entities.ReviewPlannedToPostEntity
import kotlinx.coroutines.flow.Flow
@Dao
@ -15,10 +16,13 @@ interface ReviewsDao {
suspend fun insertReview(review: ReviewEntity)
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertReviews(review: List<ReviewEntity>)
suspend fun insertReviews(reviews: List<ReviewEntity>)
@Delete
suspend fun deleteReview(review: ReviewEntity)
@Query("DELETE FROM reviews WHERE id = :id")
suspend fun deleteReview(id: Long)
@Query("DELETE FROM reviews WHERE id = :idsList")
suspend fun deleteReviews(idsList: List<Long>)
@Query("DELETE FROM reviews")
suspend fun deleteAllReviews()
@ -28,4 +32,16 @@ interface ReviewsDao {
@Query("SELECT * FROM reviews WHERE placeId = :placeId")
fun getReviewsForPlace(placeId: Long): Flow<List<ReviewEntity>>
@Query("UPDATE reviews SET deletionPlanned = :deletionPlanned WHERE id = :id")
fun markReviewForDeletion(id: Long, deletionPlanned: Boolean = true)
@Query("SELECT * FROM reviews WHERE deletionPlanned = 1")
fun getReviewsPlannedForDeletion(): List<ReviewEntity>
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertReviewPlannedToPost(review: ReviewPlannedToPostEntity)
@Query("SELECT * FROM reviews_planned_to_post")
fun getReviewsPlannedToPost(): List<ReviewPlannedToPostEntity>
}

10
android/app/src/main/java/app/tourism/data/db/entities/FavoriteToSyncEntity.kt Normal file
View file

@ -0,0 +1,10 @@
package app.tourism.data.db.entities
import androidx.room.Entity
import androidx.room.PrimaryKey
@Entity(tableName = "favorites_to_sync")
data class FavoriteToSyncEntity(
@PrimaryKey val placeId: Long,
val isFavorite: Boolean,
)

4
android/app/src/main/java/app/tourism/data/db/entities/PlaceEntity.kt
View file

@ -16,7 +16,7 @@ data class PlaceEntity(
val description: String,
val cover: String,
val gallery: List<String>,
@Embedded val coordinates: CoordinatesEntity,
@Embedded val coordinates: CoordinatesEntity?,
val rating: Double,
val isFavorite: Boolean
) {
@ -26,7 +26,7 @@ data class PlaceEntity(
rating = rating,
excerpt = excerpt,
description = description,
placeLocation = coordinates.toPlaceLocation(name),
placeLocation = coordinates?.toPlaceLocation(name),
cover = cover,
pics = gallery,
isFavorite = isFavorite

4
android/app/src/main/java/app/tourism/data/db/entities/ReviewEntity.kt
View file

@ -13,7 +13,8 @@ data class ReviewEntity(
val comment: String,
val date: String,
val rating: Int,
val images: List<String>
val images: List<String>,
val deletionPlanned: Boolean = false,
) {
fun toReview() = Review(
id = id,
@ -23,5 +24,6 @@ data class ReviewEntity(
date = date,
comment = comment,
picsUrls = images,
deletionPlanned = deletionPlanned,
)
}

25
android/app/src/main/java/app/tourism/data/db/entities/ReviewToPublishEntity.kt Normal file
View file

@ -0,0 +1,25 @@
package app.tourism.data.db.entities
import androidx.room.Entity
import androidx.room.PrimaryKey
import app.tourism.domain.models.details.ReviewToPost
import java.io.File
import java.net.URI
@Entity(tableName = "reviews_planned_to_post")
data class ReviewPlannedToPostEntity(
@PrimaryKey(autoGenerate = true) val id: Long? = null,
val placeId: Long,
val comment: String,
val rating: Int,
val images: List<String>,
) {
fun toReviewsPlannedToPostDto(): ReviewToPost {
val imageFiles = images.map { File(it) }
imageFiles.first().path
return ReviewToPost(
placeId, comment, rating, imageFiles
)
}
}

5
android/app/src/main/java/app/tourism/data/dto/FavoritesIdsDto.kt Normal file
View file

@ -0,0 +1,5 @@
package app.tourism.data.dto
data class FavoritesIdsDto(
val marks: List<Long>
)

3
android/app/src/main/java/app/tourism/data/dto/HashDto.kt Normal file
View file

@ -0,0 +1,3 @@
package app.tourism.data.dto
data class HashDto(val hash: String)

24
android/app/src/main/java/app/tourism/data/dto/place/CoordinatesDto.kt
View file

@ -3,13 +3,19 @@ package app.tourism.data.dto.place
import app.tourism.data.dto.PlaceLocation
data class CoordinatesDto(
val latitude: String,
val longitude: String
val latitude: String?,
val longitude: String?
) {
fun toPlaceLocation(name: String) =
PlaceLocation(
name,
latitude.toDouble(),
longitude.toDouble()
)
}
fun toPlaceLocation(name: String): PlaceLocation? {
try {
return PlaceLocation(
name,
latitude!!.toDouble(),
longitude!!.toDouble()
)
} catch (e: Exception) {
e.printStackTrace()
return null
}
}
}

9
android/app/src/main/java/app/tourism/data/dto/place/PlaceDto.kt
View file

@ -1,14 +1,13 @@
package app.tourism.data.dto.place
import app.tourism.domain.models.common.PlaceShort
import app.tourism.domain.models.details.PlaceFull
data class PlaceDto(
val id: Long,
val name: String,
val coordinates: CoordinatesDto,
val coordinates: CoordinatesDto?,
val cover: String,
val feedbacks: List<ReviewDto> = emptyList(),
val feedbacks: List<ReviewDto>?,
val gallery: List<String>,
val rating: String,
val short_description: String,
@ -20,10 +19,10 @@ data class PlaceDto(
rating = rating.toDouble(),
excerpt = short_description,
description = long_description,
placeLocation = coordinates.toPlaceLocation(name),
placeLocation = coordinates?.toPlaceLocation(name),
cover = cover,
pics = gallery,
isFavorite = isFavorite,
reviews = feedbacks.map { it.toReview() }
reviews = feedbacks?.map { it.toReview() } ?: emptyList()
)
}

5
android/app/src/main/java/app/tourism/data/dto/place/ReviewIdsDto.kt Normal file
View file

@ -0,0 +1,5 @@
package app.tourism.data.dto.place
data class ReviewIdsDto(
val feedbacks: List<Long>,
)

3
android/app/src/main/java/app/tourism/data/dto/place/ReviewsDto.kt Normal file
View file

@ -0,0 +1,3 @@
package app.tourism.data.dto.place
data class ReviewsDto(val data: List<ReviewDto>)

1
android/app/src/main/java/app/tourism/data/dto/profile/User.kt
View file

@ -13,6 +13,7 @@ data class User(
val username: String
) {
fun toPersonalData() = PersonalData(
id = id,
fullName = full_name,
country = country,
pfpUrl = avatar,

3
android/app/src/main/java/app/tourism/data/prefs/UserPreferences.kt
View file

@ -35,6 +35,9 @@ class UserPreferences(context: Context) {
fun getToken() = sharedPref.getString("token", "")
fun setToken(value: String?) = sharedPref.edit { putString("token", value) }
fun getUserId() = sharedPref.getString("user_id", "")
fun setUserId(value: String?) = sharedPref.edit { putString("user_id", value) }
}
data class Language(val code: String, val name: String)

19
android/app/src/main/java/app/tourism/data/remote/NetworkUtils.kt
View file

@ -1,5 +1,9 @@
package app.tourism.data.remote
import android.content.Context
import android.net.ConnectivityManager
import android.util.Log
import androidx.core.content.ContextCompat.getSystemService
import app.tourism.domain.models.SimpleResponse
import app.tourism.domain.models.resource.Resource
import com.google.gson.Gson
@ -11,6 +15,7 @@ import retrofit2.HttpException
import retrofit2.Response
import java.io.IOException
suspend inline fun <T, reified R> FlowCollector<Resource<R>>.handleGenericCall(
call: () -> Response<T>,
mapper: (T) -> R,
@ -23,18 +28,21 @@ suspend inline fun <T, reified R> FlowCollector<Resource<R>>.handleGenericCall(
if (response.isSuccessful) emit(Resource.Success(body))
else emit(response.parseError())
} catch (e: HttpException) {
e.printStackTrace()
emit(
Resource.Error(
message = "Упс! Что-то пошло не так."
)
)
} catch (e: IOException) {
e.printStackTrace()
emit(
Resource.Error(
message = "Не удается соединиться с сервером, проверьте интернет подключение"
)
)
} catch (e: Exception) {
e.printStackTrace()
emit(Resource.Error(message = "Упс! Что-то пошло не так."))
}
}
@ -47,12 +55,15 @@ suspend inline fun <reified T> handleResponse(call: () -> Response<T>): Resource
return Resource.Success(body)
} else return response.parseError()
} catch (e: HttpException) {
e.printStackTrace()
return Resource.Error(message = "Упс! Что-то пошло не так.")
} catch (e: IOException) {
e.printStackTrace()
return Resource.Error(
message = "Не удается соединиться с сервером, проверьте интернет подключение"
)
} catch (e: Exception) {
e.printStackTrace()
return Resource.Error(message = "Упс! Что-то пошло не так.")
}
}
@ -67,10 +78,16 @@ inline fun <T, reified R> Response<T>.parseError(): Resource<R> {
Resource.Error(message = response?.message ?: "")
} catch (e: JSONException) {
println(e.message)
e.printStackTrace()
Resource.Error(e.toString())
}
}
fun String.toFormDataRequestBody() = this.toRequestBody("multipart/form-data".toMediaTypeOrNull())
fun isOnline(context: Context): Boolean {
val cm =
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager?
val netInfo = cm!!.activeNetworkInfo
return netInfo != null && netInfo.isConnected()
}

27
android/app/src/main/java/app/tourism/data/remote/TourismApi.kt
View file

@ -3,8 +3,11 @@ package app.tourism.data.remote
import app.tourism.data.dto.AllDataDto
import app.tourism.data.dto.CategoryDto
import app.tourism.data.dto.FavoritesDto
import app.tourism.data.dto.FavoritesIdsDto
import app.tourism.data.dto.HashDto
import app.tourism.data.dto.auth.AuthResponseDto
import app.tourism.data.dto.place.ReviewDto
import app.tourism.data.dto.place.ReviewIdsDto
import app.tourism.data.dto.place.ReviewsDto
import app.tourism.data.dto.profile.LanguageDto
import app.tourism.data.dto.profile.ThemeDto
import app.tourism.data.dto.profile.UserData
@ -17,11 +20,13 @@ import retrofit2.http.DELETE
import retrofit2.http.Field
import retrofit2.http.FormUrlEncoded
import retrofit2.http.GET
import retrofit2.http.HTTP
import retrofit2.http.Multipart
import retrofit2.http.POST
import retrofit2.http.PUT
import retrofit2.http.Part
import retrofit2.http.Path
import retrofit2.http.Query
interface TourismApi {
// region auth
@ -72,7 +77,10 @@ interface TourismApi {
// region places
@GET("marks/{id}")
suspend fun getPlacesByCategory(@Path("id") id: Long): Response<CategoryDto>
suspend fun getPlacesByCategory(
@Path("id") id: Long,
@Query("hash") hash: String
): Response<CategoryDto>
@GET("marks/all")
suspend fun getAllPlaces(): Response<AllDataDto>
@ -83,15 +91,15 @@ interface TourismApi {
suspend fun getFavorites(): Response<FavoritesDto>
@POST("favourite-marks")
suspend fun addFavorites(@Body ids: List<Long>): Response<SimpleResponse>
suspend fun addFavorites(@Body ids: FavoritesIdsDto): Response<SimpleResponse>
@DELETE("favourite-marks")
suspend fun removeFromFavorites(@Body ids: List<Long>): Response<SimpleResponse>
@HTTP(method = "DELETE", path = "favourite-marks", hasBody = true)
suspend fun removeFromFavorites(@Body ids: FavoritesIdsDto): Response<SimpleResponse>
// endregion favorites
// region reviews
@GET("feedbacks/{id}")
suspend fun getReviewsByPlaceId(id: Long): Response<List<ReviewDto>>
suspend fun getReviewsByPlaceId(@Path("id") id: Long): Response<ReviewsDto>
@Multipart
@POST("feedbacks")
@ -102,10 +110,9 @@ interface TourismApi {
@Part images: List<MultipartBody.Part>? = null
): Response<SimpleResponse>
@DELETE("feedbacks/{mark_id}")
suspend fun deleteReview(
@Path("mark_id") placeId: Long,
@Body reviewsIds: List<Long>,
@HTTP(method = "DELETE", path = "feedbacks", hasBody = true)
suspend fun deleteReviews(
@Body feedbacks: ReviewIdsDto,
): Response<SimpleResponse>
// endregion reviews
}

37
android/app/src/main/java/app/tourism/data/remote/WifiReceiver.kt Normal file
View file

@ -0,0 +1,37 @@
package app.tourism.data.remote
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.net.ConnectivityManager
import android.net.ConnectivityManager.NetworkCallback
import android.net.Network
import android.net.NetworkRequest
import app.tourism.data.repositories.PlacesRepository
import app.tourism.data.repositories.ReviewsRepository
import javax.inject.Inject
class WifiReceiver : BroadcastReceiver() {
@Inject
lateinit var reviewsRepository: ReviewsRepository
@Inject
lateinit var placesRepository: PlacesRepository
override fun onReceive(context: Context, intent: Intent) {
val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val builder = NetworkRequest.Builder()
cm.registerNetworkCallback(
builder.build(),
object : NetworkCallback() {
override fun onAvailable(network: Network) {
super.onAvailable(network)
reviewsRepository.syncReviews()
placesRepository.syncFavorites()
}
}
)
}
}

63
android/app/src/main/java/app/tourism/data/repositories/PlacesRepository.kt
View file

@ -3,9 +3,12 @@ package app.tourism.data.repositories
import android.content.Context
import app.organicmaps.R
import app.tourism.data.db.Database
import app.tourism.data.db.entities.FavoriteToSyncEntity
import app.tourism.data.db.entities.HashEntity
import app.tourism.data.db.entities.PlaceEntity
import app.tourism.data.db.entities.ReviewEntity
import app.tourism.data.dto.FavoritesIdsDto
import app.tourism.data.dto.HashDto
import app.tourism.data.dto.place.PlaceDto
import app.tourism.data.remote.TourismApi
import app.tourism.data.remote.handleGenericCall
@ -24,14 +27,14 @@ import kotlinx.coroutines.flow.flow
class PlacesRepository(
private val api: TourismApi,
private val db: Database,
db: Database,
@ApplicationContext private val context: Context,
) {
private val placesDao = db.placesDao
private val reviewsDao = db.reviewsDao
private val hashesDao = db.hashesDao
fun downloadAllDataIfFirstTime(): Flow<Resource<SimpleResponse>> = flow {
fun downloadAllData(): Flow<Resource<SimpleResponse>> = flow {
val hashes = hashesDao.getHashes()
val favoritesResponse = handleResponse { api.getFavorites() }
@ -93,6 +96,8 @@ class PlacesRepository(
SimpleResponse(message = context.getString(R.string.great_success))
}
)
} else {
emit(Resource.Success(SimpleResponse(message = context.getString(R.string.great_success))))
}
}
@ -103,27 +108,24 @@ class PlacesRepository(
}
}
fun getPlacesByCategory(id: Long): Flow<Resource<List<PlaceShort>>> = channelFlow {
fun getPlacesByCategoryFromDbFlow(id: Long): Flow<Resource<List<PlaceShort>>> = channelFlow {
placesDao.getPlacesByCategoryId(categoryId = id)
.collectLatest { placeEntities ->
send(Resource.Success(placeEntities.map { it.toPlaceShort() }))
}
}
suspend fun getPlacesByCategoryFromApiIfThereIsChange(id: Long) {
val hash = hashesDao.getHash(id)
if (hash.value.isNotBlank()) {
placesDao.getPlacesByCategoryId(categoryId = id)
.collectLatest { placeEntities ->
send(Resource.Success(placeEntities.map { it.toPlaceShort() }))
}
}
val favorites = placesDao.getFavoritePlaces("")
val resource =
handleResponse { api.getPlacesByCategory(id, hash?.value ?: "") }
var favorites = listOf<PlaceEntity>()
placesDao.getFavoritePlaces("").collectLatest {
favorites = it
}
val resource = handleResponse { api.getPlacesByCategory(id) }
if (resource is Resource.Success) {
if (hash != null && resource is Resource.Success)
resource.data?.let { categoryDto ->
if (hash.value != categoryDto.hash) {
if (categoryDto.data.isNotEmpty()) {
// update places
hashesDao.insertHash(hash.copy(value = categoryDto.hash))
placesDao.deleteAllPlacesByCategory(categoryId = id)
val places = categoryDto.data.map { placeDto ->
@ -142,9 +144,12 @@ class PlacesRepository(
}
reviewsDao.deleteAllReviews()
reviewsDao.insertReviews(reviewsEntities)
// update hash
hashesDao.insertHash(hash.copy(value = categoryDto.hash))
}
}
}
}
fun getTopPlaces(id: Long): Flow<Resource<List<PlaceShort>>> = channelFlow {
@ -162,7 +167,7 @@ class PlacesRepository(
}
fun getFavorites(q: String): Flow<Resource<List<PlaceShort>>> = channelFlow {
placesDao.getFavoritePlaces("%$q%")
placesDao.getFavoritePlacesFlow("%$q%")
.collectLatest { placeEntities ->
send(Resource.Success(placeEntities.map { it.toPlaceShort() }))
}
@ -170,5 +175,23 @@ class PlacesRepository(
suspend fun setFavorite(placeId: Long, isFavorite: Boolean) {
placesDao.setFavorite(placeId, isFavorite)
val favoritesIdsDto = FavoritesIdsDto(marks = listOf(placeId))
val favoriteToSyncEntity = FavoriteToSyncEntity(placeId, isFavorite)
placesDao.addFavoriteToSync(favoriteToSyncEntity)
val response: Resource<SimpleResponse> = if (isFavorite)
handleResponse { api.addFavorites(favoritesIdsDto) }
else
handleResponse { api.removeFromFavorites(favoritesIdsDto) }
if (response is Resource.Success)
placesDao.removeFavoriteToSync(favoriteToSyncEntity.placeId)
else if (response is Resource.Error)
placesDao.addFavoriteToSync(favoriteToSyncEntity)
}
fun syncFavorites() {
}
}

140
android/app/src/main/java/app/tourism/data/repositories/ReviewsRepository.kt
View file

@ -1,22 +1,31 @@
package app.tourism.data.repositories
import android.content.Context
import app.tourism.data.db.Database
import app.tourism.data.dto.place.ReviewIdsDto
import app.tourism.data.remote.TourismApi
import app.tourism.data.remote.handleResponse
import app.tourism.data.remote.isOnline
import app.tourism.data.remote.toFormDataRequestBody
import app.tourism.domain.models.SimpleResponse
import app.tourism.domain.models.details.Review
import app.tourism.domain.models.details.ReviewToPost
import app.tourism.domain.models.resource.Resource
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.channelFlow
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.MultipartBody
import okhttp3.RequestBody.Companion.asRequestBody
import java.io.File
class ReviewsRepository(
@ApplicationContext val context: Context,
private val api: TourismApi,
private val db: Database,
) {
@ -29,42 +38,101 @@ class ReviewsRepository(
}
}
fun postReview(review: ReviewToPost): Flow<Resource<SimpleResponse>> = flow {
val imageMultiparts = mutableListOf<MultipartBody.Part>()
review.images.forEach {
val requestBody = it.asRequestBody("image/*".toMediaType())
val imageMultipart =
MultipartBody.Part.createFormData("images[]", it.name, requestBody)
imageMultiparts.add(imageMultipart)
}
emit(Resource.Loading())
val postReviewResponse = handleResponse {
api.postReview(
placeId = review.placeId.toString().toFormDataRequestBody(),
comment = review.comment.toFormDataRequestBody(),
points = review.rating.toString().toFormDataRequestBody(),
images = imageMultiparts
)
}
emit(postReviewResponse)
if (postReviewResponse is Resource.Success) {
updateReviewsForDb(review.placeId)
suspend fun getReviewsFromApi(id: Long) {
val getReviewsResponse = handleResponse { api.getReviewsByPlaceId(id) }
if (getReviewsResponse is Resource.Success) {
reviewsDao.deleteAllPlaceReviews(id)
getReviewsResponse.data?.data?.map { it.toReview().toReviewEntity() }
?.let { reviewsDao.insertReviews(it) }
}
}
fun deleteReviews(placeId: Long, reviewsIds: List<Long>): Flow<Resource<SimpleResponse>> =
flow {
val deleteReviewsResponse = handleResponse {
api.deleteReview(placeId, reviewsIds)
fun postReview(review: ReviewToPost): Flow<Resource<SimpleResponse>> = flow {
if (isOnline(context)) {
emit(Resource.Loading())
val postReviewResponse = handleResponse {
api.postReview(
placeId = review.placeId.toString().toFormDataRequestBody(),
comment = review.comment.toFormDataRequestBody(),
points = review.rating.toString().toFormDataRequestBody(),
images = getMultipartFromImageFiles(review.images)
)
}
emit(deleteReviewsResponse)
emit(postReviewResponse)
if (deleteReviewsResponse is Resource.Success) {
updateReviewsForDb(placeId)
if (postReviewResponse is Resource.Success) {
updateReviewsForDb(review.placeId)
}
} else {
reviewsDao.insertReviewPlannedToPost(review.toReviewPlannedToPostEntity())
}
}
fun deleteReview(id: Long): Flow<Resource<SimpleResponse>> =
flow {
reviewsDao.markReviewForDeletion(id)
val deleteReviewResponse =
handleResponse {
api.deleteReviews(ReviewIdsDto(listOf(id)))
}
if (deleteReviewResponse is Resource.Success) {
reviewsDao.deleteReview(id)
}
emit(deleteReviewResponse)
// val token = UserPreferences(context).getToken()
//
// val client = OkHttpClient()
// val mediaType = "application/json".toMediaType()
// val body = "{\n \"feedbacks\": [$id]\n}".toRequestBody(mediaType)
// val request = Request.Builder()
// .url("http://192.168.1.80:8888/api/feedbacks")
// .method("DELETE", body)
// .addHeader("Accept", "application/json")
// .addHeader("Content-Type", "application/json")
// .addHeader("Authorization", "Bearer $token")
// .build()
// val response = client.newCall(request).execute()
}
fun syncReviews() {
val coroutineScope = CoroutineScope(Dispatchers.IO)
coroutineScope.launch {
deleteReviewsThatWereNotDeletedOnTheServer()
publishReviewsThatWereNotPublished()
}
}
private suspend fun deleteReviewsThatWereNotDeletedOnTheServer() {
val reviews = reviewsDao.getReviewsPlannedForDeletion()
if (reviews.isEmpty()) {
val reviewsIds = reviews.map { it.id }
val response = handleResponse { api.deleteReviews(ReviewIdsDto(reviewsIds)) }
if (response is Resource.Success) {
reviewsDao.deleteReviews(reviewsIds)
}
}
// todo
}
private suspend fun publishReviewsThatWereNotPublished() {
val reviewsPlannedToPostEntities = reviewsDao.getReviewsPlannedToPost()
if (reviewsPlannedToPostEntities.isEmpty()) {
val reviews = reviewsPlannedToPostEntities.map { it.toReviewsPlannedToPostDto() }
reviews.forEach {
CoroutineScope(Dispatchers.IO).launch {
api.postReview(
placeId = it.placeId.toString().toFormDataRequestBody(),
comment = it.comment.toFormDataRequestBody(),
points = it.rating.toString().toFormDataRequestBody(),
images = getMultipartFromImageFiles(it.images)
)
}
}
}
}
private suspend fun updateReviewsForDb(id: Long) {
val getReviewsResponse = handleResponse {
@ -72,6 +140,20 @@ class ReviewsRepository(
}
if (getReviewsResponse is Resource.Success) {
reviewsDao.deleteAllPlaceReviews(id)
val reviews =
getReviewsResponse.data?.data?.map { it.toReview().toReviewEntity() } ?: listOf()
reviewsDao.insertReviews(reviews)
}
}
private fun getMultipartFromImageFiles(imageFiles: List<File>): MutableList<MultipartBody.Part> {
val imagesMultipart = mutableListOf<MultipartBody.Part>()
imageFiles.forEach {
val requestBody = it.asRequestBody("image/*".toMediaType())
val imageMultipart =
MultipartBody.Part.createFormData("images[]", it.name, requestBody)
imagesMultipart.add(imageMultipart)
}
return imagesMultipart
}
}

2
android/app/src/main/java/app/tourism/di/RepositoriesModule.kt
View file

@ -43,7 +43,7 @@ object RepositoriesModule {
db: Database,
@ApplicationContext context: Context,
): ReviewsRepository {
return ReviewsRepository(api, db)
return ReviewsRepository(context, api, db)
}

4
android/app/src/main/java/app/tourism/domain/models/details/PlaceFull.kt
View file

@ -10,7 +10,7 @@ data class PlaceFull(
val rating: Double,
val excerpt: String,
val description: String,
val placeLocation: PlaceLocation,
val placeLocation: PlaceLocation?,
val cover: String,
val pics: List<String> = emptyList(),
val reviews: List<Review>? = null,
@ -33,7 +33,7 @@ data class PlaceFull(
excerpt = excerpt,
description = description,
gallery = pics,
coordinates = placeLocation.toCoordinatesEntity(),
coordinates = placeLocation?.toCoordinatesEntity(),
cover = cover,
isFavorite = isFavorite,
)

4
android/app/src/main/java/app/tourism/domain/models/details/Review.kt
View file

@ -10,6 +10,7 @@ data class Review(
val date: String? = null,
val comment: String? = null,
val picsUrls: List<String> = emptyList(),
val deletionPlanned: Boolean = false,
) {
fun toReviewEntity() = ReviewEntity(
id = id,
@ -18,6 +19,7 @@ data class Review(
placeId = placeId,
date = date ?: "",
rating = rating,
images = picsUrls
images = picsUrls,
deletionPlanned = deletionPlanned
)
}

14
android/app/src/main/java/app/tourism/domain/models/details/ReviewToPost.kt
View file

@ -1,5 +1,6 @@
package app.tourism.domain.models.details
import app.tourism.data.db.entities.ReviewPlannedToPostEntity
import java.io.File
data class ReviewToPost(
@ -7,4 +8,15 @@ data class ReviewToPost(
val comment: String,
val rating: Int,
val images: List<File>,
)
) {
fun toReviewPlannedToPostEntity(): ReviewPlannedToPostEntity {
val imagesPaths = images.map { it.path }
return ReviewPlannedToPostEntity(
placeId = placeId,
comment = comment,
rating = rating,
images = imagesPaths
)
}
}

1
android/app/src/main/java/app/tourism/domain/models/profile/PersonalData.kt
View file

@ -1,6 +1,7 @@
package app.tourism.domain.models.profile
data class PersonalData(
val id: Long,
val fullName: String,
val country: String,
val pfpUrl: String?,

24
android/app/src/main/java/app/tourism/ui/common/ui_state/EmptyList.kt Normal file
View file

@ -0,0 +1,24 @@
package app.tourism.ui.common.ui_state
import androidx.compose.foundation.layout.Box
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import app.organicmaps.R
import app.tourism.ui.theme.TextStyles
@Composable
fun EmptyList(modifier: Modifier = Modifier) {
Box(
modifier = modifier,
contentAlignment = Alignment.Center
) {
Text(
text = stringResource(id = R.string.empty_list),
style = TextStyles.h2
)
}
}

9
android/app/src/main/java/app/tourism/ui/common/ui_state/NetworkError.kt → android/app/src/main/java/app/tourism/ui/common/ui_state/Error.kt
View file

@ -25,14 +25,13 @@ import app.tourism.ui.common.buttons.PrimaryButton
import app.tourism.ui.theme.TextStyles
@Composable
fun NetworkError(
fun Error(
modifier: Modifier = Modifier,
errorMessage: String? = null,
status: Boolean = true,
onEntireScreen: Boolean = true,
onRetry: (() -> Unit)? = null
) {
println("error message: $errorMessage")
if (status) {
Column(
modifier = if (onEntireScreen) modifier
@ -55,7 +54,7 @@ fun NetworkError(
Text(
text = errorMessage
?: stringResource(id = if (onEntireScreen) R.string.no_network else R.string.smth_went_wrong),
style = TextStyles.h1,
style = TextStyles.h3,
textAlign = Center
)
@ -83,8 +82,8 @@ fun NetworkError(
@Composable
fun NetworkError_preview() {
Column {
NetworkError(status = true, onEntireScreen = false) {}
Error(status = true, onEntireScreen = false) {}
VerticalSpace(height = 16.dp)
NetworkError(status = true) {}
Error(status = true) {}
}
}

15
android/app/src/main/java/app/tourism/ui/screens/main/categories/categories/CategoriesViewModel.kt
View file

@ -3,6 +3,7 @@ package app.tourism.ui.screens.main.categories.categories
import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.compose.viewModel
import app.organicmaps.R
import app.tourism.data.repositories.PlacesRepository
import app.tourism.domain.models.categories.PlaceCategory
@ -63,18 +64,22 @@ class CategoriesViewModel @Inject constructor(
}
private fun onCategoryChangeGetPlaces() {
viewModelScope.launch(Dispatchers.IO) {
viewModelScope.launch {
_selectedCategory.collectLatest { item ->
item?.key?.let { id ->
val categoryId = id as Long
placesRepository.getPlacesByCategory(categoryId).collectLatest { resource ->
if (resource is Resource.Success) {
resource.data?.let { _places.value = it }
placesRepository.getPlacesByCategoryFromApiIfThereIsChange(categoryId)
placesRepository.getPlacesByCategoryFromDbFlow(categoryId)
.collectLatest { resource ->
if (resource is Resource.Success) {
resource.data?.let { _places.value = it }
}
}
}
}
}
}
}
init {

32
android/app/src/main/java/app/tourism/ui/screens/main/favorites/favorites/FavoritesScreen.kt
View file

@ -28,6 +28,7 @@ import app.tourism.ui.common.nav.AppTopBar
import app.tourism.ui.common.nav.SearchTopBar
import app.tourism.ui.common.nav.TopBarActionData
import app.tourism.ui.common.special.PlacesItem
import app.tourism.ui.common.ui_state.EmptyList
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
@ -88,19 +89,24 @@ fun FavoritesScreen(
VerticalSpace(16.dp)
}
items(places, key = { it.id }) { item ->
Column(Modifier.animateItem()) {
PlacesItem(
place = item,
onPlaceClick = { onPlaceClick(item.id) },
isFavorite = item.isFavorite,
onFavoriteChanged = { isFavorite ->
favoritesVM.setFavoriteChanged(item, isFavorite)
},
)
VerticalSpace(height = 16.dp)
if (places.isNotEmpty())
items(places, key = { it.id }) { item ->
Column(Modifier.animateItem()) {
PlacesItem(
place = item,
onPlaceClick = { onPlaceClick(item.id) },
isFavorite = item.isFavorite,
onFavoriteChanged = { isFavorite ->
favoritesVM.setFavoriteChanged(item, isFavorite)
},
)
VerticalSpace(height = 16.dp)
}
}
else
item {
EmptyList()
}
}
item {
Column {
@ -109,4 +115,4 @@ fun FavoritesScreen(
}
}
}
}
}

113
android/app/src/main/java/app/tourism/ui/screens/main/home/HomeScreen.kt
View file

@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
@ -31,6 +32,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
@ -42,7 +44,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
import app.organicmaps.R
import app.tourism.Constants
import app.tourism.domain.models.common.PlaceShort
import app.tourism.domain.models.resource.Resource
import app.tourism.drawOverlayForTextBehind
import app.tourism.ui.ObserveAsEvents
import app.tourism.ui.common.AppSearchBar
import app.tourism.ui.common.BorderedItem
import app.tourism.ui.common.HorizontalSpace
@ -51,10 +55,13 @@ import app.tourism.ui.common.SpaceForNavBar
import app.tourism.ui.common.VerticalSpace
import app.tourism.ui.common.nav.AppTopBar
import app.tourism.ui.common.nav.TopBarActionData
import app.tourism.ui.common.ui_state.Error
import app.tourism.ui.common.ui_state.Loading
import app.tourism.ui.screens.main.categories.categories.CategoriesViewModel
import app.tourism.ui.screens.main.categories.categories.HorizontalSingleChoice
import app.tourism.ui.theme.TextStyles
import app.tourism.ui.theme.getStarColor
import app.tourism.ui.utils.showToast
@Composable
fun HomeScreen(
@ -65,10 +72,20 @@ fun HomeScreen(
homeVM: HomeViewModel = hiltViewModel(),
categoriesVM: CategoriesViewModel,
) {
val context = LocalContext.current
val query = homeVM.query.collectAsState().value
val sights = homeVM.sights.collectAsState().value
val restaurants = homeVM.restaurants.collectAsState().value
val downloadResponse = homeVM.downloadResponse.collectAsState().value
ObserveAsEvents(flow = homeVM.uiEventsChannelFlow) { event ->
when (event) {
is UiEvent.ShowToast -> context.showToast(event.message)
}
}
LaunchedEffect(true) {
categoriesVM.setSelectedCategory(null)
}
@ -88,51 +105,67 @@ fun HomeScreen(
},
contentWindowInsets = WindowInsets(left = 0.dp, right = 0.dp, top = 0.dp, bottom = 0.dp)
) { paddingValues ->
Column(
Modifier
.padding(paddingValues)
.verticalScroll(rememberScrollState())
) {
Column(Modifier.padding(horizontal = Constants.SCREEN_PADDING)) {
if (downloadResponse is Resource.Success)
Column(
Modifier
.padding(paddingValues)
.verticalScroll(rememberScrollState())
) {
Column(Modifier.padding(horizontal = Constants.SCREEN_PADDING)) {
VerticalSpace(height = 16.dp)
AppSearchBar(
modifier = Modifier.fillMaxWidth(),
query = query,
onQueryChanged = { homeVM.setQuery(it) },
onSearchClicked = onSearchClick,
onClearClicked = { homeVM.clearSearchField() },
)
}
VerticalSpace(height = 16.dp)
AppSearchBar(
modifier = Modifier.fillMaxWidth(),
query = query,
onQueryChanged = { homeVM.setQuery(it) },
onSearchClicked = onSearchClick,
onClearClicked = { homeVM.clearSearchField() },
Categories(categoriesVM, onCategoryClicked)
VerticalSpace(height = 24.dp)
HorizontalPlaces(
title = stringResource(id = R.string.sights),
items = sights,
onPlaceClick = { item ->
onPlaceClick(item.id)
},
setFavoriteChanged = { item, isFavorite ->
homeVM.setFavoriteChanged(item, isFavorite)
},
)
VerticalSpace(height = 24.dp)
HorizontalPlaces(
title = stringResource(id = R.string.restaurants),
items = restaurants,
onPlaceClick = { item ->
onPlaceClick(item.id)
},
setFavoriteChanged = { item, isFavorite ->
homeVM.setFavoriteChanged(item, isFavorite)
},
)
SpaceForNavBar()
}
VerticalSpace(height = 16.dp)
Categories(categoriesVM, onCategoryClicked)
VerticalSpace(height = 24.dp)
HorizontalPlaces(
title = stringResource(id = R.string.sights),
items = sights,
onPlaceClick = { item ->
onPlaceClick(item.id)
},
setFavoriteChanged = { item, isFavorite ->
homeVM.setFavoriteChanged(item, isFavorite)
},
if (downloadResponse is Resource.Loading) {
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Text(text = stringResource(id = R.string.plz_wait_dowloading))
VerticalSpace(height = 16.dp)
Loading(onEntireScreen = false)
}
}
}
if (downloadResponse is Resource.Error) {
Error(
errorMessage = downloadResponse.message
?: stringResource(id = R.string.smth_went_wrong),
)
VerticalSpace(height = 24.dp)
HorizontalPlaces(
title = stringResource(id = R.string.restaurants),
items = restaurants,
onPlaceClick = { item ->
onPlaceClick(item.id)
},
setFavoriteChanged = { item, isFavorite ->
homeVM.setFavoriteChanged(item, isFavorite)
},
)
SpaceForNavBar()
}
}
}

11
android/app/src/main/java/app/tourism/ui/screens/main/home/HomeViewModel.kt
View file

@ -1,5 +1,6 @@
package app.tourism.ui.screens.main.home
import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import app.tourism.data.repositories.PlacesRepository
@ -8,6 +9,7 @@ import app.tourism.domain.models.categories.PlaceCategory
import app.tourism.domain.models.common.PlaceShort
import app.tourism.domain.models.resource.Resource
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.MutableStateFlow
@ -19,6 +21,7 @@ import javax.inject.Inject
@HiltViewModel
class HomeViewModel @Inject constructor(
@ApplicationContext val context: Context,
private val placesRepository: PlacesRepository
) : ViewModel() {
private val uiChannel = Channel<UiEvent>()
@ -65,11 +68,11 @@ class HomeViewModel @Inject constructor(
}
}
private val _downloadResponse = MutableStateFlow<Resource<SimpleResponse>?>(null)
private val _downloadResponse = MutableStateFlow<Resource<SimpleResponse>>(Resource.Idle())
val downloadResponse = _downloadResponse.asStateFlow()
private fun downloadAllDataIfFirstTime() {
private fun downloadAllData() {
viewModelScope.launch(Dispatchers.IO) {
placesRepository.downloadAllDataIfFirstTime().collectLatest {
placesRepository.downloadAllData().collectLatest {
_downloadResponse.value = it
}
}
@ -82,7 +85,7 @@ class HomeViewModel @Inject constructor(
}
init {
downloadAllDataIfFirstTime()
downloadAllData()
getTopSights()
getTopRestaurants()
}

9
android/app/src/main/java/app/tourism/ui/screens/main/place_details/PlaceScreen.kt
View file

@ -49,7 +49,12 @@ fun PlaceDetailsScreen(
title = it.name,
picUrl = it.cover,
isFavorite = it.isFavorite,
onFavoriteChanged = { isFavorite -> placeVM.setFavoriteChanged(id, isFavorite) },
onFavoriteChanged = { isFavorite ->
placeVM.setFavoriteChanged(
id,
isFavorite
)
},
onMapClick = onMapClick,
onBackClick = onBackClick,
)
@ -84,7 +89,7 @@ fun PlaceDetailsScreen(
DescriptionScreen(
description = place.description,
onCreateRoute = {
onCreateRoute(place.placeLocation)
place.placeLocation?.let { it1 -> onCreateRoute(it1) }
},
)
}

67
android/app/src/main/java/app/tourism/ui/screens/main/place_details/reviews/ReviewsScreen.kt
View file

@ -23,12 +23,14 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import app.organicmaps.R
import app.tourism.Constants
import app.tourism.ui.ObserveAsEvents
import app.tourism.ui.common.HorizontalSpace
import app.tourism.ui.common.VerticalSpace
import app.tourism.ui.common.special.RatingBar
@ -36,6 +38,8 @@ import app.tourism.ui.screens.main.place_details.reviews.components.PostReview
import app.tourism.ui.screens.main.place_details.reviews.components.Review
import app.tourism.ui.theme.TextStyles
import app.tourism.ui.theme.getStarColor
import app.tourism.ui.utils.showToast
import app.tourism.ui.utils.showYesNoAlertDialog
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlin.math.roundToInt
@ -49,6 +53,7 @@ fun ReviewsScreen(
onMoreClick: (picsUrls: List<String>) -> Unit,
reviewsVM: ReviewsViewModel = hiltViewModel(),
) {
val context = LocalContext.current
val scope = rememberCoroutineScope()
val sheetState = rememberModalBottomSheetState()
@ -57,6 +62,10 @@ fun ReviewsScreen(
val userReview = reviewsVM.userReview.collectAsState().value
val reviews = reviewsVM.reviews.collectAsState().value
ObserveAsEvents(flow = reviewsVM.uiEventsChannelFlow) { event ->
if (event is UiEvent.ShowToast) context.showToast(event.message)
}
LazyColumn(
contentPadding = PaddingValues(Constants.SCREEN_PADDING),
) {
@ -64,39 +73,39 @@ fun ReviewsScreen(
item {
Column {
VerticalSpace(height = 16.dp)
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
modifier = Modifier.size(30.dp),
painter = painterResource(id = R.drawable.star),
contentDescription = null,
tint = getStarColor(),
)
HorizontalSpace(width = 8.dp)
Text(text = "%.1f".format(rating) + "/5", style = TextStyles.h1)
}
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
TextButton(
onClick = {
showReviewBottomSheet = true
scope.launch {
// Have to do add this delay, because bottom sheet doesn't expand fully itself
// and expands with duration after showReviewBottomSheet is set to true
delay(300L)
sheetState.expand()
}
},
) {
Text(text = stringResource(id = R.string.compose_review))
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
modifier = Modifier.size(30.dp),
painter = painterResource(id = R.drawable.star),
contentDescription = null,
tint = getStarColor(),
)
HorizontalSpace(width = 8.dp)
Text(text = "%.1f".format(rating) + "/5", style = TextStyles.h1)
}
RatingBar(rating = it.roundToInt())
if (userReview == null) {
TextButton(
onClick = {
showReviewBottomSheet = true
scope.launch {
// Have to do add this delay, because bottom sheet doesn't expand fully itself
// and expands with duration after showReviewBottomSheet is set to true
delay(300L)
sheetState.expand()
}
},
) {
Text(text = stringResource(id = R.string.compose_review))
}
}
}
VerticalSpace(height = 24.dp)
TextButton(
modifier = Modifier.align(Alignment.End),
@ -113,9 +122,15 @@ fun ReviewsScreen(
userReview?.let {
item {
Review(
review = userReview,
review = it,
onMoreClick = onMoreClick,
onDeleteClick = {}
onDeleteClick = {
showYesNoAlertDialog(
context = context,
title = context.getString(R.string.deletion_warning),
onPositiveButtonClick = { reviewsVM.deleteReview() },
)
}
)
}
}

36
android/app/src/main/java/app/tourism/ui/screens/main/place_details/reviews/ReviewsViewModel.kt
View file

@ -1,11 +1,15 @@
package app.tourism.ui.screens.main.place_details.reviews
import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import app.organicmaps.R
import app.tourism.data.prefs.UserPreferences
import app.tourism.data.repositories.ReviewsRepository
import app.tourism.domain.models.details.Review
import app.tourism.domain.models.resource.Resource
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.MutableStateFlow
@ -17,7 +21,9 @@ import javax.inject.Inject
@HiltViewModel
class ReviewsViewModel @Inject constructor(
private val reviewsRepository: ReviewsRepository
@ApplicationContext val context: Context,
private val reviewsRepository: ReviewsRepository,
private val userPreferences: UserPreferences,
) : ViewModel() {
private val uiChannel = Channel<UiEvent>()
val uiEventsChannelFlow = uiChannel.receiveAsFlow()
@ -30,11 +36,33 @@ class ReviewsViewModel @Inject constructor(
fun getReviews(id: Long) {
viewModelScope.launch(Dispatchers.IO) {
reviewsRepository.getReviewsForPlace(id).collectLatest {
if (it is Resource.Success) {
it.data?.let { _reviews.value = it }
reviewsRepository.getReviewsForPlace(id).collectLatest { resource ->
if (resource is Resource.Success) {
resource.data?.let { reviewList ->
_reviews.value = reviewList
_userReview.value = reviewList.firstOrNull {
it.user.id == userPreferences.getUserId()?.toLong()
}
}
}
}
}
viewModelScope.launch(Dispatchers.IO) {
reviewsRepository.getReviewsFromApi(id)
}
}
fun deleteReview() {
viewModelScope.launch(Dispatchers.IO) {
_userReview.value?.id?.let {
reviewsRepository.deleteReview(it).collectLatest {
if (it is Resource.Success) {
uiChannel.send(UiEvent.ShowToast(context.getString(R.string.review_deleted)))
}
}
}
}
}
}
enum class DeleteReviewStatus { DELETED, IN_PROCESS }

75
android/app/src/main/java/app/tourism/ui/screens/main/place_details/reviews/components/Review.kt
View file

@ -38,7 +38,6 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import app.organicmaps.R
import app.tourism.Constants
import app.tourism.domain.models.details.Review
import app.tourism.domain.models.details.User
import app.tourism.ui.common.HorizontalSpace
@ -56,7 +55,7 @@ fun Review(
modifier: Modifier = Modifier,
review: Review,
onMoreClick: (picsUrls: List<String>) -> Unit,
onDeleteClick: ((reviewId: Long) -> Unit)? = null,
onDeleteClick: (() -> Unit)? = null,
) {
Column {
HorizontalDivider(color = MaterialTheme.colorScheme.surface)
@ -68,19 +67,21 @@ fun Review(
horizontalArrangement = Arrangement.SpaceBetween
) {
User(modifier = Modifier.weight(1f), user = review.user)
review.date?.let {
Text(text = it, style = TextStyles.b2, color = getHintColor())
if (review.deletionPlanned) {
Text(stringResource(id = R.string.deletionPlanned))
} else {
review.date?.let {
Text(text = it, style = TextStyles.b2, color = getHintColor())
}
}
}
VerticalSpace(height = 16.dp)
review.rating.let {
RatingBar(
rating = it,
size = 24.dp,
)
VerticalSpace(height = 16.dp)
}
RatingBar(
rating = review.rating,
size = 24.dp,
)
VerticalSpace(height = 16.dp)
val maxPics = 3
val theresMore = review.picsUrls.size > maxPics
@ -104,8 +105,17 @@ fun Review(
VerticalSpace(height = 16.dp)
}
review.comment?.let {
Comment(comment = it)
if(!review.comment.isNullOrBlank()) {
Comment(comment = review.comment)
VerticalSpace(height = 16.dp)
}
onDeleteClick?.let {
TextButton(
onClick = { onDeleteClick() },
) {
Text(text = stringResource(id = R.string.delete_review))
}
VerticalSpace(height = 16.dp)
}
}
@ -127,8 +137,9 @@ fun User(modifier: Modifier = Modifier, user: User) {
.clip(CircleShape),
url = user.pfpUrl,
)
HorizontalSpace(width = 8.dp)
HorizontalSpace(width = 12.dp)
Column {
VerticalSpace(height = 6.dp)
Text(
text = user.name,
style = TextStyles.h4,
@ -136,19 +147,18 @@ fun User(modifier: Modifier = Modifier, user: User) {
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
user.countryCodeName.let {
CountryAsLabel(
Modifier.fillMaxWidth(),
user.countryCodeName,
contentColor = MaterialTheme.colorScheme.onBackground.toArgb(),
)
}
CountryAsLabel(
Modifier.fillMaxWidth(),
user.countryCodeName,
contentColor = MaterialTheme.colorScheme.onBackground.toArgb(),
)
}
}
}
@Composable
fun Comment(modifier: Modifier = Modifier, comment: String) {
var hasOverflown by remember { mutableStateOf(false) }
var expanded by remember { mutableStateOf(false) }
val shape = RoundedCornerShape(20.dp)
@ -159,11 +169,7 @@ fun Comment(modifier: Modifier = Modifier, comment: String) {
.background(color = MaterialTheme.colorScheme.surface, shape = shape)
.clip(shape)
.clickable { onClick() }
.padding(
start = Constants.SCREEN_PADDING,
end = Constants.SCREEN_PADDING,
top = Constants.SCREEN_PADDING,
)
.padding(start = 16.dp, end = 16.dp, top = 16.dp)
.then(modifier),
) {
Text(
@ -171,9 +177,16 @@ fun Comment(modifier: Modifier = Modifier, comment: String) {
style = TextStyles.h4.copy(fontWeight = FontWeight.W400),
maxLines = if (expanded) 6969 else 2,
overflow = TextOverflow.Ellipsis,
onTextLayout = {
if (it.hasVisualOverflow) hasOverflown = true
}
)
TextButton(onClick = { onClick() }, contentPadding = PaddingValues(0.dp)) {
Text(text = stringResource(id = if (expanded) R.string.less else R.string.more))
if (hasOverflown) {
TextButton(onClick = { onClick() }, contentPadding = PaddingValues(0.dp)) {
Text(text = stringResource(id = if (expanded) R.string.less else R.string.more))
}
} else {
VerticalSpace(height = 16.dp)
}
}
}
@ -185,7 +198,7 @@ fun ReviewPic(modifier: Modifier = Modifier, url: String) {
modifier = Modifier
.width(73.dp)
.height(65.dp)
.clip(RoundedCornerShape(4.dp))
.clip(imageShape)
.then(modifier),
url = url,
)
@ -221,4 +234,6 @@ fun Modifier.getImageProperties() =
this
.width(73.dp)
.height(65.dp)
.clip(RoundedCornerShape(4.dp))
.clip(imageShape)
val imageShape = RoundedCornerShape(4.dp)

22
android/app/src/main/java/app/tourism/ui/utils/AlertDialogs.kt Normal file
View file

@ -0,0 +1,22 @@
package app.tourism.ui.utils
import android.content.Context
import app.organicmaps.R
fun showYesNoAlertDialog(context: Context, title: String, onPositiveButtonClick: () -> Unit) {
android.app.AlertDialog.Builder(context)
.setMessage(title)
.setNegativeButton(context.getString(R.string.no)) { _, _ -> }
.setPositiveButton(context.getString(R.string.yes)) { _, _ ->
onPositiveButtonClick()
}
.create().show()
}
fun showMessageInAlertDialog(context: Context, title: String, message: String) {
android.app.AlertDialog.Builder(context)
.setTitle(title)
.setMessage(message)
.setPositiveButton(context.getString(R.string.ok)) { _, _ -> }
.create().show()
}

2
android/app/src/main/res/layout/ccp_as_country_label.xml
View file

@ -4,7 +4,7 @@
android:id="@+id/ccp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="12dp"
android:paddingVertical="6dp"
app:ccp_textSize="15sp"
app:ccp_showArrow="false"
app:ccp_autoDetectLanguage="true"

4417
android/app/src/main/res/values-ru/strings.xml
View file

File diff suppressed because it is too large Load diff

6
android/app/src/main/res/values/strings.xml
View file

@ -2262,4 +2262,10 @@
<string name="wrong_email_format">Wrong email format</string>
<string name="saved">Saved</string>
<string name="great_success">Great success😄</string>
<string name="review_deleted">Review was successfully deleted</string>
<string name="delete_review">Delete review</string>
<string name="deletion_warning">Are you sure you wanna delete this?</string>
<string name="deletionPlanned">Deleting…</string>
<string name="plz_wait_dowloading">Please, wait, data being downloaded</string>
<string name="empty_list">Пусто</string>
</resources>