Merge branch 'master' of https://codefirst.iut.uca.fr/git/valentin.clergue/sujetsAndroid

corrections/Ouafff_finP1/app/build.gradle

@@ -0,0 +1,56 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+}
+
+android {
+    namespace 'fr.iut.ouafff'
+    compileSdk 33
+
+    defaultConfig {
+        applicationId "fr.iut.ouafff"
+        minSdk 16
+        targetSdk 33
+        versionCode 1
+        versionName "1.0"
+        // Permet de spécifier le fichier dans lequel stocker le schéma de la BdD
+        kapt {
+            arguments {
+                arg("room.schemaLocation", "$projectDir/schemas".toString())
+            }
+        }
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
+    implementation "androidx.fragment:fragment-ktx:1.5.5"
+//    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+//    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+//    implementation "androidx.cardview:cardview:1.0.0"
+
+
+    // Room ORM
+    def room_version = "2.4.3"
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+}

corrections/Ouafff_finP1/app/schemas/fr.iut.ouafff.data.persistance.DogDatabase/1.json

@@ -0,0 +1,76 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "ec7718f7c93df353ddf73a877a18b155",
+    "entities": [
+      {
+        "tableName": "dogs",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `breed` TEXT NOT NULL, `gender` INTEGER NOT NULL, `weight` REAL NOT NULL, `aggressiveness` INTEGER NOT NULL, `owner` TEXT, `admissionDate` INTEGER, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "breed",
+            "columnName": "breed",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "aggressiveness",
+            "columnName": "aggressiveness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "owner",
+            "columnName": "owner",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "admissionDate",
+            "columnName": "admissionDate",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "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, 'ec7718f7c93df353ddf73a877a18b155')"
+    ]
+  }
+}

corrections/Ouafff_finP1/app/src/androidTest/java/fr/iut/ouafff/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package fr.iut.ouafff
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("fr.iut.ouafff", appContext.packageName)
+    }
+}

corrections/Ouafff_finP1/app/src/main/AndroidManifest.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- L'idée de l'appli vient d'un cours Udacity :
+         Pets App (https://github.com/udacity/ud845-Pets)
+         je l'ai ensuite largement adaptée pour la Licence Pro PM -->
+    <application
+        android:name=".DogApplication"
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Ouafff.NoActionBar"
+        tools:targetApi="33">
+        <activity
+            android:name=".ui.activity.DogListActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ui.activity.DogActivity"
+            android:parentActivityName=".ui.activity.DogListActivity" />
+        <activity
+            android:name=".ui.activity.DogPagerActivity"
+            android:parentActivityName=".ui.activity.DogListActivity" />
+    </application>
+</manifest>

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/DogApplication.kt

@@ -0,0 +1,11 @@
+package fr.iut.ouafff
+
+import android.app.Application
+import fr.iut.ouafff.data.persistance.DogDatabase
+
+class DogApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        DogDatabase.initialize(this)
+    }
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/Dog.kt

