Feature/ex 3

app/build.gradle

@@ -27,16 +27,15 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.cardview:cardview:$androidx_version"
     implementation project(":delegateadapter")
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'com.google.android.material:material:1.1.0-alpha01'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation "androidx.recyclerview:recyclerview:$androidx_version"
     implementation 'com.github.bumptech.glide:glide:4.8.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.0.1'
 }

app/src/main/java/ru/nikijava/androidacademynewsapp/presentation/news/details/NewsDetailsActivity.java

@@ -21,7 +21,7 @@
 public class NewsDetailsActivity extends AppCompatActivity {
 
     private static String NEWS_KEY = "news_key";
-    private final DateFormatter dateFormatter = new DateFormatter();
+    private static final DateFormatter dateFormatter = new DateFormatter();
 
     private News news;
 

app/src/main/res/layout/activity_news_details.xml

@@ -31,9 +31,6 @@
                 android:layout_height="200dp"
                 android:contentDescription="@string/content_description_image_for_news"
                 android:scaleType="centerCrop"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
                 tools:srcCompat="@tools:sample/avatars[0]"
                 />
 
@@ -73,10 +70,6 @@
                 android:layout_marginTop="@dimen/spacing_normal"
                 android:layout_marginEnd="@dimen/spacing_normal"
                 android:textAppearance="@style/TextAppearance.Details.Title"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/ivImage"
                 tools:text="Create your NewsItem XML layout"
                 />
             <TextView
@@ -87,10 +80,6 @@
                 android:layout_marginTop="@dimen/spacing_normal"
                 android:layout_marginEnd="@dimen/spacing_normal"
                 android:textAppearance="@style/TextAppearance.Details.Date"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvTitle"
                 tools:text="Вчера"
                 />
             <TextView
@@ -102,9 +91,6 @@
                 android:layout_marginEnd="@dimen/spacing_normal"
                 android:layout_marginBottom="@dimen/spacing_normal"
                 android:textAppearance="@style/TextAppearance.Details.Text"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvDate"
                 tools:text="Your XML layout should show News category, title, preview text, published date and heading image"
                 />
         </LinearLayout>

app/src/main/res/layout/activity_news_list.xml

@@ -14,7 +14,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
-        android:contentDescription="@string/content_description_image_for_news"
         android:orientation="vertical"
         android:padding="@dimen/spacing_micro"
         tools:context=".presentation.news.list.NewsListActivity"

app/src/main/res/layout/item_news_big.xml

@@ -45,7 +45,7 @@
             android:id="@+id/tvTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="#b4c6c5c5"
+            android:background="@color/background_transparent_grey"
             android:lines="2"
             android:paddingStart="@dimen/spacing_normal"
             android:paddingTop="@dimen/spacing_micro"

app/src/main/res/values/colors.xml

@@ -4,4 +4,5 @@
     <color name="colorPrimaryDark">#ffd4a515</color>
     <color name="colorAccent">#ff962326</color>
     <color name="window_background">?android:attr/colorBackground</color>
+    <color name="background_transparent_grey">#b4c6c5c5</color>
 </resources>

build.gradle

@@ -2,16 +2,15 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.2.71'
         glide_version = '4.8.0'
+        androidx_version = '1.0.0'
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

delegateadapter/src/main/java/ru/nikijava/adapterdelegate/CompositeDelegateAdapter.java

@@ -3,11 +3,11 @@
 import android.view.ViewGroup;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import androidx.annotation.NonNull;
+import androidx.collection.ArrayMap;
 import androidx.recyclerview.widget.RecyclerView;
 
 public class CompositeDelegateAdapter<T>
@@ -78,7 +78,7 @@ public static class Builder<T> {
         private int count;
 
         public Builder() {
-            typeToAdapterMap = new HashMap<>();
+            typeToAdapterMap = new ArrayMap<>();
         }
 
         public Builder<T> add(@NonNull final IDelegateAdapter<?, ? extends T> delegateAdapter) {