Skip to content

Move common model code into library project #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonathan-caryl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move common model code into library project #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions app-mvp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dependencies {
compile dependencies.picasso
compile dependencies.rxAndroid
compile dependencies.circleImageView
compile project(':model')

testCompile dependencies.jUnit
testCompile dependencies.mockito
Expand Down
2 changes: 1 addition & 1 deletion app-mvp/src/main/java/uk/ivanc/archimvp/ArchiApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import rx.Scheduler;
import rx.schedulers.Schedulers;
import uk.ivanc.archimvp.model.GithubService;
import uk.ivanc.archi.model.GithubService;

public class ArchiApplication extends Application {

Expand Down
2 changes: 1 addition & 1 deletion app-mvp/src/main/java/uk/ivanc/archimvp/RepositoryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import java.util.Collections;
import java.util.List;

import uk.ivanc.archimvp.model.Repository;
import uk.ivanc.archi.model.Repository;

public class RepositoryAdapter extends RecyclerView.Adapter<RepositoryAdapter.RepositoryViewHolder> {

Expand Down
32 changes: 0 additions & 32 deletions app-mvp/src/main/java/uk/ivanc/archimvp/model/GithubService.java
View file
Open in desktop

This file was deleted.

115 changes: 0 additions & 115 deletions app-mvp/src/main/java/uk/ivanc/archimvp/model/Repository.java
View file
Open in desktop

This file was deleted.

94 changes: 0 additions & 94 deletions app-mvp/src/main/java/uk/ivanc/archimvp/model/User.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions app-mvp/src/main/java/uk/ivanc/archimvp/presenter/MainPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import rx.Subscriber;
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
import uk.ivanc.archi.model.GithubService;
import uk.ivanc.archi.model.Repository;
import uk.ivanc.archimvp.ArchiApplication;
import uk.ivanc.archimvp.R;
import uk.ivanc.archimvp.model.GithubService;
import uk.ivanc.archimvp.model.Repository;
import uk.ivanc.archimvp.view.MainMvpView;

public class MainPresenter implements Presenter<MainMvpView> {
Expand Down
4 changes: 2 additions & 2 deletions app-mvp/src/main/java/uk/ivanc/archimvp/presenter/RepositoryPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
import rx.functions.Action1;
import uk.ivanc.archi.model.GithubService;
import uk.ivanc.archi.model.User;
import uk.ivanc.archimvp.ArchiApplication;
import uk.ivanc.archimvp.model.GithubService;
import uk.ivanc.archimvp.model.User;
import uk.ivanc.archimvp.view.RepositoryMvpView;

public class RepositoryPresenter implements Presenter<RepositoryMvpView> {
Expand Down
2 changes: 1 addition & 1 deletion app-mvp/src/main/java/uk/ivanc/archimvp/view/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

import java.util.List;

import uk.ivanc.archi.model.Repository;
import uk.ivanc.archimvp.R;
import uk.ivanc.archimvp.RepositoryAdapter;
import uk.ivanc.archimvp.model.Repository;
import uk.ivanc.archimvp.presenter.MainPresenter;

public class MainActivity extends AppCompatActivity implements MainMvpView {
Expand Down
2 changes: 1 addition & 1 deletion app-mvp/src/main/java/uk/ivanc/archimvp/view/MainMvpView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.List;

import uk.ivanc.archimvp.model.Repository;
import uk.ivanc.archi.model.Repository;

public interface MainMvpView extends MvpView {

Expand Down
4 changes: 2 additions & 2 deletions app-mvp/src/main/java/uk/ivanc/archimvp/view/RepositoryActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

import com.squareup.picasso.Picasso;

import uk.ivanc.archi.model.Repository;
import uk.ivanc.archi.model.User;
import uk.ivanc.archimvp.R;
import uk.ivanc.archimvp.model.Repository;
import uk.ivanc.archimvp.model.User;
import uk.ivanc.archimvp.presenter.RepositoryPresenter;

public class RepositoryActivity extends AppCompatActivity implements RepositoryMvpView {
Expand Down
2 changes: 1 addition & 1 deletion app-mvp/src/main/java/uk/ivanc/archimvp/view/RepositoryMvpView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package uk.ivanc.archimvp.view;

import uk.ivanc.archimvp.model.User;
import uk.ivanc.archi.model.User;

public interface RepositoryMvpView extends MvpView {

Expand Down
4 changes: 2 additions & 2 deletions app-mvp/src/test/java/uk/ivanc/archimvp/MainPresenterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import retrofit2.adapter.rxjava.HttpException;
import rx.Observable;
import rx.schedulers.Schedulers;
import uk.ivanc.archimvp.model.GithubService;
import uk.ivanc.archimvp.model.Repository;
import uk.ivanc.archi.model.GithubService;
import uk.ivanc.archi.model.Repository;
import uk.ivanc.archimvp.presenter.MainPresenter;
import uk.ivanc.archimvp.util.MockModelFabric;
import uk.ivanc.archimvp.view.MainMvpView;
Expand Down
4 changes: 2 additions & 2 deletions app-mvp/src/test/java/uk/ivanc/archimvp/RepositoryPresenterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

import rx.Observable;
import rx.schedulers.Schedulers;
import uk.ivanc.archimvp.model.GithubService;
import uk.ivanc.archimvp.model.User;
import uk.ivanc.archi.model.GithubService;
import uk.ivanc.archi.model.User;
import uk.ivanc.archimvp.presenter.RepositoryPresenter;
import uk.ivanc.archimvp.util.MockModelFabric;
import uk.ivanc.archimvp.view.RepositoryMvpView;
Expand Down
4 changes: 2 additions & 2 deletions app-mvp/src/test/java/uk/ivanc/archimvp/util/MockModelFabric.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import java.util.List;
import java.util.Random;

import uk.ivanc.archimvp.model.Repository;
import uk.ivanc.archimvp.model.User;
import uk.ivanc.archi.model.Repository;
import uk.ivanc.archi.model.User;

public class MockModelFabric {

Expand Down
1 change: 1 addition & 0 deletions app-mvvm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
compile dependencies.picasso
compile dependencies.rxAndroid
compile dependencies.circleImageView
compile project(':model')

testCompile dependencies.jUnit
testCompile dependencies.mockito
Expand Down
2 changes: 1 addition & 1 deletion app-mvvm/src/main/java/uk/ivanc/archimvvm/ArchiApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import rx.Scheduler;
import rx.schedulers.Schedulers;
import uk.ivanc.archimvvm.model.GithubService;
import uk.ivanc.archi.model.GithubService;

public class ArchiApplication extends Application {

Expand Down
2 changes: 1 addition & 1 deletion app-mvvm/src/main/java/uk/ivanc/archimvvm/RepositoryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import java.util.Collections;
import java.util.List;

import uk.ivanc.archi.model.Repository;
import uk.ivanc.archimvvm.databinding.ItemRepoBinding;
import uk.ivanc.archimvvm.model.Repository;
import uk.ivanc.archimvvm.viewmodel.ItemRepoViewModel;

public class RepositoryAdapter extends RecyclerView.Adapter<RepositoryAdapter.RepositoryViewHolder> {
Expand Down
Loading