@@ -0,0 +1,24 @@
+package fr.iut.ouafff.data
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.util.Date
+
+const val NEW_DOG_ID = 0L
+
+@Entity(tableName = "dogs")
+data class Dog(var name: String = "",
+               var breed: String = "",
+               var gender: Gender = Gender.UNKNOWN,
+               var weight: Float = 0f,
+               var aggressiveness: Int = 0,
+               var owner: String? = null,
+               var admissionDate: Date? = null,
+               @PrimaryKey(autoGenerate = true) val id: Long = NEW_DOG_ID) {
+
+    enum class Gender {
+        UNKNOWN,
+        MALE,
+        FEMALE
+    }
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/DogDao.kt

@@ -0,0 +1,27 @@
+package fr.iut.ouafff.data.persistance
+
+import androidx.room.*
+import androidx.room.OnConflictStrategy.REPLACE
+import fr.iut.ouafff.data.Dog
+
+@Dao
+interface DogDao {
+
+    @Query("SELECT * FROM dogs")
+    fun getAll(): List<Dog>
+
+    @Query("SELECT * FROM dogs WHERE id = :id")
+    fun findById(id: Long): Dog
+
+    @Insert(onConflict = REPLACE)
+    fun insert(dog: Dog)
+
+    @Insert
+    fun insertAll(vararg dogs: Dog)
+
+    @Update(onConflict = REPLACE)
+    fun update(dog: Dog)
+
+    @Delete
+    fun delete(dog: Dog)
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/DogDatabase.kt

@@ -0,0 +1,69 @@
+package fr.iut.ouafff.data.persistance
+
+import android.app.Application
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import androidx.sqlite.db.SupportSQLiteDatabase
+import fr.iut.ouafff.DogApplication
+import fr.iut.ouafff.data.Dog
+import fr.iut.ouafff.data.persistance.converter.DateToLongConverter
+import fr.iut.ouafff.data.persistance.converter.GenderToIntConverter
+import java.util.Date
+
+private const val DOG_DB_FILENAME = "dogs.db"
+
+@Database(entities = [Dog::class], version = 1)
+@TypeConverters(GenderToIntConverter::class, DateToLongConverter::class)
+abstract class DogDatabase : RoomDatabase() {
+
+    abstract fun dogDAO(): DogDao
+
+    companion object {
+        private lateinit var application: Application
+
+        @Volatile
+        private var instance: DogDatabase? = null
+
+        fun getInstance(): DogDatabase {
+            if (::application.isInitialized) {
+                if (instance == null)
+                    synchronized(this) {
+                        if (instance == null) {
+                            instance = Room.databaseBuilder(
+                                application.applicationContext,
+                                DogDatabase::class.java,
+                                DOG_DB_FILENAME
+                            )
+                                .allowMainThreadQueries()
+                                .build()
+
+                            instance?.dogDAO()?.let {
+                                if (it.getAll().isEmpty()) emptyDatabaseStub(it)
+                            }
+                        }
+                    }
+                return instance!!
+            } else
+                throw RuntimeException("the database must be first initialized")
+        }
+
+
+        @Synchronized
+        fun initialize(app: DogApplication) {
+            if (::application.isInitialized)
+                throw RuntimeException("the database must not be initialized twice")
+
+            application = app
+        }
+
+
+        private fun emptyDatabaseStub(dogDAO: DogDao) = with(dogDAO) {
+            insert(Dog("Lassie", "Collet", Dog.Gender.FEMALE, 22.5f, 0))
+            insert(Dog("Snoopy", "Beagle", Dog.Gender.MALE, 6f, 2, "Charlie Brown"))
+            insert(Dog("Robert", "Caniche", Dog.Gender.MALE, 5f, 1))
+            insert(Dog("Titan", "Dogue", Dog.Gender.MALE, 32f, 3, "John Doe", Date(22), 4))
+        }
+    }
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/converter/DateToLongConverter.kt

@@ -0,0 +1,12 @@
+package fr.iut.ouafff.data.persistance.converter
+
+import androidx.room.TypeConverter
+import java.util.Date
+
+class DateToLongConverter {
+    @TypeConverter
+    fun fromTimestamp(timestamp: Long?) = timestamp?.let { Date(it) }
+
+    @TypeConverter
+    fun toTimestamp(date: Date?) = date?.time
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/converter/GenderToIntConverter.kt

@@ -0,0 +1,14 @@
+package fr.iut.ouafff.data.persistance.converter
+
+import androidx.room.TypeConverter
+import fr.iut.ouafff.data.Dog.Gender
+
+fun Int.toGender() = enumValues<Gender>()[this]
+
+class GenderToIntConverter {
+    @TypeConverter
+    fun fromInt(ordinal: Int) = ordinal.toGender()
+
+    @TypeConverter
+    fun toOrdinal(gender: Gender) = gender.ordinal
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogActivity.kt

@@ -0,0 +1,37 @@
+package fr.iut.ouafff.ui.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import fr.iut.ouafff.R
+import fr.iut.ouafff.data.NEW_DOG_ID
+import fr.iut.ouafff.ui.fragment.DogFragment
+
+class DogActivity : SimpleFragmentActivity(), DogFragment.OnInteractionListener {
+
+    companion object {
+        private const val EXTRA_DOG_ID = "fr.iut.ouafff.extra_dog_id"
+
+        fun getIntent(context: Context, dogId: Long) =
+                Intent(context, DogActivity::class.java).apply {
+                    putExtra(EXTRA_DOG_ID, dogId)
+                }
+    }
+
+    private var dogId = NEW_DOG_ID
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        dogId = intent.getLongExtra(EXTRA_DOG_ID, NEW_DOG_ID)
+        super.onCreate(savedInstanceState)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+
+
+    override fun createFragment() = DogFragment.newInstance(dogId)
+    override fun getLayoutResId() = R.layout.toolbar_activity
+
+    override fun onDogSaved() = finish()
+
+    override fun onDogDeleted() = finish()
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogListActivity.kt

@@ -0,0 +1,77 @@
+package fr.iut.ouafff.ui.activity
+
+import android.os.Bundle
+import android.widget.FrameLayout
+import fr.iut.ouafff.R
+import fr.iut.ouafff.data.NEW_DOG_ID
+import fr.iut.ouafff.ui.fragment.DogFragment
+import fr.iut.ouafff.ui.fragment.DogListFragment
+
+class DogListActivity : SimpleFragmentActivity(),
+        DogListFragment.OnInteractionListener, DogFragment.OnInteractionListener {
+
+    private var isTwoPane: Boolean = false
+    private lateinit var masterFragment: DogListFragment
+
+    override fun createFragment() = DogListFragment().also { masterFragment = it }
+    override fun getLayoutResId() = R.layout.toolbar_md_activity
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        supportActionBar?.setIcon(R.mipmap.ic_launcher)
+
+        isTwoPane = findViewById<FrameLayout>(R.id.container_fragment_detail) != null
+        if (savedInstanceState != null)
+            masterFragment = supportFragmentManager.findFragmentById(R.id.container_fragment) as DogListFragment
+
+        if (!isTwoPane) {
+            removeDisplayedFragment()
+        }
+    }
+
+
+    override fun onDogSelected(dogId: Long) {
+        if (isTwoPane) {
+            supportFragmentManager.beginTransaction()
+                    .replace(R.id.container_fragment_detail, DogFragment.newInstance(dogId))
+                    .commit()
+        } else {
+            // Pour la version sans le pager, remplacer DogPagerActivity par DogActivity
+            startActivity(DogPagerActivity.getIntent(this, dogId))
+        }
+    }
+
+
+    override fun onAddNewDog() = startActivity(DogActivity.getIntent(this, NEW_DOG_ID))
+
+
+    override fun onDogSaved() {
+        if (isTwoPane) {
+            masterFragment.updateList()
+        }
+    }
+
+
+    private fun removeDisplayedFragment() {
+        supportFragmentManager.findFragmentById(R.id.container_fragment_detail)?.let {
+            supportFragmentManager.beginTransaction().remove(it).commit()
+        }
+    }
+
+
+    override fun onDogDeleted() {
+        if (isTwoPane) {
+            removeDisplayedFragment()
+        } else
+            finish()
+    }
+
+
+    override fun onDogSwiped() {
+        if (isTwoPane) {
+            removeDisplayedFragment()
+        }
+    }
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogPagerActivity.kt

@@ -0,0 +1,55 @@
+package fr.iut.ouafff.ui.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.widget.LinearLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.viewpager2.widget.ViewPager2
+import fr.iut.ouafff.R
+import fr.iut.ouafff.ui.fragment.DogFragment
+import fr.iut.ouafff.ui.utils.DogPagerAdapter
+
+
+class DogPagerActivity : AppCompatActivity(), DogFragment.OnInteractionListener {
+
+    companion object {
+        private const val EXTRA_DOG_ID = "fr.iut.ouafff.extra_dog_id"
+
+        fun getIntent(context: Context, dogId: Long) =
+                Intent(context, DogPagerActivity::class.java).apply {
+                    putExtra(EXTRA_DOG_ID, dogId)
+                }
+    }
+
+    private lateinit var viewPager: ViewPager2
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_pager)
+
+        setSupportActionBar(findViewById(R.id.toolbar_activity))
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        viewPager = ViewPager2(this)
+        viewPager.id = R.id.view_pager
+        findViewById<LinearLayout>(R.id.pager_layout).addView(viewPager)
+
+        val adapter =  DogPagerAdapter(this)
+        viewPager.adapter = adapter
+        val initialPosition = adapter.positionFromId(intent.getLongExtra(EXTRA_DOG_ID, 1))
+        viewPager.currentItem = initialPosition
+        supportActionBar?.subtitle = getString(R.string.dogs_subtitle_format, initialPosition + 1)
+
+        viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+
+            override fun onPageSelected(position: Int) {
+                supportActionBar?.subtitle = getString(R.string.dogs_subtitle_format, position + 1)
+            }
+
+        })
+    }
+
+    override fun onDogSaved() = finish()
+    override fun onDogDeleted() = finish()
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/SimpleFragmentActivity.kt

@@ -0,0 +1,43 @@
+package fr.iut.ouafff.ui.activity
+
+import android.os.Bundle
+import androidx.annotation.LayoutRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import fr.iut.ouafff.R
+
+/**
+ * A base class to manage an activity hosting one fragment
+ * and an action bar.
+ */
+abstract class SimpleFragmentActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(getLayoutResId())
+
+        setSupportActionBar(findViewById(R.id.toolbar_activity))
+
+        if (supportFragmentManager.findFragmentById(R.id.container_fragment) == null) {
+            supportFragmentManager.beginTransaction()
+                                  .add(R.id.container_fragment, createFragment())
+                                  .commit()
+        }
+    }
+
+
+    /**
+     * Creates an instance of the hosted fragment
+     */
+    protected abstract fun createFragment(): Fragment
+
+
+    /**
+     * Returns the resource id of the layout used for this activity.
+     * It must contain a view whose id is `@+id/container_fragment`
+     * to inject the hosted fragment's view
+     */
+    @LayoutRes
+    protected abstract fun getLayoutResId(): Int
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/dialog/DatePickerFragment.kt

@@ -0,0 +1,60 @@
+package fr.iut.ouafff.ui.dialog
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.widget.DatePicker
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
+import fr.iut.ouafff.R
+import java.util.*
+
+class DatePickerFragment : AppCompatDialogFragment() {
+    companion object {
+        const val EXTRA_YEAR = "fr.iut.ouafff.year"
+        const val EXTRA_MONTH = "fr.iut.ouafff.month"
+        const val EXTRA_DAY = "fr.iut.ouafff.day"
+
+        private const val ARG_DATE = "date"
+
+        fun newInstance(requestKey: String, date: Date? = null) = DatePickerFragment().apply {
+            this.requestKey = requestKey
+            if (date != null)
+                arguments = Bundle().apply {
+                    putLong(ARG_DATE, date.time)
+                }
+        }
+    }
+
+    private lateinit var requestKey: String
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val view = LayoutInflater.from(activity).inflate(R.layout.dialog_date, null)
+
+        val calendar = Calendar.getInstance()
+        calendar.timeInMillis = arguments?.getLong(ARG_DATE) ?: Date().time
+        val year = calendar.get(Calendar.YEAR)
+        val month = calendar.get(Calendar.MONTH)
+        val day = calendar.get(Calendar.DAY_OF_MONTH)
+
+        val pickerDate = view as DatePicker
+        pickerDate.init(year, month, day, null)
+
+        return AlertDialog.Builder(view.context, R.style.NarrowDialog)
+            .setView(view)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                setFragmentResult(
+                    requestKey,
+                    bundleOf(
+                        EXTRA_YEAR to pickerDate.year,
+                        EXTRA_MONTH to pickerDate.month,
+                        EXTRA_DAY to pickerDate.dayOfMonth
+                    )
+                )
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
+    }
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/fragment/DogFragment.kt

@@ -0,0 +1,247 @@
+package fr.iut.ouafff.ui.fragment
+
+import android.content.Context
+import android.os.Bundle
+import android.provider.ContactsContract
+import android.text.format.DateFormat
+import android.view.*
+import android.widget.EditText
+import android.widget.RatingBar
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.result.launch
+import androidx.appcompat.app.AlertDialog
+import androidx.core.os.bundleOf
+import androidx.core.view.MenuProvider
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.setFragmentResultListener
+import androidx.lifecycle.Lifecycle
+import fr.iut.ouafff.R
+import fr.iut.ouafff.data.Dog
+import fr.iut.ouafff.data.NEW_DOG_ID
+import fr.iut.ouafff.data.persistance.DogDatabase
+import fr.iut.ouafff.data.persistance.converter.toGender
+import fr.iut.ouafff.ui.dialog.DatePickerFragment
+import java.util.Date
+import java.util.Calendar
+
+class DogFragment : Fragment() {
+
+    companion object {
+        private const val EXTRA_DOG_ID = "fr.iut.ouafff.extra_dogid"
+        private const val REQUEST_DATE = "DateRequest"
+        private const val DIALOG_DATE = "DateDialog"
+
+        fun newInstance(dogId: Long) = DogFragment().apply {
+            arguments = bundleOf(EXTRA_DOG_ID to dogId)
+        }
+    }
+
+    private lateinit var dog: Dog
+    private var dogId: Long = NEW_DOG_ID
+
+    private lateinit var editDogName: EditText
+    private lateinit var editDogBreed: EditText
+    private lateinit var spinnerGender: Spinner
+    private lateinit var editDogWeight: EditText
+    private lateinit var ratingbarAggressiveness: RatingBar
+    private lateinit var textDogOwner: TextView
+    private lateinit var textDogAdmissionDate: TextView
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setFragmentResultListener(REQUEST_DATE, this::onAdmissionDateChanged)
+
+        dogId = savedInstanceState?.getLong(EXTRA_DOG_ID) ?: arguments?.getLong(EXTRA_DOG_ID)
+                ?: NEW_DOG_ID
+
+        dog = if (dogId == NEW_DOG_ID) {
+            requireActivity().setTitle(R.string.title_add_dog)
+            Dog()
+        } else {
+            DogDatabase.getInstance().dogDAO().findById(dogId)
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putLong(EXTRA_DOG_ID, dogId)
+    }
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.fragment_dog, container, false)
+        editDogName = view.findViewById(R.id.edit_dog_name)
+        editDogBreed = view.findViewById(R.id.edit_dog_breed)
+        spinnerGender = view.findViewById(R.id.spinner_gender)
+        editDogWeight = view.findViewById(R.id.edit_dog_weight)
+        ratingbarAggressiveness = view.findViewById(R.id.ratingbar_aggressiveness)
+        textDogOwner = view.findViewById(R.id.text_dog_owner)
+        textDogAdmissionDate = view.findViewById(R.id.text_dog_admission_date)
+
+        updateViewFromCurrentDog()
+
+        textDogOwner.setOnClickListener {
+            pickOwner.launch()
+        }
+
+        textDogAdmissionDate.setOnClickListener {
+            val dateDialog = DatePickerFragment.newInstance(REQUEST_DATE, dog.admissionDate)
+            dateDialog.show(parentFragmentManager, DIALOG_DATE)
+        }
+
+        return view
+    }
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupMenu()
+    }
+
+
+    private fun setupMenu() {
+        requireActivity().addMenuProvider(object : MenuProvider {
+            override fun onPrepareMenu(menu: Menu) {
+                super.onPrepareMenu(menu)
+                if (dogId == NEW_DOG_ID) {
+                    menu.findItem(R.id.action_delete)?.isVisible = false
+                }
+            }
+
+            override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+                menuInflater.inflate(R.menu.fragment_dog, menu)
+            }
+
+            override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+                return when (menuItem.itemId) {
+                    R.id.action_save -> {
+                        saveDog()
+                        true
+                    }
+                    R.id.action_delete -> {
+                        deleteDog()
+                        true
+                    }
+                    else -> false
+                }
+            }
+
+        }, viewLifecycleOwner, Lifecycle.State.RESUMED)
+    }
+
+
+    private fun updateViewFromCurrentDog() {
+        editDogName.setText(dog.name)
+        editDogBreed.setText(dog.breed)
+        spinnerGender.setSelection(dog.gender.ordinal)
+        editDogWeight.setText(dog.weight.toString())
+        ratingbarAggressiveness.rating = dog.aggressiveness.toFloat()
+        textDogOwner.text = dog.owner
+        dog.admissionDate?.let {
+            textDogAdmissionDate.text = DateFormat.getDateFormat(activity).format(it)
+        }
+    }
+
+
+    private fun saveDog() {
+        val dogName = editDogName.text.trim()
+        val dogWeight = editDogWeight.text.trim()
+        if (dogName.isEmpty() || dogWeight.isEmpty() || dogWeight == ".") {
+            AlertDialog.Builder(requireActivity())
+                .setTitle(R.string.create_dog_error_dialog_title)
+                .setMessage(R.string.create_dog_error_message)
+                .setNeutralButton(android.R.string.ok, null)
+                .show()
+            return
+        }
+
+        dog.name = dogName.toString()
+        dog.breed = editDogBreed.text.toString()
+        dog.gender = spinnerGender.selectedItemPosition.toGender()
+        dog.weight = dogWeight.toString().toFloat()
+        dog.aggressiveness = ratingbarAggressiveness.rating.toInt()
+
+        if (dog.id == NEW_DOG_ID)
+            DogDatabase.getInstance().dogDAO().insert(dog)
+        else
+            DogDatabase.getInstance().dogDAO().update(dog)
+
+        listener?.onDogSaved()
+    }
+
+
+    private fun deleteDog() {
+        if (dogId != NEW_DOG_ID) {
+            DogDatabase.getInstance().dogDAO().delete(dog)
+            listener?.onDogDeleted()
+        }
+    }
+
+
+    private fun onAdmissionDateChanged(requestKey: String, bundle: Bundle) {
+        if (requestKey == REQUEST_DATE) {
+            val year = bundle.getInt(DatePickerFragment.EXTRA_YEAR)
+            val month = bundle.getInt(DatePickerFragment.EXTRA_MONTH)
+            val day = bundle.getInt(DatePickerFragment.EXTRA_DAY)
+
+            val cal = Calendar.getInstance()
+            cal.set(year, month, day)
+            dog.admissionDate = Date().apply { time = cal.timeInMillis }
+            textDogAdmissionDate.text = dog.admissionDate?.let {
+                DateFormat.getDateFormat(activity).format(it)
+            } ?: ""
+        }
+    }
+
+
+    private val pickOwner =
+        registerForActivityResult(ActivityResultContracts.PickContact()) { contactUri ->
+            if (contactUri != null) {
+                val queryFields = arrayOf(ContactsContract.Contacts.DISPLAY_NAME)
+                val contactCursor = activity?.contentResolver?.query(
+                    contactUri, queryFields, null,
+                    null, null
+                )
+
+                contactCursor?.let {
+                    if (it.count != 0) {
+                        it.moveToFirst()
+                        dog.owner = it.getString(0)
+                    }
+                    it.close()
+                }
+                textDogOwner.text = dog.owner
+            }
+        }
+
+
+    interface OnInteractionListener {
+        fun onDogSaved()
+        fun onDogDeleted()
+    }
+
+    private var listener: OnInteractionListener? = null
+
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        if (context is OnInteractionListener) {
+            listener = context
+        } else {
+            throw RuntimeException("$context must implement OnInteractionListener")
+        }
+    }
+
+
+    override fun onDetach() {
+        super.onDetach()
+        listener = null
+    }
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/fragment/DogListFragment.kt

