Skip to content
This repository was archived by the owner on Apr 9, 2024. It is now read-only.

Commit 8d0b782

Browse files
thoo0224thoo0224
committed
Improvements
1 parent b7c3b0c commit 8d0b782

File tree

8 files changed

+35
-83
lines changed

8 files changed

+35
-83
lines changed

‎com/thoo/api/FortniteAPI.kt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,39 @@ class FortniteAPI {
1818
service = retrofit?.create(FortniteAPIService::class.java)
1919
}
2020

21-
fun getCosmeticByID(id: String): BRCosmeticResponse? = service?.getCosmeticByID(id)?.execute()?.body()
21+
fun getCosmeticByID(id: String): BaseResponse<BRCosmeticData>? = service?.getCosmeticByID(id)?.execute()?.body()
2222

23-
fun getCosmeticByID(id: String, language: Language): BRCosmeticResponse? = service?.getCosmeticByID(id, language.toString().toLowerCase())?.execute()?.body()
23+
fun getCosmeticByID(id: String, language: Language): BaseResponse<BRCosmeticData>? = service?.getCosmeticByID(id, language.toString().toLowerCase())?.execute()?.body()
2424

25-
fun getAllCosmetics(): BRCosmeticsResponse? = service?.getAllCosmetics()?.execute()?.body()
25+
fun getAllCosmetics(): BaseResponse<Array<BRCosmeticData>>? = service?.getAllCosmetics()?.execute()?.body()
2626

27-
fun getAllCosmetics(language: Language): BRCosmeticsResponse? = service?.getAllCosmetics(language.toString().toLowerCase())?.execute()?.body()
27+
fun getAllCosmetics(language: Language): BaseResponse<Array<BRCosmeticData>>? = service?.getAllCosmetics(language.toString().toLowerCase())?.execute()?.body()
2828

29-
fun getCosmeticsByID(ids: Array<String>): BRCosmeticsResponse? = service?.getCosmeticsByID(ids)?.execute()?.body()
29+
fun getCosmeticsByID(ids: Array<String>): BaseResponse<Array<BRCosmeticData>>? = service?.getCosmeticsByID(ids)?.execute()?.body()
3030

31-
fun getCosmeticsByID(ids: Array<String>, language: Language): BRCosmeticsResponse? = service?.getCosmeticsByID(ids, language.toString().toLowerCase())?.execute()?.body()
31+
fun getCosmeticsByID(ids: Array<String>, language: Language): BaseResponse<Array<BRCosmeticData>>? = service?.getCosmeticsByID(ids, language.toString().toLowerCase())?.execute()?.body()
3232

33-
fun getItemShop(): BRItemShop? = service?.getItemShop()?.execute()?.body();
33+
fun getItemShop(): BaseResponse<BRItemShopData>? = service?.getItemShop()?.execute()?.body();
3434

35-
fun getItemShop(language: Language): BRItemShop? = service?.getItemShop(language.toString().toLowerCase())?.execute()?.body();
35+
fun getItemShop(language: Language): BaseResponse<BRItemShopData>? = service?.getItemShop(language.toString().toLowerCase())?.execute()?.body();
3636

37-
fun getNews(): NewsResponse? = service?.getNews()?.execute()?.body();
37+
fun getNews(): BaseResponse<NewsTab>? = service?.getNews()?.execute()?.body();
3838

39-
fun getNews(language: Language): NewsResponse? = service?.getNews(language.toString().toLowerCase())?.execute()?.body();
39+
fun getNews(language: Language): BaseResponse<NewsData>? = service?.getNews(language.toString().toLowerCase())?.execute()?.body();
4040

41-
fun getNewsBR(): SepNewsResponse? = service?.getNewsBR()?.execute()?.body();
41+
fun getNewsBR(): BaseResponse<NewsTab>? = service?.getNewsBR()?.execute()?.body();
4242

43-
fun getNewsBR(language: Language): SepNewsResponse? = service?.getNewsBR(language.toString().toLowerCase())?.execute()?.body();
43+
fun getNewsBR(language: Language): BaseResponse<NewsTab>? = service?.getNewsBR(language.toString().toLowerCase())?.execute()?.body();
4444

45-
fun getNewsSTW(): SepNewsResponse? = service?.getNewsSTW()?.execute()?.body();
45+
fun getNewsSTW(): BaseResponse<NewsTab>? = service?.getNewsSTW()?.execute()?.body();
4646

47-
fun getNewsSTW(language: Language): SepNewsResponse? = service?.getNewsSTW(language.toString().toLowerCase())?.execute()?.body();
47+
fun getNewsSTW(language: Language): BaseResponse<NewsTab>? = service?.getNewsSTW(language.toString().toLowerCase())?.execute()?.body();
4848

49-
fun getNewsCreative(): SepNewsResponse? = service?.getNewsCreative()?.execute()?.body();
49+
fun getNewsCreative(): BaseResponse<NewsTab>? = service?.getNewsCreative()?.execute()?.body();
5050

51-
fun getNewsCreative(language: Language): SepNewsResponse? = service?.getNewsCreative(language.toString().toLowerCase())?.execute()?.body();
51+
fun getNewsCreative(language: Language): BaseResponse<NewsTab>? = service?.getNewsCreative(language.toString().toLowerCase())?.execute()?.body();
5252

