Pull out packages view, presenter, interactor and data.

android10 · android10 · commit 24f21e1b3691 · 2016-02-09T22:41:21.000+01:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
       android:theme="@style/AppTheme">
 
     <activity
-        android:name=".core.view.activity.MainActivity"
+        android:name=".view.activity.MainActivity"
         android:label="@string/app_name">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/core/di/components/ApplicationComponent.java b/app/src/main/java/com/fernandocejas/android10/sample/app/core/di/components/ApplicationComponent.java
@@ -20,7 +20,7 @@
 import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
 import com.fernandocejas.android10.sample.app.users.UserRepository;
 import com.fernandocejas.android10.sample.app.core.di.modules.ApplicationModule;
-import com.fernandocejas.android10.sample.app.core.view.activity.BaseActivity;
+import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;
 import dagger.Component;
 import javax.inject.Singleton;
 
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/core/di/modules/UserModule.java b/app/src/main/java/com/fernandocejas/android10/sample/app/core/di/modules/UserModule.java
@@ -19,7 +19,7 @@
 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.core.interactor.UseCase;
+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;
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/data/FileManager.java b/app/src/main/java/com/fernandocejas/android10/sample/app/data/FileManager.java
@@ -19,7 +19,6 @@
 import android.content.SharedPreferences;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -48,12 +47,8 @@ public void writeToFile(File file, String fileContent) {
         FileWriter writer = new FileWriter(file);
         writer.write(fileContent);
         writer.close();
-      } catch (FileNotFoundException e) {
-        e.printStackTrace();
       } catch (IOException e) {
         e.printStackTrace();
-      } finally {
-
       }
     }
   }
@@ -78,8 +73,6 @@ public String readFileContent(File file) {
         }
         bufferedReader.close();
         fileReader.close();
-      } catch (FileNotFoundException e) {
-        e.printStackTrace();
       } catch (IOException e) {
         e.printStackTrace();
       }
