From 42233afdfd21b43305540038b7f469e2da2e7490 Mon Sep 17 00:00:00 2001 From: CesPaul PC Date: Wed, 25 Sep 2019 18:34:49 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D1=83?= =?UTF-8?q?=D0=B7=D0=BA=D0=B0=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BE?= =?UTF-8?q?=D0=BA=20=D1=81=20=D1=81=D0=B5=D1=82=D0=B8.=20=D0=94=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=80=D0=B0=D0=B7=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=20=D1=8D=D0=BB=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B2=20=D1=81=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../injection/component/PresenterInjector.kt | 2 - .../java/com/cespaul/testjob/model/News.kt | 4 +- .../com/cespaul/testjob/ui/SplashActivity.kt | 2 +- .../cespaul/testjob/ui/news/NewsActivity.kt | 8 ++-- .../cespaul/testjob/ui/news/NewsAdapter.kt | 6 ++- .../cespaul/testjob/ui/news/NewsPresenter.kt | 1 - .../com/cespaul/testjob/ui/news/NewsView.kt | 2 +- app/src/main/res/layout/news_row.xml | 43 +++++++++++-------- 9 files changed, 40 insertions(+), 32 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a0d75a1..ae19f0b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,8 +44,8 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.6.1' implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.1' implementation "com.squareup.retrofit2:converter-moshi:2.6.1" - //Picasso pics - implementation 'com.squareup.picasso:picasso:2.71828' + //Fresco pics + implementation 'com.facebook.fresco:fresco:1.10.0' // Custom Toasts implementation 'com.github.GrenderG:Toasty:1.4.2' diff --git a/app/src/main/java/com/cespaul/testjob/injection/component/PresenterInjector.kt b/app/src/main/java/com/cespaul/testjob/injection/component/PresenterInjector.kt index b9fd9b8..cca1b79 100644 --- a/app/src/main/java/com/cespaul/testjob/injection/component/PresenterInjector.kt +++ b/app/src/main/java/com/cespaul/testjob/injection/component/PresenterInjector.kt @@ -1,13 +1,11 @@ package com.cespaul.testjob.injection.component -import android.content.Context import com.cespaul.testjob.base.BaseView import com.cespaul.testjob.injection.module.ContextModule import com.cespaul.testjob.injection.module.NetworkModule import com.cespaul.testjob.ui.news.NewsPresenter import dagger.BindsInstance import dagger.Component -import dagger.Module import javax.inject.Singleton diff --git a/app/src/main/java/com/cespaul/testjob/model/News.kt b/app/src/main/java/com/cespaul/testjob/model/News.kt index 914ac18..9b48ac2 100644 --- a/app/src/main/java/com/cespaul/testjob/model/News.kt +++ b/app/src/main/java/com/cespaul/testjob/model/News.kt @@ -1,13 +1,11 @@ package com.cespaul.testjob.model -import com.google.gson.annotations.SerializedName - data class News( val title: String, val description: String, val url: String, val publishDate: String, - val urlToImage: String, + val thumbnailUrl: String, val publishedAt: String ) diff --git a/app/src/main/java/com/cespaul/testjob/ui/SplashActivity.kt b/app/src/main/java/com/cespaul/testjob/ui/SplashActivity.kt index fe96aa5..6f1d8b1 100644 --- a/app/src/main/java/com/cespaul/testjob/ui/SplashActivity.kt +++ b/app/src/main/java/com/cespaul/testjob/ui/SplashActivity.kt @@ -1,8 +1,8 @@ package com.cespaul.testjob.ui import android.content.Intent -import android.support.v7.app.AppCompatActivity; import android.os.Bundle +import android.support.v7.app.AppCompatActivity import com.cespaul.testjob.R import com.cespaul.testjob.ui.news.NewsActivity diff --git a/app/src/main/java/com/cespaul/testjob/ui/news/NewsActivity.kt b/app/src/main/java/com/cespaul/testjob/ui/news/NewsActivity.kt index 9400b7b..892e009 100644 --- a/app/src/main/java/com/cespaul/testjob/ui/news/NewsActivity.kt +++ b/app/src/main/java/com/cespaul/testjob/ui/news/NewsActivity.kt @@ -1,15 +1,14 @@ package com.cespaul.testjob.ui.news import android.app.ProgressDialog -import android.databinding.DataBindingUtil import android.os.Bundle import android.support.v7.widget.DividerItemDecoration import android.support.v7.widget.LinearLayoutManager import android.widget.Toast import com.cespaul.testjob.R -import com.cespaul.testjob.model.News import com.cespaul.testjob.base.BaseActivity -import com.cespaul.testjob.utils.setDividerItemDecoration +import com.cespaul.testjob.model.News +import com.facebook.drawee.backends.pipeline.Fresco import es.dmoral.toasty.Toasty import kotlinx.android.synthetic.main.activity_news.* @@ -21,9 +20,12 @@ class NewsActivity : BaseActivity(), NewsView { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + Fresco.initialize(this) setContentView(R.layout.activity_news) newsRecycler.adapter = newsAdapter newsRecycler.layoutManager = layoutManager + newsRecycler.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL)) + presenter.onViewCreated() } diff --git a/app/src/main/java/com/cespaul/testjob/ui/news/NewsAdapter.kt b/app/src/main/java/com/cespaul/testjob/ui/news/NewsAdapter.kt index b559be1..4e3928c 100644 --- a/app/src/main/java/com/cespaul/testjob/ui/news/NewsAdapter.kt +++ b/app/src/main/java/com/cespaul/testjob/ui/news/NewsAdapter.kt @@ -8,7 +8,7 @@ import android.view.ViewGroup import android.widget.TextView import com.cespaul.testjob.R import com.cespaul.testjob.model.News -import kotlinx.android.synthetic.main.news_row.* +import com.facebook.drawee.view.SimpleDraweeView import kotlinx.android.synthetic.main.news_row.view.* @@ -29,7 +29,7 @@ class NewsAdapter(private val context: Context) : RecyclerView.Adapter){ @@ -40,9 +40,11 @@ class NewsAdapter(private val context: Context) : RecyclerView.Adapter) diff --git a/app/src/main/res/layout/news_row.xml b/app/src/main/res/layout/news_row.xml index 7e2314b..25ede0e 100644 --- a/app/src/main/res/layout/news_row.xml +++ b/app/src/main/res/layout/news_row.xml @@ -1,5 +1,5 @@ - + - + - + + + android:layout_height="wrap_content" + android:layout_gravity="right" + android:layout_marginLeft="8dp" + android:foregroundGravity="right" + android:gravity="right" + android:text="Date" + android:visibility="invisible" />