Skip to content

Commit a8f2f6e

Browse files
committed
api version
1 parent c86abd4 commit a8f2f6e

File tree

8 files changed

+11
-12
lines changed

8 files changed

+11
-12
lines changed
0 Bytes
Binary file not shown.
3.59 KB
Binary file not shown.
0 Bytes
Binary file not shown.

app/src/main/java/com/imagekit/android/MainActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ class MainActivity : AppCompatActivity() {
1111
override fun onCreate(savedInstanceState: Bundle?) {
1212
super.onCreate(savedInstanceState)
1313
setContentView(R.layout.activity_main)
14-
1514
ImageKit.init(
1615
context = applicationContext,
1716
publicKey = Constants.CLIENT_PUBLIC_KEY,

imagekit/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ android {
2121

2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2323

24+
buildConfigField "String", "API_VERSION", "\"1.0\""
2425
}
2526

2627
buildTypes {

imagekit/build/generated/source/buildConfig/debug/com/imagekit/android/BuildConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ public final class BuildConfig {
1515
public static final String FLAVOR = "";
1616
public static final int VERSION_CODE = 1;
1717
public static final String VERSION_NAME = "1.0";
18+
// Fields from default config.
19+
public static final String API_VERSION = "1.0";
1820
}

imagekit/src/main/java/com/imagekit/android/ImagekitUrlConstructor.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ import com.imagekit.android.injection.component.DaggerUtilComponent
66
import com.imagekit.android.injection.module.ContextModule
77
import com.imagekit.android.util.LogUtil.logError
88
import com.imagekit.android.util.TranformationMapping
9+
import java.lang.Math.abs
910
import java.util.*
1011
import java.util.regex.Pattern
11-
import kotlin.collections.ArrayList
12-
import kotlin.collections.HashMap
13-
import kotlin.math.abs
1412

1513
@Suppress("unused")
1614
class ImagekitUrlConstructor constructor(
@@ -831,7 +829,7 @@ class ImagekitUrlConstructor constructor(
831829
}
832830
} else if (transformationList.isNotEmpty()) {
833831
url = when (transformationPosition) {
834-
TransformationPosition.PATH -> String.format("%s/%s", addPathParams(url), path)
832+
TransformationPosition.PATH -> String.format("%s/%s?sdk=android-${BuildConfig.API_VERSION}", addPathParams(url), path)
835833
TransformationPosition.QUERY -> addQueryParams(
836834
String.format(
837835
"%s/%s",
@@ -868,8 +866,7 @@ class ImagekitUrlConstructor constructor(
868866
}
869867

870868
private fun addQueryParams(endpoint: String): String {
871-
872-
var url = String.format("%s?tr=", endpoint)
869+
var url = String.format("%s?sdk=android-${BuildConfig.API_VERSION}&tr=", endpoint)
873870
for (t in 0 until transformationList.size) {
874871
url = when {
875872
transformationList[t].contentEquals(":") -> String.format(

imagekit/src/test/java/com/imagekit/android/MyTests.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class MyTests {
5151
@Test
5252
fun urlConstructionTransformation1() {
5353
val expectedTransformation =
54-
"https://ik.imagekit.io/demo/img/tr:w-300.00,h-200.00,cm-pad_resize,bg-F3F3F3/plant.jpeg"
54+
"https://ik.imagekit.io/demo/img/tr:w-300.00,h-200.00,cm-pad_resize,bg-F3F3F3/plant.jpeg?sdk=android-${BuildConfig.API_VERSION}"
5555
val actualTransformation =
5656
ImageKit.getInstance().url("https://ik.imagekit.io/demo/img", "plant.jpeg")
5757
.width(300f)
@@ -66,7 +66,7 @@ class MyTests {
6666
@Test
6767
fun urlConstructionTransformation2() {
6868
val expectedTransformation =
69-
"https://ik.imagekit.io/demo/default-image.jpg?tr=h-400.00,ar-3-2"
69+
"https://ik.imagekit.io/demo/default-image.jpg?sdk=android-${BuildConfig.API_VERSION}&tr=h-400.00,ar-3-2"
7070
val actualTransformation =
7171
ImageKit.getInstance().url(
7272
path = "default-image.jpg",
@@ -82,7 +82,7 @@ class MyTests {
8282
@Test
8383
fun urlConstructionTransformation3() {
8484
val expectedTransformation =
85-
"https://ik.imagekit.io/demo/medium_cafe_B1iTdD0C.jpg?tr=oi-logo-white_SJwqB4Nfe.png,ox-10,oy-20"
85+
"https://ik.imagekit.io/demo/medium_cafe_B1iTdD0C.jpg?sdk=android-${BuildConfig.API_VERSION}&tr=oi-logo-white_SJwqB4Nfe.png,ox-10,oy-20"
8686
val actualTransformation =
8787
ImageKit.getInstance()
8888
.url(
@@ -112,7 +112,7 @@ class MyTests {
112112
@Test
113113
fun urlConstructionTransformation5() {
114114
val expectedTransformation =
115-
"https://ik.imagekit.io/demo/img/plant.jpeg?tr=w-400,ot-Hand with a green plant,otc-264120,ots-30,ox-10,oy-10"
115+
"https://ik.imagekit.io/demo/img/plant.jpeg?sdk=android-${BuildConfig.API_VERSION}&tr=w-400,ot-Hand with a green plant,otc-264120,ots-30,ox-10,oy-10"
116116
val actualTransformation =
117117
ImageKit.getInstance()
118118
.url(src = "https://ik.imagekit.io/demo/img/plant.jpeg?tr=oi-logo-white_SJwqB4Nfe.png,ox-10,oy-20")
@@ -130,7 +130,7 @@ class MyTests {
130130
@Test
131131
fun urlConstructionTransformation6() {
132132
val expectedTransformation =
133-
"https://ik.imagekit.io/demo/img/default-image.jpg?tr=w-400.00,h-300.00:rt-90"
133+
"https://ik.imagekit.io/demo/img/default-image.jpg?sdk=android-${BuildConfig.API_VERSION}&tr=w-400.00,h-300.00:rt-90"
134134
val actualTransformation =
135135
ImageKit.getInstance()
136136
.url(src = "https://ik.imagekit.io/demo/img/tr:ot-Hand%20with%20a%20green%20plant,otc-264120,ots-30,ox-10,oy-10/default-image.jpg")

0 commit comments

Comments
 (0)