Merge pull request #5 from isoguzay/task/refactor-dimens-string-usage

task/refactor-dimens-string-usage

Author: isoguzay

app/src/main/java/com/adyen/android/assignment/AdyenApplication.kt

@@ -4,10 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class AdyenApplication : Application() {
-
-    override fun onCreate() {
-        super.onCreate()
-    }
-    
-}
+class AdyenApplication : Application()

app/src/main/java/com/adyen/android/assignment/datasource/remote/PlacesRemoteData.kt

@@ -9,6 +9,10 @@ import javax.inject.Inject
 
 class PlacesRemoteData @Inject constructor(private val remoteService: PlacesService) {
 
+    /**
+     * Get places from service
+     * @param requestModel
+     */
     suspend fun getPlaces(requestModel: LocationRequestModel): NetworkResult<PlacesResponse> {
         return remoteService.getVenueRecommendationPlaces(
             VenueRecommendationsQueryBuilder()

app/src/main/java/com/adyen/android/assignment/di/RemoteModule.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.adyen.android.assignment.BuildConfig
 import com.adyen.android.assignment.network.service.PlacesService
 import com.adyen.android.assignment.network.util.AppCallAdapterFactory
+import com.adyen.android.assignment.utils.Constant.NETWORK_REQUEST_TIME_OUT
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import dagger.Module
@@ -39,8 +40,8 @@ object RemoteModule {
             interceptorDebug.level = HttpLoggingInterceptor.Level.BODY
 
         val client = OkHttpClient.Builder()
-            .connectTimeout(20, TimeUnit.SECONDS)
-            .readTimeout(20, TimeUnit.SECONDS)
+            .connectTimeout(NETWORK_REQUEST_TIME_OUT, TimeUnit.SECONDS)
+            .readTimeout(NETWORK_REQUEST_TIME_OUT, TimeUnit.SECONDS)
             .addInterceptor { chain ->
                 val request = chain.request()
                     .newBuilder()

app/src/main/java/com/adyen/android/assignment/repository/remote/PlacesRepository.kt

@@ -8,6 +8,10 @@ import javax.inject.Inject
 
 class PlacesRepository @Inject constructor(private val remote: PlacesRemoteData) {
 
+    /**
+     * Get places from service
+     * @param requestModel
+     */
     suspend fun getPlaces(requestModel: LocationRequestModel): NetworkResult<PlacesResponse> {
         return remote.getPlaces(requestModel)
     }

app/src/main/java/com/adyen/android/assignment/screens/MainActivity.kt

@@ -6,20 +6,21 @@ import android.content.pm.PackageManager
 import android.location.Location
 import android.os.Build
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.lifecycleScope
 import com.adyen.android.assignment.model.request.LocationRequestModel
 import com.adyen.android.assignment.screens.home.view.HomeScreen
 import com.adyen.android.assignment.screens.home.viewmodel.HomeViewModel
+import com.adyen.android.assignment.screens.permission.screen.LocationPermissionScreen
 import com.adyen.android.assignment.screens.permission.types.LocationPermissionTypes
 import com.adyen.android.assignment.screens.permission.viewmodel.PermissionViewModel
 import com.adyen.android.assignment.ui.theme.AdyenApplicationTheme
@@ -62,30 +63,46 @@ class MainActivity : ComponentActivity() {
         lifecycleScope.launchWhenCreated {
             delay(2000)
             keepSplashScreen = false
+
             setContent {
+                val permissionsState = permissionViewModel.locationPermission.observeAsState()
+
                 AdyenApplicationTheme {
                     Surface(
                         modifier = Modifier.fillMaxSize(),
                         color = MaterialTheme.colors.background
                     ) {
-                        HomeScreen({ locationRequestOnClick() })
+                        if (permissionsState.value == true) {
+                            HomeScreen({ locationRequestOnClick() })
+                        } else {
+                            LocationPermissionScreen()
+                        }
                     }
                 }
             }
         }
     }
 
+    /**
+     * cancel the cancellationTokenSource onDestroy
+     */
     override fun onDestroy() {
         super.onDestroy()
         cancellationTokenSource.cancel()
     }
 
+    /**
+     * check location permissions granted onStart
+     */
     @RequiresApi(Build.VERSION_CODES.M)
     override fun onStart() {
         super.onStart()
         getPermission()
     }
 
+    /**
+     * request permission result
+     */
     @SuppressLint("MissingSuperCall")
     override fun onRequestPermissionsResult(
         requestCode: Int,
@@ -107,6 +124,9 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+    /**
+     * get location permission, if permissionState true request it again
+     */
     @RequiresApi(Build.VERSION_CODES.M)
     fun getPermission() {
         val permissionState = requestPermissionWithRationale(
@@ -118,6 +138,9 @@ class MainActivity : ComponentActivity() {
                 LocationPermissionTypes.REQUEST_AGAIN
     }
 
+    /**
+     * request current location, check the location permissions approved state
+     */
     @RequiresApi(Build.VERSION_CODES.M)
     fun locationRequestOnClick() {
         Timber.d("locationRequestOnClick()")
@@ -131,6 +154,9 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+    /**
+     * request current location from location api
+     */
     @SuppressLint("MissingPermission")
     private fun requestCurrentLocation() {
         if (applicationContext.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
@@ -141,10 +167,7 @@ class MainActivity : ComponentActivity() {
             currentLocationTask.addOnCompleteListener { task: Task<Location> ->
                 if (task.isSuccessful && task.result != null) {
                     val result: Location = task.result
-                    Log.d(
-                        TAG,
-                        "getCurrentLocation() (success): ${result.latitude}, ${result.longitude}"
-                    )
+                    Timber.d("getCurrentLocation() (success): ${result.latitude} ${result.longitude}")
                     homeViewModel.setCurrentLocation(
                         LocationRequestModel(
                             latitude = task.result.latitude,
@@ -153,16 +176,12 @@ class MainActivity : ComponentActivity() {
                     )
                 } else {
                     val exception = task.exception
-                    Log.d(TAG, "getCurrentLocation() (failure): $exception\"")
+                    Timber.d("getCurrentLocation() (failure): $exception")
 
                 }
-                Log.d(TAG, "getCurrentLocation() result: ${task.result.longitude}")
-
+                Timber.d("getCurrentLocation() result: " + task.result.longitude)
             }
         }
     }
-
-    companion object {
-        private const val TAG = "MainActivity"
-    }
+    
 }

app/src/main/java/com/adyen/android/assignment/screens/home/view/HomeScreen.kt

@@ -5,30 +5,24 @@ import androidx.annotation.RequiresApi
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.dimensionResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.adyen.android.assignment.R
 import com.adyen.android.assignment.model.response.Category
 import com.adyen.android.assignment.model.response.Result
 import com.adyen.android.assignment.screens.home.viewmodel.HomeViewModel
-import com.adyen.android.assignment.screens.permission.screen.LocationPermissionScreen
-import com.adyen.android.assignment.screens.permission.viewmodel.PermissionViewModel
+import com.adyen.android.assignment.ui.components.CategoryChip
 import com.adyen.android.assignment.utils.Constant.GOOGLE_MAPS_CAMERA_ZOOM
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
@@ -41,27 +35,20 @@ import com.google.maps.android.compose.rememberCameraPositionState
 fun HomeScreen(
     locationRequestOnClick: () -> Unit,
     homeViewModel: HomeViewModel = hiltViewModel(),
-    permissionViewModel: PermissionViewModel = hiltViewModel()
 ) {
-    val venuesListState = homeViewModel.venuesListState
-
     val showProgress = remember { mutableStateOf(false) }
     val showInfo = remember { mutableStateOf(false) }
+    val cameraPositionState = rememberCameraPositionState {}
+    val venuesListState = homeViewModel.venuesListState
     val selectedPlaceState = homeViewModel.selectedPlace.observeAsState()
-    val permissionsState = permissionViewModel.locationPermission.observeAsState()
     val currentLocation = homeViewModel.currentLocation.observeAsState()
-    val cameraPositionState = rememberCameraPositionState {}
 
-    if (permissionsState.value == true) {
-        LaunchedEffect(Unit) {
-            homeViewModel.getPlaces(homeViewModel.getDummyLocationRequest())
-            cameraPositionState.position = CameraPosition.fromLatLngZoom(
-                homeViewModel.getDummyAmsterdamLocation(),
-                GOOGLE_MAPS_CAMERA_ZOOM
-            )
-        }
-    } else {
-        LocationPermissionScreen()
+    LaunchedEffect(Unit) {
+        homeViewModel.getPlaces(homeViewModel.getDummyLocationRequest())
+        cameraPositionState.position = CameraPosition.fromLatLngZoom(
+            homeViewModel.getDummyAmsterdamLocation(),
+            GOOGLE_MAPS_CAMERA_ZOOM
+        )
     }
 
     if (venuesListState.venueList?.isNotEmpty() == true) {
@@ -89,7 +76,7 @@ fun HomeScreen(
         Box(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(all = 16.dp),
+                .padding(all = dimensionResource(id = R.dimen.home_screen_show_my_current_location_box_padding)),
             contentAlignment = Alignment.BottomStart
         ) {
             Button(modifier = Modifier
@@ -100,9 +87,9 @@ fun HomeScreen(
                 }) {
                 Icon(
                     Icons.Default.Place,
-                    contentDescription = "Show My Location"
+                    contentDescription = stringResource(id = R.string.home_screen_show_my_current_location_button_content_description)
                 )
-                Text(text = "My Location")
+                Text(text = stringResource(id = R.string.home_screen_show_my_current_location_button_text))
             }
         }
     }
@@ -146,7 +133,6 @@ fun HomeScreen(
             SelectedPlaceInfo(showInfo, place)
         }
     }
-
 }
 
 @Composable
@@ -191,13 +177,13 @@ fun SelectedPlaceInfo(showInfo: MutableState<Boolean>, place: Result) {
                                 IconButton(onClick = { expanded = !expanded }) {
                                     Icon(
                                         imageVector = if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore,
-                                        contentDescription = ""
+                                        contentDescription = stringResource(id = R.string.home_screen_place_detail_expand_content_description)
                                     )
                                 }
                                 IconButton(onClick = { showInfo.value = false }) {
                                     Icon(
                                         imageVector = Icons.Filled.Close,
-                                        contentDescription = ""
+                                        contentDescription = stringResource(id = R.string.home_screen_place_detail_close_content_description)
                                     )
                                 }
                             }
@@ -218,10 +204,10 @@ fun SelectedPlaceNameField(name: String?) {
     Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.place_info_spacer)))
     Icon(
         Icons.Default.Business,
-        contentDescription = ""
+        contentDescription = stringResource(id = R.string.home_screen_place_detail_name_content_description)
     )
     Spacer(modifier = Modifier.width(dimensionResource(id = R.dimen.place_info_spacer)))
-    Text(text = "Name : $name")
+    Text(text = stringResource(id = R.string.home_screen_place_detail_name) + " $name")
 }
 
 @Composable
@@ -230,10 +216,10 @@ fun SelectedPlaceAddressField(formatted_address: String?) {
         Row(modifier = Modifier.fillMaxWidth()) {
             Icon(
                 Icons.Default.Place,
-                contentDescription = ""
+                contentDescription = stringResource(id = R.string.home_screen_place_detail_address_content_description)
             )
             Spacer(modifier = Modifier.width(dimensionResource(id = R.dimen.place_info_spacer)))
-            Text(text = "Address : $formatted_address")
+            Text(text = stringResource(id = R.string.home_screen_place_detail_address) + " $formatted_address")
         }
     }
 }
@@ -245,12 +231,12 @@ fun SelectedPlaceCategoriesField(categoryList: List<Category>?) {
         Row(modifier = Modifier.fillMaxWidth()) {
             Icon(
                 Icons.Filled.Storefront,
-                contentDescription = ""
+                contentDescription = stringResource(id = R.string.home_screen_place_detail_categories_content_description)
             )
             Spacer(modifier = Modifier.width(dimensionResource(id = R.dimen.place_info_spacer)))
             Text(
-                text = "Categories",
-                fontSize = 16.sp
+                text = stringResource(id = R.string.home_screen_place_detail_categories),
+                fontSize = dimensionResource(id = R.dimen.place_info_categories_text_size).value.sp
             )
         }
         Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.place_info_spacer)))
@@ -266,36 +252,6 @@ fun SelectedPlaceCategoriesField(categoryList: List<Category>?) {
     }
 }
 
-@Composable
-fun CategoryChip(
-    categoryName: String
-) {
-    Row(
-        horizontalArrangement = Arrangement.Center,
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier
-            .padding(
-                vertical = 2.dp,
-                horizontal = 4.dp
-            )
-            .border(
-                width = 1.dp,
-                color = Color.White,
-                shape = RoundedCornerShape(16.dp)
-            )
-            .background(
-                color = Color.Transparent,
-            )
-            .padding(4.dp)
-    ) {
-        Text(
-            text = categoryName,
-            fontWeight = FontWeight.Bold,
-            fontSize = 14.sp,
-            modifier = Modifier.padding(4.dp)
-        )
-    }
-}