53-
fun getMatchedCosmetics(matchBuilder: MatchBuilder):BRCosmeticsResponse? {
53+
fun getMatchedCosmetics(matchBuilder: MatchBuilder): BaseResponse<Array<BRCosmeticData>>? {
5454
val fields: Array<Field> = matchBuilder.javaClass.declaredFields
5555
val queryMapString: HashMap<String, String> = HashMap()
5656
val queryMapBool: HashMap<String, Boolean> = HashMap()

‎com/thoo/api/model/BRCosmeticResponse.kt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎com/thoo/api/model/BRCosmeticsResponse.kt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎com/thoo/api/model/BRItemShop.kt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎com/thoo/api/model/BRStyle.kt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎com/thoo/api/model/NewsResponse.kt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎com/thoo/api/model/SepNewsResponse.kt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎com/thoo/api/service/FortniteAPIService.kt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,56 +13,56 @@ import okhttp3.ResponseBody
1313
interface FortniteAPIService {
1414

1515
@GET("/cosmetics/br/{id}")
16-
fun getCosmeticByID(@Path("id") id: String): Call<BRCosmeticResponse>
16+
fun getCosmeticByID(@Path("id") id: String): Call<BaseResponse<BRCosmeticData>>
1717

1818
@GET("/cosmetics/br/{id}")
19-
fun getCosmeticByID(@Path("id") id: String, @Query("language") language: String): Call<BRCosmeticResponse>
19+
fun getCosmeticByID(@Path("id") id: String, @Query("language") language: String): Call<BaseResponse<BRCosmeticData>>
2020

2121
@GET("/cosmetics/br")
22-
fun getAllCosmetics(): Call<BRCosmeticsResponse>
22+
fun getAllCosmetics(): Call<BaseResponse<Array<BRCosmeticData>>>
2323

2424
@GET("/cosmetics/br")
25-
fun getAllCosmetics(@Query("language") language: String): Call<BRCosmeticsResponse>
25+
fun getAllCosmetics(@Query("language") language: String): Call<BaseResponse<Array<BRCosmeticData>>>
2626

2727
@GET("/cosmetics/br/search/ids")
28-
fun getCosmeticsByID(@Query("id") ids: Array<String>): Call<BRCosmeticsResponse>
28+
fun getCosmeticsByID(@Query("id") ids: Array<String>): Call<BaseResponse<Array<BRCosmeticData>>>
2929

3030
@GET("/cosmetics/br/search/ids")
31-
fun getCosmeticsByID(@Query("id") ids: Array<String>, @Query("language") language: String): Call<BRCosmeticsResponse>
31+
fun getCosmeticsByID(@Query("id") ids: Array<String>, @Query("language") language: String): Call<BaseResponse<Array<BRCosmeticData>>>
3232

3333
@GET("/shop/br")
34-
fun getItemShop(): Call<BRItemShop>;
34+
fun getItemShop(): Call<BaseResponse<BRItemShopData>>;
3535

3636
@GET("/shop/br")
37-
fun getItemShop(@Query("language") language: String): Call<BRItemShop>;
37+
fun getItemShop(@Query("language") language: String): Call<BaseResponse<BRItemShopData>>;
3838

3939
@GET("/news")
40-
fun getNews(): Call<NewsResponse>;
40+
fun getNews(): Call<BaseResponse<NewsTab>>;
4141

4242
@GET("/news")
43-
fun getNews(@Query("language") language: String): Call<NewsResponse>;
43+
fun getNews(@Query("language") language: String): Call<BaseResponse<NewsData>>;
4444

4545
@GET("/news/br")
46-
fun getNewsBR(): Call<SepNewsResponse>;
46+
fun getNewsBR(): Call<BaseResponse<NewsTab>>;
4747

4848
@GET("/news/br")
49-
fun getNewsBR(@Query("language") language: String): Call<SepNewsResponse>;
49+
fun getNewsBR(@Query("language") language: String): Call<BaseResponse<NewsTab>>;
5050

5151
@GET("/news/stw")
52-
fun getNewsSTW(): Call<SepNewsResponse>;
52+
fun getNewsSTW(): Call<BaseResponse<NewsTab>>;
5353

5454
@GET("/news/stw")
55-
fun getNewsSTW(@Query("language") language: String): Call<SepNewsResponse>;
55+
fun getNewsSTW(@Query("language") language: String): Call<BaseResponse<NewsTab>>;
5656

5757
@GET("/news/creative")
58-
fun getNewsCreative(): Call<SepNewsResponse>;
58+
fun getNewsCreative(): Call<BaseResponse<NewsTab>>;
5959

6060
@GET("/news/creative")
61-
fun getNewsCreative(@Query("language") language: String): Call<SepNewsResponse>;
61+
fun getNewsCreative(@Query("language") language: String): Call<BaseResponse<NewsTab>>;
6262

6363
@GET("/cosmetics/br/search/all")
64-
fun matchCosmetics(@QueryMap map: Map<String, String>, @QueryMap map2: Map<String, Boolean>): Call<BRCosmeticsResponse>
64+
fun matchCosmetics(@QueryMap map: Map<String, String>, @QueryMap map2: Map<String, Boolean>): Call<BaseResponse<Array<BRCosmeticData>>>
6565

6666
@GET("/cosmetics/br/search/all")
67-
fun matchCosmetics(@QueryMap map: Map<String, String>, @QueryMap map2: Map<String, Boolean>, @Query("language") language: String): Call<BRCosmeticsResponse>
67+
fun matchCosmetics(@QueryMap map: Map<String, String>, @QueryMap map2: Map<String, Boolean>, @Query("language") language: String): Call<BaseResponse<Array<BRCosmeticData>>>
6868
}

0 commit comments

Comments
 (0)