From 6cb3f47ae49f828a185a3647e2d881a7e07e1fd4 Mon Sep 17 00:00:00 2001
From: GeorgCantor <cupsman1986@gmail.com>
Date: Sun, 12 Jul 2020 16:41:14 +0300
Subject: [PATCH] added Images to news, fixed code style

---
 app/build.gradle                              |  4 ++
 .../androiddevs/newsflash/data/NewsError.kt   |  3 +-
 .../androiddevs/newsflash/data/NewsResult.kt  |  9 ++---
 .../androiddevs/newsflash/data/NewsSources.kt |  6 +--
 .../newsflash/repository/NewsApiService.kt    | 12 +++---
 .../newsflash/view/MainActivity.kt            | 11 +-----
 .../view/adapter/HomeNewsRecyelerAdapter.kt   | 15 ++++++--
 .../newsflash/view/fragments/HomeFragment.kt  |  1 -
 app/src/main/res/layout/activity_main.xml     |  6 ++-
 app/src/main/res/layout/fragment_home.xml     | 13 +++++--
 app/src/main/res/layout/home_news_row.xml     | 37 ++++++++++++-------
 11 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c339f69..abb1ba8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,6 +64,10 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
     implementation "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
 
+    // GLIDE
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+
     // TESTING
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.12'
diff --git a/app/src/main/java/com/androiddevs/newsflash/data/NewsError.kt b/app/src/main/java/com/androiddevs/newsflash/data/NewsError.kt
index 257a110..3500441 100644
--- a/app/src/main/java/com/androiddevs/newsflash/data/NewsError.kt
+++ b/app/src/main/java/com/androiddevs/newsflash/data/NewsError.kt
@@ -2,8 +2,7 @@ package com.androiddevs.newsflash.data
 
 import com.google.gson.annotations.SerializedName
 
