From 396f7dfb5aa4bb9833020d3fe1a9107cbc0f8897 Mon Sep 17 00:00:00 2001
From: Avior <florian.bouillon@delta-wings.net>
Date: Fri, 19 Feb 2021 17:08:47 +0100
Subject: [PATCH] Page 1

Signed-off-by: Avior <florian.bouillon@delta-wings.net>
---
 app/build.gradle                              |  27 +++--
 .../1.json                                    |  64 +++++++++++
 app/src/main/AndroidManifest.xml              |   6 +-
 .../com/example/ca_contest/CountryAdapter.kt  |  40 -------
 .../ca_contest/CountrySelectorActivity.kt     |   3 +-
 .../example/ca_contest/ListCountryActivity.kt |  61 -----------
 .../com/example/ca_contest/MainActivity.kt    |  44 ++++++--
 .../adapters/HomepageCountryAdapter.kt        |  65 +++++++++++
 .../com/example/ca_contest/dao/AppDatabase.kt |   4 +-
 .../example/ca_contest/{ => dao}/Country.kt   |   8 +-
 .../com/example/ca_contest/dao/CountryDAO.kt  |   1 -
 .../com/example/ca_contest/libs/Converters.kt |  16 +++
 app/src/main/res/drawable/border_bottom.xml   |  16 +++
 .../res/layout/activity_country_selector.xml  |  20 ++--
 .../main/res/layout/activity_list_country.xml |  36 -------
 app/src/main/res/layout/activity_main.xml     |  34 +++---
 .../main/res/layout/country_selector_item.xml |  19 +++-
 app/src/main/res/layout/item_list.xml         | 101 +++++++++++++-----
 app/src/main/res/navigation/nav_graph.xml     |  28 -----
 app/src/main/res/values/colors.xml            |   3 +
 20 files changed, 343 insertions(+), 253 deletions(-)
 create mode 100644 app/schemas/com.example.ca_contest.dao.AppDatabase/1.json
 delete mode 100644 app/src/main/java/com/example/ca_contest/CountryAdapter.kt
 delete mode 100644 app/src/main/java/com/example/ca_contest/ListCountryActivity.kt
 create mode 100644 app/src/main/java/com/example/ca_contest/adapters/HomepageCountryAdapter.kt
 rename app/src/main/java/com/example/ca_contest/{ => dao}/Country.kt (70%)
 create mode 100644 app/src/main/java/com/example/ca_contest/libs/Converters.kt
 create mode 100644 app/src/main/res/drawable/border_bottom.xml
 delete mode 100644 app/src/main/res/layout/activity_list_country.xml
 delete mode 100644 app/src/main/res/navigation/nav_graph.xml

