Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .idea/androidTestResultsUserPreferences.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ android {
testOptions {
animationsDisabled = true
}
namespace 'com.openclassrooms.magicgithub'
}

dependencies {
Expand All @@ -40,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:runner:1.5.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.espresso:espresso-core:3.5.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.0'
}
5 changes: 2 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.openclassrooms.magicgithub">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" >

<uses-permission android:name="android.permission.INTERNET" />

Expand All @@ -12,7 +11,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ui.user_list.ListUserActivity" android:exported="true">
<activity android:name=".ui.user_list.ListUserActivity" android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import com.openclassrooms.magicgithub.model.User;
import java.util.List;
import java.util.ListIterator;

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 {
Expand All @@ -14,8 +18,7 @@ public class FakeApiService implements ApiService {
*/
@Override
public List<User> getUsers() {
// TODO: A modifier
return null;
return users;
}

/**
Expand All @@ -24,14 +27,18 @@ public List<User> getUsers() {
*/
@Override
public void generateRandomUser() {
// TODO: A modifier
///users.clear();
User UserRandom = FAKE_USERS_RANDOM.get(0);
if(users.contains(UserRandom)){
users.remove(UserRandom);}
users.add(UserRandom);
}

/**
* Delete a {@link User} from the {@link FakeApiService#users} list.
*/
@Override
public void deleteUser(User user) {
// TODO: A modifier
users.remove(user);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,21 @@

public class UserRepository {

private final ApiService apiService; // TODO: A utiliser
private final ApiService apiService;

public UserRepository(ApiService apiService) {
this.apiService = apiService;
}

public List<User> 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);
}
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -16,7 +16,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.android.tools.build:gradle:7.3.1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists