Clean up and scope re organization.

Author: android10

app/src/main/java/com/fernandocejas/android10/sample/app/core/di/components/ActivityComponent.java

@@ -29,7 +29,7 @@
  */
 @PerActivity
 @Component(dependencies = ApplicationComponent.class, modules = ActivityModule.class)
-interface ActivityComponent {
+public interface ActivityComponent {
   //Exposed to sub-graphs.
   Activity activity();
 }

app/src/main/java/com/fernandocejas/android10/sample/app/users/GetUserDetails.java

@@ -25,13 +25,13 @@
  * This class is an implementation of {@link UseCase} that represents a use case for
  * retrieving data related to an specific {@link User}.
  */
-public class GetUserDetails extends UseCase {
+class GetUserDetails extends UseCase {
 
   private final int userId;
   private final UserRepository userRepository;
 
   @Inject
-  public GetUserDetails(int userId, UserRepository userRepository,
+  GetUserDetails(int userId, UserRepository userRepository,
       ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
     super(threadExecutor, postExecutionThread);
     this.userId = userId;

app/src/main/java/com/fernandocejas/android10/sample/app/users/GetUserList.java

@@ -25,7 +25,7 @@
  * This class is an implementation of {@link UseCase} that represents a use case for
  * retrieving a collection of all {@link User}.
  */
-public class GetUserList extends UseCase {
+class GetUserList extends UseCase {
 
   private final UserRepository userRepository;
 

app/src/main/java/com/fernandocejas/android10/sample/app/users/User.java

@@ -75,19 +75,4 @@ int getFollowers() {
   void setFollowers(int followers) {
     this.followers = followers;
   }
-
-  @Override public String toString() {
-    final StringBuilder stringBuilder = new StringBuilder();
-
-    stringBuilder.append("***** User Details *****\n");
-    stringBuilder.append("id=" + this.getUserId() + "\n");
-    stringBuilder.append("cover url=" + this.getCoverUrl() + "\n");
-    stringBuilder.append("fullname=" + this.getFullName() + "\n");
-    stringBuilder.append("email=" + this.getEmail() + "\n");
-    stringBuilder.append("description=" + this.getDescription() + "\n");
-    stringBuilder.append("followers=" + this.getFollowers() + "\n");
-    stringBuilder.append("*******************************");
-
-    return stringBuilder.toString();
-  }
 }

app/src/main/java/com/fernandocejas/android10/sample/app/core/di/components/UserComponent.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/UserComponent.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.core.di.components;
+package com.fernandocejas.android10.sample.app.users;
 
 import com.fernandocejas.android10.sample.app.core.di.PerActivity;
+import com.fernandocejas.android10.sample.app.core.di.components.ActivityComponent;
+import com.fernandocejas.android10.sample.app.core.di.components.ApplicationComponent;
 import com.fernandocejas.android10.sample.app.core.di.modules.ActivityModule;
-import com.fernandocejas.android10.sample.app.core.di.modules.UserModule;
-import com.fernandocejas.android10.sample.app.users.UserDetailsFragment;
-import com.fernandocejas.android10.sample.app.users.UserListFragment;
 import dagger.Component;
 
 /**
@@ -28,7 +27,7 @@
  */
 @PerActivity
 @Component(dependencies = ApplicationComponent.class, modules = {ActivityModule.class, UserModule.class})
-public interface UserComponent extends ActivityComponent {
+interface UserComponent extends ActivityComponent {
   void inject(UserListFragment userListFragment);
   void inject(UserDetailsFragment userDetailsFragment);
 }

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDataStoreFactory.java

@@ -57,8 +57,8 @@ UserDataStore create(int userId) {
    * Create {@link UserDataStore} to retrieve data from the Cloud.
    */
   UserDataStore createCloudDataStore() {
-    UserEntityJsonMapper userEntityJsonMapper = new UserEntityJsonMapper();
-    RestApi restApi = new RestApiImpl(this.context, userEntityJsonMapper);
+    final UserEntityJsonMapper userEntityJsonMapper = new UserEntityJsonMapper();
+    final RestApi restApi = new RestApiImpl(this.context, userEntityJsonMapper);
 
     return new CloudUserDataStore(restApi, this.userCache);
   }

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsActivity.java

@@ -11,9 +11,6 @@
 import android.view.Window;
 import com.fernandocejas.android10.sample.app.R;
 import com.fernandocejas.android10.sample.app.core.di.HasComponent;
-import com.fernandocejas.android10.sample.app.core.di.components.DaggerUserComponent;
-import com.fernandocejas.android10.sample.app.core.di.components.UserComponent;
-import com.fernandocejas.android10.sample.app.core.di.modules.UserModule;
 import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;
 
 /**

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsFragment.java

@@ -16,7 +16,6 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import com.fernandocejas.android10.sample.app.R;
-import com.fernandocejas.android10.sample.app.core.di.components.UserComponent;
 import com.fernandocejas.android10.sample.app.view.component.AutoLoadImageView;
 import com.fernandocejas.android10.sample.app.view.fragment.BaseFragment;
 import javax.inject.Inject;

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsPresenter.java

@@ -32,7 +32,7 @@
  * layer.
  */
 @PerActivity
-public class UserDetailsPresenter implements Presenter {
+class UserDetailsPresenter implements Presenter {
 
   private UserDetailsView viewDetailsView;
 

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserEntity.java

@@ -56,10 +56,6 @@ String getCoverUrl() {
     return coverUrl;
   }
 
-  public void setCoverUrl(String coverUrl) {
-    this.coverUrl = coverUrl;
-  }
-
   public String getFullname() {
     return fullname;
   }
@@ -72,38 +68,11 @@ String getDescription() {
     return description;
   }
 
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
   public int getFollowers() {
     return followers;
   }
 
-  public void setFollowers(int followers) {
-    this.followers = followers;
-  }
-
   String getEmail() {
     return email;
   }
-
-  public void setEmail(String email) {
-    this.email = email;
-  }
-
-  @Override public String toString() {
-    final StringBuilder stringBuilder = new StringBuilder();
-
-    stringBuilder.append("***** User Entity Details *****\n");
-    stringBuilder.append("id=" + this.getUserId() + "\n");
-    stringBuilder.append("cover url=" + this.getCoverUrl() + "\n");
-    stringBuilder.append("fullname=" + this.getFullname() + "\n");
-    stringBuilder.append("email=" + this.getEmail() + "\n");
-    stringBuilder.append("description=" + this.getDescription() + "\n");
-    stringBuilder.append("followers=" + this.getFollowers() + "\n");
-    stringBuilder.append("*******************************");
-
-    return stringBuilder.toString();
-  }
 }

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListActivity.java

@@ -11,8 +11,6 @@
 import android.view.Window;
 import com.fernandocejas.android10.sample.app.R;
 import com.fernandocejas.android10.sample.app.core.di.HasComponent;
-import com.fernandocejas.android10.sample.app.core.di.components.DaggerUserComponent;
-import com.fernandocejas.android10.sample.app.core.di.components.UserComponent;
 import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;
 
 /**

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListFragment.java

@@ -18,7 +18,6 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import com.fernandocejas.android10.sample.app.R;
-import com.fernandocejas.android10.sample.app.core.di.components.UserComponent;
 import com.fernandocejas.android10.sample.app.view.fragment.BaseFragment;
 import java.util.Collection;
 import javax.inject.Inject;

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserModel.java

@@ -75,19 +75,4 @@ int getFollowers() {
   void setFollowers(int followers) {
     this.followers = followers;
   }
-
-  @Override public String toString() {
-    final StringBuilder stringBuilder = new StringBuilder();
-
-    stringBuilder.append("***** User Model Details *****\n");
-    stringBuilder.append("id=" + this.getUserId() + "\n");
-    stringBuilder.append("cover url=" + this.getCoverUrl() + "\n");
-    stringBuilder.append("fullname=" + this.getFullName() + "\n");
-    stringBuilder.append("email=" + this.getEmail() + "\n");
-    stringBuilder.append("description=" + this.getDescription() + "\n");
-    stringBuilder.append("followers=" + this.getFollowers() + "\n");
-    stringBuilder.append("*******************************");
-
-    return stringBuilder.toString();
-  }
 }

app/src/main/java/com/fernandocejas/android10/sample/app/users/UserModelDataMapper.java

@@ -26,10 +26,10 @@
  * presentation layer.
  */
 @PerActivity
-public class UserModelDataMapper {
+class UserModelDataMapper {
 
   @Inject
-  public UserModelDataMapper() {}
+  UserModelDataMapper() {}
 
   /**
    * Transform a {@link User} into an {@link UserModel}.
@@ -41,7 +41,7 @@ UserModel transform(User user) {
     if (user == null) {
       throw new IllegalArgumentException("Cannot transform a null value");
     }
-    UserModel userModel = new UserModel(user.getUserId());
+    final UserModel userModel = new UserModel(user.getUserId());
     userModel.setCoverUrl(user.getCoverUrl());
     userModel.setFullName(user.getFullName());
     userModel.setEmail(user.getEmail());

app/src/main/java/com/fernandocejas/android10/sample/app/core/di/modules/UserModule.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/users/UserModule.java

@@ -13,15 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.core.di.modules;
+package com.fernandocejas.android10.sample.app.users;
 
+import com.fernandocejas.android10.sample.app.core.di.PerActivity;
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
 import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
-import com.fernandocejas.android10.sample.app.users.GetUserDetails;
-import com.fernandocejas.android10.sample.app.users.GetUserList;
 import com.fernandocejas.android10.sample.app.interactor.UseCase;
-import com.fernandocejas.android10.sample.app.users.UserRepository;
-import com.fernandocejas.android10.sample.app.core.di.PerActivity;
 import dagger.Module;
 import dagger.Provides;
 import javax.inject.Named;
@@ -30,13 +27,13 @@
  * Dagger module that provides user related collaborators.
  */
 @Module
-public class UserModule {
+class UserModule {
 
   private int userId = -1;
 
-  public UserModule() {}
+  UserModule() {}
 
-  public UserModule(int userId) {
+  UserModule(int userId) {
     this.userId = userId;
   }
 

app/src/main/java/com/fernandocejas/android10/sample/app/users/UsersAdapter.java

@@ -21,7 +21,7 @@
 /**
  * Adaptar that manages a collection of {@link UserModel}.
  */
-public class UsersAdapter extends RecyclerView.Adapter<UsersAdapter.UserViewHolder> {
+class UsersAdapter extends RecyclerView.Adapter<UsersAdapter.UserViewHolder> {
 
   interface OnItemClickListener {
     void onUserItemClicked(UserModel userModel);
@@ -51,11 +51,9 @@ interface OnItemClickListener {
   @Override public void onBindViewHolder(UserViewHolder holder, final int position) {
     final UserModel userModel = this.usersCollection.get(position);
     holder.textViewTitle.setText(userModel.getFullName());
-    holder.itemView.setOnClickListener(new View.OnClickListener() {
-      @Override public void onClick(View v) {
-        if (UsersAdapter.this.onItemClickListener != null) {
-          UsersAdapter.this.onItemClickListener.onUserItemClicked(userModel);
-        }
+    holder.itemView.setOnClickListener(v -> {
+      if (UsersAdapter.this.onItemClickListener != null) {
+        UsersAdapter.this.onItemClickListener.onUserItemClicked(userModel);
       }
     });
   }