From 8ede9457fd21ac5e272e73f5ece1d4bc9c23faab Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Wed, 19 May 2021 10:07:23 +0200 Subject: Big update Restructuring the packages and adding a Constants.kt for the api URL. Also adding gson in Singletons.kt --- .../xyz/adjutor/aniki/presentation/Singletons.kt | 25 ++++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'app/src/main/java/xyz/adjutor/aniki/presentation/Singletons.kt') diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/Singletons.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/Singletons.kt index 827c7e3..896757c 100644 --- a/app/src/main/java/xyz/adjutor/aniki/presentation/Singletons.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/Singletons.kt @@ -4,55 +4,52 @@ import com.google.gson.Gson import com.google.gson.GsonBuilder import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory -import xyz.adjutor.aniki.data.anime.AnimeApi -import xyz.adjutor.aniki.data.anime.SearchAnimeApi -import xyz.adjutor.aniki.data.anime.TopAnimeApi -import xyz.adjutor.aniki.data.manga.MangaApi -import xyz.adjutor.aniki.data.manga.SearchMangaApi -import xyz.adjutor.aniki.data.manga.TopMangaApi +import xyz.adjutor.aniki.data.* +import xyz.adjutor.aniki.presentation.Constants.Companion.baseUrl class Singletons { companion object { + val gson: Gson = GsonBuilder() .setLenient() - .create()!! - private const val BASE_URL = "https://api.jikan.moe/" + .create() val topMangaApi: TopMangaApi = Retrofit.Builder() - .baseUrl(BASE_URL) + .baseUrl(baseUrl) .addConverterFactory(GsonConverterFactory.create(gson)) .build() .create(TopMangaApi::class.java) val searchMangaApi: SearchMangaApi = Retrofit.Builder() - .baseUrl(BASE_URL) + .baseUrl(baseUrl) .addConverterFactory(GsonConverterFactory.create(gson)) .build() .create(SearchMangaApi::class.java) val mangaApi: MangaApi = Retrofit.Builder() - .baseUrl(BASE_URL) + .baseUrl(baseUrl) .addConverterFactory(GsonConverterFactory.create(gson)) .build() .create(MangaApi::class.java) val topAnimeApi: TopAnimeApi = Retrofit.Builder() - .baseUrl(BASE_URL) + .baseUrl(baseUrl) .addConverterFactory(GsonConverterFactory.create(gson)) .build() .create(TopAnimeApi::class.java) val searchAnimeApi: SearchAnimeApi = Retrofit.Builder() - .baseUrl(BASE_URL) + .baseUrl(baseUrl) .addConverterFactory(GsonConverterFactory.create(gson)) .build() .create(SearchAnimeApi::class.java) val animeApi: AnimeApi = Retrofit.Builder() - .baseUrl(BASE_URL) + .baseUrl(baseUrl) .addConverterFactory(GsonConverterFactory.create(gson)) .build() .create(AnimeApi::class.java) } + } -- cgit v1.2.3