sample refactoring

MaksTuev · Aug 1, 2016 · 31ab5dd · 31ab5dd
1 parent b09ddba
commit 31ab5dd
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 23 deletions.
diff --git a/sample/src/main/java/com/agna/ferro/sample/app/AppComponent.java b/sample/src/main/java/com/agna/ferro/sample/app/AppComponent.java
@@ -18,7 +18,7 @@
 import android.content.Context;
 
 import com.agna.ferro.mvp.component.scope.PerApplication;
-import com.agna.ferro.sample.module.book.BookRepository;
+import com.agna.ferro.sample.interactor.book.BookRepository;
 
 import dagger.Component;
 

diff --git a/...agna/ferro/sample/domain/entity/Book.java → ...va/com/agna/ferro/sample/domain/Book.java b/...agna/ferro/sample/domain/entity/Book.java → ...va/com/agna/ferro/sample/domain/Book.java
@@ -1,4 +1,4 @@
-package com.agna.ferro.sample.domain.entity;
+package com.agna.ferro.sample.domain;
 
 /**
  * Book entity

diff --git a/...ro/sample/module/book/BookRepository.java → ...ample/interactor/book/BookRepository.java b/...ro/sample/module/book/BookRepository.java → ...ample/interactor/book/BookRepository.java
@@ -1,10 +1,10 @@
-package com.agna.ferro.sample.module.book;
+package com.agna.ferro.sample.interactor.book;
 
 import android.content.Context;
 
 import com.agna.ferro.mvp.component.scope.PerApplication;
 import com.agna.ferro.sample.R;
-import com.agna.ferro.sample.domain.entity.Book;
+import com.agna.ferro.sample.domain.Book;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...erro/sample/ui/dagger/ActivityModule.java → ...mple/ui/common/dagger/ActivityModule.java b/...erro/sample/ui/dagger/ActivityModule.java → ...mple/ui/common/dagger/ActivityModule.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.agna.ferro.sample.ui.dagger;
+package com.agna.ferro.sample.ui.common.dagger;
 
 import com.agna.ferro.core.PersistentScreenScope;
 import com.agna.ferro.mvp.component.provider.ActivityProvider;

diff --git a/...erro/sample/ui/dagger/FragmentModule.java → ...mple/ui/common/dagger/FragmentModule.java b/...erro/sample/ui/dagger/FragmentModule.java → ...mple/ui/common/dagger/FragmentModule.java
@@ -1,4 +1,4 @@
-package com.agna.ferro.sample.ui.dagger;
+package com.agna.ferro.sample.ui.common.dagger;
 
 import com.agna.ferro.core.PersistentScreenScope;
 import com.agna.ferro.mvp.component.provider.ActivityProvider;

diff --git a/...ferro/sample/ui/navigation/Navigator.java → ...ample/ui/common/navigation/Navigator.java b/...ferro/sample/ui/navigation/Navigator.java → ...ample/ui/common/navigation/Navigator.java
@@ -1,4 +1,4 @@
-package com.agna.ferro.sample.ui.navigation;
+package com.agna.ferro.sample.ui.common.navigation;
 
 import com.agna.ferro.mvp.component.provider.ActivityProvider;
 import com.agna.ferro.mvp.component.scope.PerScreen;

diff --git a/...rro/sample/ui/widget/SquareImageView.java → ...ple/ui/common/widget/SquareImageView.java b/...rro/sample/ui/widget/SquareImageView.java → ...ple/ui/common/widget/SquareImageView.java
@@ -1,4 +1,4 @@
-package com.agna.ferro.sample.ui.widget;
+package com.agna.ferro.sample.ui.common.widget;
 
 import android.annotation.TargetApi;
 import android.content.Context;

diff --git a/sample/src/main/java/com/agna/ferro/sample/ui/screen/book/BookFragmentView.java b/sample/src/main/java/com/agna/ferro/sample/ui/screen/book/BookFragmentView.java
@@ -16,7 +16,7 @@
 import com.agna.ferro.mvp.view.fragment.MvpFragmentV4View;
 import com.agna.ferro.mvp.presenter.MvpPresenter;
 import com.agna.ferro.sample.R;
-import com.agna.ferro.sample.domain.entity.Book;
+import com.agna.ferro.sample.domain.Book;
 import com.agna.ferro.sample.ui.base.BaseActivity;
 import com.bumptech.glide.Glide;
 

diff --git a/sample/src/main/java/com/agna/ferro/sample/ui/screen/book/BookPresenter.java b/sample/src/main/java/com/agna/ferro/sample/ui/screen/book/BookPresenter.java
@@ -3,8 +3,8 @@
 import com.agna.ferro.mvp.component.scope.PerScreen;
 import com.agna.ferro.mvprx.MvpRxPresenter;
 import com.agna.ferro.rx.OperatorFreeze;
-import com.agna.ferro.sample.domain.entity.Book;
-import com.agna.ferro.sample.module.book.BookRepository;
+import com.agna.ferro.sample.domain.Book;
+import com.agna.ferro.sample.interactor.book.BookRepository;
 
 import javax.inject.Inject;
 

diff --git a/sample/src/main/java/com/agna/ferro/sample/ui/screen/book/FullBookModel.java b/sample/src/main/java/com/agna/ferro/sample/ui/screen/book/FullBookModel.java
@@ -1,6 +1,6 @@
 package com.agna.ferro.sample.ui.screen.book;
 
-import com.agna.ferro.sample.domain.entity.Book;
+import com.agna.ferro.sample.domain.Book;
 
 /**
  * inner model, which used inside Book screen

diff --git a/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/CatalogActivityView.java b/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/CatalogActivityView.java
@@ -10,9 +10,9 @@
 import com.agna.ferro.mvp.component.ScreenComponent;
 import com.agna.ferro.mvp.presenter.MvpPresenter;
 import com.agna.ferro.sample.R;
-import com.agna.ferro.sample.domain.entity.Book;
+import com.agna.ferro.sample.domain.Book;
 import com.agna.ferro.sample.ui.base.BaseActivityView;
-import com.agna.ferro.sample.ui.dagger.ActivityModule;
+import com.agna.ferro.sample.ui.common.dagger.ActivityModule;
 import com.agna.ferro.sample.ui.screen.catalog.grid.BookItemListener;
 import com.agna.ferro.sample.ui.screen.catalog.grid.BooksAdapter;
 

diff --git a/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/CatalogPresenter.java b/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/CatalogPresenter.java
@@ -5,9 +5,9 @@
 import com.agna.ferro.mvp.component.scope.PerScreen;
 import com.agna.ferro.mvprx.MvpRxPresenter;
 import com.agna.ferro.rx.OperatorFreeze;
-import com.agna.ferro.sample.domain.entity.Book;
-import com.agna.ferro.sample.module.book.BookRepository;
-import com.agna.ferro.sample.ui.navigation.Navigator;
+import com.agna.ferro.sample.domain.Book;
+import com.agna.ferro.sample.interactor.book.BookRepository;
+import com.agna.ferro.sample.ui.common.navigation.Navigator;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/CatalogScreenComponent.java b/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/CatalogScreenComponent.java
@@ -3,7 +3,7 @@
 import com.agna.ferro.mvp.component.ScreenComponent;
 import com.agna.ferro.mvp.component.scope.PerScreen;
 import com.agna.ferro.sample.app.AppComponent;
-import com.agna.ferro.sample.ui.dagger.ActivityModule;
+import com.agna.ferro.sample.ui.common.dagger.ActivityModule;
 
 import dagger.Component;
 

diff --git a/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/grid/BookHolder.java b/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/grid/BookHolder.java
@@ -9,7 +9,7 @@
 import android.widget.TextView;
 
 import com.agna.ferro.sample.R;
-import com.agna.ferro.sample.domain.entity.Book;
+import com.agna.ferro.sample.domain.Book;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.drawable.GlideDrawable;
 import com.bumptech.glide.request.RequestListener;

diff --git a/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/grid/BookItemListener.java b/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/grid/BookItemListener.java
@@ -1,6 +1,6 @@
 package com.agna.ferro.sample.ui.screen.catalog.grid;
 
-import com.agna.ferro.sample.domain.entity.Book;
+import com.agna.ferro.sample.domain.Book;
 
 public interface BookItemListener {
     void onDownloadClick(Book book);

diff --git a/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/grid/BooksAdapter.java b/sample/src/main/java/com/agna/ferro/sample/ui/screen/catalog/grid/BooksAdapter.java
@@ -3,7 +3,7 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
-import com.agna.ferro.sample.domain.entity.Book;
+import com.agna.ferro.sample.domain.Book;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/sample/src/main/res/layout/fragment_book.xml b/sample/src/main/res/layout/fragment_book.xml
@@ -20,7 +20,7 @@
                 android:padding="15dp"
                 android:visibility="gone">
 
-            <com.agna.ferro.sample.ui.widget.SquareImageView
+            <com.agna.ferro.sample.ui.common.widget.SquareImageView
                 android:id="@+id/book_cover_iv"
                 android:layout_width="200dp"
                 android:layout_height="wrap_content"

diff --git a/sample/src/main/res/layout/item_book.xml b/sample/src/main/res/layout/item_book.xml
@@ -10,7 +10,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <com.agna.ferro.sample.ui.widget.SquareImageView
+        <com.agna.ferro.sample.ui.common.widget.SquareImageView
             android:id="@+id/book_item_image"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"