From 1eb274dcaaf1ee5f79505da935afcd89856e21fd Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Sat, 20 Feb 2021 16:43:50 +0100 Subject: Implementation of Glide. Replace the current way by Glide for more stability. Also allows to keep the images with sharedpreferences. --- app/build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 4a23638..4dd9f20 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,8 +48,8 @@ dependencies { //Recycleview implementation "androidx.recyclerview:recyclerview:1.1.0" //Retrofit - implementation 'com.squareup.retrofit2:retrofit:2.6.0' - implementation 'com.squareup.retrofit2:converter-gson:2.6.0' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.9.0' // Required for local unit tests (JUnit 4 framework) testImplementation 'junit:junit:4.13.2' @@ -58,5 +58,8 @@ dependencies { androidTestImplementation 'com.android.support:support-annotations:28.0.0' androidTestImplementation 'com.android.support.test:runner:1.0.2' + //to display images + implementation 'com.github.bumptech.glide:glide:4.12.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' } \ No newline at end of file -- cgit v1.2.3 From 496eff5e9bf0380253594ddf37a5743f6d250562 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Sat, 20 Feb 2021 18:10:38 +0100 Subject: Intents now working for top mangas --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 11 ++++- .../aniki/topmanga/DetailTopMangaActivity.kt | 36 +++++++++++++++ .../xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt | 22 ++++++++- .../main/res/layout/activity_detail_top_manga.xml | 54 ++++++++++++++++++++++ app/src/main/res/layout/item_layout.xml | 9 ++-- app/src/main/res/values/strings.xml | 8 ++-- 7 files changed, 129 insertions(+), 12 deletions(-) create mode 100644 app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt create mode 100644 app/src/main/res/layout/activity_detail_top_manga.xml (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 4dd9f20..fb76368 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,6 +34,7 @@ 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' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 105fdfd..5316b25 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,9 @@ - + + android:theme="@style/Theme.Aniki" + tools:ignore="AllowBackup"> + + diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt new file mode 100644 index 0000000..61c5b14 --- /dev/null +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt @@ -0,0 +1,36 @@ +package xyz.adjutor.aniki.topmanga + +import android.os.Bundle +import android.widget.Button +import android.widget.ImageView +import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity +import androidx.navigation.fragment.NavHostFragment.findNavController +import androidx.navigation.fragment.findNavController +import com.bumptech.glide.Glide +import xyz.adjutor.aniki.R + +class DetailTopMangaActivity : AppCompatActivity() { + + private val currentMangaTitle: String = "themangatitle" + val currentMangaRank: String = "themangarank" + val currentMangaScore: String = "themangascore" + val currentMangaImageUrl: String = "themangaimageurl" + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_detail_top_manga) + + val mangaTitle = intent.getStringExtra(currentMangaTitle) + val mangaRank = intent.getStringExtra(currentMangaRank) + val mangaScore = intent.getStringExtra(currentMangaScore) + + 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) + + tvTitle.text = mangaTitle + tvRank.text = mangaRank + tvScore.text = mangaScore + } +} \ 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/topmanga/TopMangaAdapter.kt index f5a2bd2..2eaf958 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/TopMangaAdapter.kt @@ -2,11 +2,13 @@ package xyz.adjutor.aniki.topmanga +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 @@ -21,6 +23,8 @@ class TopMangaAdapter(val mangaList: List) : 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 @@ -42,12 +46,28 @@ class TopMangaAdapter(val mangaList: List) : holder.mangaTitle.text = currentManga.title holder.mangaRank.text = currentManga.rank.toString() holder.mangaScore.text = currentManga.score.toString() - val image : String = currentManga.image_url.toString() + val image: String = currentManga.image_url.toString() Glide .with(holder.itemView.context) .load(image) .apply(RequestOptions().override(400)) .into(holder.mangaImage) + + //to go to a detail page of the selected manga + holder.cardview.setOnClickListener { + val currentMangaTitle = "themangatitle" + val currentMangaRank = "themangarank" + val currentMangaScore = "themangascore" + val currentMangaImageUrl = "themangaimageurl" + + val intent: Intent = Intent(holder.itemView.context, DetailTopMangaActivity::class.java).apply { + putExtra(currentMangaTitle, currentManga.title) + putExtra(currentMangaRank, currentManga.rank.toString()) + putExtra(currentMangaScore, currentManga.score.toString()) + putExtra(currentMangaImageUrl, currentManga.image_url.toString()) + } + holder.itemView.context.startActivity(intent) + } } } diff --git a/app/src/main/res/layout/activity_detail_top_manga.xml b/app/src/main/res/layout/activity_detail_top_manga.xml new file mode 100644 index 0000000..3e74697 --- /dev/null +++ b/app/src/main/res/layout/activity_detail_top_manga.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml index 5ef1c19..f904109 100644 --- a/app/src/main/res/layout/item_layout.xml +++ b/app/src/main/res/layout/item_layout.xml @@ -10,7 +10,6 @@ android:foreground="?selectableItemBackground" app:cardBackgroundColor="@color/black" app:cardCornerRadius="13dp"> - News Page Article Page Top Manga Page - Title - 0 - image + Title + 0 + image Image of manga Top Anime Page Top Anime - 00.00 + 00.00 \ No newline at end of file -- cgit v1.2.3 From 8e2f9e71a8b5ca3c978007da5c6db59491349d84 Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Mon, 22 Feb 2021 01:25:50 +0100 Subject: Text justified and constrained better. --- app/build.gradle | 7 ++++--- .../xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt | 4 ---- app/src/main/res/layout/activity_detail_top_manga.xml | 13 +++++++------ 3 files changed, 11 insertions(+), 13 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index fb76368..1e612ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,9 +46,10 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - //Recycleview + //Recycleview for lists implementation "androidx.recyclerview:recyclerview:1.1.0" - //Retrofit + + //Retrofit for REST APIs implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' @@ -59,7 +60,7 @@ dependencies { androidTestImplementation 'com.android.support:support-annotations:28.0.0' androidTestImplementation 'com.android.support.test:runner:1.0.2' - //to display images + //Glide to display images properly implementation 'com.github.bumptech.glide:glide:4.12.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt index 5749071..1863815 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt @@ -1,14 +1,10 @@ package xyz.adjutor.aniki.topmanga -import android.content.Context import android.os.Bundle -import android.view.View import android.widget.ImageView import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions import com.google.gson.GsonBuilder 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 ffb9791..f5ce8b9 100644 --- a/app/src/main/res/layout/activity_detail_top_manga.xml +++ b/app/src/main/res/layout/activity_detail_top_manga.xml @@ -218,12 +218,12 @@ android:id="@+id/tv_synopsis" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:justificationMode="inter_word" android:text="@string/synopsis" android:textColor="@color/slightly_desaturated_magenta" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_text_synopsis"/> + app:layout_constraintTop_toBottomOf="@id/tv_text_synopsis" + tools:targetApi="o" /> @@ -248,16 +248,17 @@ android:textColor="@color/strong_pink" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> + + app:layout_constraintTop_toBottomOf="@id/tv_text_background" + tools:targetApi="o" /> -- cgit v1.2.3 From 9ee5918fa86da6c160145498b1a95f4f4a083fdc Mon Sep 17 00:00:00 2001 From: Clyhtsuriva Date: Mon, 22 Feb 2021 14:25:15 +0100 Subject: Sharedpreference now working for the DetailTopMangaActivity.kt --- app/build.gradle | 1 - .../xyz/adjutor/aniki/manga/RestMangaResponse.kt | 4 ++- .../aniki/topmanga/DetailTopMangaActivity.kt | 41 ++++++++++++++++++++-- 3 files changed, 41 insertions(+), 5 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 1e612ce..d1d101c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,6 @@ 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' diff --git a/app/src/main/java/xyz/adjutor/aniki/manga/RestMangaResponse.kt b/app/src/main/java/xyz/adjutor/aniki/manga/RestMangaResponse.kt index 7a4aff9..00b0dce 100644 --- a/app/src/main/java/xyz/adjutor/aniki/manga/RestMangaResponse.kt +++ b/app/src/main/java/xyz/adjutor/aniki/manga/RestMangaResponse.kt @@ -2,8 +2,10 @@ package xyz.adjutor.aniki.manga import com.google.gson.annotations.SerializedName -class RestMangaResponse{ //only kept the infos I didnt have and that were interresting to me. +class RestMangaResponse{ //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") diff --git a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt index 1863815..32e3457 100644 --- a/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt +++ b/app/src/main/java/xyz/adjutor/aniki/topmanga/DetailTopMangaActivity.kt @@ -1,5 +1,7 @@ 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 @@ -8,6 +10,7 @@ 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 @@ -16,10 +19,12 @@ 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() @@ -38,6 +43,8 @@ class DetailTopMangaActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_detail_top_manga) + sharedPreferences = this.getSharedPreferences("app_aniki", Context.MODE_PRIVATE) + val mangaId = intent.getStringExtra(intentMangaId) val mangaTitle = intent.getStringExtra(intentMangaTitle) val mangaRank = intent.getStringExtra(intentMangaRank) @@ -83,8 +90,26 @@ class DetailTopMangaActivity : AppCompatActivity() { fieldIsNull() } - //taking the API's fields I want and displaying them - makeApiCall(baseUrl, mangaId.toString()) + 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) + + if(jsonManga == null) { + return null + } else { + val type: Type = object : TypeToken() {}.type + return gson.fromJson(jsonManga, type) + } } private fun makeApiCall(BASE_URL: String, mangaId: String) { @@ -95,13 +120,14 @@ class DetailTopMangaActivity : AppCompatActivity() { .build() val service = retrofit.create(MangaApi::class.java) - val call = service.getMangaData(mangaId) + val call = service.getMangaData(mangaId) //based on the id call.enqueue(object : Callback { override fun onResponse(call: Call, response: Response) { 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 { @@ -144,4 +170,13 @@ class DetailTopMangaActivity : AppCompatActivity() { 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 -- cgit v1.2.3