@@ -105,12 +98,14 @@ public boolean exists(File file) {
    *
    * @param directory The directory which its content will be deleted.
    */
-  public void clearDirectory(File directory) {
+  public boolean clearDirectory(File directory) {
+    boolean result = false;
     if (directory.exists()) {
       for (File file : directory.listFiles()) {
-        file.delete();
+        result = file.delete();
       }
     }
+    return result;
   }
 
   /**
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/interactor/DefaultSubscriber.java b/app/src/main/java/com/fernandocejas/android10/sample/app/interactor/DefaultSubscriber.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.core.interactor;
+package com.fernandocejas.android10.sample.app.interactor;
 
 /**
  * Default subscriber base class to be used whenever you want default error handling.
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/interactor/UseCase.java b/app/src/main/java/com/fernandocejas/android10/sample/app/interactor/UseCase.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.core.interactor;
+package com.fernandocejas.android10.sample.app.interactor;
 
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
 import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/presenter/Presenter.java b/app/src/main/java/com/fernandocejas/android10/sample/app/presenter/Presenter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fernandocejas.android10.sample.app.core.presenter;
+package com.fernandocejas.android10.sample.app.presenter;
 
 /**
  * Interface representing a Presenter in a model view presenter (MVP) pattern.
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/GetUserDetails.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/GetUserDetails.java
@@ -17,7 +17,7 @@
 
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
 import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
-import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
+import com.fernandocejas.android10.sample.app.interactor.UseCase;
 import javax.inject.Inject;
 import rx.Observable;
 
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/GetUserList.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/GetUserList.java
@@ -17,7 +17,7 @@
 
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
 import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
-import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
+import com.fernandocejas.android10.sample.app.interactor.UseCase;
 import javax.inject.Inject;
 import rx.Observable;
 
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsActivity.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsActivity.java
@@ -14,7 +14,7 @@
 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.core.view.activity.BaseActivity;
+import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;
 
 /**
  * Activity that shows details of a certain user.
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsFragment.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsFragment.java
@@ -17,8 +17,8 @@
 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.core.view.component.AutoLoadImageView;
-import com.fernandocejas.android10.sample.app.core.view.fragment.BaseFragment;
+import com.fernandocejas.android10.sample.app.view.component.AutoLoadImageView;
+import com.fernandocejas.android10.sample.app.view.fragment.BaseFragment;
 import javax.inject.Inject;
 
 /**
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsPresenter.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsPresenter.java
@@ -16,11 +16,11 @@
 package com.fernandocejas.android10.sample.app.users;
 
 import android.support.annotation.NonNull;
-import com.fernandocejas.android10.sample.app.core.presenter.Presenter;
+import com.fernandocejas.android10.sample.app.presenter.Presenter;
 import com.fernandocejas.android10.sample.app.exception.DefaultErrorBundle;
 import com.fernandocejas.android10.sample.app.exception.ErrorBundle;
-import com.fernandocejas.android10.sample.app.core.interactor.DefaultSubscriber;
-import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
+import com.fernandocejas.android10.sample.app.interactor.DefaultSubscriber;
+import com.fernandocejas.android10.sample.app.interactor.UseCase;
 import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
 import com.fernandocejas.android10.sample.app.core.di.PerActivity;
 import com.fernandocejas.frodo.annotation.RxLogSubscriber;
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsView.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserDetailsView.java
@@ -4,7 +4,7 @@
  */
 package com.fernandocejas.android10.sample.app.users;
 
-import com.fernandocejas.android10.sample.app.core.view.component.LoadDataView;
+import com.fernandocejas.android10.sample.app.view.component.LoadDataView;
 
 /**
  * Interface representing a View in a model view presenter (MVP) pattern.
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListActivity.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListActivity.java
@@ -13,7 +13,7 @@
 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.view.activity.BaseActivity;
+import com.fernandocejas.android10.sample.app.view.activity.BaseActivity;
 
 /**
  * Activity that shows a list of Users.
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListFragment.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListFragment.java
@@ -19,7 +19,7 @@
 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.core.view.fragment.BaseFragment;
+import com.fernandocejas.android10.sample.app.view.fragment.BaseFragment;
 import java.util.Collection;
 import javax.inject.Inject;
 
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListPresenter.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListPresenter.java
@@ -16,11 +16,11 @@
 package com.fernandocejas.android10.sample.app.users;
 
 import android.support.annotation.NonNull;
-import com.fernandocejas.android10.sample.app.core.presenter.Presenter;
+import com.fernandocejas.android10.sample.app.presenter.Presenter;
 import com.fernandocejas.android10.sample.app.exception.DefaultErrorBundle;
 import com.fernandocejas.android10.sample.app.exception.ErrorBundle;
-import com.fernandocejas.android10.sample.app.core.interactor.DefaultSubscriber;
-import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
+import com.fernandocejas.android10.sample.app.interactor.DefaultSubscriber;
+import com.fernandocejas.android10.sample.app.interactor.UseCase;
 import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
 import com.fernandocejas.android10.sample.app.core.di.PerActivity;
 import java.util.Collection;
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListView.java b/app/src/main/java/com/fernandocejas/android10/sample/app/users/UserListView.java
@@ -4,7 +4,7 @@
  */
 package com.fernandocejas.android10.sample.app.users;
 
-import com.fernandocejas.android10.sample.app.core.view.component.LoadDataView;
+import com.fernandocejas.android10.sample.app.view.component.LoadDataView;
 import java.util.Collection;
 
 /**
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/view/activity/BaseActivity.java b/app/src/main/java/com/fernandocejas/android10/sample/app/view/activity/BaseActivity.java
@@ -1,4 +1,4 @@
-package com.fernandocejas.android10.sample.app.core.view.activity;
+package com.fernandocejas.android10.sample.app.view.activity;
 
 import android.app.Activity;
 import android.app.Fragment;
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/view/activity/MainActivity.java b/app/src/main/java/com/fernandocejas/android10/sample/app/view/activity/MainActivity.java
@@ -1,4 +1,4 @@
-package com.fernandocejas.android10.sample.app.core.view.activity;
+package com.fernandocejas.android10.sample.app.view.activity;
 
 import android.os.Bundle;
 import android.widget.Button;
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/view/component/AutoLoadImageView.java b/app/src/main/java/com/fernandocejas/android10/sample/app/view/component/AutoLoadImageView.java
@@ -3,7 +3,7 @@
  *
  * @author Fernando Cejas (the android10 coder)
  */
-package com.fernandocejas.android10.sample.app.core.view.component;
+package com.fernandocejas.android10.sample.app.view.component;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/view/component/LoadDataView.java b/app/src/main/java/com/fernandocejas/android10/sample/app/view/component/LoadDataView.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2014 android10.org. All rights reserved.
  * @author Fernando Cejas (the android10 coder)
  */
-package com.fernandocejas.android10.sample.app.core.view.component;
+package com.fernandocejas.android10.sample.app.view.component;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/com/fernandocejas/android10/sample/app/view/fragment/BaseFragment.java b/app/src/main/java/com/fernandocejas/android10/sample/app/view/fragment/BaseFragment.java
@@ -3,7 +3,7 @@
  *
  * @author Fernando Cejas (the android10 coder)
  */
-package com.fernandocejas.android10.sample.app.core.view.fragment;
+package com.fernandocejas.android10.sample.app.view.fragment;
 
 import android.app.Fragment;
 import android.widget.Toast;
diff --git a/app/src/main/res/layout/view_user_details.xml b/app/src/main/res/layout/view_user_details.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical"
     >
 
-  <com.fernandocejas.android10.sample.app.core.view.component.AutoLoadImageView
+  <com.fernandocejas.android10.sample.app.view.component.AutoLoadImageView
       android:id="@+id/iv_cover"
       android:layout_width="match_parent"
       android:layout_height="@dimen/iv_cover_height"
diff --git a/app/src/test/java/com/fernandocejas/android10/sample/app/interactor/UseCaseTest.java b/app/src/test/java/com/fernandocejas/android10/sample/app/interactor/UseCaseTest.java
@@ -17,7 +17,6 @@
 
 import com.fernandocejas.android10.sample.app.core.executor.PostExecutionThread;
 import com.fernandocejas.android10.sample.app.core.executor.ThreadExecutor;
-import com.fernandocejas.android10.sample.app.core.interactor.UseCase;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`import android.content.SharedPreferences;`
`20`	`20`	`import java.io.BufferedReader;`
`21`	`21`	`import java.io.File;`
`22`		`-import java.io.FileNotFoundException;`
`23`	`22`	`import java.io.FileReader;`
`24`	`23`	`import java.io.FileWriter;`
`25`	`24`	`import java.io.IOException;`
`@@ -48,12 +47,8 @@ public void writeToFile(File file, String fileContent) {`
`48`	`47`	`FileWriter writer = new FileWriter(file);`
`49`	`48`	`writer.write(fileContent);`
`50`	`49`	`writer.close();`
`51`		`- } catch (FileNotFoundException e) {`
`52`		`- e.printStackTrace();`
`53`	`50`	`} catch (IOException e) {`
`54`	`51`	`e.printStackTrace();`
`55`		`- } finally {`
`56`		`-`
`57`	`52`	`}`
`58`	`53`	`}`
`59`	`54`	`}`
`@@ -78,8 +73,6 @@ public String readFileContent(File file) {`
`78`	`73`	`}`
`79`	`74`	`bufferedReader.close();`
`80`	`75`	`fileReader.close();`
`81`		`- } catch (FileNotFoundException e) {`
`82`		`- e.printStackTrace();`
`83`	`76`	`} catch (IOException e) {`
`84`	`77`	`e.printStackTrace();`
`85`	`78`	`}`
`@@ -105,12 +98,14 @@ public boolean exists(File file) {`
`105`	`98`	`*`
`106`	`99`	`* @param directory The directory which its content will be deleted.`
`107`	`100`	`*/`
`108`		`- public void clearDirectory(File directory) {`
	`101`	`+ public boolean clearDirectory(File directory) {`
	`102`	`+ boolean result = false;`
`109`	`103`	`if (directory.exists()) {`
`110`	`104`	`for (File file : directory.listFiles()) {`
`111`		`- file.delete();`
	`105`	`+ result = file.delete();`
`112`	`106`	`}`
`113`	`107`	`}`
	`108`	`+ return result;`
`114`	`109`	`}`
`115`	`110`
`116`	`111`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.fernandocejas.android10.sample.app.core.view.activity;`
	`1`	`+package com.fernandocejas.android10.sample.app.view.activity;`
`2`	`2`
`3`	`3`	`import android.app.Activity;`
`4`	`4`	`import android.app.Fragment;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* @author Fernando Cejas (the android10 coder)`
`5`	`5`	`*/`
`6`		`-package com.fernandocejas.android10.sample.app.core.view.component;`
	`6`	`+package com.fernandocejas.android10.sample.app.view.component;`
`7`	`7`
`8`	`8`	`import android.app.Activity;`
`9`	`9`	`import android.content.Context;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`android:orientation="vertical"`
`6`	`6`	`>`
`7`	`7`
`8`		`- <com.fernandocejas.android10.sample.app.core.view.component.AutoLoadImageView`
	`8`	`+ <com.fernandocejas.android10.sample.app.view.component.AutoLoadImageView`
`9`	`9`	`android:id="@+id/iv_cover"`
`10`	`10`	`android:layout_width="match_parent"`
`11`	`11`	`android:layout_height="@dimen/iv_cover_height"`