@@ -0,0 +1,147 @@
+package fr.iut.ouafff.ui.fragment
+
+import android.content.Context
+import android.os.Bundle
+import android.view.*
+import androidx.constraintlayout.widget.Group
+import androidx.core.view.MenuProvider
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import fr.iut.ouafff.R
+import fr.iut.ouafff.data.Dog
+import fr.iut.ouafff.data.persistance.DogDatabase
+import fr.iut.ouafff.ui.utils.DogRecyclerViewAdapter
+
+class DogListFragment : Fragment(), DogRecyclerViewAdapter.Callbacks {
+
+    private var dogList = DogDatabase.getInstance().dogDAO().getAll()
+    private val dogListAdapter =
+        DogRecyclerViewAdapter(dogList, this)
+
+    private lateinit var groupEmptyView: Group
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.fragment_list_dog, container, false)
+        groupEmptyView = view.findViewById(R.id.group_empty_view)
+        groupEmptyView.visibility = if (dogList.isEmpty()) View.VISIBLE else View.GONE
+        val recyclerview = view.findViewById<RecyclerView>(R.id.recycler_view)
+        recyclerview.adapter = dogListAdapter
+        ItemTouchHelper(DogListItemTouchHelper()).attachToRecyclerView(recyclerview)
+        view.findViewById<FloatingActionButton>(R.id.fab_add_dog).setOnClickListener { addNewDog() }
+        return view
+    }
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupMenu()
+    }
+
+
+    private fun setupMenu() {
+        requireActivity().addMenuProvider(object : MenuProvider {
+            override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+                menuInflater.inflate(R.menu.fragment_list_dog, menu)
+            }
+
+            override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+                return when (menuItem.itemId) {
+                    R.id.menu_item_new_dog -> {
+                        addNewDog()
+                        true
+                    }
+                    else -> false
+                }
+            }
+        }, viewLifecycleOwner, Lifecycle.State.RESUMED)
+    }
+
+
+    override fun onResume() {
+        super.onResume()
+        updateList()
+    }
+
+
+    fun updateList() {
+        dogList = DogDatabase.getInstance().dogDAO().getAll()
+        dogListAdapter.updateList(dogList)
+        groupEmptyView.visibility = if (dogList.isEmpty()) View.VISIBLE else View.GONE
+    }
+
+
+    private fun addNewDog() {
+        listener?.onAddNewDog()
+    }
+
+
+    override fun onDogSelected(dogId: Long) {
+        listener?.onDogSelected(dogId)
+    }
+
+
+    private inner class DogListItemTouchHelper : ItemTouchHelper.Callback() {
+        override fun isLongPressDragEnabled() = false
+
+        override fun getMovementFlags(
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder
+        ) =
+            makeMovementFlags(
+                ItemTouchHelper.UP or ItemTouchHelper.DOWN,
+                ItemTouchHelper.START or ItemTouchHelper.END
+            )
+
+        override fun onMove(
+            recyclerView: RecyclerView,
+            viewHolder: RecyclerView.ViewHolder,
+            target: RecyclerView.ViewHolder
+        ) = false
+
+        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+            (viewHolder as DogRecyclerViewAdapter.DogViewHolder).dog?.also {
+                removeDog(it)
+                listener?.onDogSwiped()
+            }
+        }
+    }
+
+
+    private fun removeDog(dog: Dog) {
+        val dao = DogDatabase.getInstance().dogDAO()
+        dao.delete(dog)
+        updateList()
+    }
+
+
+    interface OnInteractionListener {
+        fun onDogSelected(dogId: Long)
+        fun onAddNewDog()
+        fun onDogSwiped()
+    }
+
+    private var listener: OnInteractionListener? = null
+
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        if (context is OnInteractionListener) {
+            listener = context
+        } else {
+            throw RuntimeException("$context must implement OnInteractionListener")
+        }
+    }
+
+
+    override fun onDetach() {
+        super.onDetach()
+        listener = null
+    }
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/utils/DogPagerAdapter.kt

@@ -0,0 +1,16 @@
+package fr.iut.ouafff.ui.utils
+
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import fr.iut.ouafff.data.persistance.DogDatabase
+import fr.iut.ouafff.ui.fragment.DogFragment
+
+class DogPagerAdapter(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) {
+    private var dogList = DogDatabase.getInstance().dogDAO().getAll()
+
+    override fun getItemCount() = dogList.size
+
+    override fun createFragment(position: Int) = DogFragment.newInstance(dogList[position].id)
+
+    fun positionFromId(dogId: Long) = dogList.indexOfFirst { it.id == dogId }
+}

corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/utils/DogRecyclerViewAdapter.kt

@@ -0,0 +1,70 @@
+package fr.iut.ouafff.ui.utils
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.recyclerview.widget.RecyclerView
+import fr.iut.ouafff.R
+import fr.iut.ouafff.data.Dog
+
+class DogRecyclerViewAdapter(private var dogList: List<Dog>, private val listener: Callbacks) :
+    RecyclerView.Adapter<DogRecyclerViewAdapter.DogViewHolder>() {
+
+    override fun getItemCount() = dogList.size
+
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        DogViewHolder(
+            LayoutInflater.from(parent.context).inflate(
+                R.layout.item_list_dog,
+                parent,
+                false
+            ), listener
+        )
+
+
+    override fun onBindViewHolder(holder: DogViewHolder, position: Int) =
+        holder.bind(dogList[position])
+
+
+    class DogViewHolder(itemView: View, listener: Callbacks) :
+        RecyclerView.ViewHolder(itemView) {
+
+        private val viewName = itemView.findViewById<TextView>(R.id.view_name)
+        private val viewBreed = itemView.findViewById<TextView>(R.id.view_breed)
+        private val cardviewDog = itemView.findViewById<CardView>(R.id.cardview_dog)
+
+        var dog: Dog? = null
+            private set
+
+        init {
+            itemView.setOnClickListener { dog?.let { listener.onDogSelected(it.id) } }
+        }
+
+        fun bind(dog: Dog) {
+            this.dog = dog
+            viewName.text = dog.name
+            val context = itemView.context
+            val breed = dog.breed
+            viewBreed.text =
+                breed.ifEmpty { context.getString(R.string.unknown_breed) }
+            val color =
+                context.resources.getIntArray(R.array.aggressiveness_color)[dog.aggressiveness]
+            cardviewDog.setCardBackgroundColor(color)
+        }
+
+    }
+
+
+    fun updateList(dogList: List<Dog>) {
+        this.dogList = dogList
+        notifyDataSetChanged()
+    }
+
+
+    interface Callbacks {
+        fun onDogSelected(dogId: Long)
+    }
+}

corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#727272"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>

corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add_pet.xml

@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="47.625"
+    android:viewportWidth="47.625">
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="m24.08,45.6c4.68,-0.08 9.76,-0.44 13.6,-3.43 3.15,-2.62 3.73,-7.22 2.72,-10.98 -1.86,-7.54 -9.73,-12.82 -17.39,-12.16 -6.89,0.38 -13.57,5.25 -15.23,12.09 -1.01,3.72 -0.5,8.25 2.57,10.9 3.75,3.2 9.03,3.46 13.73,3.58"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.17870538" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.57,6.94m-4.9,0a4.9,4.9 0,1 1,9.79 0a4.9,4.9 0,1 1,-9.79 0"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeWidth="0.17870538" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M31.08,6.92m-4.9,0a4.9,4.9 0,1 1,9.79 0a4.9,4.9 0,1 1,-9.79 0"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeWidth="0.17870538" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6.89,16.59m-4.9,0a4.9,4.9 0,1 1,9.79 0a4.9,4.9 0,1 1,-9.79 0"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeWidth="0.17870538" />
+    <path
+        android:fillAlpha="1"
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M40.74,16.59m-4.9,0a4.9,4.9 0,1 1,9.79 0a4.9,4.9 0,1 1,-9.79 0"
+        android:strokeAlpha="1"
+        android:strokeColor="#00000000"
+        android:strokeWidth="0.17870538" />
+</vector>

corrections/Ouafff_finP1/app/src/main/res/drawable/ic_delete.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>

corrections/Ouafff_finP1/app/src/main/res/drawable/ic_done.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+</vector>

corrections/Ouafff_finP1/app/src/main/res/drawable/ic_empty_shelter.xml

@@ -0,0 +1,49 @@
+<vector android:height="105dp" android:viewportHeight="105.9596"
+    android:viewportWidth="151.06255" android:width="150dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#ffecb2"
+        android:pathData="M116.4,23.99m-23.99,0a23.99,23.99 0,1 1,47.97 0a23.99,23.99 0,1 1,-47.97 0"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="0.96375841"/>
+    <path android:fillAlpha="1" android:fillColor="#586a7e"
+        android:pathData="M-0,21.1h119.63v8.52h-119.63z"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#92a7bd"
+        android:pathData="M3.22,29.62h113.19v4.27h-113.19z"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#abc0d7"
+        android:pathData="M3.22,33.89h113.19v72.07h-113.19z"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="1"/>
+    <path android:fillAlpha="1" android:fillColor="#586a7e"
+        android:pathData="m59.82,60.13a24.29,22.07 0,0 0,-24.29 22.07,24.29 22.07,0 0,0 0,0v23.76h48.59L84.11,82.2a24.29,22.07 0,0 0,0 -0,24.29 22.07,0 0,0 -24.29,-22.07z"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="1.18381763"/>
+    <path android:fillAlpha="1" android:fillColor="#2b3d4d"
+        android:pathData="m59.82,64.43a20,20 0,0 0,-20 20,20 20,0 0,0 0,0L39.82,105.96L79.82,105.96L79.82,84.43a20,20 0,0 0,0 -0,20 20,0 0,0 -20,-20z"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="1.02245367"/>
+    <path android:fillAlpha="1" android:fillColor="#22303d"
+        android:pathData="M39.82,105.96L79.82,105.96L79.82,86.84Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.26458332"/>
+    <path android:fillAlpha="1" android:fillColor="#586a7e"
+        android:pathData="m59.91,54.99c1.73,-0.03 3.6,-0.16 5.01,-1.26 1.16,-0.96 1.38,-2.66 1,-4.05 -0.69,-2.78 -3.59,-4.72 -6.41,-4.48 -2.54,0.14 -5,1.94 -5.61,4.46 -0.37,1.37 -0.18,3.04 0.95,4.02 1.38,1.18 3.33,1.27 5.06,1.32"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.06586754"/>
+    <path android:fillAlpha="1" android:fillColor="#586a7e"
+        android:pathData="M57.15,40.74m-1.8,0a1.8,1.8 0,1 1,3.61 0a1.8,1.8 0,1 1,-3.61 0"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="0.06586754"/>
+    <path android:fillAlpha="1" android:fillColor="#586a7e"
+        android:pathData="M62.49,40.73m-1.8,0a1.8,1.8 0,1 1,3.61 0a1.8,1.8 0,1 1,-3.61 0"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="0.06586754"/>
+    <path android:fillAlpha="1" android:fillColor="#586a7e"
+        android:pathData="M53.58,44.3m-1.8,0a1.8,1.8 0,1 1,3.61 0a1.8,1.8 0,1 1,-3.61 0"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="0.06586754"/>
+    <path android:fillAlpha="1" android:fillColor="#586a7e"
+        android:pathData="M66.05,44.3m-1.8,0a1.8,1.8 0,1 1,3.61 0a1.8,1.8 0,1 1,-3.61 0"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="0.06586754"/>
+    <path android:fillAlpha="1" android:fillColor="#a3b7ce"
+        android:pathData="m105,84.86c-2.55,0.11 -4.55,2.32 -4.8,4.78 -1.19,5.44 -2.38,10.88 -3.57,16.32h19.79L116.41,84.86Z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.27995262"/>
+    <path android:fillAlpha="1" android:fillColor="#bfd9f5"
+        android:pathData="m106.03,86.02c-2.41,0.11 -4.3,2.2 -4.54,4.52 -1.13,5.14 -2.25,10.28 -3.38,15.42 17.65,0 35.3,0 52.95,0 -1.15,-5.47 -2.28,-10.94 -3.43,-16.4 -0.59,-2.4 -3.1,-3.82 -5.47,-3.54 -12.04,0 -24.09,0 -36.13,0z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="0.26458332"/>
+</vector>

