From e5e891204090b5190b854a25ffb0adf15b99aecd Mon Sep 17 00:00:00 2001 From: HandyS11 <62420910+HandyS11@users.noreply.github.com> Date: Tue, 3 Jan 2023 17:53:48 +0100 Subject: [PATCH] add corrections --- .../Quiz => Ouafff_finP1}/.gitignore | 0 .../Quiz => Ouafff_finP1}/app/.gitignore | 0 corrections/Ouafff_finP1/app/build.gradle | 56 ++++ .../app/proguard-rules.pro | 0 .../1.json | 76 ++++++ .../fr/iut/ouafff/ExampleInstrumentedTest.kt | 24 ++ .../app/src/main/AndroidManifest.xml | 34 +++ .../main/java/fr/iut/ouafff/DogApplication.kt | 11 + .../src/main/java/fr/iut/ouafff/data/Dog.kt | 24 ++ .../fr/iut/ouafff/data/persistance/DogDao.kt | 27 ++ .../ouafff/data/persistance/DogDatabase.kt | 69 +++++ .../converter/DateToLongConverter.kt | 12 + .../converter/GenderToIntConverter.kt | 14 + .../fr/iut/ouafff/ui/activity/DogActivity.kt | 37 +++ .../iut/ouafff/ui/activity/DogListActivity.kt | 77 ++++++ .../ouafff/ui/activity/DogPagerActivity.kt | 55 ++++ .../ui/activity/SimpleFragmentActivity.kt | 43 +++ .../ouafff/ui/dialog/DatePickerFragment.kt | 60 +++++ .../fr/iut/ouafff/ui/fragment/DogFragment.kt | 247 ++++++++++++++++++ .../iut/ouafff/ui/fragment/DogListFragment.kt | 147 +++++++++++ .../fr/iut/ouafff/ui/utils/DogPagerAdapter.kt | 16 ++ .../ouafff/ui/utils/DogRecyclerViewAdapter.kt | 70 +++++ .../app/src/main/res/drawable/ic_add.xml | 9 + .../app/src/main/res/drawable/ic_add_pet.xml | 43 +++ .../app/src/main/res/drawable/ic_delete.xml | 9 + .../app/src/main/res/drawable/ic_done.xml | 9 + .../main/res/drawable/ic_empty_shelter.xml | 49 ++++ .../res/drawable/ic_launcher_foreground.xml | 46 ++++ .../app/src/main/res/drawable/ic_person.xml | 9 + .../app/src/main/res/drawable/ic_time.xml | 9 + .../toolbar_md_activity_content.xml | 22 ++ .../src/main/res/layout/activity_pager.xml | 19 ++ .../app/src/main/res/layout/dialog_date.xml | 5 + .../app/src/main/res/layout/fragment_dog.xml | 145 ++++++++++ .../src/main/res/layout/fragment_list_dog.xml | 67 +++++ .../app/src/main/res/layout/item_list_dog.xml | 35 +++ .../src/main/res/layout/toolbar_activity.xml | 25 ++ .../main/res/layout/toolbar_md_activity.xml | 22 ++ .../layout/toolbar_md_activity_content.xml | 4 + .../app/src/main/res/menu/fragment_dog.xml | 15 ++ .../src/main/res/menu/fragment_list_dog.xml | 11 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3728 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 3728 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2298 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2298 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 5175 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 5175 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 8228 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 8228 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 11736 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 11736 bytes .../app/src/main/res/values-fr/strings.xml | 42 +++ .../app/src/main/res/values-night/themes.xml | 16 ++ .../app/src/main/res/values/arrays.xml | 19 ++ .../app/src/main/res/values/colors.xml | 23 ++ .../app/src/main/res/values/dimens.xml | 15 ++ .../app/src/main/res/values/ids.xml | 4 + .../app/src/main/res/values/strings.xml | 42 +++ .../app/src/main/res/values/themes.xml | 72 +++++ .../app/src/main/res/xml/backup_rules.xml | 0 .../main/res/xml/data_extraction_rules.xml | 0 .../java/fr/iut/ouafff/ExampleUnitTest.kt | 17 ++ corrections/Ouafff_finP1/build.gradle | 6 + .../Quiz => Ouafff_finP1}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 6 + .../Quiz => Ouafff_finP1}/gradlew | 0 .../Quiz => Ouafff_finP1}/gradlew.bat | 178 ++++++------- corrections/Ouafff_finP1/settings.gradle | 16 ++ corrections/Quiz/.gitignore | 15 ++ corrections/Quiz/app/.gitignore | 1 + .../{corrigeQuiz => }/Quiz/app/build.gradle | 0 corrections/Quiz/app/proguard-rules.pro | 21 ++ .../fr/iut/pm/quiz/ExampleInstrumentedTest.kt | 0 .../Quiz/app/src/main/AndroidManifest.xml | 0 .../main/java/fr/iut/pm/quiz/CheatActivity.kt | 0 .../main/java/fr/iut/pm/quiz/QuizActivity.kt | 0 .../app/src/main/java/fr/iut/pm/quiz/Stub.kt | 0 .../iut/pm/quiz/question/TrueFalseQuestion.kt | 0 .../res/drawable-v21/ic_navigate_next.xml | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../main/res/drawable/ic_navigate_next.xml | 0 .../src/main/res/layout/activity_cheat.xml | 0 .../app/src/main/res/layout/activity_quiz.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../app/src/main/res/values-fr/strings.xml | 0 .../app/src/main/res/values-night/themes.xml | 0 .../Quiz/app/src/main/res/values/colors.xml | 0 .../Quiz/app/src/main/res/values/dimens.xml | 0 .../Quiz/app/src/main/res/values/strings.xml | 0 .../Quiz/app/src/main/res/values/themes.xml | 0 .../app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 ++ .../java/fr/iut/pm/quiz/ExampleUnitTest.kt | 0 .../{corrigeQuiz => }/Quiz/build.gradle | 0 corrections/Quiz/gradle.properties | 23 ++ .../gradle/wrapper/gradle-wrapper.properties | 0 corrections/Quiz/gradlew | 185 +++++++++++++ corrections/Quiz/gradlew.bat | 89 +++++++ .../{corrigeQuiz => }/Quiz/settings.gradle | 0 112 files changed, 2395 insertions(+), 89 deletions(-) rename corrections/{corrigeQuiz/Quiz => Ouafff_finP1}/.gitignore (100%) rename corrections/{corrigeQuiz/Quiz => Ouafff_finP1}/app/.gitignore (100%) create mode 100644 corrections/Ouafff_finP1/app/build.gradle rename corrections/{corrigeQuiz/Quiz => Ouafff_finP1}/app/proguard-rules.pro (100%) create mode 100644 corrections/Ouafff_finP1/app/schemas/fr.iut.ouafff.data.persistance.DogDatabase/1.json create mode 100644 corrections/Ouafff_finP1/app/src/androidTest/java/fr/iut/ouafff/ExampleInstrumentedTest.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/AndroidManifest.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/DogApplication.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/Dog.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/DogDao.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/DogDatabase.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/converter/DateToLongConverter.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/converter/GenderToIntConverter.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogActivity.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogListActivity.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogPagerActivity.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/SimpleFragmentActivity.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/dialog/DatePickerFragment.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/fragment/DogFragment.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/fragment/DogListFragment.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/utils/DogPagerAdapter.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/utils/DogRecyclerViewAdapter.kt create mode 100644 corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add_pet.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/drawable/ic_delete.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/drawable/ic_done.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/drawable/ic_empty_shelter.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/drawable/ic_person.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/drawable/ic_time.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/layout-land/toolbar_md_activity_content.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/layout/activity_pager.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/layout/dialog_date.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/layout/fragment_dog.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/layout/fragment_list_dog.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/layout/item_list_dog.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_activity.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity_content.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/menu/fragment_dog.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/menu/fragment_list_dog.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 corrections/Ouafff_finP1/app/src/main/res/values-fr/strings.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/values-night/themes.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/values/arrays.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/values/colors.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/values/dimens.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/values/ids.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/values/strings.xml create mode 100644 corrections/Ouafff_finP1/app/src/main/res/values/themes.xml rename corrections/{corrigeQuiz/Quiz => Ouafff_finP1}/app/src/main/res/xml/backup_rules.xml (100%) rename corrections/{corrigeQuiz/Quiz => Ouafff_finP1}/app/src/main/res/xml/data_extraction_rules.xml (100%) create mode 100644 corrections/Ouafff_finP1/app/src/test/java/fr/iut/ouafff/ExampleUnitTest.kt create mode 100644 corrections/Ouafff_finP1/build.gradle rename corrections/{corrigeQuiz/Quiz => Ouafff_finP1}/gradle.properties (100%) create mode 100644 corrections/Ouafff_finP1/gradle/wrapper/gradle-wrapper.properties rename corrections/{corrigeQuiz/Quiz => Ouafff_finP1}/gradlew (100%) mode change 100755 => 100644 rename corrections/{corrigeQuiz/Quiz => Ouafff_finP1}/gradlew.bat (96%) create mode 100644 corrections/Ouafff_finP1/settings.gradle create mode 100644 corrections/Quiz/.gitignore create mode 100644 corrections/Quiz/app/.gitignore rename corrections/{corrigeQuiz => }/Quiz/app/build.gradle (100%) create mode 100644 corrections/Quiz/app/proguard-rules.pro rename corrections/{corrigeQuiz => }/Quiz/app/src/androidTest/java/fr/iut/pm/quiz/ExampleInstrumentedTest.kt (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/AndroidManifest.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/java/fr/iut/pm/quiz/CheatActivity.kt (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/java/fr/iut/pm/quiz/QuizActivity.kt (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/java/fr/iut/pm/quiz/Stub.kt (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/java/fr/iut/pm/quiz/question/TrueFalseQuestion.kt (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/drawable-v21/ic_navigate_next.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/drawable/ic_navigate_next.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/layout/activity_cheat.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/layout/activity_quiz.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/values-fr/strings.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/values-night/themes.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/values/colors.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/values/dimens.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/values/strings.xml (100%) rename corrections/{corrigeQuiz => }/Quiz/app/src/main/res/values/themes.xml (100%) create mode 100644 corrections/Quiz/app/src/main/res/xml/backup_rules.xml create mode 100644 corrections/Quiz/app/src/main/res/xml/data_extraction_rules.xml rename corrections/{corrigeQuiz => }/Quiz/app/src/test/java/fr/iut/pm/quiz/ExampleUnitTest.kt (100%) rename corrections/{corrigeQuiz => }/Quiz/build.gradle (100%) create mode 100644 corrections/Quiz/gradle.properties rename corrections/{corrigeQuiz => }/Quiz/gradle/wrapper/gradle-wrapper.properties (100%) create mode 100644 corrections/Quiz/gradlew create mode 100644 corrections/Quiz/gradlew.bat rename corrections/{corrigeQuiz => }/Quiz/settings.gradle (100%) diff --git a/corrections/corrigeQuiz/Quiz/.gitignore b/corrections/Ouafff_finP1/.gitignore similarity index 100% rename from corrections/corrigeQuiz/Quiz/.gitignore rename to corrections/Ouafff_finP1/.gitignore diff --git a/corrections/corrigeQuiz/Quiz/app/.gitignore b/corrections/Ouafff_finP1/app/.gitignore similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/.gitignore rename to corrections/Ouafff_finP1/app/.gitignore diff --git a/corrections/Ouafff_finP1/app/build.gradle b/corrections/Ouafff_finP1/app/build.gradle new file mode 100644 index 0000000..3608d3c --- /dev/null +++ b/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" +} \ No newline at end of file diff --git a/corrections/corrigeQuiz/Quiz/app/proguard-rules.pro b/corrections/Ouafff_finP1/app/proguard-rules.pro similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/proguard-rules.pro rename to corrections/Ouafff_finP1/app/proguard-rules.pro diff --git a/corrections/Ouafff_finP1/app/schemas/fr.iut.ouafff.data.persistance.DogDatabase/1.json b/corrections/Ouafff_finP1/app/schemas/fr.iut.ouafff.data.persistance.DogDatabase/1.json new file mode 100644 index 0000000..f8890ec --- /dev/null +++ b/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')" + ] + } +} \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/androidTest/java/fr/iut/ouafff/ExampleInstrumentedTest.kt b/corrections/Ouafff_finP1/app/src/androidTest/java/fr/iut/ouafff/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..deeeb0a --- /dev/null +++ b/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) + } +} \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/AndroidManifest.xml b/corrections/Ouafff_finP1/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8b6f9c7 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/DogApplication.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/DogApplication.kt new file mode 100644 index 0000000..ba10fe5 --- /dev/null +++ b/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) + } +} \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/Dog.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/Dog.kt new file mode 100644 index 0000000..46b1ef6 --- /dev/null +++ b/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 + } +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/DogDao.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/DogDao.kt new file mode 100644 index 0000000..36d9581 --- /dev/null +++ b/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 + + @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) +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/DogDatabase.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/DogDatabase.kt new file mode 100644 index 0000000..e069aec --- /dev/null +++ b/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)) + } + } +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/converter/DateToLongConverter.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/converter/DateToLongConverter.kt new file mode 100644 index 0000000..b9f888a --- /dev/null +++ b/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 +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/converter/GenderToIntConverter.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/data/persistance/converter/GenderToIntConverter.kt new file mode 100644 index 0000000..1599761 --- /dev/null +++ b/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()[this] + +class GenderToIntConverter { + @TypeConverter + fun fromInt(ordinal: Int) = ordinal.toGender() + + @TypeConverter + fun toOrdinal(gender: Gender) = gender.ordinal +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogActivity.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogActivity.kt new file mode 100644 index 0000000..721b1f2 --- /dev/null +++ b/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() +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogListActivity.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogListActivity.kt new file mode 100644 index 0000000..388517b --- /dev/null +++ b/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(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() + } + } +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogPagerActivity.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/DogPagerActivity.kt new file mode 100644 index 0000000..49b2a31 --- /dev/null +++ b/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(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() +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/SimpleFragmentActivity.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/activity/SimpleFragmentActivity.kt new file mode 100644 index 0000000..8629590 --- /dev/null +++ b/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 +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/dialog/DatePickerFragment.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/dialog/DatePickerFragment.kt new file mode 100644 index 0000000..2258eb3 --- /dev/null +++ b/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() + } +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/fragment/DogFragment.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/fragment/DogFragment.kt new file mode 100644 index 0000000..a7ad39b --- /dev/null +++ b/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 + } +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/fragment/DogListFragment.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/fragment/DogListFragment.kt new file mode 100644 index 0000000..deae0df --- /dev/null +++ b/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(R.id.recycler_view) + recyclerview.adapter = dogListAdapter + ItemTouchHelper(DogListItemTouchHelper()).attachToRecyclerView(recyclerview) + view.findViewById(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 + } +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/utils/DogPagerAdapter.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/utils/DogPagerAdapter.kt new file mode 100644 index 0000000..390078e --- /dev/null +++ b/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 } +} diff --git a/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/utils/DogRecyclerViewAdapter.kt b/corrections/Ouafff_finP1/app/src/main/java/fr/iut/ouafff/ui/utils/DogRecyclerViewAdapter.kt new file mode 100644 index 0000000..ecd716b --- /dev/null +++ b/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, private val listener: Callbacks) : + RecyclerView.Adapter() { + + 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(R.id.view_name) + private val viewBreed = itemView.findViewById(R.id.view_breed) + private val cardviewDog = itemView.findViewById(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) { + this.dogList = dogList + notifyDataSetChanged() + } + + + interface Callbacks { + fun onDogSelected(dogId: Long) + } +} diff --git a/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add.xml b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add.xml new file mode 100644 index 0000000..a07919d --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add.xml @@ -0,0 +1,9 @@ + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add_pet.xml b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add_pet.xml new file mode 100644 index 0000000..b6fb20c --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_add_pet.xml @@ -0,0 +1,43 @@ + + + + + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_delete.xml b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_delete.xml new file mode 100644 index 0000000..f9213d2 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,9 @@ + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_done.xml b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_done.xml new file mode 100644 index 0000000..99caef9 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_done.xml @@ -0,0 +1,9 @@ + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_empty_shelter.xml b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_empty_shelter.xml new file mode 100644 index 0000000..32841b3 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_empty_shelter.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_launcher_foreground.xml b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..7ead9c8 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,46 @@ + + + + + + + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_person.xml b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_person.xml new file mode 100644 index 0000000..fbe0080 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_person.xml @@ -0,0 +1,9 @@ + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_time.xml b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_time.xml new file mode 100644 index 0000000..da57663 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/drawable/ic_time.xml @@ -0,0 +1,9 @@ + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/layout-land/toolbar_md_activity_content.xml b/corrections/Ouafff_finP1/app/src/main/res/layout-land/toolbar_md_activity_content.xml new file mode 100644 index 0000000..db8cb86 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/layout-land/toolbar_md_activity_content.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/layout/activity_pager.xml b/corrections/Ouafff_finP1/app/src/main/res/layout/activity_pager.xml new file mode 100644 index 0000000..c21af28 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/layout/activity_pager.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/layout/dialog_date.xml b/corrections/Ouafff_finP1/app/src/main/res/layout/dialog_date.xml new file mode 100644 index 0000000..fe35895 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/layout/dialog_date.xml @@ -0,0 +1,5 @@ + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/layout/fragment_dog.xml b/corrections/Ouafff_finP1/app/src/main/res/layout/fragment_dog.xml new file mode 100644 index 0000000..7852d34 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/layout/fragment_dog.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/layout/fragment_list_dog.xml b/corrections/Ouafff_finP1/app/src/main/res/layout/fragment_list_dog.xml new file mode 100644 index 0000000..391af63 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/layout/fragment_list_dog.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/layout/item_list_dog.xml b/corrections/Ouafff_finP1/app/src/main/res/layout/item_list_dog.xml new file mode 100644 index 0000000..27a172d --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/layout/item_list_dog.xml @@ -0,0 +1,35 @@ + + + + + + + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_activity.xml b/corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_activity.xml new file mode 100644 index 0000000..1755a2b --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_activity.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity.xml b/corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity.xml new file mode 100644 index 0000000..f43e40a --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity_content.xml b/corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity_content.xml new file mode 100644 index 0000000..59d3295 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/layout/toolbar_md_activity_content.xml @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/menu/fragment_dog.xml b/corrections/Ouafff_finP1/app/src/main/res/menu/fragment_dog.xml new file mode 100644 index 0000000..ac9a7ae --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/menu/fragment_dog.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/menu/fragment_list_dog.xml b/corrections/Ouafff_finP1/app/src/main/res/menu/fragment_list_dog.xml new file mode 100644 index 0000000..4dd4b9e --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/menu/fragment_list_dog.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..7353dbd --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..7353dbd --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/mipmap-hdpi/ic_launcher.png b/corrections/Ouafff_finP1/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..3131d552f2cc4e21498f1d1a158f2b60a300be8b GIT binary patch literal 3728 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 Q9oql}8CB_ONz;)30Wk*FasU7T literal 0 HcmV?d00001 diff --git a/corrections/Ouafff_finP1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/corrections/Ouafff_finP1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..0f04309c0cf1eec894922d021c6ed289c47a3145 GIT binary patch literal 11736 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 Q9oql}8CB_ONz;)30Wk*FasU7T literal 0 HcmV?d00001 diff --git a/corrections/Ouafff_finP1/app/src/main/res/values-fr/strings.xml b/corrections/Ouafff_finP1/app/src/main/res/values-fr/strings.xml new file mode 100644 index 0000000..99ca5bb --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/values-fr/strings.xml @@ -0,0 +1,42 @@ + + + Ouafff + Détail du chien + Nouveau chien + Chien %d + Date d\'admission + Chien supprimé + Impossible de supprimer le chien + Sauvegarder + Supprimer + "URL inconnue : " + "Insertion non autorisée dans : " + "Mise à jour non autorisée dans : " + "Suppression non autorisée dans : " + Ajouter un chien + + Genre + Identité + Mesure + Agressivité + Divers + + Nom + Race + Poids + kg + Propriétaire + Date d\'admission + + Inconnu + Mâle + Femelle + + Race inconnue + + C\'est un peu vide par ici… + Commençons par ajouter un chien + Impossible de créer le chien + Le nom du chien et son poids ne peuvent pas être vides. + Un bouton de raccourci pour ajouter un nouveau chien + diff --git a/corrections/Ouafff_finP1/app/src/main/res/values-night/themes.xml b/corrections/Ouafff_finP1/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..4d084c9 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/values/arrays.xml b/corrections/Ouafff_finP1/app/src/main/res/values/arrays.xml new file mode 100644 index 0000000..def17c5 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/values/arrays.xml @@ -0,0 +1,19 @@ + + + + + + @string/gender_unknown + @string/gender_male + @string/gender_female + + + + + + @color/colorNice + @color/colorNormal + @color/colorBad + @color/colorDevil + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/values/colors.xml b/corrections/Ouafff_finP1/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..0e49785 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/values/colors.xml @@ -0,0 +1,23 @@ + + + #F0514B + #C0403C + + #212121 + #727272 + + #FFFFFF + #000000 + + @color/white + + + #2D3640 + #394450 + + + @color/red + #FFAC40 + #FFEE58 + @color/white + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/values/dimens.xml b/corrections/Ouafff_finP1/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..97cb59e --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/values/dimens.xml @@ -0,0 +1,15 @@ + + + + 16dp + 16dp + + 4dp + + + 48dp + 16dp + 8dp + 32dp + + diff --git a/corrections/Ouafff_finP1/app/src/main/res/values/ids.xml b/corrections/Ouafff_finP1/app/src/main/res/values/ids.xml new file mode 100644 index 0000000..3241b29 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/values/ids.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/corrections/Ouafff_finP1/app/src/main/res/values/strings.xml b/corrections/Ouafff_finP1/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..26e7e82 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/values/strings.xml @@ -0,0 +1,42 @@ + + + Ouafff + Dog detail + New dog + Dog %d + Admission date of the dog: + Dog deleted + Fail to delete dog + Save + Delete + "Unknown URI: " + "Insertion not allowed in: " + "Update not allowed: " + "Delete not allowed: " + Add a dog + + Overview + Gender + Measurement + Aggressiveness + Miscellaneous + + Name + Breed + Weight + kg + Owner + Admission date + + Unknown + Male + Female + + Unknown breed + + It\'s a bit lonely here… + Get started by adding a pet + Cannot create the dog + Dog\'s name and weight cannot be empty. + A shortcut button to add a new dog + diff --git a/corrections/Ouafff_finP1/app/src/main/res/values/themes.xml b/corrections/Ouafff_finP1/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..64a3211 --- /dev/null +++ b/corrections/Ouafff_finP1/app/src/main/res/values/themes.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/xml/backup_rules.xml b/corrections/Ouafff_finP1/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/xml/backup_rules.xml rename to corrections/Ouafff_finP1/app/src/main/res/xml/backup_rules.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/xml/data_extraction_rules.xml b/corrections/Ouafff_finP1/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/xml/data_extraction_rules.xml rename to corrections/Ouafff_finP1/app/src/main/res/xml/data_extraction_rules.xml diff --git a/corrections/Ouafff_finP1/app/src/test/java/fr/iut/ouafff/ExampleUnitTest.kt b/corrections/Ouafff_finP1/app/src/test/java/fr/iut/ouafff/ExampleUnitTest.kt new file mode 100644 index 0000000..2bf15c5 --- /dev/null +++ b/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) + } +} \ No newline at end of file diff --git a/corrections/Ouafff_finP1/build.gradle b/corrections/Ouafff_finP1/build.gradle new file mode 100644 index 0000000..2536974 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/corrections/corrigeQuiz/Quiz/gradle.properties b/corrections/Ouafff_finP1/gradle.properties similarity index 100% rename from corrections/corrigeQuiz/Quiz/gradle.properties rename to corrections/Ouafff_finP1/gradle.properties diff --git a/corrections/Ouafff_finP1/gradle/wrapper/gradle-wrapper.properties b/corrections/Ouafff_finP1/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..7e06b40 --- /dev/null +++ b/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 diff --git a/corrections/corrigeQuiz/Quiz/gradlew b/corrections/Ouafff_finP1/gradlew old mode 100755 new mode 100644 similarity index 100% rename from corrections/corrigeQuiz/Quiz/gradlew rename to corrections/Ouafff_finP1/gradlew diff --git a/corrections/corrigeQuiz/Quiz/gradlew.bat b/corrections/Ouafff_finP1/gradlew.bat similarity index 96% rename from corrections/corrigeQuiz/Quiz/gradlew.bat rename to corrections/Ouafff_finP1/gradlew.bat index ac1b06f..107acd3 100644 --- a/corrections/corrigeQuiz/Quiz/gradlew.bat +++ b/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 diff --git a/corrections/Ouafff_finP1/settings.gradle b/corrections/Ouafff_finP1/settings.gradle new file mode 100644 index 0000000..a0cc7e6 --- /dev/null +++ b/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' diff --git a/corrections/Quiz/.gitignore b/corrections/Quiz/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/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 diff --git a/corrections/Quiz/app/.gitignore b/corrections/Quiz/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/corrections/Quiz/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/corrections/corrigeQuiz/Quiz/app/build.gradle b/corrections/Quiz/app/build.gradle similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/build.gradle rename to corrections/Quiz/app/build.gradle diff --git a/corrections/Quiz/app/proguard-rules.pro b/corrections/Quiz/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/corrections/corrigeQuiz/Quiz/app/src/androidTest/java/fr/iut/pm/quiz/ExampleInstrumentedTest.kt b/corrections/Quiz/app/src/androidTest/java/fr/iut/pm/quiz/ExampleInstrumentedTest.kt similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/androidTest/java/fr/iut/pm/quiz/ExampleInstrumentedTest.kt rename to corrections/Quiz/app/src/androidTest/java/fr/iut/pm/quiz/ExampleInstrumentedTest.kt diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/AndroidManifest.xml b/corrections/Quiz/app/src/main/AndroidManifest.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/AndroidManifest.xml rename to corrections/Quiz/app/src/main/AndroidManifest.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/java/fr/iut/pm/quiz/CheatActivity.kt b/corrections/Quiz/app/src/main/java/fr/iut/pm/quiz/CheatActivity.kt similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/java/fr/iut/pm/quiz/CheatActivity.kt rename to corrections/Quiz/app/src/main/java/fr/iut/pm/quiz/CheatActivity.kt diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/java/fr/iut/pm/quiz/QuizActivity.kt b/corrections/Quiz/app/src/main/java/fr/iut/pm/quiz/QuizActivity.kt similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/java/fr/iut/pm/quiz/QuizActivity.kt rename to corrections/Quiz/app/src/main/java/fr/iut/pm/quiz/QuizActivity.kt diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/java/fr/iut/pm/quiz/Stub.kt b/corrections/Quiz/app/src/main/java/fr/iut/pm/quiz/Stub.kt similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/java/fr/iut/pm/quiz/Stub.kt rename to corrections/Quiz/app/src/main/java/fr/iut/pm/quiz/Stub.kt diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/java/fr/iut/pm/quiz/question/TrueFalseQuestion.kt b/corrections/Quiz/app/src/main/java/fr/iut/pm/quiz/question/TrueFalseQuestion.kt similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/java/fr/iut/pm/quiz/question/TrueFalseQuestion.kt rename to corrections/Quiz/app/src/main/java/fr/iut/pm/quiz/question/TrueFalseQuestion.kt diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/drawable-v21/ic_navigate_next.xml b/corrections/Quiz/app/src/main/res/drawable-v21/ic_navigate_next.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/drawable-v21/ic_navigate_next.xml rename to corrections/Quiz/app/src/main/res/drawable-v21/ic_navigate_next.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/drawable/ic_launcher_foreground.xml b/corrections/Quiz/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/drawable/ic_launcher_foreground.xml rename to corrections/Quiz/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/drawable/ic_navigate_next.xml b/corrections/Quiz/app/src/main/res/drawable/ic_navigate_next.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/drawable/ic_navigate_next.xml rename to corrections/Quiz/app/src/main/res/drawable/ic_navigate_next.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/layout/activity_cheat.xml b/corrections/Quiz/app/src/main/res/layout/activity_cheat.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/layout/activity_cheat.xml rename to corrections/Quiz/app/src/main/res/layout/activity_cheat.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/layout/activity_quiz.xml b/corrections/Quiz/app/src/main/res/layout/activity_quiz.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/layout/activity_quiz.xml rename to corrections/Quiz/app/src/main/res/layout/activity_quiz.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/corrections/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to corrections/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/corrections/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to corrections/Quiz/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher.png b/corrections/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to corrections/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/corrections/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to corrections/Quiz/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher.png b/corrections/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to corrections/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/corrections/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to corrections/Quiz/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/corrections/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to corrections/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/corrections/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to corrections/Quiz/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/corrections/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to corrections/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/corrections/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to corrections/Quiz/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/corrections/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to corrections/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/corrections/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to corrections/Quiz/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/values-fr/strings.xml b/corrections/Quiz/app/src/main/res/values-fr/strings.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/values-fr/strings.xml rename to corrections/Quiz/app/src/main/res/values-fr/strings.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/values-night/themes.xml b/corrections/Quiz/app/src/main/res/values-night/themes.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/values-night/themes.xml rename to corrections/Quiz/app/src/main/res/values-night/themes.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/values/colors.xml b/corrections/Quiz/app/src/main/res/values/colors.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/values/colors.xml rename to corrections/Quiz/app/src/main/res/values/colors.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/values/dimens.xml b/corrections/Quiz/app/src/main/res/values/dimens.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/values/dimens.xml rename to corrections/Quiz/app/src/main/res/values/dimens.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/values/strings.xml b/corrections/Quiz/app/src/main/res/values/strings.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/values/strings.xml rename to corrections/Quiz/app/src/main/res/values/strings.xml diff --git a/corrections/corrigeQuiz/Quiz/app/src/main/res/values/themes.xml b/corrections/Quiz/app/src/main/res/values/themes.xml similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/main/res/values/themes.xml rename to corrections/Quiz/app/src/main/res/values/themes.xml diff --git a/corrections/Quiz/app/src/main/res/xml/backup_rules.xml b/corrections/Quiz/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/corrections/Quiz/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/corrections/Quiz/app/src/main/res/xml/data_extraction_rules.xml b/corrections/Quiz/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/corrections/Quiz/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/corrections/corrigeQuiz/Quiz/app/src/test/java/fr/iut/pm/quiz/ExampleUnitTest.kt b/corrections/Quiz/app/src/test/java/fr/iut/pm/quiz/ExampleUnitTest.kt similarity index 100% rename from corrections/corrigeQuiz/Quiz/app/src/test/java/fr/iut/pm/quiz/ExampleUnitTest.kt rename to corrections/Quiz/app/src/test/java/fr/iut/pm/quiz/ExampleUnitTest.kt diff --git a/corrections/corrigeQuiz/Quiz/build.gradle b/corrections/Quiz/build.gradle similarity index 100% rename from corrections/corrigeQuiz/Quiz/build.gradle rename to corrections/Quiz/build.gradle diff --git a/corrections/Quiz/gradle.properties b/corrections/Quiz/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/corrections/Quiz/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/corrections/corrigeQuiz/Quiz/gradle/wrapper/gradle-wrapper.properties b/corrections/Quiz/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from corrections/corrigeQuiz/Quiz/gradle/wrapper/gradle-wrapper.properties rename to corrections/Quiz/gradle/wrapper/gradle-wrapper.properties diff --git a/corrections/Quiz/gradlew b/corrections/Quiz/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/corrections/Quiz/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/corrections/Quiz/gradlew.bat b/corrections/Quiz/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/corrections/Quiz/gradlew.bat @@ -0,0 +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 diff --git a/corrections/corrigeQuiz/Quiz/settings.gradle b/corrections/Quiz/settings.gradle similarity index 100% rename from corrections/corrigeQuiz/Quiz/settings.gradle rename to corrections/Quiz/settings.gradle