-object NewsError
-{
+object NewsError {
     data class Error(
         @SerializedName("status")
         val status: String,
diff --git a/app/src/main/java/com/androiddevs/newsflash/data/NewsResult.kt b/app/src/main/java/com/androiddevs/newsflash/data/NewsResult.kt
index 7418dc8..2ea779f 100644
--- a/app/src/main/java/com/androiddevs/newsflash/data/NewsResult.kt
+++ b/app/src/main/java/com/androiddevs/newsflash/data/NewsResult.kt
@@ -2,8 +2,7 @@ package com.androiddevs.newsflash.data
 
 import com.google.gson.annotations.SerializedName
 
-object NewsResult
-{
+object NewsResult {
 
     data class News(
         @SerializedName("status")
@@ -12,8 +11,7 @@ object NewsResult
         val totalResults: Int,
         @SerializedName("articles")
         val articles: List<Article>
-    )
-    {
+    ) {
         data class Article(
             @SerializedName("source")
             val source: Source,
@@ -31,8 +29,7 @@ object NewsResult
             val publishedAt: String,
             @SerializedName("content")
             val content: String
-        )
-        {
+        ) {
             data class Source(
                 @SerializedName("id")
                 val id: String,
diff --git a/app/src/main/java/com/androiddevs/newsflash/data/NewsSources.kt b/app/src/main/java/com/androiddevs/newsflash/data/NewsSources.kt
index a3b34b8..a0cbb38 100644
--- a/app/src/main/java/com/androiddevs/newsflash/data/NewsSources.kt
+++ b/app/src/main/java/com/androiddevs/newsflash/data/NewsSources.kt
@@ -2,16 +2,14 @@ package com.androiddevs.newsflash.data
 
 import com.google.gson.annotations.SerializedName
 
-object NewsSources
-{
+object NewsSources {
 
     data class Sources(
         @SerializedName("status")
         val status: String,
         @SerializedName("sources")
         val sources: List<Source>
-    )
-    {
+    ) {
         data class Source(
             @SerializedName("id")
             val id: String,
diff --git a/app/src/main/java/com/androiddevs/newsflash/repository/NewsApiService.kt b/app/src/main/java/com/androiddevs/newsflash/repository/NewsApiService.kt
index d7ef33f..f12c6af 100644
--- a/app/src/main/java/com/androiddevs/newsflash/repository/NewsApiService.kt
+++ b/app/src/main/java/com/androiddevs/newsflash/repository/NewsApiService.kt
@@ -37,16 +37,17 @@ interface NewsApiService {
     @GET("everything")
     fun getEverything(
         @Query("q") keyword: String,
-        @Query("qInTitle") keyWordInArtcile : String,
+        @Query("qInTitle") keyWordInArtcile: String,
         @Query("sources") sources: String,
         @Query("domains") domain: String,
         @Query("excludeDomains") excludeDomains: String,
         @Query("from") from: String,
         @Query("to") to: String,
-        @Query("language") language:String,
-        @Query("sortBy") sortBy:String,
+        @Query("language") language: String,
+        @Query("sortBy") sortBy: String,
         @Query("pageSize") pageSize: Int,
-        @Query("page") page: Int):Observable<NewsResult.News>
+        @Query("page") page: Int
+    ): Observable<NewsResult.News>
 
 
     companion object {
@@ -81,12 +82,9 @@ interface NewsApiService {
                 .client(okHttpClient)
                 .build()
 
-
             return retrofit.create(NewsApiService::class.java)
-
         }
 
     }
 
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/androiddevs/newsflash/view/MainActivity.kt b/app/src/main/java/com/androiddevs/newsflash/view/MainActivity.kt
index 85370ea..b9873b0 100644
--- a/app/src/main/java/com/androiddevs/newsflash/view/MainActivity.kt
+++ b/app/src/main/java/com/androiddevs/newsflash/view/MainActivity.kt
@@ -9,17 +9,10 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 
-class MainActivity : AppCompatActivity()
-{
+class MainActivity : AppCompatActivity() {
 
-    override fun onCreate(savedInstanceState: Bundle?)
-    {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-
-
-
-
-
     }
 }
diff --git a/app/src/main/java/com/androiddevs/newsflash/view/adapter/HomeNewsRecyelerAdapter.kt b/app/src/main/java/com/androiddevs/newsflash/view/adapter/HomeNewsRecyelerAdapter.kt
index 8d473c4..080925f 100644
--- a/app/src/main/java/com/androiddevs/newsflash/view/adapter/HomeNewsRecyelerAdapter.kt
+++ b/app/src/main/java/com/androiddevs/newsflash/view/adapter/HomeNewsRecyelerAdapter.kt
@@ -1,14 +1,14 @@
 package com.androiddevs.newsflash.view.adapter
 
-
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.androiddevs.newsflash.R
 import com.androiddevs.newsflash.data.NewsResult
 import com.androiddevs.newsflash.databinding.HomeNewsRowBinding
-
+import com.bumptech.glide.Glide
 
 class HomeNewsRecyelerAdapter(private var newsList: ArrayList<NewsResult.News.Article>) :
     RecyclerView.Adapter<HomeNewsRecyelerAdapter.ViewHolder>() {
@@ -32,12 +32,19 @@ class HomeNewsRecyelerAdapter(private var newsList: ArrayList<NewsResult.News.Ar
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val newsArticle = newsList[position]
         holder.bind(newsArticle)
+
+        Glide.with(holder.itemView.context)
+            .load(newsArticle.urlToImage)
+            .into(holder.image)
     }
+
     class ViewHolder(binding: HomeNewsRowBinding) : RecyclerView.ViewHolder(binding.root) {
         private var binding: HomeNewsRowBinding? = binding
 
-        fun bind(obj: NewsResult.News.Article){
-            binding!!.setVariable(com.androiddevs.newsflash.BR.news,obj)
+        val image: ImageView = binding.image
+
+        fun bind(obj: NewsResult.News.Article) {
+            binding!!.setVariable(com.androiddevs.newsflash.BR.news, obj)
         }
 
     }
diff --git a/app/src/main/java/com/androiddevs/newsflash/view/fragments/HomeFragment.kt b/app/src/main/java/com/androiddevs/newsflash/view/fragments/HomeFragment.kt
index 90d45f3..f5a3396 100644
--- a/app/src/main/java/com/androiddevs/newsflash/view/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/androiddevs/newsflash/view/fragments/HomeFragment.kt
@@ -53,5 +53,4 @@ class HomeFragment : Fragment() {
         return homeBinding.root
     }
 
-
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3c27338..8883dba 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,16 +2,20 @@
 <layout 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">
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".view.MainActivity">
+
         <fragment
             android:id="@+id/fragment_main"
             android:name="androidx.navigation.fragment.NavHostFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:defaultNavHost="true"
-            app:navGraph="@navigation/navigation_graph"/>
+            app:navGraph="@navigation/navigation_graph" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index fb5ab35..3695d62 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".view.fragments.HomeFragment">
-<androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/homeRecyclerView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/homeRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/home_news_row" />
+
     </FrameLayout>
+
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/home_news_row.xml b/app/src/main/res/layout/home_news_row.xml
index a3351ff..56ea355 100644
--- a/app/src/main/res/layout/home_news_row.xml
+++ b/app/src/main/res/layout/home_news_row.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-<data>
-    <variable
-        name="news"
-        type="com.androiddevs.newsflash.data.NewsResult.News.Article" />
-</data>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="news"
+            type="com.androiddevs.newsflash.data.NewsResult.News.Article" />
+    </data>
+
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -16,30 +19,38 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
             <TextView
                 android:id="@+id/textView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
                 android:text="@{news.title}"
-                android:textStyle="bold"
-                android:textSize="20sp"
                 android:textColor="@android:color/black"
+                android:textSize="20sp"
+                android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toBottomOf="@+id/image" />
 
             <TextView
                 android:id="@+id/textView2"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
                 android:text="@{(news.author.length>0)? news.author : @string/unknown_value}"
-                android:textSize="18sp"
                 android:textColor="@android:color/black"
+                android:textSize="18sp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textView" />