corrections/Ouafff_finP1/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,46 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="64dp"
+        android:height="64dp"
+        android:viewportWidth="96.21212"
+        android:viewportHeight="96.21212">
+    <group android:translateX="24.29356"
+            android:translateY="24.29356">
+        <path
+            android:pathData="m24.08,45.6c4.68,-0.08 9.76,-0.44 13.6,-3.43 3.15,-2.62 3.73,-7.22 2.72,-10.98 -1.86,-7.54 -9.73,-12.82 -17.39,-12.16 -6.89,0.38 -13.57,5.25 -15.23,12.09 -1.01,3.72 -0.5,8.25 2.57,10.9 3.75,3.2 9.03,3.46 13.73,3.58"
+            android:strokeLineCap="butt"
+            android:fillAlpha="1"
+            android:strokeColor="#00000000"
+            android:fillColor="#F0514B"
+            android:strokeWidth="0.17870538"
+            android:strokeLineJoin="miter"
+            android:strokeAlpha="1"/>
+        <path
+            android:pathData="M16.57,6.94m-4.9,0a4.9,4.9 0,1 1,9.79 0a4.9,4.9 0,1 1,-9.79 0"
+            android:fillAlpha="1"
+            android:strokeColor="#00000000"
+            android:fillColor="#F0514B"
+            android:strokeWidth="0.17870538"
+            android:strokeAlpha="1"/>
+        <path
+            android:pathData="M31.08,6.92m-4.9,0a4.9,4.9 0,1 1,9.79 0a4.9,4.9 0,1 1,-9.79 0"
+            android:fillAlpha="1"
+            android:strokeColor="#00000000"
+            android:fillColor="#F0514B"
+            android:strokeWidth="0.17870538"
+            android:strokeAlpha="1"/>
+        <path
+            android:pathData="M6.89,16.59m-4.9,0a4.9,4.9 0,1 1,9.79 0a4.9,4.9 0,1 1,-9.79 0"
+            android:fillAlpha="1"
+            android:strokeColor="#00000000"
+            android:fillColor="#F0514B"
+            android:strokeWidth="0.17870538"
+            android:strokeAlpha="1"/>
+        <path
+            android:pathData="M40.74,16.59m-4.9,0a4.9,4.9 0,1 1,9.79 0a4.9,4.9 0,1 1,-9.79 0"
+            android:fillAlpha="1"
+            android:strokeColor="#00000000"
+            android:fillColor="#F0514B"
+            android:strokeWidth="0.17870538"
+            android:strokeAlpha="1"/>
+    </group>
+</vector>

corrections/Ouafff_finP1/app/src/main/res/drawable/ic_person.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#727272"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>

corrections/Ouafff_finP1/app/src/main/res/drawable/ic_time.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#727272"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>

corrections/Ouafff_finP1/app/src/main/res/layout-land/toolbar_md_activity_content.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:baselineAligned="false"
+    android:orientation="horizontal"
+    android:showDividers="middle"
+    android:divider="?android:attr/dividerVertical">
+
+    <FrameLayout
+        android:id="@+id/container_fragment"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="3" />
+
+    <FrameLayout
+        android:id="@+id/container_fragment_detail"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="7" />
+
+</LinearLayout>

corrections/Ouafff_finP1/app/src/main/res/layout/activity_pager.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:id="@+id/pager_layout">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar_activity"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:elevation="@dimen/toolbar_elevation"
+        android:theme="@style/Theme.Ouafff.AppBarOverlay"
+        app:popupTheme="@style/Theme.Ouafff.PopupOverlay"
+        app:titleMarginStart="@dimen/icon_title_space" />
+
+</LinearLayout>

corrections/Ouafff_finP1/app/src/main/res/layout/dialog_date.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<DatePicker xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />

corrections/Ouafff_finP1/app/src/main/res/layout/fragment_dog.xml

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/activity_margin"
+        tools:context=".ui.activity.DogActivity">
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="right"
+            app:constraint_referenced_ids="text_overview,text_gender,text_measurement,text_aggressiveness,text_misc" />
+
+        <TextView
+            android:id="@+id/text_overview"
+            style="@style/CategoryStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/category_overview"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <EditText
+            android:id="@+id/edit_dog_name"
+            style="@style/EditorFieldStyle"
+            android:layout_width="0dp"
+            android:hint="@string/hint_dog_name"
+            android:importantForAutofill="no"
+            android:inputType="textCapWords"
+            app:layout_constraintBaseline_toBaselineOf="@+id/text_overview"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/barrier" />
+
+        <EditText
+            android:id="@+id/edit_dog_breed"
+            style="@style/EditorFieldStyle"
+            android:layout_width="0dp"
+            android:hint="@string/hint_dog_breed"
+            android:importantForAutofill="no"
+            android:inputType="textCapWords"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/barrier"
+            app:layout_constraintTop_toBottomOf="@+id/edit_dog_name" />
+
+        <TextView
+            android:id="@+id/text_gender"
+            style="@style/CategoryStyle"
+            android:layout_width="wrap_content"
+            android:text="@string/category_gender"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/edit_dog_breed" />
+
+        <Spinner
+            android:id="@+id/spinner_gender"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/large_space"
+            android:entries="@array/array_gender_options"
+            android:spinnerMode="dropdown"
+            app:layout_constraintStart_toEndOf="@id/barrier"
+            app:layout_constraintTop_toTopOf="@+id/text_gender" />
+
+        <TextView
+            android:id="@+id/text_measurement"
+            style="@style/CategoryStyle"
+            android:layout_width="wrap_content"
+            android:text="@string/category_measurement"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/spinner_gender" />
+
+        <EditText
+            android:id="@+id/edit_dog_weight"
+            style="@style/EditorFieldStyle"
+            android:layout_width="0dp"
+            android:hint="@string/hint_dog_weight"
+            android:importantForAutofill="no"
+            android:inputType="numberDecimal"
+            app:layout_constraintBaseline_toBaselineOf="@+id/text_measurement"
+            app:layout_constraintEnd_toStartOf="@id/label_weight_unit"
+            app:layout_constraintStart_toEndOf="@id/barrier" />
+
+        <TextView
+            android:id="@+id/label_weight_unit"
+            style="@style/EditorUnitsStyle"
+            android:layout_width="wrap_content"
+            android:text="@string/unit_dog_weight"
+            app:layout_constraintBaseline_toBaselineOf="@+id/text_measurement"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/edit_dog_weight" />
+
+        <TextView
+            android:id="@+id/text_aggressiveness"
+            style="@style/CategoryStyle"
+            android:layout_width="wrap_content"
+            android:text="@string/category_aggressiveness"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/edit_dog_weight" />
+
+        <RatingBar
+            android:id="@+id/ratingbar_aggressiveness"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:numStars="3"
+            android:stepSize="1"
+            app:layout_constraintStart_toEndOf="@id/barrier"
+            app:layout_constraintTop_toTopOf="@+id/text_aggressiveness" />
+
+        <TextView
+            android:id="@+id/text_misc"
+            style="@style/CategoryStyle"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="@dimen/large_space"
+            android:text="@string/category_misc"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ratingbar_aggressiveness" />
+
+        <TextView
+            android:id="@+id/text_dog_owner"
+            style="@style/EditorTextStyle"
+            android:layout_width="0dp"
+            android:hint="@string/hint_dog_owner"
+            app:drawableEndCompat="@drawable/ic_person"
+            app:drawableRightCompat="@drawable/ic_person"
+            app:layout_constraintBaseline_toBaselineOf="@+id/text_misc"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/barrier" />
+
+        <TextView
+            android:id="@+id/text_dog_admission_date"
+            style="@style/EditorTextStyle"
+            android:layout_width="0dp"
+            android:hint="@string/hint_dog_admission_date"
+            android:paddingTop="@dimen/medium_space"
+            app:drawableEndCompat="@drawable/ic_time"
+            app:drawableRightCompat="@drawable/ic_time"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/barrier"
+            app:layout_constraintTop_toBottomOf="@+id/text_dog_owner" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>

