diff options
85 files changed, 3478 insertions, 1354 deletions
diff --git a/README.md b/README.md new file mode 100644 index 0000000..da5ecc0 --- /dev/null +++ b/README.md @@ -0,0 +1,58 @@ +# Android myanimelist client project. (WIP) + +## Features + +List of elements used in top manga and top anime with a recycler view +SwipeRefresh used to refresh the list of data of the first page. +Use the button (prev and next) to navigate with ease through the pages. + +Details of a chosen element from the recycler view with an intent object +Title, synopsys and background clickable. +URL link openable. + +Search pages for animes and mangas. +They display the data in a recycler view similar to the tops. +A feature has been added that hides the keyboard when the query is submitted by the user. +We can also submit the query by clicking the "search" button that replace the "return" one. +Clicking on a searched item also opens a detail page of it. +I'm not adding the "multiple pages" feature to the search section because I assume the user should use a more precise query if what he's looking for doesn't show up in the first page. + +## API +Multiple calls of the REST API from jikan.moe. +Usage of : ++ /v3/top/manga ++ /v3/top/anime ++ /v3/manga ++ /v3/anime ++ /v3/search/manga ++ /v3/search/anime + +## Data Storage +Data storage with sharedpreferences used for the recycler view of top manga and top anime as well as the details +Saves the detail page of an item when opened, not when the list is shown +Usage of ScrollView in the detail page. Thus, items with long synopsis and background aren't cut down. + +## Design +Used my "personal" theme colors for the app. +It consists of some colors of the pink/purple "family" : ++ very dark purple : #09022A ++ very light magenta : #FF70FF ++ strong pink : #D52C70 ++ slightly desaturated magenta : #C583B6 ++ grayish magenta : #C9A6C9 + +Also added the "bangers" font for the titles. + +## Gitflow +Development done with a Gitflow workflow. I used master, release, develop and feature branches. + +## Architecture +I used the MVC architecture. + +## TO-DO ++ Finishing MVC ++ Adding Singleton ++ Clicking on an image opens it full size ++ Firebase ++ Bottom navigation ++ ... diff --git a/app/build.gradle b/app/build.gradle index d1d101c..e8f6245 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,19 +34,20 @@ android { dependencies { + //noinspection GradleDependency implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.3' + implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' + implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' //Recycleview for lists - implementation "androidx.recyclerview:recyclerview:1.1.0" + implementation "androidx.recyclerview:recyclerview:1.2.0" //Retrofit for REST APIs implementation 'com.squareup.retrofit2:retrofit:2.9.0' @@ -56,11 +57,14 @@ dependencies { testImplementation 'junit:junit:4.13.2' // Required for instrumented tests - androidTestImplementation 'com.android.support:support-annotations:28.0.0' - androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'androidx.annotation:annotation:1.2.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' //Glide to display images properly implementation 'com.github.bumptech.glide:glide:4.12.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' + //swipe feature + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + }
\ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 09802b7..356c924 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,15 +14,23 @@ android:theme="@style/Theme.Aniki" tools:ignore="AllowBackup"> <activity - android:name=".topmanga.DetailTopMangaActivity" + android:name="xyz.adjutor.aniki.presentation.view.manga.DetailTopMangaActivity" android:label="Details" android:theme="@style/Theme.Aniki" /> <activity - android:name=".topanime.DetailTopAnimeActivity" + android:name="xyz.adjutor.aniki.presentation.view.anime.DetailTopAnimeActivity" android:label="Details" android:theme="@style/Theme.Aniki" /> <activity - android:name=".MainActivity" + android:name="xyz.adjutor.aniki.presentation.view.manga.DetailSearchMangaActivity" + android:label="Details" + android:theme="@style/Theme.Aniki" /> + <activity + android:name="xyz.adjutor.aniki.presentation.view.anime.DetailSearchAnimeActivity" + android:label="Details" + android:theme="@style/Theme.Aniki" /> + <activity + android:name=".presentation.view.MainActivity" android:label="@string/app_name" android:theme="@style/Theme.Aniki.NoActionBar"> <intent-filter> diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png Binary files differindex 1d40b22..7ec9dd9 100644 --- a/app/src/main/ic_launcher-playstore.png +++ b/app/src/main/ic_launcher-playstore.png diff --git a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt b/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt deleted file mode 100644 index a195f97..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/MainActivity.kt +++ /dev/null @@ -1,31 +0,0 @@ -package xyz.adjutor.aniki - -import android.os.Bundle -import android.view.Menu -import android.view.MenuItem -import androidx.appcompat.app.AppCompatActivity - -class MainActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - setSupportActionBar(findViewById(R.id.toolbar)) - } - - override fun onCreateOptionsMenu(menu: Menu): Boolean { - // Inflate the menu; this adds items to the action bar if it is present. - menuInflater.inflate(R.menu.menu_main, menu) - return true - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - return when (item.itemId) { - R.id.action_settings -> true - else -> super.onOptionsItemSelected(item) - } - } -}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/anime/AnimeApi.kt deleted file mode 100644 index 028097a..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/anime/AnimeApi.kt +++ /dev/null @@ -1,12 +0,0 @@ -package xyz.adjutor.aniki.anime - -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Path - -interface AnimeApi { - - @GET("v3/anime/{id}") - fun getAnimeData(@Path("id") id: String): Call<RestAnimeResponse> - -}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/anime/RestAnimeResponse.kt b/app/src/main/java/xyz/adjutor/aniki/anime/RestAnimeResponse.kt deleted file mode 100644 index aa15dfd..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/anime/RestAnimeResponse.kt +++ /dev/null @@ -1,11 +0,0 @@ -package xyz.adjutor.aniki.anime - -import com.google.gson.annotations.SerializedName - -class RestAnimeResponse{ //only kept the infos I didn't have and that were interesting to me. - - @SerializedName("mal_id") - var mal_id: Int? = null - @SerializedName("synopsis") - var synopsis: String? = null -} diff --git a/app/src/main/java/xyz/adjutor/aniki/data/anime/AnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/anime/AnimeApi.kt new file mode 100644 index 0000000..24e5cd7 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/data/anime/AnimeApi.kt @@ -0,0 +1,13 @@ +package xyz.adjutor.aniki.data.anime + +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Path +import xyz.adjutor.aniki.presentation.model.anime.AnimeResponse + +interface AnimeApi { + + @GET("v3/anime/{id}") + fun getAnimeData(@Path("id") id: String): Call<AnimeResponse> + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/data/anime/SearchAnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/anime/SearchAnimeApi.kt new file mode 100644 index 0000000..9bd6b2d --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/data/anime/SearchAnimeApi.kt @@ -0,0 +1,13 @@ +package xyz.adjutor.aniki.data.anime + +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Query +import xyz.adjutor.aniki.presentation.model.anime.SearchAnimeResponse + +interface SearchAnimeApi { + + @GET("v3/search/anime") + fun getSearchAnimeData(@Query("q") q: String): Call<SearchAnimeResponse> + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/data/anime/TopAnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/anime/TopAnimeApi.kt new file mode 100644 index 0000000..76fd25f --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/data/anime/TopAnimeApi.kt @@ -0,0 +1,13 @@ +package xyz.adjutor.aniki.data.anime + +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Path +import xyz.adjutor.aniki.presentation.model.anime.TopAnimeResponse + +interface TopAnimeApi { + + @GET("v3/top/anime/{page}") + fun getTopAnimeData(@Path("page") page: Int): Call<TopAnimeResponse> + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/data/manga/MangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/manga/MangaApi.kt new file mode 100644 index 0000000..a0f8df1 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/data/manga/MangaApi.kt @@ -0,0 +1,13 @@ +package xyz.adjutor.aniki.data.manga + +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Path +import xyz.adjutor.aniki.presentation.model.manga.MangaResponse + +interface MangaApi { + + @GET("v3/manga/{id}") + fun getMangaData(@Path("id") id: String): Call<MangaResponse> + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/data/manga/SearchMangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/manga/SearchMangaApi.kt new file mode 100644 index 0000000..6cc2d77 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/data/manga/SearchMangaApi.kt @@ -0,0 +1,13 @@ +package xyz.adjutor.aniki.data.manga + +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Query +import xyz.adjutor.aniki.presentation.model.manga.SearchMangaResponse + +interface SearchMangaApi { + + @GET("v3/search/manga") + fun getSearchMangaData(@Query("q") q: String): Call<SearchMangaResponse> + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/data/manga/TopMangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/data/manga/TopMangaApi.kt new file mode 100644 index 0000000..222dce3 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/data/manga/TopMangaApi.kt @@ -0,0 +1,13 @@ +package xyz.adjutor.aniki.data.manga + +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Path +import xyz.adjutor.aniki.presentation.model.manga.TopMangaResponse + +interface TopMangaApi { + + @GET("v3/top/manga/{page}") + fun getTopMangaData(@Path("page") page: Int): Call<TopMangaResponse> + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt deleted file mode 100644 index 419d510..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/manga/MangaApi.kt +++ /dev/null @@ -1,12 +0,0 @@ -package xyz.adjutor.aniki.manga - -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Path - -interface MangaApi { - - @GET("v3/manga/{id}") - fun getMangaData(@Path("id") id: String): Call<RestMangaResponse> - -}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/DetailSearchAnimeController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/DetailSearchAnimeController.kt new file mode 100644 index 0000000..3114d01 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/DetailSearchAnimeController.kt @@ -0,0 +1,63 @@ +package xyz.adjutor.aniki.presentation.controller.anime + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import xyz.adjutor.aniki.data.anime.AnimeApi +import xyz.adjutor.aniki.presentation.model.anime.AnimeResponse +import xyz.adjutor.aniki.presentation.view.anime.DetailSearchAnimeActivity + +class DetailSearchAnimeController { + + lateinit var gson: Gson + private lateinit var baseUrl: String //the api's base url + lateinit var view: DetailSearchAnimeActivity + + fun onStart(DetailSearchAnimeActivity: DetailSearchAnimeActivity, animeId: String) { + + view = DetailSearchAnimeActivity + baseUrl = "https://api.jikan.moe/" //the api's base url + gson = GsonBuilder() + .setLenient() + .create() + + makeApiCall(baseUrl, animeId) + } + + private fun makeApiCall(BASE_URL: String, animeId: String) { + + val retrofit = Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build() + + val service = retrofit.create(AnimeApi::class.java) + val call = service.getAnimeData(animeId) //based on the id + + call.enqueue(object : Callback<AnimeResponse> { + override fun onResponse( + call: Call<AnimeResponse>, + response: Response<AnimeResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val anime = response.body() //getting the AnimeResponse fields + view.showDetail(anime!!) + + } else { + view.showError("API ERROR : is not successful") + } + } + + override fun onFailure(call: Call<AnimeResponse>, t: Throwable) { + view.showError("API ERROR : onFailure") + } + + }) + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/DetailTopAnimeController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/DetailTopAnimeController.kt new file mode 100644 index 0000000..6f3cedb --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/DetailTopAnimeController.kt @@ -0,0 +1,97 @@ +package xyz.adjutor.aniki.presentation.controller.anime + +import android.content.Context +import android.content.SharedPreferences +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import com.google.gson.reflect.TypeToken +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import xyz.adjutor.aniki.data.anime.AnimeApi +import xyz.adjutor.aniki.presentation.model.anime.AnimeResponse +import xyz.adjutor.aniki.presentation.view.anime.DetailTopAnimeActivity +import java.lang.reflect.Type + +class DetailTopAnimeController { + + private lateinit var sharedPreferences: SharedPreferences + lateinit var gson: Gson + private lateinit var baseUrl: String //the api's base url + lateinit var view: DetailTopAnimeActivity + + fun onStart(DetailTopAnimeActivity: DetailTopAnimeActivity, animeId: String) { + + view = DetailTopAnimeActivity + baseUrl = "https://api.jikan.moe/" //the api's base url + gson = GsonBuilder() + .setLenient() + .create() + sharedPreferences = + view.applicationContext.getSharedPreferences("sp_anime", Context.MODE_PRIVATE) + + val anime: AnimeResponse? = getDataFromCache(animeId) + if (anime != null) { + view.showDetail(anime) + } else { + //taking the API's fields I want and displaying them + makeApiCall(baseUrl, animeId) + } + } + + private fun getDataFromCache(animeId: String): AnimeResponse? { + val jsonAnime: String? = sharedPreferences.getString(animeId, null) + + return if (jsonAnime == null) { + null + } else { + val type: Type = object : TypeToken<AnimeResponse>() {}.type + gson.fromJson(jsonAnime, type) + } + } + + private fun makeApiCall(BASE_URL: String, animeId: String) { + + val retrofit = Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build() + + val service = retrofit.create(AnimeApi::class.java) + val call = service.getAnimeData(animeId) //based on the id + + call.enqueue(object : Callback<AnimeResponse> { + override fun onResponse( + call: Call<AnimeResponse>, + response: Response<AnimeResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val anime = response.body() //getting the AnimeResponse fields + saveList(anime) + view.showDetail(anime!!) + + } else { + view.showError("API ERROR : is not successful") + } + } + + override fun onFailure(call: Call<AnimeResponse>, t: Throwable) { + view.showError("API ERROR : onFailure") + } + + }) + } + + fun saveList(anime: AnimeResponse?) { + val jsonString: String = gson.toJson(anime) + + sharedPreferences + .edit() + .putString(anime?.mal_id.toString(), jsonString) + .apply() + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/SearchAnimeController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/SearchAnimeController.kt new file mode 100644 index 0000000..aa8487e --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/SearchAnimeController.kt @@ -0,0 +1,73 @@ +package xyz.adjutor.aniki.presentation.controller.anime + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import xyz.adjutor.aniki.data.anime.SearchAnimeApi +import xyz.adjutor.aniki.presentation.model.anime.SearchAnime +import xyz.adjutor.aniki.presentation.model.anime.SearchAnimeResponse +import xyz.adjutor.aniki.presentation.view.anime.SearchAnimePage + +class SearchAnimeController { + + lateinit var gson: Gson + lateinit var baseUrl: String //the api's base url + lateinit var view: SearchAnimePage + + fun onStart(searchAnimePage: SearchAnimePage) { + + view = searchAnimePage + baseUrl = "https://api.jikan.moe/" //the api's base url + gson = GsonBuilder() + .setLenient() + .create() + } + + //call the API and show the list + private fun makeApiCall(view: SearchAnimePage, BASE_URL: String, query: String) { + + val retrofit = Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build() + + val service = retrofit.create(SearchAnimeApi::class.java) + val call = + service.getSearchAnimeData(q = query) //fate is an exemple, we'll have to replace it by the user input. + + call.enqueue(object : Callback<SearchAnimeResponse> { + override fun onResponse( + call: Call<SearchAnimeResponse>, + response: Response<SearchAnimeResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val animeList: List<SearchAnime> = response.body()!! + .getResults() //getting the "search" field containing our list of SearchAnimes + + view.showList( + view.requireView(), + animeList + ) //calling the method in charge of displaying on the recyclerview + + } else { + view.showError() //a snackbar + } + } + + override fun onFailure(call: Call<SearchAnimeResponse>, t: Throwable) { + view.showError() + } + + }) + } + + fun updateList(userInput: String) { + makeApiCall(view, baseUrl, userInput) + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/TopAnimeController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/TopAnimeController.kt new file mode 100644 index 0000000..7105af5 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/anime/TopAnimeController.kt @@ -0,0 +1,131 @@ +package xyz.adjutor.aniki.presentation.controller.anime + +import android.content.Context +import android.content.SharedPreferences +import android.view.View +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import com.google.gson.reflect.TypeToken +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import xyz.adjutor.aniki.data.anime.TopAnimeApi +import xyz.adjutor.aniki.presentation.model.anime.TopAnime +import xyz.adjutor.aniki.presentation.model.anime.TopAnimeResponse +import xyz.adjutor.aniki.presentation.view.anime.TopAnimePage +import java.lang.reflect.Type +import kotlin.properties.Delegates + +class TopAnimeController { + + lateinit var sharedPreferences: SharedPreferences + lateinit var gson: Gson + lateinit var baseUrl: String //the api's base url + var page by Delegates.notNull<Int>() + lateinit var view: TopAnimePage + + fun onStart(topAnimePage: TopAnimePage, viewTopAnimePage: View) { + + view = topAnimePage + baseUrl = "https://api.jikan.moe/" //the api's base url + page = 1 + gson = GsonBuilder() + .setLenient() + .create() + sharedPreferences = + viewTopAnimePage.context.getSharedPreferences("sp_anime", Context.MODE_PRIVATE) + + + val animeList: List<TopAnime>? = getDataFromCache() + if (animeList != null) { + view.showList(viewTopAnimePage, animeList) + } else { + makeApiCall(view, baseUrl, 1) + } + } + + fun makeApiCall(view: TopAnimePage, BASE_URL: String, page: Int) { + + val retrofit = Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build() + + val service = retrofit.create(TopAnimeApi::class.java) + val call = service.getTopAnimeData(page) + + call.enqueue(object : Callback<TopAnimeResponse> { + override fun onResponse( + call: Call<TopAnimeResponse>, + response: Response<TopAnimeResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val animeList: List<TopAnime> = response.body()!! + .getResults() //getting the "top" field containing our list of TopAnimes + saveList(animeList) + view.showList( + view.requireView(), + animeList + ) //calling the method in charge of displaying on the recyclerview + + } else { + view.showError() //a snackbar + } + } + + override fun onFailure(call: Call<TopAnimeResponse>, t: Throwable) { + view.showError() + } + + }) + } + + private fun saveList(animeList: List<TopAnime>) { + val jsonString: String = gson.toJson(animeList) + + sharedPreferences + .edit() + .putString("jsonAnimeList", jsonString) + .apply() + } + + private fun getDataFromCache(): List<TopAnime>? { + //the value of the animeList json, if nothing is found, return null + val jsonAnime: String? = sharedPreferences.getString("jsonAnimeList", null) + + //if it's null, well, return null + return if (jsonAnime == null) { + null + } else { //else deserialize the list and return it + val listType: Type = object : TypeToken<List<TopAnime>>() {}.type + gson.fromJson(jsonAnime, listType) + } + } + + + fun onButtonPrevClick() { + if (page > 1) { // if we're not on the first page, because we can't go back if we're on the first one. + page -= 1 + makeApiCall(view, baseUrl, page) + view.showText("Page $page has been loaded.") + } else { + view.showText("You're already on page 1. (If you're actually not, refresh the list.)") + } + } + + fun onButtonNextClick() { + page += 1 + makeApiCall(view, baseUrl, page) + view.showText("Page $page has been loaded.") + } + + fun updateList() { + makeApiCall(view, baseUrl, 1) + view.showText("Data refreshed") + page = 1 + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailSearchMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailSearchMangaController.kt new file mode 100644 index 0000000..a874976 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailSearchMangaController.kt @@ -0,0 +1,63 @@ +package xyz.adjutor.aniki.presentation.controller.manga + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import xyz.adjutor.aniki.data.manga.MangaApi +import xyz.adjutor.aniki.presentation.model.manga.MangaResponse +import xyz.adjutor.aniki.presentation.view.manga.DetailSearchMangaActivity + +class DetailSearchMangaController { + + lateinit var gson: Gson + private lateinit var baseUrl: String //the api's base url + lateinit var view: DetailSearchMangaActivity + + fun onStart(DetailSearchMangaActivity: DetailSearchMangaActivity, mangaId: String) { + + view = DetailSearchMangaActivity + baseUrl = "https://api.jikan.moe/" //the api's base url + gson = GsonBuilder() + .setLenient() + .create() + + makeApiCall(baseUrl, mangaId) + } + + private fun makeApiCall(BASE_URL: String, mangaId: String) { + + val retrofit = Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build() + + val service = retrofit.create(MangaApi::class.java) + val call = service.getMangaData(mangaId) //based on the id + + call.enqueue(object : Callback<MangaResponse> { + override fun onResponse( + call: Call<MangaResponse>, + response: Response<MangaResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val manga = response.body() //getting the MangaResponse fields + view.showDetail(manga!!) + + } else { + view.showError("API ERROR : is not successful") + } + } + + override fun onFailure(call: Call<MangaResponse>, t: Throwable) { + view.showError("API ERROR : onFailure") + } + + }) + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailTopMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailTopMangaController.kt new file mode 100644 index 0000000..807421c --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/DetailTopMangaController.kt @@ -0,0 +1,97 @@ +package xyz.adjutor.aniki.presentation.controller.manga + +import android.content.Context +import android.content.SharedPreferences +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import com.google.gson.reflect.TypeToken +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import xyz.adjutor.aniki.data.manga.MangaApi +import xyz.adjutor.aniki.presentation.model.manga.MangaResponse +import xyz.adjutor.aniki.presentation.view.manga.DetailTopMangaActivity +import java.lang.reflect.Type + +class DetailTopMangaController { + + private lateinit var sharedPreferences: SharedPreferences + lateinit var gson: Gson + private lateinit var baseUrl: String //the api's base url + lateinit var view: DetailTopMangaActivity + + fun onStart(DetailTopMangaActivity: DetailTopMangaActivity, mangaId: String) { + + view = DetailTopMangaActivity + baseUrl = "https://api.jikan.moe/" //the api's base url + gson = GsonBuilder() + .setLenient() + .create() + sharedPreferences = + view.applicationContext.getSharedPreferences("sp_manga", Context.MODE_PRIVATE) + + val manga: MangaResponse? = getDataFromCache(mangaId) + if (manga != null) { + view.showDetail(manga) + } else { + //taking the API's fields I want and displaying them + makeApiCall(baseUrl, mangaId) + } + } + + private fun getDataFromCache(mangaId: String): MangaResponse? { + val jsonManga: String? = sharedPreferences.getString(mangaId, null) + + return if (jsonManga == null) { + null + } else { + val type: Type = object : TypeToken<MangaResponse>() {}.type + gson.fromJson(jsonManga, type) + } + } + + private fun makeApiCall(BASE_URL: String, mangaId: String) { + + val retrofit = Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build() + + val service = retrofit.create(MangaApi::class.java) + val call = service.getMangaData(mangaId) //based on the id + + call.enqueue(object : Callback<MangaResponse> { + override fun onResponse( + call: Call<MangaResponse>, + response: Response<MangaResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val manga = response.body() //getting the MangaResponse fields + saveList(manga) + view.showDetail(manga!!) + + } else { + view.showError("API ERROR : is not successful") + } + } + + override fun onFailure(call: Call<MangaResponse>, t: Throwable) { + view.showError("API ERROR : onFailure") + } + + }) + } + + fun saveList(manga: MangaResponse?) { + val jsonString: String = gson.toJson(manga) + + sharedPreferences + .edit() + .putString(manga?.mal_id.toString(), jsonString) + .apply() + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/SearchMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/SearchMangaController.kt new file mode 100644 index 0000000..32e46eb --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/SearchMangaController.kt @@ -0,0 +1,73 @@ +package xyz.adjutor.aniki.presentation.controller.manga + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import xyz.adjutor.aniki.data.manga.SearchMangaApi +import xyz.adjutor.aniki.presentation.model.manga.SearchManga +import xyz.adjutor.aniki.presentation.model.manga.SearchMangaResponse +import xyz.adjutor.aniki.presentation.view.manga.SearchMangaPage + +class SearchMangaController { + + lateinit var gson: Gson + lateinit var baseUrl: String //the api's base url + lateinit var view: SearchMangaPage + + fun onStart(searchMangaPage: SearchMangaPage) { + + view = searchMangaPage + baseUrl = "https://api.jikan.moe/" //the api's base url + gson = GsonBuilder() + .setLenient() + .create() + } + + //call the API and show the list + private fun makeApiCall(view: SearchMangaPage, BASE_URL: String, query: String) { + + val retrofit = Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build() + + val service = retrofit.create(SearchMangaApi::class.java) + val call = + service.getSearchMangaData(q = query) //fate is an exemple, we'll have to replace it by the user input. + + call.enqueue(object : Callback<SearchMangaResponse> { + override fun onResponse( + call: Call<SearchMangaResponse>, + response: Response<SearchMangaResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val mangaList: List<SearchManga> = response.body()!! + .getResults() //getting the "search" field containing our list of SearchMangas + + view.showList( + view.requireView(), + mangaList + ) //calling the method in charge of displaying on the recyclerview + + } else { + view.showError() //a snackbar + } + } + + override fun onFailure(call: Call<SearchMangaResponse>, t: Throwable) { + view.showError() + } + + }) + } + + fun updateList(userInput: String) { + makeApiCall(view, baseUrl, userInput) + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/TopMangaController.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/TopMangaController.kt new file mode 100644 index 0000000..845e750 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/controller/manga/TopMangaController.kt @@ -0,0 +1,131 @@ +package xyz.adjutor.aniki.presentation.controller.manga + +import android.content.Context +import android.content.SharedPreferences +import android.view.View +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import com.google.gson.reflect.TypeToken +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import xyz.adjutor.aniki.data.manga.TopMangaApi +import xyz.adjutor.aniki.presentation.model.manga.TopManga +import xyz.adjutor.aniki.presentation.model.manga.TopMangaResponse +import xyz.adjutor.aniki.presentation.view.manga.TopMangaPage +import java.lang.reflect.Type +import kotlin.properties.Delegates + +class TopMangaController { + + lateinit var sharedPreferences: SharedPreferences + lateinit var gson: Gson + lateinit var baseUrl: String //the api's base url + var page by Delegates.notNull<Int>() + lateinit var view: TopMangaPage + + fun onStart(topMangaPage: TopMangaPage, viewTopMangaPage: View) { + + view = topMangaPage + baseUrl = "https://api.jikan.moe/" //the api's base url + page = 1 + gson = GsonBuilder() + .setLenient() + .create() + sharedPreferences = + viewTopMangaPage.context.getSharedPreferences("sp_manga", Context.MODE_PRIVATE) + + + val mangaList: List<TopManga>? = getDataFromCache() + if (mangaList != null) { + view.showList(viewTopMangaPage, mangaList) + } else { + makeApiCall(view, baseUrl, 1) + } + } + + private fun makeApiCall(view: TopMangaPage, BASE_URL: String, page: Int) { + + val retrofit = Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build() + + val service = retrofit.create(TopMangaApi::class.java) + val call = service.getTopMangaData(page) + + call.enqueue(object : Callback<TopMangaResponse> { + override fun onResponse( + call: Call<TopMangaResponse>, + response: Response<TopMangaResponse> + ) { + if (response.isSuccessful && response.body() != null) { //if the code returned is >= 200 and < 300 AND the the body ain't empty + + val mangaList: List<TopManga> = response.body()!! + .getResults() //getting the "top" field containing our list of TopMangas + saveList(mangaList) + view.showList( + view.requireView(), + mangaList + ) //calling the method in charge of displaying on the recyclerview + + } else { + view.showError() //a snackbar + } + } + + override fun onFailure(call: Call<TopMangaResponse>, t: Throwable) { + view.showError() + } + + }) + } + + private fun saveList(mangaList: List<TopManga>) { + val jsonString: String = gson.toJson(mangaList) + + sharedPreferences + .edit() + .putString("jsonMangaList", jsonString) + .apply() + } + + private fun getDataFromCache(): List<TopManga>? { + //the value of the mangaList json, if nothing is found, return null + val jsonManga: String? = sharedPreferences.getString("jsonMangaList", null) + + //if it's null, well, return null + return if (jsonManga == null) { + null + } else { //else deserialize the list and return it + val listType: Type = object : TypeToken<List<TopManga>>() {}.type + gson.fromJson(jsonManga, listType) + } + } + + + fun onButtonPrevClick() { + if (page > 1) { // if we're not on the first page, because we can't go back if we're on the first one. + page -= 1 + makeApiCall(view, baseUrl, page) + view.showText("Page $page has been loaded.") + } else { + view.showText("You're already on page 1. (If you're actually not, refresh the list.)") + } + } + + fun onButtonNextClick() { + page += 1 + makeApiCall(view, baseUrl, page) + view.showText("Page $page has been loaded.") + } + + fun updateList() { + makeApiCall(view, baseUrl, 1) + view.showText("Data refreshed") + page = 1 + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/AnimeResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/AnimeResponse.kt new file mode 100644 index 0000000..e4336ce --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/AnimeResponse.kt @@ -0,0 +1,16 @@ +package xyz.adjutor.aniki.presentation.model.anime + +import com.google.gson.annotations.SerializedName + +class AnimeResponse { //only kept the infos I didn't have and that were interesting to me. + + @SerializedName("mal_id") + var mal_id: Int? = null + + @SerializedName("rank") + var rank: Int? = null //added for the search feature (detail) + + @SerializedName("synopsis") + var synopsis: String? = null + +} diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/SearchAnime.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/SearchAnime.kt new file mode 100644 index 0000000..7e4340c --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/SearchAnime.kt @@ -0,0 +1,31 @@ +package xyz.adjutor.aniki.presentation.model.anime + +import com.google.gson.annotations.SerializedName + +class SearchAnime { + + @SerializedName("mal_id") + var mal_id: Int? = null + + @SerializedName("url") + var url: String? = null + + @SerializedName("image_url") + var image_url: String? = null + + @SerializedName("title") + var title: String? = null + + @SerializedName("episodes") + var episodes: Int? = null + + @SerializedName("score") + var score: Float? = null + + @SerializedName("start_date") //we'll maybe remove this later + var start_date: String? = null + + @SerializedName("end_date") //we'll maybe remove this later + var end_date: String? = null + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/SearchAnimeResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/SearchAnimeResponse.kt new file mode 100644 index 0000000..d04aa67 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/SearchAnimeResponse.kt @@ -0,0 +1,13 @@ +package xyz.adjutor.aniki.presentation.model.anime + +import com.google.gson.annotations.SerializedName + +class SearchAnimeResponse { //only kept the infos I didn't have and that were interesting to me. + + @SerializedName("results") + private lateinit var results: List<SearchAnime> + + fun getResults(): List<SearchAnime> { + return results + } +} diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/TopAnime.kt index 1764878..aefc1c5 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnime.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/TopAnime.kt @@ -1,26 +1,34 @@ -package xyz.adjutor.aniki.topanime +package xyz.adjutor.aniki.presentation.model.anime import com.google.gson.annotations.SerializedName //Content of the top field from the api of top anime -class TopAnime{ +class TopAnime { @SerializedName("mal_id") var mal_id: Int? = null + @SerializedName("rank") var rank: Int? = null + @SerializedName("title") var title: String? = null + @SerializedName("url") var url: String? = null + @SerializedName("episodes") var episodes: Int? = null + @SerializedName("start_date") var start_date: String? = null + @SerializedName("end_date") var end_date: String? = null + @SerializedName("score") var score: Float? = null + @SerializedName("image_url") var image_url: String? = null diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/RestTopAnimeResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/TopAnimeResponse.kt index 0bd1354..48e2f8f 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/RestTopAnimeResponse.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/anime/TopAnimeResponse.kt @@ -1,8 +1,8 @@ -package xyz.adjutor.aniki.topanime +package xyz.adjutor.aniki.presentation.model.anime import com.google.gson.annotations.SerializedName -class RestTopAnimeResponse { +class TopAnimeResponse { @SerializedName("top") var top: List<TopAnime>? = null diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/RestMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/MangaResponse.kt index 00b0dce..06aeed0 100644 --- a/app/src/main/java/xyz/adjutor/aniki/manga/RestMangaResponse.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/MangaResponse.kt @@ -1,15 +1,21 @@ -package xyz.adjutor.aniki.manga +package xyz.adjutor.aniki.presentation.model.manga import com.google.gson.annotations.SerializedName -class RestMangaResponse{ //only kept the infos I didn't have and that were interesting to me. +class MangaResponse { //only kept the infos I didn't have and that were interesting to me. @SerializedName("mal_id") var mal_id: Int? = null + @SerializedName("chapters") var chapters: Int? = null + @SerializedName("synopsis") var synopsis: String? = null + + @SerializedName("rank") + var rank: Int? = null //added for the search feature (detail) + @SerializedName("background") var background: String? = null //a bit of background story about the manga diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/SearchManga.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/SearchManga.kt new file mode 100644 index 0000000..d69227b --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/SearchManga.kt @@ -0,0 +1,34 @@ +package xyz.adjutor.aniki.presentation.model.manga + +import com.google.gson.annotations.SerializedName + +class SearchManga { + + @SerializedName("mal_id") + var mal_id: Int? = null + + @SerializedName("url") + var url: String? = null + + @SerializedName("image_url") + var image_url: String? = null + + @SerializedName("title") + var title: String? = null + + @SerializedName("chapters") + var chapters: Int? = null + + @SerializedName("volumes") + var volumes: Int? = null + + @SerializedName("score") + var score: Float? = null + + @SerializedName("start_date") //we'll maybe remove this later + var start_date: String? = null + + @SerializedName("end_date") //we'll maybe remove this later + var end_date: String? = null + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/SearchMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/SearchMangaResponse.kt new file mode 100644 index 0000000..942c071 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/SearchMangaResponse.kt @@ -0,0 +1,13 @@ +package xyz.adjutor.aniki.presentation.model.manga + +import com.google.gson.annotations.SerializedName + +class SearchMangaResponse { //only kept the infos I didn't have and that were interesting to me. + + @SerializedName("results") + private lateinit var results: List<SearchManga> + + fun getResults(): List<SearchManga> { + return results + } +} diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopManga.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/TopManga.kt index 05f4692..4fe3951 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopManga.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/TopManga.kt @@ -1,26 +1,35 @@ -package xyz.adjutor.aniki.topmanga +package xyz.adjutor.aniki.presentation.model.manga import com.google.gson.annotations.SerializedName +//model //Content of the top field from the api of top manga -class TopManga{ +class TopManga { @SerializedName("mal_id") var mal_id: Int? = null + @SerializedName("rank") var rank: Int? = null + @SerializedName("title") var title: String? = null + @SerializedName("url") var url: String? = null + @SerializedName("volumes") var volumes: Int? = null + @SerializedName("start_date") var start_date: String? = null + @SerializedName("end_date") var end_date: String? = null + @SerializedName("score") var score: Float? = null + @SerializedName("image_url") var image_url: String? = null diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/TopMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/TopMangaResponse.kt new file mode 100644 index 0000000..a0f6b8c --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/model/manga/TopMangaResponse.kt @@ -0,0 +1,13 @@ +package xyz.adjutor.aniki.presentation.model.manga + +import com.google.gson.annotations.SerializedName + +class TopMangaResponse { + + @SerializedName("top") + private lateinit var top: List<TopManga> + + fun getResults(): List<TopManga> { + return top + } +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/HomePage.kt index 734e917..f2abca1 100644 --- a/app/src/main/java/xyz/adjutor/aniki/HomePage.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/HomePage.kt @@ -1,4 +1,4 @@ -package xyz.adjutor.aniki +package xyz.adjutor.aniki.presentation.view import android.os.Bundle import android.view.LayoutInflater @@ -7,12 +7,13 @@ import android.view.ViewGroup import android.widget.Button import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController +import xyz.adjutor.aniki.R class HomePage : Fragment() { override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? ): View? { // Inflate the layout for this fragment return inflater.inflate(R.layout.home_page, container, false) @@ -20,12 +21,18 @@ class HomePage : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - + view.findViewById<Button>(R.id.button_top_manga).setOnClickListener { findNavController().navigate(R.id.action_HomePage_to_TopMangaPage) } view.findViewById<Button>(R.id.button_top_anime).setOnClickListener { findNavController().navigate(R.id.action_HomePage_to_TopAnimePage) } + view.findViewById<Button>(R.id.button_search_manga).setOnClickListener { + findNavController().navigate(R.id.action_HomePage_to_SearchMangaPage) + } + view.findViewById<Button>(R.id.button_search_anime).setOnClickListener { + findNavController().navigate(R.id.action_HomePage_to_SearchAnimePage) + } } }
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/MainActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/MainActivity.kt new file mode 100644 index 0000000..e58737a --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/MainActivity.kt @@ -0,0 +1,15 @@ +package xyz.adjutor.aniki.presentation.view + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import xyz.adjutor.aniki.R + +class MainActivity : AppCompatActivity() { + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + setSupportActionBar(findViewById(R.id.toolbar)) + } +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailSearchAnimeActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailSearchAnimeActivity.kt new file mode 100644 index 0000000..5acf1c3 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailSearchAnimeActivity.kt @@ -0,0 +1,114 @@ +package xyz.adjutor.aniki.presentation.view.anime + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.controller.anime.DetailSearchAnimeController +import xyz.adjutor.aniki.presentation.model.anime.AnimeResponse + +class DetailSearchAnimeActivity : AppCompatActivity() { + + lateinit var controller: DetailSearchAnimeController + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_detail_search_anime) + + controller = DetailSearchAnimeController() + + //used in the list + val intentAnimeImageUrl = "theanimeimageurl" + val intentAnimeTitle = "theanimetitle" + val intentAnimeScore = "theanimescore" + + //only used for the detail + val intentAnimeId = "theanimeid" + val intentAnimeUrl = "theanimeurl" + val intentAnimeEpisodes = "theanimeepisodes" + val intentAnimeStartDate = "theanimestartdate" + val intentAnimeEndDate = "theanimeenddate" + + val animeImageUrl = intent.getStringExtra(intentAnimeImageUrl) + val animeTitle = intent.getStringExtra(intentAnimeTitle) + val animeScore = intent.getStringExtra(intentAnimeScore) + + val animeId = intent.getStringExtra(intentAnimeId) + val animeUrl = intent.getStringExtra(intentAnimeUrl) + val animeEpisodes = intent.getStringExtra(intentAnimeEpisodes) + val animeStartDate = intent.getStringExtra(intentAnimeStartDate) + val animeEndDate = intent.getStringExtra(intentAnimeEndDate) + + + val ivImage: ImageView = findViewById(R.id.iv_detail_image) + val tvTitle: TextView = findViewById(R.id.tv_detail_title) + val tvScore: TextView = findViewById(R.id.tv_detail_score) + + val tvId: TextView = findViewById(R.id.tv_detail_id) + val tvUrl: TextView = findViewById(R.id.tv_url) + val tvEpisodes: TextView = findViewById(R.id.tv_episodes) + val tvStartDate: TextView = findViewById(R.id.tv_start_date) + val tvEndDate: TextView = findViewById(R.id.tv_end_date) + + Glide + .with(this) + .load(animeImageUrl) + .apply(RequestOptions().override(400)) + .into(ivImage) + tvTitle.text = animeTitle + tvScore.text = animeScore + + + tvId.text = animeId + tvUrl.text = animeUrl + + //using null as a string because it has been converted to a string before + tvEpisodes.text = if (animeEpisodes != "null") { + animeEpisodes + } else { + fieldIsNull() + } + + tvStartDate.text = splitDate(animeStartDate!!) + + tvEndDate.text = if (animeEndDate != "null") { + splitDate(animeEndDate!!) + } else { + fieldIsNull() + } + + controller.onStart(this, animeId.toString()) + + } + + private fun splitDate(animeDate: String): CharSequence { + val delimiter = "T" + return animeDate + .split(delimiter) //split between the date and the time + .toTypedArray()[0] //convert it to an array and take the first string + + } + + fun showDetail(anime: AnimeResponse) { + //elements from AnimeResponse + val tvSynopsis: TextView = findViewById(R.id.tv_synopsis) + val tvRank: TextView = findViewById(R.id.tv_detail_rank) + + tvSynopsis.text = anime.synopsis.toString() + + tvRank.text = anime.rank.toString() + + } + + fun showError(text: String) { + Toast.makeText(this, text, Toast.LENGTH_LONG).show() + } + + private fun fieldIsNull(): String { + return "Unknown" + } +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailTopAnimeActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailTopAnimeActivity.kt new file mode 100644 index 0000000..b8cf505 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/DetailTopAnimeActivity.kt @@ -0,0 +1,104 @@ +package xyz.adjutor.aniki.presentation.view.anime + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.controller.anime.DetailTopAnimeController +import xyz.adjutor.aniki.presentation.model.anime.AnimeResponse + +class DetailTopAnimeActivity : AppCompatActivity() { + + lateinit var controller: DetailTopAnimeController + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_detail_top_anime) + + controller = DetailTopAnimeController() + + val intentAnimeId = "theanimeid" + val intentAnimeTitle = "theanimetitle" + val intentAnimeRank = "theanimerank" + val intentAnimeScore = "theanimescore" + val intentAnimeImageUrl = "theanimeimageurl" + + val intentAnimeEpisodes = "theanimeepisodes" + val intentAnimeStartDate = "theanimestartdate" + val intentAnimeEndDate = "theanimeenddate" + val intentAnimeUrl = "theanimeurl" + + val animeId = intent.getStringExtra(intentAnimeId) + val animeTitle = intent.getStringExtra(intentAnimeTitle) + val animeRank = intent.getStringExtra(intentAnimeRank) + val animeScore = intent.getStringExtra(intentAnimeScore) + val animeImageUrl = intent.getStringExtra(intentAnimeImageUrl) + + val animeEpisodes = intent.getStringExtra(intentAnimeEpisodes) + val animeStartDate = intent.getStringExtra(intentAnimeStartDate) + val animeEndDate = intent.getStringExtra(intentAnimeEndDate) + val animeUrl = intent.getStringExtra(intentAnimeUrl) + + val tvId: TextView = findViewById(R.id.tv_detail_id) + val tvTitle: TextView = findViewById(R.id.tv_detail_title) + val tvRank: TextView = findViewById(R.id.tv_detail_rank) + val tvScore: TextView = findViewById(R.id.tv_detail_score) + val ivImage: ImageView = findViewById(R.id.iv_detail_image) + + val tvEpisodes: TextView = findViewById(R.id.tv_episodes) + val tvStartDate: TextView = findViewById(R.id.tv_start_date) + val tvEndDate: TextView = findViewById(R.id.tv_end_date) + val tvUrl: TextView = findViewById(R.id.tv_url) + + tvId.text = animeId + tvTitle.text = animeTitle + tvRank.text = animeRank + tvScore.text = animeScore + Glide + .with(this) + .load(animeImageUrl) + .apply(RequestOptions().override(400)) + .into(ivImage) + + //using null as a string because it has been converted to a string before + tvEpisodes.text = if (animeEpisodes != "null") { + animeEpisodes + } else { + fieldIsNull() + } + + tvStartDate.text = animeStartDate + + tvEndDate.text = if (animeEndDate != "null") { + animeEndDate + } else { + fieldIsNull() + } + + tvUrl.text = animeUrl + + controller.onStart(this, animeId.toString()) + + } + + fun showDetail(anime: AnimeResponse) { + //elements from AnimeResponse + val tvSynopsis: TextView = findViewById(R.id.tv_synopsis) + + tvSynopsis.text = anime.synopsis.toString() + + } + + fun showError(text: String) { + Toast.makeText(this, text, Toast.LENGTH_LONG).show() + } + + private fun fieldIsNull(): String { + return "Unknown" + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimeAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimeAdapter.kt new file mode 100644 index 0000000..3bb875b --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimeAdapter.kt @@ -0,0 +1,82 @@ +package xyz.adjutor.aniki.presentation.view.anime + +import android.content.Intent +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.cardview.widget.CardView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.model.anime.SearchAnime + +class SearchAnimeAdapter(private val animeList: List<SearchAnime>) : + RecyclerView.Adapter<SearchAnimeAdapter.AnimeViewHolder>() { + + // Describes an item view and its place within the RecyclerView + class AnimeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val animeTitle: TextView = itemView.findViewById(R.id.tv_title) + val animeRank: TextView = itemView.findViewById(R.id.tv_rank) + val animeScore: TextView = itemView.findViewById(R.id.tv_score) + val animeImage: ImageView = itemView.findViewById(R.id.iv_image) + val cardview: CardView = itemView.findViewById(R.id.cv_cardView) + } + + // Returns a new ViewHolder + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AnimeViewHolder { + val view = LayoutInflater.from(parent.context) + .inflate(R.layout.item_layout, parent, false) + + return AnimeViewHolder(view) + } + + // Returns size of data list + override fun getItemCount(): Int { + return animeList.size + } + + // Displays data at a certain position + override fun onBindViewHolder(holder: AnimeViewHolder, position: Int) { + val currentAnime: SearchAnime = animeList[position] + holder.animeTitle.text = currentAnime.title + holder.animeRank.text = "" //the rank isn't supplied by this API + holder.animeScore.text = currentAnime.score.toString() + val image: String = currentAnime.image_url.toString() + Glide + .with(holder.itemView.context) + .load(image) + .apply(RequestOptions().override(400)) + .into(holder.animeImage) + + //when you click on a selected cardview, some datas are sent to the other activity + holder.cardview.setOnClickListener { + val currentAnimeId = "theanimeid" + val currentAnimeUrl = "theanimeurl" + val currentAnimeImageUrl = "theanimeimageurl" + val currentAnimeTitle = "theanimetitle" + val currentAnimeEpisodes = "theanimeepisodes" + val currentAnimeScore = "theanimescore" + val currentAnimeStartDate = "theanimestartdate" + val currentAnimeEndDate = "theanimeenddate" + + //intent is used to pass data to another activity + + val intent: Intent = + Intent(holder.itemView.context, DetailSearchAnimeActivity::class.java).apply { + putExtra(currentAnimeId, currentAnime.mal_id.toString()) + putExtra(currentAnimeUrl, currentAnime.url.toString()) + putExtra(currentAnimeImageUrl, currentAnime.image_url.toString()) + putExtra(currentAnimeTitle, currentAnime.title) + putExtra(currentAnimeEpisodes, currentAnime.episodes.toString()) + putExtra(currentAnimeScore, currentAnime.score.toString()) + putExtra(currentAnimeStartDate, currentAnime.start_date) + putExtra(currentAnimeEndDate, currentAnime.end_date.toString()) + } + holder.itemView.context.startActivity(intent) + } + + } +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimePage.kt new file mode 100644 index 0000000..764601f --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/SearchAnimePage.kt @@ -0,0 +1,99 @@ +package xyz.adjutor.aniki.presentation.view.anime + +import android.content.Context +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager +import android.widget.Button +import android.widget.TextView +import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.snackbar.Snackbar +import com.google.android.material.textfield.TextInputEditText +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.controller.anime.SearchAnimeController +import xyz.adjutor.aniki.presentation.model.anime.SearchAnime +import xyz.adjutor.aniki.presentation.view.MainActivity + +class SearchAnimePage : Fragment() { + + lateinit var controller: SearchAnimeController + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + val view = inflater.inflate(R.layout.search_anime_page, container, false) + + controller = SearchAnimeController() + controller.onStart(this) + + return view + } + + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + //button to return to the home page + view.findViewById<Button>(R.id.button_home).setOnClickListener { + findNavController().navigate(R.id.action_SearchAnimePage_to_HomePage) + } + + view.findViewById<Button>(R.id.button_query).setOnClickListener { + val userInput = view.findViewById<TextInputEditText>(R.id.tiet_query).text.toString() + hideKeyboard() + controller.updateList(userInput) + } + + view.findViewById<TextInputEditText>(R.id.tiet_query) + .setOnEditorActionListener(TextView.OnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + val userInput = + view.findViewById<TextInputEditText>(R.id.tiet_query).text.toString() + hideKeyboard() + controller.updateList(userInput) + return@OnEditorActionListener true + } + false + }) + + } + + private fun hideKeyboard() { + val activity = activity as MainActivity + + val view = activity.currentFocus + if (view != null) { + val imm = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + imm.hideSoftInputFromWindow(view.windowToken, 0) + } + } + + //display the recyclerview + fun showList(view: View, animeList: List<SearchAnime>) { + val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view) + recyclerView.setHasFixedSize(true) + recyclerView.layoutManager = LinearLayoutManager(view.context) + recyclerView.adapter = SearchAnimeAdapter(animeList) + (recyclerView.adapter as SearchAnimeAdapter).notifyDataSetChanged() + } + + + //display a snack + fun showError() { + Snackbar.make( + requireView(), + "API ERROR : Verify your internet connection or your query.", + Snackbar.LENGTH_LONG + ) + .setAction("Action", null).show() + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimeAdapter.kt index e5a2bb5..0529c26 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeAdapter.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimeAdapter.kt @@ -1,4 +1,4 @@ -package xyz.adjutor.aniki.topanime +package xyz.adjutor.aniki.presentation.view.anime import android.content.Intent import android.view.LayoutInflater @@ -11,9 +11,10 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.model.anime.TopAnime class TopAnimeAdapter(private val animeList: List<TopAnime>) : - RecyclerView.Adapter<TopAnimeAdapter.AnimeViewHolder>() { + RecyclerView.Adapter<TopAnimeAdapter.AnimeViewHolder>() { // Describes an item view and its place within the RecyclerView class AnimeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { @@ -27,7 +28,7 @@ class TopAnimeAdapter(private val animeList: List<TopAnime>) : // Returns a new ViewHolder override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AnimeViewHolder { val view = LayoutInflater.from(parent.context) - .inflate(R.layout.item_layout, parent, false) + .inflate(R.layout.item_layout, parent, false) return AnimeViewHolder(view) } @@ -45,10 +46,10 @@ class TopAnimeAdapter(private val animeList: List<TopAnime>) : holder.animeScore.text = currentAnime.score.toString() val image: String = currentAnime.image_url.toString() Glide - .with(holder.itemView.context) - .load(image) - .apply(RequestOptions().override(400)) - .into(holder.animeImage) + .with(holder.itemView.context) + .load(image) + .apply(RequestOptions().override(400)) + .into(holder.animeImage) //when you click on a selected cardview, some datas are sent to the other activity holder.cardview.setOnClickListener { @@ -62,17 +63,18 @@ class TopAnimeAdapter(private val animeList: List<TopAnime>) : val currentAnimeEndDate = "theanimeenddate" val currentAnimeUrl = "theanimeurl" - val intent: Intent = Intent(holder.itemView.context, DetailTopAnimeActivity::class.java).apply { - putExtra(currentAnimeId, currentAnime.mal_id.toString()) - putExtra(currentAnimeTitle, currentAnime.title) - putExtra(currentAnimeRank, currentAnime.rank.toString()) - putExtra(currentAnimeScore, currentAnime.score.toString()) - putExtra(currentAnimeImageUrl, currentAnime.image_url.toString()) - putExtra(currentAnimeEpisodes, currentAnime.episodes.toString()) - putExtra(currentAnimeStartDate, currentAnime.start_date) - putExtra(currentAnimeEndDate, currentAnime.end_date.toString()) - putExtra(currentAnimeUrl, currentAnime.url.toString()) - } + val intent: Intent = + Intent(holder.itemView.context, DetailTopAnimeActivity::class.java).apply { + putExtra(currentAnimeId, currentAnime.mal_id.toString()) + putExtra(currentAnimeTitle, currentAnime.title) + putExtra(currentAnimeRank, currentAnime.rank.toString()) + putExtra(currentAnimeScore, currentAnime.score.toString()) + putExtra(currentAnimeImageUrl, currentAnime.image_url.toString()) + putExtra(currentAnimeEpisodes, currentAnime.episodes.toString()) + putExtra(currentAnimeStartDate, currentAnime.start_date) + putExtra(currentAnimeEndDate, currentAnime.end_date.toString()) + putExtra(currentAnimeUrl, currentAnime.url.toString()) + } holder.itemView.context.startActivity(intent) } } diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimePage.kt new file mode 100644 index 0000000..5453154 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/anime/TopAnimePage.kt @@ -0,0 +1,87 @@ +package xyz.adjutor.aniki.presentation.view.anime + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Button +import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout +import com.google.android.material.snackbar.Snackbar +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.controller.anime.TopAnimeController +import xyz.adjutor.aniki.presentation.model.anime.TopAnime + +//view +class TopAnimePage : Fragment() { + + lateinit var controller: TopAnimeController + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + val view = inflater.inflate(R.layout.top_anime_page, container, false) + + controller = TopAnimeController() + controller.onStart(this, view) + + return view + + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + //button to return to the home page + view.findViewById<Button>(R.id.button_home).setOnClickListener { + findNavController().navigate(R.id.action_TopAnimePage_to_HomePage) + } + view.findViewById<Button>(R.id.button_prev).setOnClickListener { + controller.onButtonPrevClick() + } + view.findViewById<Button>(R.id.button_next).setOnClickListener { + controller.onButtonNextClick() + } + + //refresh when swiping down at the top of the page + val swipeRefresh: SwipeRefreshLayout = view.findViewById(R.id.swiperefresh) + swipeRefresh.setOnRefreshListener { + controller.updateList() + swipeRefresh.isRefreshing = false + } + + } + + //display the recyclerview + fun showList(view: View, animeList: List<TopAnime>) { + val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view) + recyclerView.setHasFixedSize(true) + recyclerView.layoutManager = LinearLayoutManager(view.context) + recyclerView.adapter = TopAnimeAdapter(animeList) + (recyclerView.adapter as TopAnimeAdapter).notifyDataSetChanged() + } + + fun showError() { + Snackbar.make( + requireView(), + "API ERROR : Verify your internet connection.", + Snackbar.LENGTH_LONG + ) + .setAction("Action", null).show() + } + + fun showText(text: String) { + Snackbar.make( + requireView(), + text, + Snackbar.LENGTH_SHORT + ) + .setAction("Action", null).show() + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/DetailSearchMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/DetailSearchMangaActivity.kt new file mode 100644 index 0000000..83beb9b --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/DetailSearchMangaActivity.kt @@ -0,0 +1,130 @@ +package xyz.adjutor.aniki.presentation.view.manga + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.controller.manga.DetailSearchMangaController +import xyz.adjutor.aniki.presentation.model.manga.MangaResponse + +class DetailSearchMangaActivity : AppCompatActivity() { + + lateinit var controller: DetailSearchMangaController + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_detail_search_manga) + + controller = DetailSearchMangaController() + + //used in the list + val intentMangaImageUrl = "themangaimageurl" + val intentMangaTitle = "themangatitle" + val intentMangaScore = "themangascore" + + //only used for the detail + val intentMangaId = "themangaid" + val intentMangaUrl = "themangaurl" + val intentMangaChapters = "themangachapters" + val intentMangaVolumes = "themangavolumes" + val intentMangaStartDate = "themangastartdate" + val intentMangaEndDate = "themangaenddate" + + val mangaImageUrl = intent.getStringExtra(intentMangaImageUrl) + val mangaTitle = intent.getStringExtra(intentMangaTitle) + val mangaScore = intent.getStringExtra(intentMangaScore) + + val mangaId = intent.getStringExtra(intentMangaId) + val mangaUrl = intent.getStringExtra(intentMangaUrl) + val mangaChapters = intent.getStringExtra(intentMangaChapters) + val mangaVolumes = intent.getStringExtra(intentMangaVolumes) + val mangaStartDate = intent.getStringExtra(intentMangaStartDate) + val mangaEndDate = intent.getStringExtra(intentMangaEndDate) + + + val ivImage: ImageView = findViewById(R.id.iv_detail_image) + val tvTitle: TextView = findViewById(R.id.tv_detail_title) + val tvScore: TextView = findViewById(R.id.tv_detail_score) + + val tvId: TextView = findViewById(R.id.tv_detail_id) + val tvUrl: TextView = findViewById(R.id.tv_url) + val tvChapters: TextView = findViewById(R.id.tv_chapters) + val tvVolumes: TextView = findViewById(R.id.tv_volumes) + val tvStartDate: TextView = findViewById(R.id.tv_start_date) + val tvEndDate: TextView = findViewById(R.id.tv_end_date) + + Glide + .with(this) + .load(mangaImageUrl) + .apply(RequestOptions().override(400)) + .into(ivImage) + tvTitle.text = mangaTitle + tvScore.text = mangaScore + + + tvId.text = mangaId + tvUrl.text = mangaUrl + + //using null as a string because it has been converted to a string before + tvChapters.text = if (mangaChapters != "null") { + mangaChapters + } else { + fieldIsNull() + } + + tvVolumes.text = if (mangaVolumes != "null") { + mangaVolumes + } else { + fieldIsNull() + } + + tvStartDate.text = splitDate(mangaStartDate!!) + + tvEndDate.text = if (mangaEndDate != "null") { + splitDate(mangaEndDate!!) + } else { + fieldIsNull() + } + + controller.onStart(this, mangaId.toString()) + + } + + private fun splitDate(mangaDate: String): CharSequence { + val delimiter = "T" + return mangaDate + .split(delimiter) //split between the date and the time + .toTypedArray()[0] //convert it to an array and take the first string + + } + + fun showDetail(manga: MangaResponse) { + //elements from MangaResponse + val tvSynopsis: TextView = findViewById(R.id.tv_synopsis) + val tvRank: TextView = findViewById(R.id.tv_detail_rank) + val tvBackground: TextView = findViewById(R.id.tv_background) + + tvSynopsis.text = manga.synopsis.toString() + + tvRank.text = manga.rank.toString() + + tvBackground.text = if (manga.background != null) { + manga.background.toString() + } else { + fieldIsNull() + } + + } + + fun showError(text: String) { + Toast.makeText(this, text, Toast.LENGTH_LONG).show() + } + + private fun fieldIsNull(): String { + return "Unknown" + } +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/DetailTopMangaActivity.kt new file mode 100644 index 0000000..2a4b28b --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/DetailTopMangaActivity.kt @@ -0,0 +1,121 @@ +package xyz.adjutor.aniki.presentation.view.manga + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.controller.manga.DetailTopMangaController +import xyz.adjutor.aniki.presentation.model.manga.MangaResponse + +class DetailTopMangaActivity : AppCompatActivity() { + + lateinit var controller: DetailTopMangaController + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_detail_top_manga) + + controller = DetailTopMangaController() + + //used in the list + val intentMangaTitle = "themangatitle" + val intentMangaRank = "themangarank" + val intentMangaScore = "themangascore" + val intentMangaImageUrl = "themangaimageurl" + + //only used for the detail + val intentMangaId = "themangaid" + val intentMangaVolumes = "themangavolumes" + val intentMangaStartDate = "themangastartdate" + val intentMangaEndDate = "themangaenddate" + val intentMangaUrl = "themangaurl" + + val mangaTitle = intent.getStringExtra(intentMangaTitle) + val mangaRank = intent.getStringExtra(intentMangaRank) + val mangaScore = intent.getStringExtra(intentMangaScore) + val mangaImageUrl = intent.getStringExtra(intentMangaImageUrl) + + val mangaId = intent.getStringExtra(intentMangaId) + val mangaVolumes = intent.getStringExtra(intentMangaVolumes) + val mangaStartDate = intent.getStringExtra(intentMangaStartDate) + val mangaEndDate = intent.getStringExtra(intentMangaEndDate) + val mangaUrl = intent.getStringExtra(intentMangaUrl) + + val tvTitle: TextView = findViewById(R.id.tv_detail_title) + val tvRank: TextView = findViewById(R.id.tv_detail_rank) + val tvScore: TextView = findViewById(R.id.tv_detail_score) + val ivImage: ImageView = findViewById(R.id.iv_detail_image) + + val tvId: TextView = findViewById(R.id.tv_detail_id) + val tvVolumes: TextView = findViewById(R.id.tv_volumes) + val tvStartDate: TextView = findViewById(R.id.tv_start_date) + val tvEndDate: TextView = findViewById(R.id.tv_end_date) + val tvUrl: TextView = findViewById(R.id.tv_url) + + tvTitle.text = mangaTitle + tvRank.text = mangaRank + tvScore.text = mangaScore + Glide + .with(this) + .load(mangaImageUrl) + .apply(RequestOptions().override(400)) + .into(ivImage) + + tvId.text = mangaId + + //using null as a string because it has been converted to a string before + tvVolumes.text = if (mangaVolumes != "null") { + mangaVolumes + } else { + fieldIsNull() + } + + tvStartDate.text = mangaStartDate + + tvEndDate.text = if (mangaEndDate != "null") { + mangaEndDate + } else { + fieldIsNull() + } + + tvUrl.text = mangaUrl + + controller.onStart(this, mangaId.toString()) + + } + + fun showDetail(manga: MangaResponse) { + //elements from MangaResponse + val tvChapters: TextView = findViewById(R.id.tv_chapters) + val tvSynopsis: TextView = findViewById(R.id.tv_synopsis) + val tvBackground: TextView = findViewById(R.id.tv_background) + + tvChapters.text = if (manga.chapters != null) { + manga.chapters.toString() + } else { + fieldIsNull() + } + + tvSynopsis.text = manga.synopsis.toString() + + tvBackground.text = if (manga.background != null) { + manga.background.toString() + } else { + fieldIsNull() + } + + } + + fun showError(text: String) { + Toast.makeText(this, text, Toast.LENGTH_LONG).show() + } + + private fun fieldIsNull(): String { + return "Unknown" + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaAdapter.kt new file mode 100644 index 0000000..c0813c8 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaAdapter.kt @@ -0,0 +1,84 @@ +package xyz.adjutor.aniki.presentation.view.manga + +import android.content.Intent +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.cardview.widget.CardView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.model.manga.SearchManga + +class SearchMangaAdapter(private val mangaList: List<SearchManga>) : + RecyclerView.Adapter<SearchMangaAdapter.MangaViewHolder>() { + + // Describes an item view and its place within the RecyclerView + class MangaViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val mangaTitle: TextView = itemView.findViewById(R.id.tv_title) + val mangaRank: TextView = itemView.findViewById(R.id.tv_rank) + val mangaScore: TextView = itemView.findViewById(R.id.tv_score) + val mangaImage: ImageView = itemView.findViewById(R.id.iv_image) + val cardview: CardView = itemView.findViewById(R.id.cv_cardView) + } + + // Returns a new ViewHolder + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MangaViewHolder { + val view = LayoutInflater.from(parent.context) + .inflate(R.layout.item_layout, parent, false) + + return MangaViewHolder(view) + } + + // Returns size of data list + override fun getItemCount(): Int { + return mangaList.size + } + + // Displays data at a certain position + override fun onBindViewHolder(holder: MangaViewHolder, position: Int) { + val currentManga: SearchManga = mangaList[position] + holder.mangaTitle.text = currentManga.title + holder.mangaRank.text = "" //the rank isn't supplied by this API + holder.mangaScore.text = currentManga.score.toString() + val image: String = currentManga.image_url.toString() + Glide + .with(holder.itemView.context) + .load(image) + .apply(RequestOptions().override(400)) + .into(holder.mangaImage) + + //when you click on a selected cardview, some datas are sent to the other activity + holder.cardview.setOnClickListener { + val currentMangaId = "themangaid" + val currentMangaUrl = "themangaurl" + val currentMangaImageUrl = "themangaimageurl" + val currentMangaTitle = "themangatitle" + val currentMangaChapters = "themangachapters" + val currentMangaVolumes = "themangavolumes" + val currentMangaScore = "themangascore" + val currentMangaStartDate = "themangastartdate" + val currentMangaEndDate = "themangaenddate" + + //intent is used to pass data to another activity + + val intent: Intent = + Intent(holder.itemView.context, DetailSearchMangaActivity::class.java).apply { + putExtra(currentMangaId, currentManga.mal_id.toString()) + putExtra(currentMangaUrl, currentManga.url.toString()) + putExtra(currentMangaImageUrl, currentManga.image_url.toString()) + putExtra(currentMangaTitle, currentManga.title) + putExtra(currentMangaChapters, currentManga.chapters.toString()) + putExtra(currentMangaVolumes, currentManga.volumes.toString()) + putExtra(currentMangaScore, currentManga.score.toString()) + putExtra(currentMangaStartDate, currentManga.start_date) + putExtra(currentMangaEndDate, currentManga.end_date.toString()) + } + holder.itemView.context.startActivity(intent) + } + + } +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaPage.kt new file mode 100644 index 0000000..b6ae2bb --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/SearchMangaPage.kt @@ -0,0 +1,101 @@ +package xyz.adjutor.aniki.presentation.view.manga + +import android.content.Context +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager +import android.widget.Button +import android.widget.TextView.OnEditorActionListener +import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.snackbar.Snackbar +import com.google.android.material.textfield.TextInputEditText +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.controller.manga.SearchMangaController +import xyz.adjutor.aniki.presentation.model.manga.SearchManga +import xyz.adjutor.aniki.presentation.view.MainActivity + + +class SearchMangaPage : Fragment() { + + lateinit var controller: SearchMangaController + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + val view = inflater.inflate(R.layout.search_manga_page, container, false) + + controller = SearchMangaController() + controller.onStart(this) + + return view + } + + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + //button to return to the home page + view.findViewById<Button>(R.id.button_home).setOnClickListener { + findNavController().navigate(R.id.action_SearchMangaPage_to_HomePage) + } + + view.findViewById<Button>(R.id.button_query).setOnClickListener { + val userInput = view.findViewById<TextInputEditText>(R.id.tiet_query).text.toString() + hideKeyboard() + controller.updateList(userInput) + } + + view.findViewById<TextInputEditText>(R.id.tiet_query) + .setOnEditorActionListener(OnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + val userInput = + view.findViewById<TextInputEditText>(R.id.tiet_query).text.toString() + hideKeyboard() + controller.updateList(userInput) + return@OnEditorActionListener true + } + false + }) + + } + + private fun hideKeyboard() { + val activity = activity as MainActivity + + val view = activity.currentFocus + if (view != null) { + val imm = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + imm.hideSoftInputFromWindow(view.windowToken, 0) + } + } + + + //display the recyclerview + fun showList(view: View, mangaList: List<SearchManga>) { + val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view) + recyclerView.setHasFixedSize(true) + recyclerView.layoutManager = LinearLayoutManager(view.context) + recyclerView.adapter = SearchMangaAdapter(mangaList) + (recyclerView.adapter as SearchMangaAdapter).notifyDataSetChanged() + } + + + //display a snack + fun showError() { + Snackbar.make( + requireView(), + "API ERROR : Verify your internet connection or your query.", + Snackbar.LENGTH_LONG + ) + .setAction("Action", null).show() + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaAdapter.kt index 0396b3d..5ab1713 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaAdapter.kt @@ -1,4 +1,4 @@ -package xyz.adjutor.aniki.topmanga +package xyz.adjutor.aniki.presentation.view.manga import android.content.Intent import android.view.LayoutInflater @@ -11,9 +11,10 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.model.manga.TopManga class TopMangaAdapter(private val mangaList: List<TopManga>) : - RecyclerView.Adapter<TopMangaAdapter.MangaViewHolder>() { + RecyclerView.Adapter<TopMangaAdapter.MangaViewHolder>() { // Describes an item view and its place within the RecyclerView class MangaViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { @@ -27,7 +28,7 @@ class TopMangaAdapter(private val mangaList: List<TopManga>) : // Returns a new ViewHolder override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MangaViewHolder { val view = LayoutInflater.from(parent.context) - .inflate(R.layout.item_layout, parent, false) + .inflate(R.layout.item_layout, parent, false) return MangaViewHolder(view) } @@ -45,10 +46,10 @@ class TopMangaAdapter(private val mangaList: List<TopManga>) : holder.mangaScore.text = currentManga.score.toString() val image: String = currentManga.image_url.toString() Glide - .with(holder.itemView.context) - .load(image) - .apply(RequestOptions().override(400)) - .into(holder.mangaImage) + .with(holder.itemView.context) + .load(image) + .apply(RequestOptions().override(400)) + .into(holder.mangaImage) //when you click on a selected cardview, some datas are sent to the other activity holder.cardview.setOnClickListener { @@ -62,17 +63,19 @@ class TopMangaAdapter(private val mangaList: List<TopManga>) : val currentMangaEndDate = "themangaenddate" val currentMangaUrl = "themangaurl" - val intent: Intent = Intent(holder.itemView.context, DetailTopMangaActivity::class.java).apply { - putExtra(currentMangaId, currentManga.mal_id.toString()) - putExtra(currentMangaTitle, currentManga.title) - putExtra(currentMangaRank, currentManga.rank.toString()) - putExtra(currentMangaScore, currentManga.score.toString()) - putExtra(currentMangaImageUrl, currentManga.image_url.toString()) - putExtra(currentMangaVolumes, currentManga.volumes.toString()) - putExtra(currentMangaStartDate, currentManga.start_date) - putExtra(currentMangaEndDate, currentManga.end_date.toString()) - putExtra(currentMangaUrl, currentManga.url.toString()) - } + //intent is used to pass data to another activity + val intent: Intent = + Intent(holder.itemView.context, DetailTopMangaActivity::class.java).apply { + putExtra(currentMangaId, currentManga.mal_id.toString()) + putExtra(currentMangaTitle, currentManga.title) + putExtra(currentMangaRank, currentManga.rank.toString()) + putExtra(currentMangaScore, currentManga.score.toString()) + putExtra(currentMangaImageUrl, currentManga.image_url.toString()) + putExtra(currentMangaVolumes, currentManga.volumes.toString()) + putExtra(currentMangaStartDate, currentManga.start_date) + putExtra(currentMangaEndDate, currentManga.end_date.toString()) + putExtra(currentMangaUrl, currentManga.url.toString()) + } holder.itemView.context.startActivity(intent) } } diff --git a/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaPage.kt new file mode 100644 index 0000000..98eb0dd --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/presentation/view/manga/TopMangaPage.kt @@ -0,0 +1,87 @@ +package xyz.adjutor.aniki.presentation.view.manga + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Button +import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout +import com.google.android.material.snackbar.Snackbar +import xyz.adjutor.aniki.R +import xyz.adjutor.aniki.presentation.controller.manga.TopMangaController +import xyz.adjutor.aniki.presentation.model.manga.TopManga + +//view +class TopMangaPage : Fragment() { + + lateinit var controller: TopMangaController + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + val view = inflater.inflate(R.layout.top_manga_page, container, false) + + controller = TopMangaController() + controller.onStart(this, view) + + return view + + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + //button to return to the home page + view.findViewById<Button>(R.id.button_home).setOnClickListener { + findNavController().navigate(R.id.action_TopMangaPage_to_HomePage) + } + view.findViewById<Button>(R.id.button_prev).setOnClickListener { + controller.onButtonPrevClick() + } + view.findViewById<Button>(R.id.button_next).setOnClickListener { + controller.onButtonNextClick() + } + + //refresh when swiping down at the top of the page + val swipeRefresh: SwipeRefreshLayout = view.findViewById(R.id.swiperefresh) + swipeRefresh.setOnRefreshListener { + controller.updateList() + swipeRefresh.isRefreshing = false + } + + } + + //display the recyclerview + fun showList(view: View, mangaList: List<TopManga>) { + val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view) + recyclerView.setHasFixedSize(true) + recyclerView.layoutManager = LinearLayoutManager(view.context) + recyclerView.adapter = TopMangaAdapter(mangaList) + (recyclerView.adapter as TopMangaAdapter).notifyDataSetChanged() + } + + fun showError() { + Snackbar.make( + requireView(), + "API ERROR : Verify your internet connection.", + Snackbar.LENGTH_LONG + ) + .setAction("Action", null).show() + } + + fun showText(text: String) { + Snackbar.make( + requireView(), + text, + Snackbar.LENGTH_SHORT + ) + .setAction("Action", null).show() + } + +}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/DetailTopAnimeActivity.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/DetailTopAnimeActivity.kt deleted file mode 100644 index 3f1d008..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/DetailTopAnimeActivity.kt +++ /dev/null @@ -1,172 +0,0 @@ -package xyz.adjutor.aniki.topanime - -import android.content.Context -import android.content.SharedPreferences -import android.os.Bundle -import android.widget.ImageView -import android.widget.TextView -import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions -import com.google.gson.GsonBuilder -import com.google.gson.reflect.TypeToken -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory -import xyz.adjutor.aniki.R -import xyz.adjutor.aniki.anime.AnimeApi -import xyz.adjutor.aniki.anime.RestAnimeResponse -import java.lang.reflect.Type - -class DetailTopAnimeActivity : AppCompatActivity() { - - private var baseUrl = "https://api.jikan.moe/" - var sharedPreferences: SharedPreferences? = null - private val gson = GsonBuilder() - .setLenient() - .create() - - private val intentAnimeId = "theanimeid" - private val intentAnimeTitle = "theanimetitle" - private val intentAnimeRank = "theanimerank" - private val intentAnimeScore = "theanimescore" - private val intentAnimeImageUrl = "theanimeimageurl" - - private val intentAnimeEpisodes = "theanimeepisodes" - private val intentAnimeStartDate = "theanimestartdate" - private val intentAnimeEndDate = "theanimeenddate" - private val intentAnimeUrl = "theanimeurl" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_detail_top_anime) - - sharedPreferences = this.getSharedPreferences("sp_anime", Context.MODE_PRIVATE) - - val animeId = intent.getStringExtra(intentAnimeId) - val animeTitle = intent.getStringExtra(intentAnimeTitle) - val animeRank = intent.getStringExtra(intentAnimeRank) - val animeScore = intent.getStringExtra(intentAnimeScore) - val animeImageUrl = intent.getStringExtra(intentAnimeImageUrl) - - val animeEpisodes = intent.getStringExtra(intentAnimeEpisodes) - val animeStartDate = intent.getStringExtra(intentAnimeStartDate) - val animeEndDate = intent.getStringExtra(intentAnimeEndDate) - val animeUrl = intent.getStringExtra(intentAnimeUrl) - - val tvId: TextView = findViewById(R.id.tv_detail_id) - val tvTitle: TextView = findViewById(R.id.tv_detail_title) - val tvRank: TextView = findViewById(R.id.tv_detail_rank) - val tvScore: TextView = findViewById(R.id.tv_detail_score) - val ivImage: ImageView = findViewById(R.id.iv_detail_image) - - val tvEpisodes: TextView = findViewById(R.id.tv_episodes) - val tvStartDate: TextView = findViewById(R.id.tv_start_date) - val tvEndDate: TextView = findViewById(R.id.tv_end_date) - val tvUrl: TextView = findViewById(R.id.tv_url) - - tvId.text = animeId - tvTitle.text = animeTitle - tvRank.text = animeRank - tvScore.text = animeScore - Glide - .with(this) - .load(animeImageUrl) - .apply(RequestOptions().override(400)) - .into(ivImage) - - //using null as a string because it has been converted to a string before - tvEpisodes.text = if (animeEpisodes != "null"){ - animeEpisodes - } else { - fieldIsNull() - } - - tvStartDate.text = animeStartDate - - tvEndDate.text = if (animeEndDate != "null"){ - animeEndDate - } else { - fieldIsNull() - } - - tvUrl.text = animeUrl - - val anime: RestAnimeResponse? = getDataFromCache(animeId.toString()) - if(anime != null ){ - showDetail(anime) - } else { - //taking the API's fields I want and displaying them - makeApiCall(baseUrl, animeId.toString()) - } - - } - - private fun getDataFromCache(animeId: String): RestAnimeResponse? { - val jsonAnime: String?= sharedPreferences?.getString(animeId, null) - - return if(jsonAnime == null) { - null - } else { - val type: Type = object : TypeToken<RestAnimeResponse>() {}.type - gson.fromJson(jsonAnime, type) - } - } - - private fun makeApiCall(BASE_URL: String, animeId: String) { - - val retrofit = Retrofit.Builder() - .baseUrl(BASE_URL) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build() - - val service = retrofit.create(AnimeApi::class.java) - val call = service.getAnimeData(animeId) //based on the id - - call.enqueue(object : Callback<RestAnimeResponse> { - override fun onResponse(call: Call<RestAnimeResponse>, response: Response<RestAnimeResponse>) { - if(response.isSuccessful && response.body() != null){ //if the code returned is >= 200 and < 300 AND the the body ain't empty - - val anime = response.body() //getting the RestAnimeResponse fields - saveList(anime) - showDetail(anime!!) - - } else { - showError("API ERROR : is not successful") - } - } - - override fun onFailure(call: Call<RestAnimeResponse>, t: Throwable) { - showError("API ERROR : onFailure") - } - - }) - } - - private fun showDetail(anime: RestAnimeResponse) { - //elements from RestAnimeResponse - val tvSynopsis: TextView = findViewById(R.id.tv_synopsis) - - tvSynopsis.text = anime.synopsis.toString() - - } - - fun showError(text: String) { - Toast.makeText(this, text, Toast.LENGTH_LONG).show() - } - private fun fieldIsNull(): String{ - return "Unknown" - } - - fun saveList(anime: RestAnimeResponse?) { - val jsonString: String = gson.toJson(anime) - - sharedPreferences - ?.edit() - ?.putString(anime?.mal_id.toString(), jsonString) - ?.apply() - } -}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeApi.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeApi.kt deleted file mode 100644 index bea4c63..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimeApi.kt +++ /dev/null @@ -1,11 +0,0 @@ -package xyz.adjutor.aniki.topanime - -import retrofit2.Call -import retrofit2.http.GET - -interface TopAnimeApi { - - @GET("v3/top/anime") - fun getTopAnimeData(): Call<RestTopAnimeResponse> - -}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt b/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt deleted file mode 100644 index f2d5e4c..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/topanime/TopAnimePage.kt +++ /dev/null @@ -1,127 +0,0 @@ -package xyz.adjutor.aniki.topanime - -import android.content.Context -import android.content.SharedPreferences -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Button -import androidx.fragment.app.Fragment -import androidx.navigation.fragment.findNavController -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.snackbar.Snackbar -import com.google.gson.GsonBuilder -import com.google.gson.reflect.TypeToken -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory -import xyz.adjutor.aniki.R -import java.lang.reflect.Type - -class TopAnimePage : Fragment() { - - var sharedPreferences: SharedPreferences? = null - val gson = GsonBuilder() - .setLenient() - .create() - var base_url = "https://api.jikan.moe/" //the api's base url - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - // Inflate the layout for this fragment - val view = inflater.inflate(R.layout.top_anime_page, container, false) - - sharedPreferences = view.context.getSharedPreferences("sp_anime", Context.MODE_PRIVATE) - - val animeList: List<TopAnime>? = getDataFromCache() - if(animeList != null ){ - showList(view, animeList) - } else { - makeApiCall(view, base_url) - } - - return view - } - - private fun getDataFromCache(): List<TopAnime>? { - //the value of the animeList json, if nothing is found, return null - val jsonAnime: String? = sharedPreferences?.getString("jsonAnimeList", null) - - //if it's null, well, return null - if(jsonAnime == null) { - return null - } else { //else deserialize the list and return it - val listType: Type = object : TypeToken<List<TopAnime>>() {}.type - return gson.fromJson(jsonAnime, listType) - } - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - //button to return to the home page - view.findViewById<Button>(R.id.button_home).setOnClickListener { - findNavController().navigate(R.id.action_TopAnimePage_to_HomePage) - } - - } - - //display the recyclerview - fun showList(view: View, animeList: List<TopAnime> ){ - val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view) - recyclerView.setHasFixedSize(true) - recyclerView.layoutManager = LinearLayoutManager(view.context) - recyclerView.adapter = TopAnimeAdapter(animeList) - } - - private fun makeApiCall(view: View, BASE_URL: String) { - - val retrofit = Retrofit.Builder() - .baseUrl(BASE_URL) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build() - - val service = retrofit.create(TopAnimeApi::class.java) - val call = service.getTopAnimeData() - - call.enqueue(object : Callback<RestTopAnimeResponse> { - override fun onResponse(call: Call<RestTopAnimeResponse>, response: Response<RestTopAnimeResponse>) { - if(response.isSuccessful && response.body() != null){ //if the code returned is >= 200 and < 300 AND the the body ain't empty - - val animeList: List<TopAnime> = response.body()!!.getResults() //getting the "top" field containing our list of TopAnimes - saveList(animeList) - showList(view, animeList) //calling the method in charge of displaying on the recyclerview - - } else { - showError() //a snackbar - } - } - - override fun onFailure(call: Call<RestTopAnimeResponse>, t: Throwable) { - showError() - } - - }) - } - - private fun saveList(animeList: List<TopAnime>) { - val jsonString: String = gson.toJson(animeList) - - sharedPreferences - ?.edit() - ?.putString("jsonAnimeList", jsonString) - ?.apply() - } - - private fun showError() { - Snackbar.make(requireView(), "API ERROR", Snackbar.LENGTH_LONG) - .setAction("Action", null).show() - } - -}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt deleted file mode 100644 index 2b1fac4..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt +++ /dev/null @@ -1,186 +0,0 @@ -package xyz.adjutor.aniki.topmanga - -import android.content.Context -import android.content.SharedPreferences -import android.os.Bundle -import android.widget.ImageView -import android.widget.TextView -import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity -import com.bumptech.glide.Glide -import com.bumptech.glide.request.RequestOptions -import com.google.gson.GsonBuilder -import com.google.gson.reflect.TypeToken -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory -import xyz.adjutor.aniki.R -import xyz.adjutor.aniki.manga.MangaApi -import xyz.adjutor.aniki.manga.RestMangaResponse -import java.lang.reflect.Type - -class DetailTopMangaActivity : AppCompatActivity() { - - private var baseUrl = "https://api.jikan.moe/" - var sharedPreferences: SharedPreferences? = null - private val gson = GsonBuilder() - .setLenient() - .create() - - private val intentMangaId = "themangaid" - private val intentMangaTitle = "themangatitle" - private val intentMangaRank = "themangarank" - private val intentMangaScore = "themangascore" - private val intentMangaImageUrl = "themangaimageurl" - - private val intentMangaVolumes = "themangavolumes" - private val intentMangaStartDate = "themangastartdate" - private val intentMangaEndDate = "themangaenddate" - private val intentMangaUrl = "themangaurl" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_detail_top_manga) - - sharedPreferences = this.getSharedPreferences("sp_manga", Context.MODE_PRIVATE) - - val mangaId = intent.getStringExtra(intentMangaId) - val mangaTitle = intent.getStringExtra(intentMangaTitle) - val mangaRank = intent.getStringExtra(intentMangaRank) - val mangaScore = intent.getStringExtra(intentMangaScore) - val mangaImageUrl = intent.getStringExtra(intentMangaImageUrl) - - val mangaVolumes = intent.getStringExtra(intentMangaVolumes) - val mangaStartDate = intent.getStringExtra(intentMangaStartDate) - val mangaEndDate = intent.getStringExtra(intentMangaEndDate) - val mangaUrl = intent.getStringExtra(intentMangaUrl) - - val tvId: TextView = findViewById(R.id.tv_detail_id) - val tvTitle: TextView = findViewById(R.id.tv_detail_title) - val tvRank: TextView = findViewById(R.id.tv_detail_rank) - val tvScore: TextView = findViewById(R.id.tv_detail_score) - val ivImage: ImageView = findViewById(R.id.iv_detail_image) - - val tvVolumes: TextView = findViewById(R.id.tv_volumes) - val tvStartDate: TextView = findViewById(R.id.tv_start_date) - val tvEndDate: TextView = findViewById(R.id.tv_end_date) - val tvUrl: TextView = findViewById(R.id.tv_url) - - tvId.text = mangaId - tvTitle.text = mangaTitle - tvRank.text = mangaRank - tvScore.text = mangaScore - Glide - .with(this) - .load(mangaImageUrl) - .apply(RequestOptions().override(400)) - .into(ivImage) - - //using null as a string because it has been converted to a string before - tvVolumes.text = if (mangaVolumes != "null"){ - mangaVolumes - } else { - fieldIsNull() - } - - tvStartDate.text = mangaStartDate - - tvEndDate.text = if (mangaEndDate != "null"){ - mangaEndDate - } else { - fieldIsNull() - } - - tvUrl.text = mangaUrl - - val manga: RestMangaResponse? = getDataFromCache(mangaId.toString()) - if(manga != null ){ - showDetail(manga) - } else { - //taking the API's fields I want and displaying them - makeApiCall(baseUrl, mangaId.toString()) - } - - } - - private fun getDataFromCache(mangaId: String): RestMangaResponse? { - val jsonManga: String?= sharedPreferences?.getString(mangaId, null) - - return if(jsonManga == null) { - null - } else { - val type: Type = object : TypeToken<RestMangaResponse>() {}.type - gson.fromJson(jsonManga, type) - } - } - - private fun makeApiCall(BASE_URL: String, mangaId: String) { - - val retrofit = Retrofit.Builder() - .baseUrl(BASE_URL) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build() - - val service = retrofit.create(MangaApi::class.java) - val call = service.getMangaData(mangaId) //based on the id - - call.enqueue(object : Callback<RestMangaResponse> { - override fun onResponse(call: Call<RestMangaResponse>, response: Response<RestMangaResponse>) { - if(response.isSuccessful && response.body() != null){ //if the code returned is >= 200 and < 300 AND the the body ain't empty - - val manga = response.body() //getting the RestMangaResponse fields - saveList(manga) - showDetail(manga!!) - - } else { - showError("API ERROR : is not successful") - } - } - - override fun onFailure(call: Call<RestMangaResponse>, t: Throwable) { - showError("API ERROR : onFailure") - } - - }) - } - - private fun showDetail(manga: RestMangaResponse) { - //elements from RestMangaResponse - val tvChapters: TextView = findViewById(R.id.tv_chapters) - val tvSynopsis: TextView = findViewById(R.id.tv_synopsis) - val tvBackground: TextView = findViewById(R.id.tv_background) - - tvChapters.text = if (manga.chapters != null){ - manga.chapters.toString() - } else { - fieldIsNull() - } - - tvSynopsis.text = manga.synopsis.toString() - - tvBackground.text = if (manga.background != null){ - manga.background.toString() - } else { - fieldIsNull() - } - - } - - fun showError(text: String) { - Toast.makeText(this, text, Toast.LENGTH_LONG).show() - } - private fun fieldIsNull(): String{ - return "Unknown" - } - - fun saveList(manga: RestMangaResponse?) { - val jsonString: String = gson.toJson(manga) - - sharedPreferences - ?.edit() - ?.putString(manga?.mal_id.toString(), jsonString) - ?.apply() - } -}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/RestTopMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/RestTopMangaResponse.kt deleted file mode 100644 index dc7827a..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/RestTopMangaResponse.kt +++ /dev/null @@ -1,13 +0,0 @@ -package xyz.adjutor.aniki.topmanga - -import com.google.gson.annotations.SerializedName - -class RestTopMangaResponse { - - @SerializedName("top") - var top: List<TopManga>? = null - - fun getResults(): List<TopManga> { - return top!! - } -}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaApi.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaApi.kt deleted file mode 100644 index e8231b0..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaApi.kt +++ /dev/null @@ -1,11 +0,0 @@ -package xyz.adjutor.aniki.topmanga - -import retrofit2.Call -import retrofit2.http.GET - -interface TopMangaApi { - - @GET("v3/top/manga") - fun getTopMangaData(): Call<RestTopMangaResponse> - -}
\ No newline at end of file diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt deleted file mode 100644 index f99cd9a..0000000 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaPage.kt +++ /dev/null @@ -1,127 +0,0 @@ -package xyz.adjutor.aniki.topmanga - -import android.content.Context -import android.content.SharedPreferences -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Button -import androidx.fragment.app.Fragment -import androidx.navigation.fragment.findNavController -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.snackbar.Snackbar -import com.google.gson.GsonBuilder -import com.google.gson.reflect.TypeToken -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response -import retrofit2.Retrofit -import retrofit2.converter.gson.GsonConverterFactory -import xyz.adjutor.aniki.R -import java.lang.reflect.Type - -class TopMangaPage : Fragment() { - - var sharedPreferences: SharedPreferences? = null - val gson = GsonBuilder() - .setLenient() - .create() - var base_url = "https://api.jikan.moe/" //the api's base url - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - // Inflate the layout for this fragment - val view = inflater.inflate(R.layout.top_manga_page, container, false) - - sharedPreferences = view.context.getSharedPreferences("sp_manga", Context.MODE_PRIVATE) - - val mangaList: List<TopManga>? = getDataFromCache() - if(mangaList != null ){ - showList(view, mangaList) - } else { - makeApiCall(view, base_url) - } - - return view - } - - private fun getDataFromCache(): List<TopManga>? { - //the value of the mangaList json, if nothing is found, return null - val jsonManga: String? = sharedPreferences?.getString("jsonMangaList", null) - - //if it's null, well, return null - if(jsonManga == null) { - return null - } else { //else deserialize the list and return it - val listType: Type = object : TypeToken<List<TopManga>>() {}.type - return gson.fromJson(jsonManga, listType) - } - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - //button to return to the home page - view.findViewById<Button>(R.id.button_home).setOnClickListener { - findNavController().navigate(R.id.action_TopMangaPage_to_HomePage) - } - - } - - //display the recyclerview - fun showList(view: View, mangaList: List<TopManga> ){ - val recyclerView: RecyclerView = view.findViewById(R.id.recycler_view) - recyclerView.setHasFixedSize(true) - recyclerView.layoutManager = LinearLayoutManager(view.context) - recyclerView.adapter = TopMangaAdapter(mangaList) - } - - private fun makeApiCall(view: View, BASE_URL: String) { - - val retrofit = Retrofit.Builder() - .baseUrl(BASE_URL) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build() - - val service = retrofit.create(TopMangaApi::class.java) - val call = service.getTopMangaData() - - call.enqueue(object : Callback<RestTopMangaResponse> { - override fun onResponse(call: Call<RestTopMangaResponse>, response: Response<RestTopMangaResponse>) { - if(response.isSuccessful && response.body() != null){ //if the code returned is >= 200 and < 300 AND the the body ain't empty - - val mangaList: List<TopManga> = response.body()!!.getResults() //getting the "top" field containing our list of TopMangas - saveList(mangaList) - showList(view, mangaList) //calling the method in charge of displaying on the recyclerview - - } else { - showError() //a snackbar - } - } - - override fun onFailure(call: Call<RestTopMangaResponse>, t: Throwable) { - showError() - } - - }) - } - - private fun saveList(mangaList: List<TopManga>) { - val jsonString: String = gson.toJson(mangaList) - - sharedPreferences - ?.edit() - ?.putString("jsonMangaList", jsonString) - ?.apply() - } - - private fun showError() { - Snackbar.make(requireView(), "API ERROR", Snackbar.LENGTH_LONG) - .setAction("Action", null).show() - } - -}
\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 16c436c..ff2a106 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -5,7 +5,7 @@ android:viewportWidth="108" android:viewportHeight="108"> <path - android:fillColor="#333333" + android:fillColor="#09022A" android:pathData="M0,0h108v108h-108z" /> </vector> diff --git a/app/src/main/res/layout/activity_detail_search_anime.xml b/app/src/main/res/layout/activity_detail_search_anime.xml new file mode 100644 index 0000000..90f2459 --- /dev/null +++ b/app/src/main/res/layout/activity_detail_search_anime.xml @@ -0,0 +1,259 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/very_dark_purple"> + + <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:context=".anime.searchanime.DetailSearchAnimeActivity"> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toTopOf="parent"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:text="@string/text_mal_id" + android:textColor="@color/strong_pink" + app:layout_constraintEnd_toStartOf="@id/tv_detail_id" /> + + <TextView + android:id="@+id/tv_detail_id" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/id" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/iv_detail_image" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/iv_detail_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/image" + android:src="@mipmap/ic_launcher" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_detail_title" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_marginHorizontal="10sp" + android:fontFamily="@font/bangers" + android:text="@string/title" + android:textAlignment="center" + android:textColor="@color/strong_pink" + android:textIsSelectable="true" + android:textSize="30sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/iv_detail_image" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_rank" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_detail_rank" + app:layout_constraintEnd_toStartOf="@id/tv_detail_rank" + app:layout_constraintTop_toTopOf="@id/tv_detail_rank" /> + + <TextView + android:id="@+id/tv_detail_rank" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/rank" + android:textColor="@color/slightly_desaturated_magenta" + android:textSize="20sp" + app:layout_constraintBottom_toTopOf="@id/tv_detail_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_score" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_detail_score" + app:layout_constraintEnd_toStartOf="@id/tv_detail_score" + app:layout_constraintTop_toTopOf="@id/tv_detail_score" /> + + <TextView + android:id="@+id/tv_detail_score" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/score" + android:textColor="@color/slightly_desaturated_magenta" + android:textSize="20sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_detail_title" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_more_infos" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_header"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + <TextView + android:id="@+id/tv_text_episodes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_episodes" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_episodes" + app:layout_constraintEnd_toStartOf="@id/tv_episodes" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/tv_episodes" /> + + <TextView + android:id="@+id/tv_episodes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/episodes" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/tv_text_episodes" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_text_start_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_start_date" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_start_date" + app:layout_constraintEnd_toStartOf="@id/tv_start_date" + app:layout_constraintTop_toTopOf="@id/tv_start_date" /> + + <TextView + android:id="@+id/tv_start_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/start_date" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_text_end_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_end_date" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_end_date" + app:layout_constraintEnd_toStartOf="@id/tv_end_date" + app:layout_constraintTop_toTopOf="@id/tv_end_date" /> + + <TextView + android:id="@+id/tv_end_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/end_date" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_start_date" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_synopsis" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_more_infos"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + <TextView + android:id="@+id/tv_text_synopsis" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_synopsis" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_synopsis" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_synopsis" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_synopsis"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + + <TextView + android:id="@+id/tv_text_url" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_url" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_url" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:autoLink="all" + android:text="@string/url" + android:textColor="@color/slightly_desaturated_magenta" + android:textColorLink="@color/very_light_magenta" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_url" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + </androidx.constraintlayout.widget.ConstraintLayout> +</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_detail_search_manga.xml b/app/src/main/res/layout/activity_detail_search_manga.xml new file mode 100644 index 0000000..75cad74 --- /dev/null +++ b/app/src/main/res/layout/activity_detail_search_manga.xml @@ -0,0 +1,313 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/very_dark_purple"> + + <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:context=".manga.searchmanga.DetailSearchMangaActivity"> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toTopOf="parent"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:text="@string/text_mal_id" + android:textColor="@color/strong_pink" + app:layout_constraintEnd_toStartOf="@id/tv_detail_id" /> + + <TextView + android:id="@+id/tv_detail_id" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/id" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/iv_detail_image" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/iv_detail_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/image" + android:src="@mipmap/ic_launcher" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_detail_title" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_marginHorizontal="10sp" + android:fontFamily="@font/bangers" + android:text="@string/title" + android:textAlignment="center" + android:textColor="@color/strong_pink" + android:textIsSelectable="true" + android:textSize="30sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/iv_detail_image" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_rank" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_detail_rank" + app:layout_constraintEnd_toStartOf="@id/tv_detail_rank" + app:layout_constraintTop_toTopOf="@id/tv_detail_rank" /> + + <TextView + android:id="@+id/tv_detail_rank" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/rank" + android:textColor="@color/slightly_desaturated_magenta" + android:textSize="20sp" + app:layout_constraintBottom_toTopOf="@id/tv_detail_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_score" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_detail_score" + app:layout_constraintEnd_toStartOf="@id/tv_detail_score" + app:layout_constraintTop_toTopOf="@id/tv_detail_score" /> + + <TextView + android:id="@+id/tv_detail_score" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/score" + android:textColor="@color/slightly_desaturated_magenta" + android:textSize="20sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_detail_title" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_more_infos" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_header"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + <TextView + android:id="@+id/tv_text_volumes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_volumes" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_volumes" + app:layout_constraintEnd_toStartOf="@id/tv_volumes" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/tv_volumes" /> + + <TextView + android:id="@+id/tv_volumes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/volumes" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintStart_toEndOf="@id/tv_text_volumes" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_text_chapters" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_chapters" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_chapters" + app:layout_constraintEnd_toStartOf="@id/tv_chapters" + app:layout_constraintTop_toTopOf="@id/tv_chapters" /> + + <TextView + android:id="@+id/tv_chapters" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/chapters" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/tv_text_chapters" + app:layout_constraintTop_toBottomOf="@id/tv_volumes" /> + + <TextView + android:id="@+id/tv_text_start_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_start_date" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_start_date" + app:layout_constraintEnd_toStartOf="@id/tv_start_date" + app:layout_constraintTop_toTopOf="@id/tv_start_date" /> + + <TextView + android:id="@+id/tv_start_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/start_date" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_text_end_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_end_date" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_end_date" + app:layout_constraintEnd_toStartOf="@id/tv_end_date" + app:layout_constraintTop_toTopOf="@id/tv_end_date" /> + + <TextView + android:id="@+id/tv_end_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/end_date" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_start_date" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_synopsis" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_more_infos"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + <TextView + android:id="@+id/tv_text_synopsis" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_synopsis" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_synopsis" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_synopsis" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_background" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_synopsis"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + + <TextView + android:id="@+id/tv_text_background" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_background" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_background" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_background" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_background"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + + <TextView + android:id="@+id/tv_text_url" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_url" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_url" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:autoLink="all" + android:text="@string/url" + android:textColor="@color/slightly_desaturated_magenta" + android:textColorLink="@color/very_light_magenta" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_url" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + </androidx.constraintlayout.widget.ConstraintLayout> +</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_detail_top_anime.xml b/app/src/main/res/layout/activity_detail_top_anime.xml index a982bdd..f352e61 100644 --- a/app/src/main/res/layout/activity_detail_top_anime.xml +++ b/app/src/main/res/layout/activity_detail_top_anime.xml @@ -3,250 +3,257 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/very_dark_purple"> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:context=".topanime.DetailTopAnimeActivity"> - <androidx.cardview.widget.CardView - android:id="@+id/cv_header" + + <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="4sp" - app:cardBackgroundColor="@color/black" - app:layout_constraintTop_toTopOf="parent"> - <androidx.constraintlayout.widget.ConstraintLayout + tools:context=".presentation.view.anime.DetailTopAnimeActivity"> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_header" android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toTopOf="parent"> - <TextView - android:layout_width="wrap_content" + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" android:layout_height="match_parent" - android:text="@string/text_mal_id" - android:textColor="@color/strong_pink" - app:layout_constraintEnd_toStartOf="@id/tv_detail_id" /> - <TextView - android:id="@+id/tv_detail_id" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/id" - android:textColor="@color/slightly_desaturated_magenta" - android:textIsSelectable="true" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/iv_detail_image" - app:layout_constraintTop_toTopOf="parent" /> - - <ImageView - android:id="@+id/iv_detail_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/image" - android:src="@mipmap/ic_launcher" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/tv_detail_title" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_marginHorizontal="10sp" - android:fontFamily="@font/bangers" - android:text="@string/title" - android:textAlignment="center" - android:textColor="@color/strong_pink" - android:textIsSelectable="true" - android:textSize="30sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/iv_detail_image" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_rank" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_detail_rank" - app:layout_constraintEnd_toStartOf="@id/tv_detail_rank" - app:layout_constraintTop_toTopOf="@id/tv_detail_rank" /> - <TextView - android:id="@+id/tv_detail_rank" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/rank" - android:textColor="@color/slightly_desaturated_magenta" - android:textSize="20sp" - app:layout_constraintBottom_toTopOf="@id/tv_detail_title" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_score" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_detail_score" - app:layout_constraintEnd_toStartOf="@id/tv_detail_score" - app:layout_constraintTop_toTopOf="@id/tv_detail_score" /> - <TextView - android:id="@+id/tv_detail_score" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/score" - android:textColor="@color/slightly_desaturated_magenta" - android:textSize="20sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_detail_title" /> - - </androidx.constraintlayout.widget.ConstraintLayout> -</androidx.cardview.widget.CardView> - - <androidx.cardview.widget.CardView - android:id="@+id/cv_more_infos" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="4sp" - app:cardBackgroundColor="@color/black" - app:layout_constraintTop_toBottomOf="@id/cv_header"> + android:padding="10dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:text="@string/text_mal_id" + android:textColor="@color/strong_pink" + app:layout_constraintEnd_toStartOf="@id/tv_detail_id" /> + + <TextView + android:id="@+id/tv_detail_id" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/id" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/iv_detail_image" + app:layout_constraintTop_toTopOf="parent" /> - <androidx.constraintlayout.widget.ConstraintLayout + <ImageView + android:id="@+id/iv_detail_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/image" + android:src="@mipmap/ic_launcher" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_detail_title" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_marginHorizontal="10sp" + android:fontFamily="@font/bangers" + android:text="@string/title" + android:textAlignment="center" + android:textColor="@color/strong_pink" + android:textIsSelectable="true" + android:textSize="30sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/iv_detail_image" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_rank" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_detail_rank" + app:layout_constraintEnd_toStartOf="@id/tv_detail_rank" + app:layout_constraintTop_toTopOf="@id/tv_detail_rank" /> + + <TextView + android:id="@+id/tv_detail_rank" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/rank" + android:textColor="@color/slightly_desaturated_magenta" + android:textSize="20sp" + app:layout_constraintBottom_toTopOf="@id/tv_detail_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_score" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_detail_score" + app:layout_constraintEnd_toStartOf="@id/tv_detail_score" + app:layout_constraintTop_toTopOf="@id/tv_detail_score" /> + + <TextView + android:id="@+id/tv_detail_score" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/score" + android:textColor="@color/slightly_desaturated_magenta" + android:textSize="20sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_detail_title" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_more_infos" android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> - - <TextView - android:id="@+id/tv_text_episodes" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_episodes" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_episodes" - app:layout_constraintEnd_toStartOf="@id/tv_episodes" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@id/tv_episodes" /> - - <TextView - android:id="@+id/tv_episodes" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/episodes" - android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintStart_toEndOf="@id/tv_text_episodes" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> - - <TextView - android:id="@+id/tv_text_start_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_start_date" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_start_date" - app:layout_constraintEnd_toStartOf="@id/tv_start_date" - app:layout_constraintTop_toTopOf="@id/tv_start_date" /> - - <TextView - android:id="@+id/tv_start_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/start_date" - android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/tv_text_end_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_end_date" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_end_date" - app:layout_constraintEnd_toStartOf="@id/tv_end_date" - app:layout_constraintTop_toTopOf="@id/tv_end_date" /> - - <TextView - android:id="@+id/tv_end_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/end_date" - android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_start_date" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.cardview.widget.CardView> - - <androidx.cardview.widget.CardView - android:id="@+id/cv_synopsis" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="4sp" - app:cardBackgroundColor="@color/black" - app:layout_constraintTop_toBottomOf="@id/cv_more_infos"> - <androidx.constraintlayout.widget.ConstraintLayout + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_header"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + <TextView + android:id="@+id/tv_text_episodes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_episodes" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_episodes" + app:layout_constraintEnd_toStartOf="@id/tv_episodes" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/tv_episodes" /> + + <TextView + android:id="@+id/tv_episodes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/episodes" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/tv_text_episodes" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_text_start_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_start_date" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_start_date" + app:layout_constraintEnd_toStartOf="@id/tv_start_date" + app:layout_constraintTop_toTopOf="@id/tv_start_date" /> + + <TextView + android:id="@+id/tv_start_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/start_date" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_text_end_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_end_date" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_end_date" + app:layout_constraintEnd_toStartOf="@id/tv_end_date" + app:layout_constraintTop_toTopOf="@id/tv_end_date" /> + + <TextView + android:id="@+id/tv_end_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/end_date" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_start_date" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_synopsis" android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> - - <TextView - android:id="@+id/tv_text_synopsis" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_synopsis" - android:textColor="@color/strong_pink" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - <TextView - android:id="@+id/tv_synopsis" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/synopsis" - android:textColor="@color/slightly_desaturated_magenta" - android:textIsSelectable="true" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_text_synopsis" - /> + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_more_infos"> - </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.cardview.widget.CardView> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> - <androidx.cardview.widget.CardView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="4sp" - app:cardBackgroundColor="@color/black" - app:layout_constraintTop_toBottomOf="@id/cv_synopsis"> - <androidx.constraintlayout.widget.ConstraintLayout + <TextView + android:id="@+id/tv_text_synopsis" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_synopsis" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_synopsis" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_synopsis" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> - - - <TextView - android:id="@+id/tv_text_url" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_url" - android:textColor="@color/strong_pink" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/tv_url" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/url" - android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_text_url" - android:autoLink="all" - /> - - </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.cardview.widget.CardView> - -</androidx.constraintlayout.widget.ConstraintLayout> + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_synopsis"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + + <TextView + android:id="@+id/tv_text_url" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_url" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_url" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:autoLink="all" + android:text="@string/url" + android:textColor="@color/slightly_desaturated_magenta" + android:textColorLink="@color/very_light_magenta" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_url" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_detail_top_manga.xml b/app/src/main/res/layout/activity_detail_top_manga.xml index 6d069c9..cbfa296 100644 --- a/app/src/main/res/layout/activity_detail_top_manga.xml +++ b/app/src/main/res/layout/activity_detail_top_manga.xml @@ -3,304 +3,311 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/very_dark_purple"> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:context=".topmanga.DetailTopMangaActivity"> - <androidx.cardview.widget.CardView - android:id="@+id/cv_header" + + <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="4sp" - app:cardBackgroundColor="@color/black" - app:layout_constraintTop_toTopOf="parent"> - <androidx.constraintlayout.widget.ConstraintLayout + tools:context=".presentation.view.manga.DetailTopMangaActivity"> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_header" android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toTopOf="parent"> - <TextView - android:layout_width="wrap_content" + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" android:layout_height="match_parent" - android:text="@string/text_mal_id" - android:textColor="@color/strong_pink" - app:layout_constraintEnd_toStartOf="@id/tv_detail_id" /> - <TextView - android:id="@+id/tv_detail_id" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/id" - android:textColor="@color/slightly_desaturated_magenta" - android:textIsSelectable="true" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/iv_detail_image" - app:layout_constraintTop_toTopOf="parent" /> - - <ImageView - android:id="@+id/iv_detail_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@string/image" - android:src="@mipmap/ic_launcher" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/tv_detail_title" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_marginHorizontal="10sp" - android:fontFamily="@font/bangers" - android:text="@string/title" - android:textAlignment="center" - android:textColor="@color/strong_pink" - android:textIsSelectable="true" - android:textSize="30sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/iv_detail_image" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_rank" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_detail_rank" - app:layout_constraintEnd_toStartOf="@id/tv_detail_rank" - app:layout_constraintTop_toTopOf="@id/tv_detail_rank" /> - <TextView - android:id="@+id/tv_detail_rank" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/rank" - android:textColor="@color/slightly_desaturated_magenta" - android:textSize="20sp" - app:layout_constraintBottom_toTopOf="@id/tv_detail_title" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_score" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_detail_score" - app:layout_constraintEnd_toStartOf="@id/tv_detail_score" - app:layout_constraintTop_toTopOf="@id/tv_detail_score" /> - <TextView - android:id="@+id/tv_detail_score" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/score" - android:textColor="@color/slightly_desaturated_magenta" - android:textSize="20sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_detail_title" /> - - </androidx.constraintlayout.widget.ConstraintLayout> -</androidx.cardview.widget.CardView> - - <androidx.cardview.widget.CardView - android:id="@+id/cv_more_infos" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="4sp" - app:cardBackgroundColor="@color/black" - app:layout_constraintTop_toBottomOf="@id/cv_header"> + android:padding="10dp"> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> - - <TextView - android:id="@+id/tv_text_volumes" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_volumes" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_volumes" - app:layout_constraintEnd_toStartOf="@id/tv_volumes" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="@id/tv_volumes" /> - - <TextView - android:id="@+id/tv_volumes" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/volumes" - android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintStart_toEndOf="@id/tv_text_volumes" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/tv_text_chapters" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_chapters" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_chapters" - app:layout_constraintEnd_toStartOf="@id/tv_chapters" - app:layout_constraintTop_toTopOf="@id/tv_chapters" /> - - <TextView - android:id="@+id/tv_chapters" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/chapters" - android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/tv_text_chapters" - app:layout_constraintTop_toBottomOf="@id/tv_volumes" /> - - <TextView - android:id="@+id/tv_text_start_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_start_date" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_start_date" - app:layout_constraintEnd_toStartOf="@id/tv_start_date" - app:layout_constraintTop_toTopOf="@id/tv_start_date" /> - - <TextView - android:id="@+id/tv_start_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/start_date" - android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/tv_text_end_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_end_date" - android:textColor="@color/strong_pink" - app:layout_constraintBottom_toBottomOf="@id/tv_end_date" - app:layout_constraintEnd_toStartOf="@id/tv_end_date" - app:layout_constraintTop_toTopOf="@id/tv_end_date" /> - - <TextView - android:id="@+id/tv_end_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/end_date" - android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_start_date" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.cardview.widget.CardView> - - <androidx.cardview.widget.CardView - android:id="@+id/cv_synopsis" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="4sp" - app:cardBackgroundColor="@color/black" - app:layout_constraintTop_toBottomOf="@id/cv_more_infos"> - <androidx.constraintlayout.widget.ConstraintLayout + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:text="@string/text_mal_id" + android:textColor="@color/strong_pink" + app:layout_constraintEnd_toStartOf="@id/tv_detail_id" /> + + <TextView + android:id="@+id/tv_detail_id" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/id" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/iv_detail_image" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/iv_detail_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/image" + android:src="@mipmap/ic_launcher" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_detail_title" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_marginHorizontal="10sp" + android:fontFamily="@font/bangers" + android:text="@string/title" + android:textAlignment="center" + android:textColor="@color/strong_pink" + android:textIsSelectable="true" + android:textSize="30sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/iv_detail_image" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_rank" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_detail_rank" + app:layout_constraintEnd_toStartOf="@id/tv_detail_rank" + app:layout_constraintTop_toTopOf="@id/tv_detail_rank" /> + + <TextView + android:id="@+id/tv_detail_rank" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/rank" + android:textColor="@color/slightly_desaturated_magenta" + android:textSize="20sp" + app:layout_constraintBottom_toTopOf="@id/tv_detail_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_score" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_detail_score" + app:layout_constraintEnd_toStartOf="@id/tv_detail_score" + app:layout_constraintTop_toTopOf="@id/tv_detail_score" /> + + <TextView + android:id="@+id/tv_detail_score" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/score" + android:textColor="@color/slightly_desaturated_magenta" + android:textSize="20sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_detail_title" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_more_infos" android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> - - <TextView - android:id="@+id/tv_text_synopsis" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_synopsis" - android:textColor="@color/strong_pink" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - <TextView - android:id="@+id/tv_synopsis" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/synopsis" - android:textColor="@color/slightly_desaturated_magenta" - android:textIsSelectable="true" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_text_synopsis" - /> - - </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.cardview.widget.CardView> - - <androidx.cardview.widget.CardView - android:id="@+id/cv_background" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="4sp" - app:cardBackgroundColor="@color/black" - app:layout_constraintTop_toBottomOf="@id/cv_synopsis"> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_header"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + <TextView + android:id="@+id/tv_text_volumes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_volumes" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_volumes" + app:layout_constraintEnd_toStartOf="@id/tv_volumes" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/tv_volumes" /> + + <TextView + android:id="@+id/tv_volumes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/volumes" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintStart_toEndOf="@id/tv_text_volumes" + app:layout_constraintTop_toTopOf="parent" /> + <TextView + android:id="@+id/tv_text_chapters" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_chapters" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_chapters" + app:layout_constraintEnd_toStartOf="@id/tv_chapters" + app:layout_constraintTop_toTopOf="@id/tv_chapters" /> - <TextView - android:id="@+id/tv_text_background" - android:layout_width="wrap_content" + <TextView + android:id="@+id/tv_chapters" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/chapters" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/tv_text_chapters" + app:layout_constraintTop_toBottomOf="@id/tv_volumes" /> + + <TextView + android:id="@+id/tv_text_start_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_start_date" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_start_date" + app:layout_constraintEnd_toStartOf="@id/tv_start_date" + app:layout_constraintTop_toTopOf="@id/tv_start_date" /> + + <TextView + android:id="@+id/tv_start_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/start_date" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_text_end_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_end_date" + android:textColor="@color/strong_pink" + app:layout_constraintBottom_toBottomOf="@id/tv_end_date" + app:layout_constraintEnd_toStartOf="@id/tv_end_date" + app:layout_constraintTop_toTopOf="@id/tv_end_date" /> + + <TextView + android:id="@+id/tv_end_date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/end_date" + android:textColor="@color/slightly_desaturated_magenta" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_start_date" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_synopsis" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/text_background" - android:textColor="@color/strong_pink" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/tv_background" - android:layout_width="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_more_infos"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + <TextView + android:id="@+id/tv_text_synopsis" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_synopsis" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_synopsis" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_synopsis" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView + android:id="@+id/cv_background" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/background" - android:textColor="@color/slightly_desaturated_magenta" - android:textIsSelectable="true" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_text_background" /> + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_synopsis"> - </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.cardview.widget.CardView> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> - <androidx.cardview.widget.CardView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="4sp" - app:cardBackgroundColor="@color/black" - app:layout_constraintTop_toBottomOf="@id/cv_background"> - <androidx.constraintlayout.widget.ConstraintLayout + + <TextView + android:id="@+id/tv_text_background" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_background" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_background" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/slightly_desaturated_magenta" + android:textIsSelectable="true" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_background" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + <androidx.cardview.widget.CardView android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> - - - <TextView - android:id="@+id/tv_text_url" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/text_url" - android:textColor="@color/strong_pink" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/tv_url" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/url" - android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_text_url" - android:autoLink="all" - /> - - </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.cardview.widget.CardView> - -</androidx.constraintlayout.widget.ConstraintLayout> + android:layout_height="wrap_content" + android:layout_margin="4sp" + app:cardBackgroundColor="@color/black" + app:layout_constraintTop_toBottomOf="@id/cv_background"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="10dp"> + + + <TextView + android:id="@+id/tv_text_url" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text_url" + android:textColor="@color/strong_pink" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/tv_url" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:autoLink="all" + android:text="@string/url" + android:textColor="@color/slightly_desaturated_magenta" + android:textColorLink="@color/very_light_magenta" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_text_url" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.cardview.widget.CardView> + + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index dd69e51..ff9ab1f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.coordinatorlayout.widget.CoordinatorLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".presentation.view.MainActivity"> <com.google.android.material.appbar.AppBarLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/home_page.xml b/app/src/main/res/layout/home_page.xml index 564d7da..1c547d6 100644 --- a/app/src/main/res/layout/home_page.xml +++ b/app/src/main/res/layout/home_page.xml @@ -4,9 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".HomePage" android:background="@color/very_dark_purple" - > + tools:context=".presentation.view.HomePage"> <TextView android:id="@+id/tv_title" @@ -19,29 +18,47 @@ android:textColor="@color/strong_pink" android:textSize="40sp" app:layout_constraintBottom_toBottomOf="@id/button_top_manga" - app:layout_constraintTop_toTopOf="parent" - /> + app:layout_constraintTop_toTopOf="parent" /> <Button android:id="@+id/button_top_manga" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/top_manga" - app:layout_constraintTop_toBottomOf="@id/tv_title" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/button_top_anime" - /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_title" /> <Button android:id="@+id/button_top_anime" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/top_anime" - app:layout_constraintTop_toBottomOf="@id/tv_title" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@id/button_top_manga" app:layout_constraintEnd_toEndOf="parent" - /> + app:layout_constraintStart_toEndOf="@id/button_top_manga" + app:layout_constraintTop_toBottomOf="@id/tv_title" /> + + <Button + android:id="@+id/button_search_manga" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/search_manga" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/button_top_manga" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/button_search_anime"/> + + <Button + android:id="@+id/button_search_anime" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/search_anime" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/button_top_anime" + app:layout_constraintStart_toEndOf="@id/button_search_manga" + app:layout_constraintEnd_toEndOf="parent"/> + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/search_anime_page.xml b/app/src/main/res/layout/search_anime_page.xml new file mode 100644 index 0000000..abbd762 --- /dev/null +++ b/app/src/main/res/layout/search_anime_page.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/very_dark_purple" + tools:context=".presentation.view.anime.SearchAnimePage"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/tiet_query" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:hint="@string/hint_query" + android:textColor="@color/very_light_magenta" + android:textColorHint="@color/grayish_magenta" + android:textStyle="bold" + app:layout_constraintBottom_toTopOf="@id/recycler_view" + app:layout_constraintEnd_toStartOf="@id/button_query" + app:layout_constraintStart_toStartOf="parent" + android:imeOptions="actionSearch" + android:inputType="text" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/button_query" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/recycler_view" + app:layout_constraintStart_toEndOf="@id/tiet_query" + android:text="@string/search" + /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_view" + android:layout_width="0dp" + android:layout_height="0dp" + android:scrollbars="vertical" + app:layout_constraintBottom_toTopOf="@+id/button_home" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tiet_query" + tools:listitem="@layout/item_layout" /> + + <Button + android:id="@+id/button_home" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/home" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/search_manga_page.xml b/app/src/main/res/layout/search_manga_page.xml new file mode 100644 index 0000000..db4bd6c --- /dev/null +++ b/app/src/main/res/layout/search_manga_page.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/very_dark_purple" + tools:context=".presentation.view.manga.SearchMangaPage"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/tiet_query" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:hint="@string/hint_query" + android:textColor="@color/very_light_magenta" + android:textColorHint="@color/grayish_magenta" + android:textStyle="bold" + app:layout_constraintBottom_toTopOf="@id/recycler_view" + app:layout_constraintEnd_toStartOf="@id/button_query" + app:layout_constraintStart_toStartOf="parent" + android:imeOptions="actionSearch" + android:inputType="text" + app:layout_constraintTop_toTopOf="parent" /> + + <Button + android:id="@+id/button_query" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/recycler_view" + app:layout_constraintStart_toEndOf="@id/tiet_query" + android:text="@string/search" + /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_view" + android:layout_width="0dp" + android:layout_height="0dp" + android:scrollbars="vertical" + app:layout_constraintBottom_toTopOf="@+id/button_home" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tiet_query" + tools:listitem="@layout/item_layout" /> + + <Button + android:id="@+id/button_home" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/home" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/top_anime_page.xml b/app/src/main/res/layout/top_anime_page.xml index 4b6a58f..633e5f4 100644 --- a/app/src/main/res/layout/top_anime_page.xml +++ b/app/src/main/res/layout/top_anime_page.xml @@ -1,22 +1,36 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".topanime.TopAnimePage" - android:background="@color/very_dark_purple"> + android:background="@color/very_dark_purple" + tools:context=".presentation.view.anime.TopAnimePage"> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recycler_view" - android:layout_width="0dp" - android:layout_height="0dp" - app:layout_constraintBottom_toTopOf="@+id/button_home" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:listitem="@layout/item_layout" /> + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/swiperefresh" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_view" + android:layout_width="0dp" + android:layout_height="0dp" + android:scrollbars="vertical" + app:layout_constraintBottom_toTopOf="@+id/button_home" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:listitem="@layout/item_layout" /> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + + <Button + android:id="@+id/button_prev" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/prev" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/button_home" /> <Button android:id="@+id/button_home" @@ -25,7 +39,14 @@ android:text="@string/home" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - /> + app:layout_constraintStart_toStartOf="parent" /> + + <Button + android:id="@+id/button_next" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/next" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/button_home" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/top_manga_page.xml b/app/src/main/res/layout/top_manga_page.xml index 95c9161..6bb911b 100644 --- a/app/src/main/res/layout/top_manga_page.xml +++ b/app/src/main/res/layout/top_manga_page.xml @@ -1,22 +1,36 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".topmanga.TopMangaPage" - android:background="@color/very_dark_purple"> + android:background="@color/very_dark_purple" + tools:context=".presentation.view.manga.TopMangaPage"> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recycler_view" - android:layout_width="0dp" - android:layout_height="0dp" - app:layout_constraintBottom_toTopOf="@+id/button_home" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:listitem="@layout/item_layout" /> + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/swiperefresh" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_view" + android:layout_width="0dp" + android:layout_height="0dp" + android:scrollbars="vertical" + app:layout_constraintBottom_toTopOf="@+id/button_home" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:listitem="@layout/item_layout" /> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + + <Button + android:id="@+id/button_prev" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/prev" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/button_home" /> <Button android:id="@+id/button_home" @@ -25,7 +39,14 @@ android:text="@string/home" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - /> + app:layout_constraintStart_toStartOf="parent" /> + + <Button + android:id="@+id/button_next" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/next" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/button_home" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml deleted file mode 100644 index 4d1a64f..0000000 --- a/app/src/main/res/menu/menu_main.xml +++ /dev/null @@ -1,10 +0,0 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - tools:context="xyz.adjutor.aniki.MainActivity"> - <item - android:id="@+id/action_settings" - android:orderInCategory="100" - android:title="@string/action_settings" - app:showAsAction="never" /> -</menu>
\ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differindex 0fce361..f455466 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differindex 5429d13..8c80415 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differindex 7f6c2ad..dffa9de 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differindex 735ecf0..85122da 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differindex b994dd7..1a34a8f 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differindex baa9a61..c49deab 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differindex 3ead759..af69e12 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differindex 26fa079..f56b5b8 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differindex efdcdac..b25aedf 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differindex 14126a1..fa73bbd 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differindex 698f5ff..5757f58 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differindex ba6ab2e..0acc8b4 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differindex 5524755..af4bdc6 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differindex a4ef2dc..af2b644 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differindex e4a88ec..64170bb 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 132de49..63639d8 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -7,7 +7,7 @@ <fragment android:id="@+id/HomePage" - android:name="xyz.adjutor.aniki.HomePage" + android:name="xyz.adjutor.aniki.presentation.view.HomePage" android:label="@string/home_page_label" tools:layout="@layout/home_page"> @@ -17,12 +17,18 @@ <action android:id="@+id/action_HomePage_to_TopAnimePage" app:destination="@id/TopAnimePage" /> + <action + android:id="@+id/action_HomePage_to_SearchMangaPage" + app:destination="@id/SearchMangaPage" /> + <action + android:id="@+id/action_HomePage_to_SearchAnimePage" + app:destination="@id/SearchAnimePage" /> </fragment> <fragment android:id="@+id/TopMangaPage" - android:name="xyz.adjutor.aniki.topmanga.TopMangaPage" + android:name="xyz.adjutor.aniki.presentation.view.manga.TopMangaPage" android:label="@string/top_manga_page_label" tools:layout="@layout/top_manga_page"> @@ -32,7 +38,7 @@ </fragment> <fragment android:id="@+id/TopAnimePage" - android:name="xyz.adjutor.aniki.topanime.TopAnimePage" + android:name="xyz.adjutor.aniki.presentation.view.anime.TopAnimePage" android:label="@string/top_anime_page_label" tools:layout="@layout/top_anime_page"> @@ -40,5 +46,25 @@ android:id="@+id/action_TopAnimePage_to_HomePage" app:destination="@id/HomePage" /> </fragment> + <fragment + android:id="@+id/SearchMangaPage" + android:name="xyz.adjutor.aniki.presentation.view.manga.SearchMangaPage" + android:label="@string/search_manga_page_label" + tools:layout="@layout/search_manga_page"> + + <action + android:id="@+id/action_SearchMangaPage_to_HomePage" + app:destination="@id/HomePage" /> + </fragment> + <fragment + android:id="@+id/SearchAnimePage" + android:name="xyz.adjutor.aniki.presentation.view.anime.SearchAnimePage" + android:label="@string/search_anime_page_label" + tools:layout="@layout/search_anime_page"> + + <action + android:id="@+id/action_SearchAnimePage_to_HomePage" + app:destination="@id/HomePage" /> + </fragment> </navigation>
\ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 95a118e..caca611 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,13 +3,12 @@ <color name="purple_200">#FFBB86FC</color> <color name="purple_500">#FF6200EE</color> <color name="purple_700">#FF3700B3</color> - <color name="teal_200">#FF03DAC5</color> - <color name="teal_700">#FF018786</color> <color name="black">#FF000000</color> <color name="white">#FFFFFFFF</color> <color name="very_dark_purple">#09022A</color> <color name="very_light_magenta">#FF70FF</color> <color name="strong_pink">#D52C70</color> - <color name="slightly_desaturated_magenta">#c583b6</color> + <color name="slightly_desaturated_magenta">#C583B6</color> + <color name="grayish_magenta">#C9A6C9</color> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bb9520a..861a440 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,4 +36,13 @@ <string name="text_episodes">"Episodes "</string> <string name="episodes">0000</string> + <string name="search_manga_page_label">Search Manga Page</string> + <string name="search_manga">Search Manga</string> + <string name="search">Search in the database</string> + <string name="search_anime">Search Anime</string> + <string name="search_anime_page_label">Search Anime Page</string> + <string name="hint_query">Your query …</string> + <string name="prev">PREV</string> + <string name="next">NEXT</string> + </resources>
\ No newline at end of file diff --git a/build.gradle b/build.gradle index ef7bd27..cd9f6d3 100644 --- a/build.gradle +++ b/build.gradle @@ -3,10 +3,10 @@ buildscript { ext.kotlin_version = "1.3.72" repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.1.2" + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -17,7 +17,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 356bc93..3d9a37e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip |
