Skip to content

Commit 83fc3c7

Browse files
ajunggajungg
committed
Merge branch 'persistance_and_initialization' into accessibility_improvements
2 parents e98c9ed + d99d0e1 commit 83fc3c7

File tree

65 files changed

+338
-384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+338
-384
lines changed

‎core/src/main/java/io/snabble/sdk/AcceptedLanguageInterceptor.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class AcceptedLanguageInterceptor : Interceptor {
2828
override fun intercept(chain: Interceptor.Chain): Response {
2929
var request: Request = chain.request()
3030
val url = request.url.toString()
31-
val baseUrl = Snabble.getInstance().endpointBaseUrl
32-
if (baseUrl != null && url.startsWith(baseUrl)) {
31+
val baseUrl = Snabble.endpointBaseUrl
32+
if (url.startsWith(baseUrl)) {
3333
request = request.newBuilder()
3434
.addHeader("Accept-Language", acceptedLanguagesHeader)
3535
.build()

‎core/src/main/java/io/snabble/sdk/Coupons.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class Coupons (
9797
}
9898
}
9999
project.urls["coupons"]?.let { path ->
100-
val couponsUrl = Snabble.getInstance().absoluteUrl(path) ?: return
100+
val couponsUrl = Snabble.absoluteUrl(path)
101101
isLoading.setAsap(true)
102102

103103
val request = Request.Builder()

‎core/src/main/java/io/snabble/sdk/Snabble.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ import java.util.concurrent.atomic.AtomicBoolean
3434

3535
object Snabble {
3636
@JvmStatic
37-
fun getInstance() : Snabble {
38-
return this
39-
}
37+
val instance: Snabble
38+
get() = this
4039

4140
@JvmStatic
4241
val version: String

‎core/src/main/java/io/snabble/sdk/checkin/CheckInLocationManager.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class CheckInLocationManager(val application: Application) {
8181
fun isLocationAvailable(): Boolean {
8282
return if (!checkLocationPermission()) {
8383
false
84-
} else isEnabled(Snabble.getInstance().application)
84+
} else isEnabled(Snabble.application)
8585
}
8686

8787
/**

‎core/src/main/java/io/snabble/sdk/checkin/CheckInManager.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,15 @@ class CheckInManager(val snabble: Snabble,
195195
Dispatch.mainThread {
196196
locationManager.startTrackingLocation()
197197
locationManager.location.observeForever(locationObserver)
198-
Snabble.getInstance().addOnMetadataUpdateListener(metadataListener)
198+
Snabble.addOnMetadataUpdateListener(metadataListener)
199199
}
200200
}
201201

202202
fun stopUpdating() {
203203
Dispatch.mainThread {
204204
locationManager.stopTrackingLocation()
205205
locationManager.location.removeObserver(locationObserver)
206-
Snabble.getInstance().removeOnMetadataUpdateListener(metadataListener)
206+
Snabble.removeOnMetadataUpdateListener(metadataListener)
207207
}
208208
}
209209

@@ -250,7 +250,7 @@ class CheckInManager(val snabble: Snabble,
250250

251251

252252
private fun updateShopProjectsMap() {
253-
val projects = Snabble.getInstance().projects
253+
val projects = Snabble.projects
254254
projectByShopId = projects.flatMap { project -> project.shops.map { it.id to project } }.toMap()
255255
}
256256

‎core/src/main/java/io/snabble/sdk/googlepay/GooglePayHelper.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class GooglePayHelper(
3636
.setEnvironment(env)
3737
.build()
3838

39-
return Wallet.getPaymentsClient(Snabble.getInstance().application, walletOptions)
39+
return Wallet.getPaymentsClient(Snabble.application, walletOptions)
4040
}
4141

4242
fun setUseTestEnvironment(boolean: Boolean) {

‎core/src/main/java/io/snabble/sdk/googlepay/GooglePayHelperActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class GooglePayHelperActivity : AppCompatActivity() {
3939
private val googlePayHelper: GooglePayHelper?
4040
get() {
4141
val projectId = intent.getStringExtra(INTENT_EXTRA_PROJECT_ID)
42-
val project = Snabble.getInstance().projects.firstOrNull { it.id == projectId }
42+
val project = Snabble.projects.firstOrNull { it.id == projectId }
4343
if (project != null) {
4444
return project.googlePayHelper
4545
}

‎core/src/test/java/io/snabble/sdk/CheckInManagerTest.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ class CheckInManagerTest : SnabbleSdkTest() {
4343

4444
@Test
4545
fun testCheckIn() {
46-
val checkInManager = Snabble.getInstance().checkInManager
46+
val checkInManager = Snabble.checkInManager
4747
checkInManager.startUpdating()
4848

4949
val listener = CheckInListener(checkInManager, onMultipleCandidatesAvailable = {
5050
countDown()
5151
})
5252

53-
val locationManager = Snabble.getInstance().checkInLocationManager
53+
val locationManager = Snabble.checkInLocationManager
5454
locationManager.mockLocation = locationSnabble
5555

5656
listener.await()
@@ -59,14 +59,14 @@ class CheckInManagerTest : SnabbleSdkTest() {
5959

6060
@Test
6161
fun testCheckOutByDistanceAndTime() {
62-
val checkInManager = Snabble.getInstance().checkInManager
62+
val checkInManager = Snabble.checkInManager
6363
checkInManager.startUpdating()
6464

6565
val listener = CheckInListener(checkInManager, onMultipleCandidatesAvailable = {
6666
countDown()
6767
})
6868

69-
val locationManager = Snabble.getInstance().checkInLocationManager
69+
val locationManager = Snabble.checkInLocationManager
7070
locationManager.mockLocation = locationSnabble
7171

7272
listener.await()
@@ -86,14 +86,14 @@ class CheckInManagerTest : SnabbleSdkTest() {
8686

8787
@Test
8888
fun testStillCheckedInWhileInTimeWindow() {
89-
val checkInManager = Snabble.getInstance().checkInManager
89+
val checkInManager = Snabble.checkInManager
9090
checkInManager.startUpdating()
9191

9292
val listener = CheckInListener(checkInManager, onMultipleCandidatesAvailable = {
9393
countDown()
9494
})
9595

96-
val locationManager = Snabble.getInstance().checkInLocationManager
96+
val locationManager = Snabble.checkInLocationManager
9797
locationManager.mockLocation = locationSnabble
9898

9999
listener.await()
@@ -115,14 +115,14 @@ class CheckInManagerTest : SnabbleSdkTest() {
115115

116116
@Test
117117
fun testStillCheckedInWhileInCheckOutRadiusButNotInTimeWindow() {
118-
val checkInManager = Snabble.getInstance().checkInManager
118+
val checkInManager = Snabble.checkInManager
119119
checkInManager.startUpdating()
120120

121121
val listener = CheckInListener(checkInManager, onMultipleCandidatesAvailable = {
122122
countDown()
123123
})
124124

125-
val locationManager = Snabble.getInstance().checkInLocationManager
125+
val locationManager = Snabble.checkInLocationManager
126126
locationManager.mockLocation = locationSnabble
127127

128128
listener.await()
@@ -146,14 +146,14 @@ class CheckInManagerTest : SnabbleSdkTest() {
146146

147147
@Test
148148
fun testMultipleShopsAvailable() {
149-
val checkInManager = Snabble.getInstance().checkInManager
149+
val checkInManager = Snabble.checkInManager
150150
checkInManager.startUpdating()
151151

152152
val listener = CheckInListener(checkInManager, onMultipleCandidatesAvailable = {
153153
countDown()
154154
})
155155

156-
val locationManager = Snabble.getInstance().checkInLocationManager
156+
val locationManager = Snabble.checkInLocationManager
157157
locationManager.mockLocation = locationSnabble
158158

159159
listener.await()
@@ -162,14 +162,14 @@ class CheckInManagerTest : SnabbleSdkTest() {
162162

163163
@Test
164164
fun testMultipleShopsCheckIn() {
165-
val checkInManager = Snabble.getInstance().checkInManager
165+
val checkInManager = Snabble.checkInManager
166166
checkInManager.startUpdating()
167167

168168
val listener = CheckInListener(checkInManager, onCheckIn = {
169169
countDown()
170170
})
171171

172-
val locationManager = Snabble.getInstance().checkInLocationManager
172+
val locationManager = Snabble.checkInLocationManager
173173
locationManager.mockLocation = locationSnabble
174174

175175
listener.await()

‎kotlin-sample/src/main/java/io/snabble/sdk/sample/LoadingActivity.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ class LoadingActivity : AppCompatActivity() {
2626

2727
Snabble.setDebugLoggingEnabled(BuildConfig.DEBUG)
2828

29-
val snabble = Snabble.getInstance()
30-
snabble.setup(application, config, object : Snabble.SetupCompletionListener {
29+
Snabble.setup(application, config, object : Snabble.SetupCompletionListener {
3130
override fun onReady() {
3231
// an application can have multiple projects
33-
val project = snabble.projects.first()
32+
val project = Snabble.projects.first()
3433
SnabbleUI.project = project
3534
project.checkedInShop = project.shops.first()
3635

‎kotlin-sample/src/main/java/io/snabble/sdk/sample/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class MainActivity : AppCompatActivity() {
2323
super.onCreate(savedInstanceState)
2424

2525
// for simplicity sake we are reloading the whole application on state loss
26-
if (Snabble.getInstance().application == null) {
26+
if (Snabble.application == null) {
2727
startActivity(Intent(this, LoadingActivity::class.java))
2828
finish()
2929
} else {

0 commit comments

Comments
 (0)