diff --git a/app/build.gradle b/app/build.gradle
index 525466b..dc8b799 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-android-extensions'
-    id  'kotlin-kapt'
+    id 'kotlin-kapt'
 }
 
 android {
@@ -48,20 +48,11 @@ dependencies {
     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.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.room:room-runtime:2.2.6'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.room:room-runtime:2.2.6'
-    implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'com.squareup.okhttp:okhttp:2.2.0'
-    implementation 'com.squareup.okhttp:okhttp-urlconnection:2.2.0'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    annotationProcessor 'androidx.room:room-compiler:2.2.6'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
+//    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+//    implementation 'com.google.android.material:material:1.3.0'
+//    implementation 'androidx.preference:preference:1.1.1'
+//    implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
+//    implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
@@ -79,6 +70,12 @@ dependencies {
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.squareup.okhttp:okhttp:2.2.0'
     implementation 'com.squareup.okhttp:okhttp-urlconnection:2.2.0'
+
+    // Database
+    implementation 'androidx.room:room-runtime:2.2.6'
+    implementation 'androidx.room:room-runtime:2.2.6'
+    kapt 'androidx.room:room-compiler:2.2.6'
+
 }
 
 apply plugin: 'kotlin-android-extensions'
diff --git a/app/schemas/com.example.ca_contest.dao.AppDatabase/1.json b/app/schemas/com.example.ca_contest.dao.AppDatabase/1.json
new file mode 100644
index 0000000..3122f40
--- /dev/null
+++ b/app/schemas/com.example.ca_contest.dao.AppDatabase/1.json
@@ -0,0 +1,64 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "8bdf84f071ba217eb3653e01500bac94",
+    "entities": [
+      {
+        "tableName": "country",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`countryId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `country` TEXT, `capitalCity` TEXT, `continent` TEXT, `code` TEXT, `date` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "countryId",
+            "columnName": "countryId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "country",
+            "columnName": "country",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "capitalCity",
+            "columnName": "capitalCity",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "continent",
+            "columnName": "continent",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "countryId"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8bdf84f071ba217eb3653e01500bac94')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f127d22..21da455 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,9 +12,7 @@
         android:usesCleartextTraffic="true"
         android:theme="@style/Theme.CA_Contest">
         <activity
-            android:name=".CountrySelectorActivity"
-            android:label="@string/title_activity_country_selector"
-            android:theme="@style/Theme.CA_Contest.NoActionBar"></activity>
+            android:name=".CountrySelectorActivity"></activity>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -22,8 +20,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".MainActivity">
-        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ca_contest/CountryAdapter.kt b/app/src/main/java/com/example/ca_contest/CountryAdapter.kt
deleted file mode 100644
index 8093f14..0000000
--- a/app/src/main/java/com/example/ca_contest/CountryAdapter.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.example.ca_contest
-
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-
-class CountryAdapter(private var listCountry: MutableList<Country>) :
-    RecyclerView.Adapter<CountryAdapter.CountryViewHolder>()
-{
-    // Crée chaque vue item à afficher :
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CountryViewHolder
-    {
-        val viewCourse = LayoutInflater.from(parent.context)
-            .inflate(R.layout.item_list, parent, false)
-        return CountryViewHolder(viewCourse)
-    }
-
-    // Renseigne le contenu de chaque vue item :
-    override fun onBindViewHolder(holder: CountryViewHolder, position: Int)
-    {
-        holder.textViewLibelleCourse.text = listCountry[position].country
-    }
-
-    override fun getItemCount(): Int = listCountry.size
-    // ViewHolder :
-    inner class CountryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
-    {
-        val textViewLibelleCourse: TextView = itemView.findViewById(R.id.list_country)
-        init
-        {
-            textViewLibelleCourse.setOnClickListener {
-                val country = listCountry[adapterPosition]
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ca_contest/CountrySelectorActivity.kt b/app/src/main/java/com/example/ca_contest/CountrySelectorActivity.kt
index 139c2cb..231228d 100644
--- a/app/src/main/java/com/example/ca_contest/CountrySelectorActivity.kt
+++ b/app/src/main/java/com/example/ca_contest/CountrySelectorActivity.kt
@@ -5,11 +5,13 @@ import android.app.ProgressDialog
 import android.content.Intent
 import android.os.Bundle
 import android.view.KeyEvent
+import android.view.MenuItem
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -70,5 +72,4 @@ class CountrySelectorActivity : AppCompatActivity() {
             recycler.adapter?.notifyDataSetChanged()
         }
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ca_contest/ListCountryActivity.kt b/app/src/main/java/com/example/ca_contest/ListCountryActivity.kt
deleted file mode 100644
index 3dddf02..0000000
--- a/app/src/main/java/com/example/ca_contest/ListCountryActivity.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.example.ca_contest
-
-import android.annotation.SuppressLint
-import android.content.ContextWrapper
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.util.Log
-import android.view.View
-import android.widget.ImageView
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.ca_contest.dao.AppDatabaseHelper
-import com.squareup.picasso.Picasso;
-import kotlinx.android.synthetic.main.activity_list_country.*
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlin.collections.ArrayList
-
-class ListCountryActivity : AppCompatActivity() {
-    private lateinit var countryAdapter: CountryAdapter
-//    private lateinit var imageView: ImageView
-    @SuppressLint("SimpleDateFormat")
-    override fun onCreate(savedInstanceState: Bundle?)
-    {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_list_country)
-
-//        imageView = findViewById(R.id.image)
-        // à ajouter pour de meilleures performances :
-        list_country.setHasFixedSize(true)
-
-        // layout manager, décrivant comment les items sont disposés :
-        val layoutManager = LinearLayoutManager(this)
-        list_country.layoutManager = layoutManager
-        // contenu d'exemple :
-        val listCountry: List<Country> = AppDatabaseHelper
-            .getDatabase(this)
-            .countryDAO()
-            .getListCountry()
-
-//        Picasso.get()
-//            .load("http://www.geognos.com/api/en/countries/flag/FR.png")
-//            .fit()
-//            .centerCrop() // ou centerInside()
-//            .into(imageView)
-
-    }
-
-    fun addCountry(view: View) {
-//        val intent = Intent(this, CountrySelectorActivity::class.java)
-//        startActivity(intent)
-//
-//        finish()
-    }
-
-    fun deleteCountry(view: View) {
-
-    }
-
-}
diff --git a/app/src/main/java/com/example/ca_contest/MainActivity.kt b/app/src/main/java/com/example/ca_contest/MainActivity.kt
index 8dc40d6..20aa4b6 100644
--- a/app/src/main/java/com/example/ca_contest/MainActivity.kt
+++ b/app/src/main/java/com/example/ca_contest/MainActivity.kt
@@ -1,19 +1,43 @@
 package com.example.ca_contest
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Button
+import android.view.View
+import androidx.appcompat.app.ActionBar
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.example.ca_contest.adapters.HomepageCountryAdapter
+import com.example.ca_contest.dao.AppDatabaseHelper
+import java.util.*
 
 class MainActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
+    private lateinit var countryAdapter: HomepageCountryAdapter
+    //    private lateinit var imageView: ImageView
+    override fun onCreate(savedInstanceState: Bundle?)
+    {
         super.onCreate(savedInstanceState)
+
         setContentView(R.layout.activity_main)
-        var btn = findViewById<Button>(R.id.btnStartAnotherActivity)
-        btn.setOnClickListener {
-            val intent = Intent(this, CountrySelectorActivity::class.java)
-            // start your next activity
-            startActivity(intent)
-        }
+
+        val recycler = findViewById<RecyclerView>(R.id.list_country)
+        recycler.setHasFixedSize(true)
+
+        val layoutManager = LinearLayoutManager(this)
+        recycler.layoutManager = layoutManager
+
+        val adapter = HomepageCountryAdapter(
+            AppDatabaseHelper
+                .getDatabase(this)
+                .countryDAO()
+                .getListCountry()
+        )
+        recycler.adapter = adapter
     }
-}
\ No newline at end of file
+
+    fun addCountry(view: View) {
+        val intent = Intent(this, CountrySelectorActivity::class.java)
+        startActivity(intent)
+    }
+
+}
diff --git a/app/src/main/java/com/example/ca_contest/adapters/HomepageCountryAdapter.kt b/app/src/main/java/com/example/ca_contest/adapters/HomepageCountryAdapter.kt
new file mode 100644
index 0000000..ab6fcc5
--- /dev/null
+++ b/app/src/main/java/com/example/ca_contest/adapters/HomepageCountryAdapter.kt
@@ -0,0 +1,65 @@
+package com.example.ca_contest.adapters
+
+import com.example.ca_contest.R
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
+import com.example.ca_contest.dao.Country
+import com.squareup.picasso.Picasso
+
+class HomepageCountryAdapter(list: List<Country>) : RecyclerView.Adapter<HomepageCountryAdapter.CountryViewHolder>() {
+
+    private var list: List<Country> = ArrayList()
+
+    init {
+        this.list = list
+    }
+
+    // Create the view Holder
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CountryViewHolder {
+        val viewMemo: View =
+            LayoutInflater.from(parent.context).inflate(R.layout.item_list, parent, false)
+        return CountryViewHolder(viewMemo)
+    }
+
+    // Bind each items
+    override fun onBindViewHolder(holder: CountryViewHolder, position: Int) {
+        holder.name?.text = list[position].country
+        holder.capital?.text = "Capital : " + list[position].capitalCity
+        holder.date?.text = list[position].date.toString()
+        holder.region?.text = "Continent : " + list[position].continent
+        Picasso.get()
+                .load("http://www.geognos.com/api/en/countries/flag/" + list[position].code + ".png")
+                .into(holder.image!!)
+    }
+
+    // Update the list
+    fun update(list: ArrayList<Country>) {
+        this.list = list
+    }
+
+    override fun getItemCount(): Int {
+        return list.size
+    }
+
+    inner class CountryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        var name: TextView? = null
+        var capital: TextView? = null
+        var region: TextView? = null
+        var date: TextView? = null
+        var image: ImageView? = null
+
+        init {
+            name = itemView.findViewById(R.id.country)
+            date = itemView.findViewById(R.id.date)
+            capital = itemView.findViewById(R.id.capital)
+            region = itemView.findViewById(R.id.continent)
+            image = itemView.findViewById(R.id.image)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ca_contest/dao/AppDatabase.kt b/app/src/main/java/com/example/ca_contest/dao/AppDatabase.kt
index 4747b00..a43fc21 100644
--- a/app/src/main/java/com/example/ca_contest/dao/AppDatabase.kt
+++ b/app/src/main/java/com/example/ca_contest/dao/AppDatabase.kt
@@ -1,10 +1,12 @@
 package com.example.ca_contest.dao
 
+import com.example.ca_contest.libs.Converters
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import com.example.ca_contest.Country
+import androidx.room.TypeConverters
 
 @Database(entities = [Country::class], version = 1)
+@TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase()
 {
     abstract fun countryDAO(): CountryDAO
diff --git a/app/src/main/java/com/example/ca_contest/Country.kt b/app/src/main/java/com/example/ca_contest/dao/Country.kt
similarity index 70%
rename from app/src/main/java/com/example/ca_contest/Country.kt
rename to app/src/main/java/com/example/ca_contest/dao/Country.kt
index 4dc5f10..237fd7c 100644
--- a/app/src/main/java/com/example/ca_contest/Country.kt
+++ b/app/src/main/java/com/example/ca_contest/dao/Country.kt
@@ -1,8 +1,8 @@
-package com.example.ca_contest
+package com.example.ca_contest.dao
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.text.SimpleDateFormat
+import java.util.Date
 
 @Entity(tableName = "country")
 class Country(
@@ -11,4 +11,6 @@ class Country(
     val country: String? = null,
     val capitalCity: String? = null,
     val continent: String? = null,
-    val date: SimpleDateFormat? = null)
\ No newline at end of file
+    val code: String? = null,
+    val date: Date? = null
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ca_contest/dao/CountryDAO.kt b/app/src/main/java/com/example/ca_contest/dao/CountryDAO.kt
index cba6e64..c7c7a1b 100644
--- a/app/src/main/java/com/example/ca_contest/dao/CountryDAO.kt
+++ b/app/src/main/java/com/example/ca_contest/dao/CountryDAO.kt
@@ -1,7 +1,6 @@
 package com.example.ca_contest.dao
 
 import androidx.room.*
-import com.example.ca_contest.Country
 
 @Dao
 abstract class CountryDAO {
diff --git a/app/src/main/java/com/example/ca_contest/libs/Converters.kt b/app/src/main/java/com/example/ca_contest/libs/Converters.kt
new file mode 100644
index 0000000..7db5b69
--- /dev/null
+++ b/app/src/main/java/com/example/ca_contest/libs/Converters.kt
@@ -0,0 +1,16 @@
+package com.example.ca_contest.libs
+
+import androidx.room.TypeConverter
+import java.util.*
+
+class Converters {
+    @TypeConverter
+    fun fromTimestamp(value: Long?): Date? {
+        return value?.let { Date(it) }
+    }
+
+    @TypeConverter
+    fun dateToTimestamp(date: Date?): Long? {
+        return date?.time?.toLong()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/border_bottom.xml b/app/src/main/res/drawable/border_bottom.xml
new file mode 100644
index 0000000..28ec5a3
--- /dev/null
+++ b/app/src/main/res/drawable/border_bottom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <stroke
+                android:width="1dp"
+                android:color="@color/black" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+    <item android:bottom="1dp">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="@color/white" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_country_selector.xml b/app/src/main/res/layout/activity_country_selector.xml
index 50d65c9..2680adc 100644
--- a/app/src/main/res/layout/activity_country_selector.xml
+++ b/app/src/main/res/layout/activity_country_selector.xml
@@ -8,33 +8,39 @@
 
     <EditText
         android:id="@+id/text"
-        android:layout_width="325dp"
-        android:layout_height="40dp"
+        android:layout_width="0dp"
+        android:layout_height="70dp"
         android:background="#eee"
         android:hint="Nom du pays"
+        android:paddingLeft="16px"
         android:inputType="textCapSentences"
         android:maxLines="1"
         android:textColor="@android:color/black"
+        app:layout_constraintEnd_toStartOf="@+id/validate"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/validate"
-        android:layout_width="0dp"
-        android:layout_height="40dp"
+        android:layout_width="70dp"
+        android:layout_height="0dp"
         android:background="#eee"
         android:text="OK"
         android:textColor="@android:color/white"
+        app:backgroundTint="@color/button"
+        app:layout_constraintBottom_toTopOf="@+id/list"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/text"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:layout_editor_absoluteX="16dp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_list_country.xml b/app/src/main/res/layout/activity_list_country.xml
deleted file mode 100644
index 027d9e3..0000000
--- a/app/src/main/res/layout/activity_list_country.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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"
-    tools:context=".ListCountryActivity">
-
-<!--    <ImageView-->
-<!--        android:id="@+id/image"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="match_parent"-->
-<!--        tools:ignore="MissingConstraints" />-->
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/list_country"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/bouton_retour"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
-
-    <Button
-        android:id="@+id/bouton_retour"
-        android:layout_width="0dp"
-        android:layout_height="50dp"
-        android:background="@color/purple_200"
-        android:onClick="addCountry"
-        android:text="AJOUTER UN PAYS"
-        android:textColor="@android:color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 188e4b1..5c45424 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,24 +6,28 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list_country"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toTopOf="@+id/bouton_retour"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/btnStartAnotherActivity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="48dp"
-        android:background="#397bb2"
-        android:padding="20sp"
-        android:text="Start Another Activity"
-        android:textColor="#FFF"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:layout_editor_absoluteX="86dp" />
+        android:id="@+id/bouton_retour"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:background="#eee"
+        android:onClick="addCountry"
+        android:text="AJOUTER UN PAYS"
+        android:textColor="@android:color/white"
+        app:backgroundTint="@color/button"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/country_selector_item.xml b/app/src/main/res/layout/country_selector_item.xml
index 0bf0ce9..f206d01 100644
--- a/app/src/main/res/layout/country_selector_item.xml
+++ b/app/src/main/res/layout/country_selector_item.xml
@@ -3,22 +3,30 @@
     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_height="wrap_content"
+    android:background="@drawable/border_bottom">
 
     <ImageView
         android:id="@+id/image"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="72dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:layout_weight="1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:srcCompat="@tools:sample/avatars" />
 
     <TextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:fontFamily="sans-serif-medium"
         android:textColor="@android:color/black"
+        android:textSize="24sp"
         app:layout_constraintStart_toEndOf="@+id/image"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Nom Pays" />
@@ -27,6 +35,7 @@
         android:id="@+id/capital"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
         android:textColor="@android:color/black"
         app:layout_constraintStart_toEndOf="@+id/image"
         app:layout_constraintTop_toBottomOf="@+id/name"
@@ -36,8 +45,10 @@
         android:id="@+id/region"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="1dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="8dp"
         android:textColor="@android:color/black"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image"
         app:layout_constraintTop_toBottomOf="@+id/capital"
         tools:text="Continent: Continent" />
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index 61fa2bb..b7202e5 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -1,38 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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:id="@+id/list"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:background="@drawable/border_bottom">
 
     <LinearLayout
-        android:id="@+id/list"
-        android:layout_width="match_parent"
+        android:id="@+id/linearLayout"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="wrap_content"
+            android:layout_height="64dp"
+            android:layout_weight="1"
+            tools:srcCompat="@tools:sample/avatars" />
 
         <TextView
-            android:id="@+id/list_country"
-            android:layout_width="359dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-
-        <ImageButton
-            android:id="@+id/delete"
+            android:id="@+id/date"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/white"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:onClick="deleteCountry"
-            android:src="@drawable/ic_trash" />
-
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:fontFamily="sans-serif-medium"
+            android:textAlignment="center"
+            android:textColor="@color/black"
+            tools:text="12 sep. 2018" />
     </LinearLayout>
 
-</FrameLayout>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/linearLayout"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/country"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:textColor="@color/black"
+            android:textSize="24sp"
+            tools:text="France" />
+
+        <TextView
+            android:id="@+id/capital"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="Capital: Paris" />
+
+        <TextView
+            android:id="@+id/continent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="Continent: Europe" />
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/delete"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:background="@color/white"
+        android:onClick="deleteCountry"
+        android:src="@drawable/ic_trash"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
deleted file mode 100644
index 1cda0e3..0000000
--- a/app/src/main/res/navigation/nav_graph.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation 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:id="@+id/nav_graph"
-    app:startDestination="@id/FirstFragment">
-
-    <fragment
-        android:id="@+id/FirstFragment"
-        android:name="com.example.ca_contest.FirstFragment"
-        android:label="@string/first_fragment_label"
-        tools:layout="@layout/fragment_first">
-
-        <action
-            android:id="@+id/action_FirstFragment_to_SecondFragment"
-            app:destination="@id/SecondFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/SecondFragment"
-        android:name="com.example.ca_contest.SecondFragment"
-        android:label="@string/second_fragment_label"
-        tools:layout="@layout/fragment_second">
-
-        <action
-            android:id="@+id/action_SecondFragment_to_FirstFragment"
-            app:destination="@id/FirstFragment" />
-    </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 f8c6127..bb8d2b5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,7 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="button">#CD4E61</color>
+    <color name="validation">#2ECB60</color>
+
 </resources>
\ No newline at end of file