Create base module architecture

isoguzay · isoguzay · commit 6f53beb9d9aa · 2022-04-16T16:26:30.000+03:00
- `data`
 - `repository`
 - `network`
 - `ui`
 - `di`
diff --git a/app/src/main/java/com/adyen/android/assignment/AdyenApplication.kt b/app/src/main/java/com/adyen/android/assignment/AdyenApplication.kt
@@ -0,0 +1,11 @@
+package com.adyen.android.assignment
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class AdyenApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+    }
+}
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/Category.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/Category.kt
@@ -1,4 +1,4 @@
-package com.adyen.android.assignment.api.model
+package com.adyen.android.assignment.data.remote.model
 
 data class Category(
     val icon: Icon,
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/GeoCode.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/GeoCode.kt
@@ -1,4 +1,4 @@
-package com.adyen.android.assignment.api.model
+package com.adyen.android.assignment.data.remote.model
 
 data class GeoCode(
     val main: Main
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/Icon.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/Icon.kt
@@ -1,4 +1,4 @@
-package com.adyen.android.assignment.api.model
+package com.adyen.android.assignment.data.remote.model
 
 data class Icon(
     val prefix: String,
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/Location.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/Location.kt
@@ -1,4 +1,4 @@
-package com.adyen.android.assignment.api.model
+package com.adyen.android.assignment.data.remote.model
 
 data class Location(
     val address: String,
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/ResponseWrapper.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/ResponseWrapper.kt
@@ -1,4 +1,4 @@
-package com.adyen.android.assignment.api.model
+package com.adyen.android.assignment.data.remote.model
 
 data class ResponseWrapper(
     val results: List<Result>?,
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/Result.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/Result.kt
@@ -1,4 +1,4 @@
-package com.adyen.android.assignment.api.model
+package com.adyen.android.assignment.data.remote.model
 
 data class Result(
     val categories: List<Category>,
diff --git a/app/src/main/java/com/adyen/android/assignment/di/RemoteModule.kt b/app/src/main/java/com/adyen/android/assignment/di/RemoteModule.kt
@@ -0,0 +1,85 @@
+package com.adyen.android.assignment.di
+
+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.google.gson.Gson
+import com.google.gson.GsonBuilder
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import okhttp3.Cache
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.TimeUnit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RemoteModule {
+
+    @Provides
+    @Singleton
+    fun providesService(retrofit: Retrofit): PlacesService =
+        retrofit.create(PlacesService::class.java)
+
+    @Provides
+    @Singleton
+    fun providesRetrofit(
+        gsonConverterFactory: GsonConverterFactory,
+        appCallAdapterFactory: AppCallAdapterFactory,
+    ): Retrofit {
+        val interceptorDebug = HttpLoggingInterceptor()
+        if (BuildConfig.DEBUG)
+            interceptorDebug.level = HttpLoggingInterceptor.Level.BODY
+
+        val client = OkHttpClient.Builder()
+            .connectTimeout(20, TimeUnit.SECONDS)
+            .readTimeout(20, TimeUnit.SECONDS)
+            .addInterceptor { chain ->
+                val request = chain.request()
+                    .newBuilder()
+                    .build()
+                chain.proceed(request)
+            }
+            .addInterceptor(interceptorDebug)
+            .build()
+
+        return Retrofit.Builder()
+            .baseUrl(BuildConfig.FOURSQUARE_BASE_URL)
+            .addCallAdapterFactory(appCallAdapterFactory)
+            .addConverterFactory(gsonConverterFactory)
+            .client(client)
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun providesOkhttpCache(@ApplicationContext context: Context): Cache {
+        val cacheSize = 10 * 1024 * 1024
+        return Cache(context.cacheDir, cacheSize.toLong())
+    }
+
+    @Provides
+    @Singleton
+    fun providesGson(): Gson {
+        return GsonBuilder().setLenient().create()
+    }
+
+    @Provides
+    @Singleton
+    fun providesGsonConverterFactory(gson: Gson): GsonConverterFactory {
+        return GsonConverterFactory.create(gson)
+    }
+
+    @Provides
+    @Singleton
+    fun providesAppCallAdapterFactory(): AppCallAdapterFactory {
+        return AppCallAdapterFactory()
+    }
+}
diff --git a/app/src/main/java/com/adyen/android/assignment/network/querybuilder/PlacesQueryBuilder.kt b/app/src/main/java/com/adyen/android/assignment/network/querybuilder/PlacesQueryBuilder.kt
@@ -1,4 +1,4 @@
-package com.adyen.android.assignment.api
+package com.adyen.android.assignment.network.querybuilder
 
 import java.text.SimpleDateFormat
 import java.util.Date
diff --git a/app/src/main/java/com/adyen/android/assignment/network/querybuilder/VenueRecommendationsQueryBuilder.kt b/app/src/main/java/com/adyen/android/assignment/network/querybuilder/VenueRecommendationsQueryBuilder.kt
@@ -1,4 +1,4 @@
-package com.adyen.android.assignment.api
+package com.adyen.android.assignment.network.querybuilder
 
 class VenueRecommendationsQueryBuilder : PlacesQueryBuilder() {
     private var latitudeLongitude: String? = null
diff --git a/app/src/main/java/com/adyen/android/assignment/network/service/PlacesService.kt b/app/src/main/java/com/adyen/android/assignment/network/service/PlacesService.kt
@@ -1,10 +1,10 @@
-package com.adyen.android.assignment.api
+package com.adyen.android.assignment.network.service
 
 import com.adyen.android.assignment.BuildConfig
-import com.adyen.android.assignment.api.model.ResponseWrapper
+import com.adyen.android.assignment.data.remote.model.ResponseWrapper
 import retrofit2.Call
 import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Headers
 import retrofit2.http.QueryMap
@@ -20,11 +20,11 @@ interface PlacesService {
     @GET("places/nearby")
     fun getVenueRecommendations(@QueryMap query: Map<String, String>): Call<ResponseWrapper>
 
-    companion object  {
+    companion object {
         private val retrofit by lazy {
             Retrofit.Builder()
                 .baseUrl(BuildConfig.FOURSQUARE_BASE_URL)
-                .addConverterFactory(MoshiConverterFactory.create())
+                .addConverterFactory(GsonConverterFactory.create())
                 .build()
         }
 
diff --git a/app/src/main/java/com/adyen/android/assignment/network/util/AppCallAdapterFactory.kt b/app/src/main/java/com/adyen/android/assignment/network/util/AppCallAdapterFactory.kt
@@ -0,0 +1,27 @@
+package com.adyen.android.assignment.network.util
+
+import retrofit2.Call
+import retrofit2.CallAdapter
+import retrofit2.Retrofit
+import java.lang.reflect.ParameterizedType
+import java.lang.reflect.Type
+
+class AppCallAdapterFactory : CallAdapter.Factory() {
+    override fun get(
+        returnType: Type,
+        annotations: Array<Annotation>,
+        retrofit: Retrofit
+    ) = when (getRawType(returnType)) {
+        Call::class.java -> {
+            val callType = getParameterUpperBound(0, returnType as ParameterizedType)
+            when (getRawType(callType)) {
+                NetworkResult::class.java -> {
+                    val resultType = getParameterUpperBound(0, callType as ParameterizedType)
+                    ResultAdapter(resultType)
+                }
+                else -> null
+            }
+        }
+        else -> null
+    }
+}
diff --git a/app/src/main/java/com/adyen/android/assignment/network/util/CallDelegate.kt b/app/src/main/java/com/adyen/android/assignment/network/util/CallDelegate.kt
@@ -0,0 +1,20 @@
+package com.adyen.android.assignment.network.util
+
+import okhttp3.Request
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+abstract class CallDelegate<TIn, TOut>(protected val proxy: Call<TIn>) : Call<TOut> {
+    override fun execute(): Response<TOut> = throw NotImplementedError()
+    final override fun enqueue(callback: Callback<TOut>) = enqueueImpl(callback)
+    final override fun clone(): Call<TOut> = cloneImpl()
+
+    override fun cancel() = proxy.cancel()
+    override fun request(): Request = proxy.request()
+    override fun isExecuted() = proxy.isExecuted
+    override fun isCanceled() = proxy.isCanceled
+
+    abstract fun enqueueImpl(callback: Callback<TOut>)
+    abstract fun cloneImpl(): Call<TOut>
+}
diff --git a/app/src/main/java/com/adyen/android/assignment/network/util/NetworkResult.kt b/app/src/main/java/com/adyen/android/assignment/network/util/NetworkResult.kt
@@ -0,0 +1,7 @@
+package com.adyen.android.assignment.network.util
+
+sealed class NetworkResult<out T> {
+    data class Progress<T>(var isLoading: Boolean) : NetworkResult<T>()
+    data class Success<T>(var data: T?) : NetworkResult<T>()
+    data class Failure<T>(val statusCode: Int = -1, val exception: Throwable? = null) : NetworkResult<T>()
+}
diff --git a/app/src/main/java/com/adyen/android/assignment/network/util/ResultAdapter.kt b/app/src/main/java/com/adyen/android/assignment/network/util/ResultAdapter.kt
@@ -0,0 +1,10 @@
+package com.adyen.android.assignment.network.util
+
+import retrofit2.Call
+import retrofit2.CallAdapter
+import java.lang.reflect.Type
+
+class ResultAdapter(private val type: Type) : CallAdapter<Type, Call<NetworkResult<Type>>> {
+    override fun responseType() = type
+    override fun adapt(call: Call<Type>): Call<NetworkResult<Type>> = ResultCall(call)
+}
diff --git a/app/src/main/java/com/adyen/android/assignment/network/util/ResultCall.kt b/app/src/main/java/com/adyen/android/assignment/network/util/ResultCall.kt
@@ -0,0 +1,29 @@
+package com.adyen.android.assignment.network.util
+
+import okio.Timeout
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class ResultCall<T>(proxy: Call<T>) : CallDelegate<T, NetworkResult<T>>(proxy) {
+    override fun enqueueImpl(callback: Callback<NetworkResult<T>>) = proxy.enqueue(object :
+        Callback<T> {
+        override fun onResponse(call: Call<T>, response: Response<T>) {
+            val result = if (response.isSuccessful)
+                NetworkResult.Success(response.body())
+            else
+                NetworkResult.Failure(response.code())
+
+            callback.onResponse(this@ResultCall, Response.success(result))
+        }
+
+        override fun onFailure(call: Call<T>, t: Throwable) {
+            val result = NetworkResult.Failure<T>(exception = t)
+            callback.onResponse(this@ResultCall, Response.success(result))
+        }
+    })
+
+    override fun cloneImpl() = ResultCall(proxy.clone())
+
+    override fun timeout() = Timeout()
+}
diff --git a/app/src/main/java/com/adyen/android/assignment/ui/MainActivity.kt b/app/src/main/java/com/adyen/android/assignment/ui/MainActivity.kt
@@ -1,7 +1,50 @@
 package com.adyen.android.assignment.ui
 
-import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.ui.Modifier
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.lifecycle.lifecycleScope
+import com.adyen.android.assignment.ui.screens.home.view.HomeScreen
+import com.adyen.android.assignment.ui.theme.AdyenApplicationTheme
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+
+@AndroidEntryPoint
+class MainActivity : ComponentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        var keepSplashScreen = true
+
+        installSplashScreen().apply {
+            setKeepOnScreenCondition {
+                keepSplashScreen
+            }
+        }
+
+        lifecycleScope.launchWhenCreated {
+
+            delay(2000)
+            keepSplashScreen = false
+
+            setContent {
+                AdyenApplicationTheme {
+                    Surface(
+                        modifier = Modifier.fillMaxSize(),
+                        color = MaterialTheme.colors.background
+                    ) {
+                        HomeScreen()
+                    }
+                }
+            }
+
+        }
+    }
 
-class MainActivity : AppCompatActivity() {
-    // TODO: Placeholder activity that may be used
 }
diff --git a/app/src/main/java/com/adyen/android/assignment/ui/components/MapMarker.kt b/app/src/main/java/com/adyen/android/assignment/ui/components/MapMarker.kt
@@ -0,0 +1,45 @@
+package com.adyen.android.assignment.ui.components
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.annotation.DrawableRes
+import androidx.compose.runtime.Composable
+import androidx.core.content.ContextCompat
+import com.google.android.gms.maps.model.BitmapDescriptor
+import com.google.android.gms.maps.model.BitmapDescriptorFactory
+import com.google.android.gms.maps.model.LatLng
+import com.google.maps.android.compose.Marker
+
+@Composable
+fun MapMarker(
+    context: Context,
+    position: LatLng,
+    title: String,
+    snippet: String,
+    rotation: Float? = null,
+    @DrawableRes iconResourceId: Int
+) {
+    val icon = bitmapDescriptor(
+        context, iconResourceId
+    )
+    Marker(
+        position = position,
+        title = title,
+        snippet = snippet,
+        icon = icon,
+        rotation = rotation ?: 0F,
+    )
+}
+
+fun bitmapDescriptor(context: Context, vectorResId: Int): BitmapDescriptor? {
+    val drawable = ContextCompat.getDrawable(context, vectorResId) ?: return null
+    drawable.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
+    val bm = Bitmap.createBitmap(
+        drawable.intrinsicWidth,
+        drawable.intrinsicHeight,
+        Bitmap.Config.ARGB_8888
+    )
+    val canvas = android.graphics.Canvas(bm)
+    drawable.draw(canvas)
+    return BitmapDescriptorFactory.fromBitmap(bm)
+}
diff --git a/app/src/main/java/com/adyen/android/assignment/ui/screens/home/view/HomeScreen.kt b/app/src/main/java/com/adyen/android/assignment/ui/screens/home/view/HomeScreen.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/ui/screens/home/viewmodel/HomeViewModel.kt b/app/src/main/java/com/adyen/android/assignment/ui/screens/home/viewmodel/HomeViewModel.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/ui/theme/Color.kt b/app/src/main/java/com/adyen/android/assignment/ui/theme/Color.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/ui/theme/Shape.kt b/app/src/main/java/com/adyen/android/assignment/ui/theme/Shape.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/ui/theme/Theme.kt b/app/src/main/java/com/adyen/android/assignment/ui/theme/Theme.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/ui/theme/Type.kt b/app/src/main/java/com/adyen/android/assignment/ui/theme/Type.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/utils/Constant.kt b/app/src/main/java/com/adyen/android/assignment/utils/Constant.kt
diff --git a/app/src/test/java/com/adyen/android/assignment/PlacesUnitTest.kt b/app/src/test/java/com/adyen/android/assignment/PlacesUnitTest.kt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.adyen.android.assignment.api.model`
	`1`	`+package com.adyen.android.assignment.data.remote.model`
`2`	`2`
`3`	`3`	`data class Category(`
`4`	`4`	`val icon: Icon,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.adyen.android.assignment.api`
	`1`	`+package com.adyen.android.assignment.network.querybuilder`
`2`	`2`
`3`	`3`	`import java.text.SimpleDateFormat`
`4`	`4`	`import java.util.Date`