Skip to content

Commit 23bbd87

Browse files
committed
Refactor and update classes
1 parent e9289e4 commit 23bbd87

File tree

5 files changed

+23
-11
lines changed

5 files changed

+23
-11
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.Context
44
import com.adyen.android.assignment.BuildConfig
55
import com.adyen.android.assignment.network.service.PlacesService
66
import com.adyen.android.assignment.network.util.AppCallAdapterFactory
7+
import com.adyen.android.assignment.utils.Constant.NETWORK_REQUEST_TIME_OUT
78
import com.google.gson.Gson
89
import com.google.gson.GsonBuilder
910
import dagger.Module
@@ -39,8 +40,8 @@ object RemoteModule {
3940
interceptorDebug.level = HttpLoggingInterceptor.Level.BODY
4041

4142
val client = OkHttpClient.Builder()
42-
.connectTimeout(20, TimeUnit.SECONDS)
43-
.readTimeout(20, TimeUnit.SECONDS)
43+
.connectTimeout(NETWORK_REQUEST_TIME_OUT, TimeUnit.SECONDS)
44+
.readTimeout(NETWORK_REQUEST_TIME_OUT, TimeUnit.SECONDS)
4445
.addInterceptor { chain ->
4546
val request = chain.request()
4647
.newBuilder()

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,26 @@ class MainActivity : ComponentActivity() {
8383
}
8484
}
8585

86+
/**
87+
* cancel the cancellationTokenSource onDestroy
88+
*/
8689
override fun onDestroy() {
8790
super.onDestroy()
8891
cancellationTokenSource.cancel()
8992
}
9093

94+
/**
95+
* check location permissions granted onStart
96+
*/
9197
@RequiresApi(Build.VERSION_CODES.M)
9298
override fun onStart() {
9399
super.onStart()
94100
getPermission()
95101
}
96102

103+
/**
104+
* request permission result
105+
*/
97106
@SuppressLint("MissingSuperCall")
98107
override fun onRequestPermissionsResult(
99108
requestCode: Int,
@@ -115,6 +124,9 @@ class MainActivity : ComponentActivity() {
115124
}
116125
}
117126

127+
/**
128+
* get location permission, if permissionState true request it again
129+
*/
118130
@RequiresApi(Build.VERSION_CODES.M)
119131
fun getPermission() {
120132
val permissionState = requestPermissionWithRationale(
@@ -126,6 +138,9 @@ class MainActivity : ComponentActivity() {
126138
LocationPermissionTypes.REQUEST_AGAIN
127139
}
128140

141+
/**
142+
* request current location, check the location permissions approved state
143+
*/
129144
@RequiresApi(Build.VERSION_CODES.M)
130145
fun locationRequestOnClick() {
131146
Timber.d("locationRequestOnClick()")
@@ -139,6 +154,9 @@ class MainActivity : ComponentActivity() {
139154
}
140155
}
141156

157+
/**
158+
* request current location from location api
159+
*/
142160
@SuppressLint("MissingPermission")
143161
private fun requestCurrentLocation() {
144162
if (applicationContext.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
@@ -165,8 +183,5 @@ class MainActivity : ComponentActivity() {
165183
}
166184
}
167185
}
168-
169-
companion object {
170-
private const val TAG = "MainActivity"
171-
}
186+
172187
}

β€Žapp/src/main/java/com/adyen/android/assignment/utils/Constant.ktβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ object Constant {
66
const val DUMMY_LOCATION_LAT = 52.37651 // double dummy location for Amsterdam
77
const val DUMMY_LOCATION_LON = 4.90589 // double dummy location for Amsterdam
88
const val REQUEST_FINE_LOCATION_PERMISSIONS_REQUEST_CODE = 34
9+
const val NETWORK_REQUEST_TIME_OUT = 20L
910

1011
}

β€Žapp/src/test/java/com/adyen/android/assignment/utils/CoroutinesTestRule.ktβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import org.junit.runner.Description
88
import org.junit.runners.model.Statement
99

1010
@ExperimentalCoroutinesApi
11-
1211
class CoroutinesTestRule : TestRule {
1312

1413
private val testCoroutineDispatcher = TestCoroutineDispatcher()

β€Žbuild.gradleβ€Ž

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
42

53
ext.gradle_build_version = "7.0.4"
@@ -15,8 +13,6 @@ buildscript {
1513
classpath "com.android.tools.build:gradle:$gradle_build_version"
1614
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1715
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
18-
// NOTE: Do not place your application dependencies here; they belong
19-
// in the individual module build.gradle files
2016
}
2117

2218
}

0 commit comments

Comments
Β (0)