corrections/Ouafff_finP1/app/src/main/res/layout/fragment_list_dog.xml

@@ -0,0 +1,67 @@
+<?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=".ui.activity.DogListActivity">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+        app:spanCount="2"
+        tools:listitem="@layout/item_list_dog" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/group_empty_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="shelter_icon,empty_view_title,empty_view_subtitle" />
+
+    <ImageView
+        android:id="@+id/shelter_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/empty_view_subtitle_text"
+        app:layout_constraintBottom_toTopOf="@+id/empty_view_title"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:src="@drawable/ic_empty_shelter" />
+
+    <TextView
+        android:id="@+id/empty_view_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-medium"
+        android:paddingTop="@dimen/medium_space"
+        android:text="@string/empty_view_title_text"
+        android:textAppearance="?android:textAppearanceMedium"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/empty_view_subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif"
+        android:paddingTop="@dimen/small_space"
+        android:text="@string/empty_view_subtitle_text"
+        android:textAppearance="?android:textAppearanceSmall"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/empty_view_title" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_add_dog"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/activity_margin"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:src="@drawable/ic_add_pet"
+        android:contentDescription="@string/new_dog_accessibility_text" />
+</androidx.constraintlayout.widget.ConstraintLayout>

corrections/Ouafff_finP1/app/src/main/res/layout/item_list_dog.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cardview_dog"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="2dp"
+    card_view:cardUseCompatPadding="true">
+
+    <LinearLayout
+        android:id="@+id/layout_cardview_dog"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="@dimen/activity_margin">
+
+        <TextView
+            android:id="@+id/view_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:textAppearance="?android:textAppearanceMedium"
+            android:textColor="@color/text_black"
+            tools:text="Dog's Name" />
+
+        <TextView
+            android:id="@+id/view_breed"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:textAppearanceSmall"
+            android:textColor="@color/text_black_lighter"
+            tools:text="Breed" />
+    </LinearLayout>
+</androidx.cardview.widget.CardView>

corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_activity.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+              android:orientation="vertical"
+              tools:context=".ui.activity.DogActivity">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar_activity"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:elevation="@dimen/toolbar_elevation"
+        android:theme="@style/Theme.Ouafff.AppBarOverlay"
+        app:popupTheme="@style/Theme.Ouafff.PopupOverlay"
+        app:titleMarginStart="@dimen/icon_title_space" />
+
+    <FrameLayout
+        android:id="@+id/container_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>

corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:orientation="vertical"
+    tools:context=".ui.activity.DogListActivity">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar_activity"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:elevation="@dimen/toolbar_elevation"
+        android:theme="@style/Theme.Ouafff.AppBarOverlay"
+        app:popupTheme="@style/Theme.Ouafff.PopupOverlay"
+        app:titleMarginStart="@dimen/icon_title_space" />
+
+    <include layout="@layout/toolbar_md_activity_content" />
+
+</LinearLayout>

corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity_content.xml

@@ -0,0 +1,4 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container_fragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />

corrections/Ouafff_finP1/app/src/main/res/menu/fragment_dog.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_save"
+        android:icon="@drawable/ic_done"
+        android:title="@string/action_save"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/action_delete"
+        android:icon="@drawable/ic_delete"
+        android:title="@string/action_delete"
+        app:showAsAction="ifRoom"/>
+</menu>

corrections/Ouafff_finP1/app/src/main/res/menu/fragment_list_dog.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_new_dog"
+        android:icon="@drawable/ic_add"
+        android:title="@string/new_dog"
+        app:showAsAction="never"/>
+
+</menu>

corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

corrections/Ouafff_finP1/app/src/main/res/values-fr/strings.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Ouafff</string>
+    <string name="title_dog_detail">Détail du chien</string>
+    <string name="new_dog">Nouveau chien</string>
+    <string name="dogs_subtitle_format">Chien %d</string>
+    <string name="dialog_date_title">Date d\'admission</string>
+    <string name="dog_deleted">Chien supprimé</string>
+    <string name="delete_dog_failed">Impossible de supprimer le chien</string>
+    <string name="action_save">Sauvegarder</string>
+    <string name="action_delete">Supprimer</string>
+    <string name="unknown_uri_error">"URL inconnue : "</string>
+    <string name="insertion_uri_error">"Insertion non autorisée dans : "</string>
+    <string name="update_uri_error">"Mise à jour non autorisée dans : "</string>
+    <string name="delete_uri_error">"Suppression non autorisée dans : "</string>
+    <string name="title_add_dog">Ajouter un chien</string>
+
+    <string name="category_gender">Genre</string>
+    <string name="category_overview">Identité</string>
+    <string name="category_measurement">Mesure</string>
+    <string name="category_aggressiveness">Agressivité</string>
+    <string name="category_misc">Divers</string>
+
+    <string name="hint_dog_name">Nom</string>
+    <string name="hint_dog_breed">Race</string>
+    <string name="hint_dog_weight">Poids</string>
+    <string name="unit_dog_weight">kg</string>
+    <string name="hint_dog_owner">Propriétaire</string>
+    <string name="hint_dog_admission_date">Date d\'admission</string>
+
+    <string name="gender_unknown">Inconnu</string>
+    <string name="gender_male">Mâle</string>
+    <string name="gender_female">Femelle</string>
+
+    <string name="unknown_breed">Race inconnue</string>
+
+    <string name="empty_view_title_text">C\'est un peu vide par ici…</string>
+    <string name="empty_view_subtitle_text">Commençons par ajouter un chien</string>
+    <string name="create_dog_error_dialog_title">Impossible de créer le chien</string>
+    <string name="create_dog_error_message">Le nom du chien et son poids ne peuvent pas être vides.</string>
+    <string name="new_dog_accessibility_text">Un bouton de raccourci pour ajouter un nouveau chien</string>
+</resources>

corrections/Ouafff_finP1/app/src/main/res/values-night/themes.xml

@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Ouafff" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/red</item>
+        <item name="colorPrimaryVariant">@color/colorBad</item>
+        <item name="colorOnPrimary">@color/black</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/colorNormal</item>
+        <item name="colorSecondaryVariant">@color/colorNormal</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>

corrections/Ouafff_finP1/app/src/main/res/values/arrays.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- These are the options displayed in the gender drop-down Spinner -->
+    <!-- They MUST match the Dog.Gender enum order -->
+    <string-array name="array_gender_options">
+        <item>@string/gender_unknown</item>
+        <item>@string/gender_male</item>
+        <item>@string/gender_female</item>
+    </string-array>
+
+    <!-- These are the colors displayed in the recyclerview's items -->
+    <!-- Their position in the array MUST match the dog's aggressiveness rating -->
+    <array name="aggressiveness_color">
+        <item>@color/colorNice</item>
+        <item>@color/colorNormal</item>
+        <item>@color/colorBad</item>
+        <item>@color/colorDevil</item>
+    </array>
+</resources>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="red">#F0514B</color>
+    <color name="red_darker">#C0403C</color>
+
+    <color name="text_black">#212121</color>
+    <color name="text_black_lighter">#727272</color>
+
+    <color name="white">#FFFFFF</color>
+    <color name="black">#000000</color>
+
+    <color name="ic_launcher_background">@color/white</color>
+
+    <!-- Editor colors -->
+    <color name="editorColorPrimary">#2D3640</color>
+    <color name="editorColorPrimaryDark">#394450</color>
+
+    <!-- Cards color -->
+    <color name="colorDevil">@color/red</color>
+    <color name="colorBad">#FFAC40</color>
+    <color name="colorNormal">#FFEE58</color>
+    <color name="colorNice">@color/white</color>
+</resources>

corrections/Ouafff_finP1/app/src/main/res/values/dimens.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common margin value used throughout the app -->
+    <dimen name="activity_margin">16dp</dimen>
+    <dimen name="text_margin">16dp</dimen>
+
+    <dimen name="toolbar_elevation">4dp</dimen>
+    
+    <!-- Common spaces used throughout the app -->
+    <dimen name="large_space">48dp</dimen>
+    <dimen name="medium_space">16dp</dimen>
+    <dimen name="small_space">8dp</dimen>
+    <dimen name="icon_title_space">32dp</dimen>
+</resources>
+

corrections/Ouafff_finP1/app/src/main/res/values/ids.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="id" name="view_pager" />
+</resources>

corrections/Ouafff_finP1/app/src/main/res/values/strings.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Ouafff</string>
+    <string name="title_dog_detail">Dog detail</string>
+    <string name="new_dog">New dog</string>
+    <string name="dogs_subtitle_format">Dog %d</string>
+    <string name="dialog_date_title"> Admission date of the dog:</string>
+    <string name="dog_deleted">Dog deleted</string>
+    <string name="delete_dog_failed">Fail to delete dog</string>
+    <string name="action_save">Save</string>
+    <string name="action_delete">Delete</string>
+    <string name="unknown_uri_error">"Unknown URI: "</string>
+    <string name="insertion_uri_error">"Insertion not allowed in: "</string>
+    <string name="update_uri_error">"Update not allowed: "</string>
+    <string name="delete_uri_error">"Delete not allowed: "</string>
+    <string name="title_add_dog">Add a dog</string>
+
+    <string name="category_overview">Overview</string>
+    <string name="category_gender">Gender</string>
+    <string name="category_measurement">Measurement</string>
+    <string name="category_aggressiveness">Aggressiveness</string>
+    <string name="category_misc">Miscellaneous</string>
+
+    <string name="hint_dog_name">Name</string>
+    <string name="hint_dog_breed">Breed</string>
+    <string name="hint_dog_weight">Weight</string>
+    <string name="unit_dog_weight">kg</string>
+    <string name="hint_dog_owner">Owner</string>
+    <string name="hint_dog_admission_date">Admission date</string>
+
+    <string name="gender_unknown">Unknown</string>
+    <string name="gender_male">Male</string>
+    <string name="gender_female">Female</string>
+
+    <string name="unknown_breed">Unknown breed</string>
+
+    <string name="empty_view_title_text">It\'s a bit lonely here…</string>
+    <string name="empty_view_subtitle_text">Get started by adding a pet</string>
+    <string name="create_dog_error_dialog_title">Cannot create the dog</string>
+    <string name="create_dog_error_message">Dog\'s name and weight cannot be empty.</string>
+    <string name="new_dog_accessibility_text">A shortcut button to add a new dog</string>
+</resources>

corrections/Ouafff_finP1/app/src/main/res/values/themes.xml

@@ -0,0 +1,72 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Ouafff" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/red</item>
+        <item name="colorPrimaryVariant">@color/red_darker</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/red</item>
+        <item name="colorSecondaryVariant">@color/colorBad</item>
+        <item name="colorOnSecondary">?attr/colorOnPrimary</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="21">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+
+    <style name="Theme.Ouafff.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.Ouafff.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
+
+    <style name="Theme.Ouafff.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
+
+    <!-- A narrower dialog (wrap its content) than the default MaterialComponents theme
+         Useful to correctly display the DatePicker Dialog without extra blank space -->
+    <style name="NarrowDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+        <item name="android:windowMinWidthMajor">0dp</item>
+        <item name="android:windowMinWidthMinor">0dp</item>
+    </style>
+
+    <!-- Theme of the editor -->
+    <style name="EditorTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/editorColorPrimary</item>
+        <item name="colorPrimaryDark">@color/editorColorPrimaryDark</item>
+        <item name="colorAccent">@color/red</item>
+    </style>
+
+    <!-- Style for a category in the editor -->
+    <style name="CategoryStyle">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:paddingTop">@dimen/medium_space</item>
+        <item name="android:paddingRight">@dimen/medium_space</item>
+        <item name="android:textColor">@color/red</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+    </style>
+
+    <!-- Style for an EditText field in the editor -->
+    <style name="EditorFieldStyle">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:textAppearance">?android:textAppearanceMedium</item>
+    </style>
+
+    <!-- Style for a TextView in the editor -->
+    <style name="EditorTextStyle">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:textAppearance">?android:textAppearanceMedium</item>
+    </style>
+
+    <!-- Style for the measurement units for an EditText field in the editor -->
+    <style name="EditorUnitsStyle">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+    </style>
+</resources>

corrections/Ouafff_finP1/app/src/test/java/fr/iut/ouafff/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package fr.iut.ouafff
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

corrections/Ouafff_finP1/build.gradle

@@ -0,0 +1,6 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id 'com.android.application' version '7.3.1' apply false
+    id 'com.android.library' version '7.3.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
+}

corrections/Ouafff_finP1/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Dec 19 12:14:28 CET 2022
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

corrections/Ouafff_finP1/gradlew.bat

@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

corrections/Ouafff_finP1/settings.gradle

@@ -0,0 +1,16 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+rootProject.name = "Ouafff"
+include ':app'

corrections/Quiz/.gitignore

@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

corrections/Quiz/app/.gitignore

@@ -0,0 +1 @@
+/build

corrections/Quiz/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile