From b0c67354ab310420be21de02e547e873830036e7 Mon Sep 17 00:00:00 2001 From: Sephigan <117346105+Sephigan@users.noreply.github.com> Date: Fri, 25 Nov 2022 10:02:22 +0100 Subject: [PATCH 01/13] correct_debug --- .idea/misc.xml | 6 ++++++ .../magicgithub/api/FakeApiService.java | 11 +++++++---- .../magicgithub/repository/UserRepository.java | 7 +++---- 3 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 .idea/misc.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8f5c8ae --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java index 4160020..d2052fc 100644 --- a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java +++ b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java @@ -2,6 +2,8 @@ import com.openclassrooms.magicgithub.model.User; import java.util.List; + +import static com.openclassrooms.magicgithub.api.FakeApiServiceGenerator.FAKE_USERS; import static com.openclassrooms.magicgithub.api.FakeApiServiceGenerator.generateUsers; public class FakeApiService implements ApiService { @@ -14,8 +16,7 @@ public class FakeApiService implements ApiService { */ @Override public List getUsers() { - // TODO: A modifier - return null; + return FAKE_USERS; } /** @@ -24,7 +25,9 @@ public List getUsers() { */ @Override public void generateRandomUser() { - // TODO: A modifier + users.clear(); + User New_User = FAKE_USERS.get(0); + users.add(FAKE_USERS.get(0)); } /** @@ -32,6 +35,6 @@ public void generateRandomUser() { */ @Override public void deleteUser(User user) { - // TODO: A modifier + getUsers().remove(user); } } diff --git a/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java b/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java index fd4c13d..ff1c2c1 100644 --- a/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java +++ b/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java @@ -14,15 +14,14 @@ public UserRepository(ApiService apiService) { } public List getUsers() { - // TODO: A modifier - return null; + return apiService.getUsers(); } public void generateRandomUser() { - // TODO: A modifier + apiService.generateRandomUser(); } public void deleteUser(User user) { - // TODO: A modifier + apiService.deleteUser(user); } } From 6915ae470b6add908febfae2e70a77ffcc811d95 Mon Sep 17 00:00:00 2001 From: Sephigan <117346105+Sephigan@users.noreply.github.com> Date: Fri, 25 Nov 2022 10:16:48 +0100 Subject: [PATCH 02/13] Repair_Code --- .../magicgithub/api/FakeApiService.java | 8 ++------ .../magicgithub/repository/UserRepository.java | 12 +++--------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java index d2052fc..261a61f 100644 --- a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java +++ b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java @@ -15,9 +15,7 @@ public class FakeApiService implements ApiService { * Those users must be generated by {@link FakeApiServiceGenerator} */ @Override - public List getUsers() { - return FAKE_USERS; - } + public List getUsers() { return FAKE_USERS; } /** * Generate a random {@link User} and add it {@link FakeApiService#users} list. @@ -34,7 +32,5 @@ public void generateRandomUser() { * Delete a {@link User} from the {@link FakeApiService#users} list. */ @Override - public void deleteUser(User user) { - getUsers().remove(user); - } + public void deleteUser(User user) { getUsers().remove(user); } } diff --git a/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java b/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java index ff1c2c1..7d018c3 100644 --- a/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java +++ b/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java @@ -13,15 +13,9 @@ public UserRepository(ApiService apiService) { this.apiService = apiService; } - public List getUsers() { - return apiService.getUsers(); - } + public List getUsers() { return apiService.getUsers(); } - public void generateRandomUser() { - apiService.generateRandomUser(); - } + public void generateRandomUser() { apiService.generateRandomUser(); } - public void deleteUser(User user) { - apiService.deleteUser(user); - } + public void deleteUser(User user) { apiService.deleteUser(user); } } From b331920b8ba267302a73a7eec3e2d63a0e19ffed Mon Sep 17 00:00:00 2001 From: Sephigan <117346105+Sephigan@users.noreply.github.com> Date: Fri, 25 Nov 2022 10:23:14 +0100 Subject: [PATCH 03/13] Correctifs --- .../openclassrooms/magicgithub/api/FakeApiService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java index 261a61f..b3730c2 100644 --- a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java +++ b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java @@ -15,7 +15,7 @@ public class FakeApiService implements ApiService { * Those users must be generated by {@link FakeApiServiceGenerator} */ @Override - public List getUsers() { return FAKE_USERS; } + public List getUsers() { return users; } /** * Generate a random {@link User} and add it {@link FakeApiService#users} list. @@ -24,13 +24,13 @@ public class FakeApiService implements ApiService { @Override public void generateRandomUser() { users.clear(); - User New_User = FAKE_USERS.get(0); - users.add(FAKE_USERS.get(0)); + User UserRandom = FAKE_USERS.get(0); + users.add(UserRandom); } /** * Delete a {@link User} from the {@link FakeApiService#users} list. */ @Override - public void deleteUser(User user) { getUsers().remove(user); } + public void deleteUser(User user) { users.remove(user); } } From 9607d58de7584e599854216cb015c737775a9976 Mon Sep 17 00:00:00 2001 From: Sephigan <117346105+Sephigan@users.noreply.github.com> Date: Fri, 25 Nov 2022 10:31:09 +0100 Subject: [PATCH 04/13] Corrections --- .../com/openclassrooms/magicgithub/api/FakeApiService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java index b3730c2..e0afe99 100644 --- a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java +++ b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java @@ -4,6 +4,7 @@ import java.util.List; import static com.openclassrooms.magicgithub.api.FakeApiServiceGenerator.FAKE_USERS; +import static com.openclassrooms.magicgithub.api.FakeApiServiceGenerator.FAKE_USERS_RANDOM; import static com.openclassrooms.magicgithub.api.FakeApiServiceGenerator.generateUsers; public class FakeApiService implements ApiService { @@ -24,7 +25,7 @@ public class FakeApiService implements ApiService { @Override public void generateRandomUser() { users.clear(); - User UserRandom = FAKE_USERS.get(0); + User UserRandom = FAKE_USERS_RANDOM.get(0); users.add(UserRandom); } From cc430a45950f3603b22ab0da4c497fa29198989b Mon Sep 17 00:00:00 2001 From: Sephigan <117346105+Sephigan@users.noreply.github.com> Date: Wed, 30 Nov 2022 13:36:07 +0100 Subject: [PATCH 05/13] Instrumented_Clear --- .idea/compiler.xml | 6 ++++++ .idea/gradle.xml | 19 +++++++++++++++++++ .idea/jarRepositories.xml | 25 +++++++++++++++++++++++++ .idea/misc.xml | 3 ++- .idea/vcs.xml | 6 ++++++ 5 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..36394ad --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 8f5c8ae..d34a26e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ - + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 9691b5e50835dba37c34de310816637360a8febf Mon Sep 17 00:00:00 2001 From: Sephigan <117346105+Sephigan@users.noreply.github.com> Date: Wed, 30 Nov 2022 13:36:16 +0100 Subject: [PATCH 06/13] Valide --- .idea/androidTestResultsUserPreferences.xml | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .idea/androidTestResultsUserPreferences.xml diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml new file mode 100644 index 0000000..8994dc6 --- /dev/null +++ b/.idea/androidTestResultsUserPreferences.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file From 2340fb8906c76310d9002b31428e384c1878df3c Mon Sep 17 00:00:00 2001 From: Sephigan <117346105+Sephigan@users.noreply.github.com> Date: Thu, 1 Dec 2022 08:38:00 +0100 Subject: [PATCH 07/13] Gradle_Update --- .idea/gradle.xml | 1 + .idea/misc.xml | 2 +- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 3 +-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 36394ad..7b46144 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1b7c1f4..8b05d01 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,10 +41,10 @@ dependencies { testImplementation 'junit:junit:4.12' testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0' // INSTRUMENTED TEST - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.ext:junit:1.1.0' - androidTestImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.1' + androidTestImplementation 'androidx.test:runner:1.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.0' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5d0c2e2..c91c801 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/build.gradle b/build.gradle index e959832..fafbeef 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext.android_appcompat_version = '1.0.2' - ext.android_constraint_layout_version = '1.1.3' + ext.android_constraint_layout_version = '2.1.4' ext.android_material_version = '1.0.0' ext.dagger_version = '2.16' ext.glide_version = '4.8.0' From c70e51d294cd44e2a43d48f5b7f3ff98f47cb890 Mon Sep 17 00:00:00 2001 From: Sephigan <117346105+Sephigan@users.noreply.github.com> Date: Mon, 5 Dec 2022 08:22:48 +0100 Subject: [PATCH 12/13] Fini --- app/build.gradle | 4 ++-- .../com/openclassrooms/magicgithub/api/FakeApiService.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8b05d01..10ddfd6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,8 +42,8 @@ dependencies { testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0' // INSTRUMENTED TEST androidTestImplementation 'androidx.test:runner:1.5.1' - androidTestImplementation 'androidx.test.ext:junit:1.1.4' - androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.0' + androidTestImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.0' androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.0' diff --git a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java index 25bc282..affe9dc 100644 --- a/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java +++ b/app/src/main/java/com/openclassrooms/magicgithub/api/FakeApiService.java @@ -27,8 +27,10 @@ public List getUsers() { */ @Override public void generateRandomUser() { - users.clear(); + ///users.clear(); User UserRandom = FAKE_USERS_RANDOM.get(0); + if(users.contains(UserRandom)){ + users.remove(UserRandom);} users.add(UserRandom); } From 2c4f65ee76d4ccd1850d5e3769fb2141a9fae07e Mon Sep 17 00:00:00 2001 From: Sephigan <117346105+Sephigan@users.noreply.github.com> Date: Fri, 16 Dec 2022 15:44:12 +0100 Subject: [PATCH 13/13] Update UserRepository.java --- .../openclassrooms/magicgithub/repository/UserRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java b/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java index ff1c2c1..d6ce216 100644 --- a/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java +++ b/app/src/main/java/com/openclassrooms/magicgithub/repository/UserRepository.java @@ -7,7 +7,7 @@ public class UserRepository { - private final ApiService apiService; // TODO: A utiliser + private final ApiService apiService; public UserRepository(ApiService apiService) { this.apiService = apiService;