Repository: incubator-taverna-mobile Updated Branches: refs/heads/master bed82dfff -> 87898736d
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c421e709/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java index 8aa5d70..0ab57dc 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailActivity.java @@ -26,12 +26,13 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import org.apache.taverna.mobile.R; +import org.apache.taverna.mobile.ui.base.BaseActivity; import org.apache.taverna.mobile.utils.Constants; import butterknife.BindView; import butterknife.ButterKnife; -public class WorkflowDetailActivity extends AppCompatActivity { +public class WorkflowDetailActivity extends BaseActivity { @BindView(R.id.toolbar) Toolbar mToolbar; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c421e709/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java index b332882..3b4c8a0 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java @@ -52,12 +52,15 @@ import org.apache.taverna.mobile.data.DataManager; import org.apache.taverna.mobile.data.model.License; import org.apache.taverna.mobile.data.model.User; import org.apache.taverna.mobile.data.model.Workflow; +import org.apache.taverna.mobile.ui.base.BaseActivity; import org.apache.taverna.mobile.ui.imagezoom.ImageZoomActivity; import org.apache.taverna.mobile.ui.imagezoom.ImageZoomFragment; import org.apache.taverna.mobile.ui.workflowrun.WorkflowRunActivity; import org.apache.taverna.mobile.utils.ConnectionInfo; import org.apache.taverna.mobile.utils.Constants; +import javax.inject.Inject; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -68,6 +71,9 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv public final String LOG_TAG = getClass().getSimpleName(); + @Inject DataManager dataManager; + @Inject WorkflowDetailPresenter mWorkflowDetailPresenter; + @BindView(R.id.ivWorkflowImage) ImageView workflowImage; @@ -106,10 +112,6 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv private AlertDialog alertDialog; - private DataManager dataManager; - - private WorkflowDetailPresenter mWorkflowDetailPresenter; - private String id; private String licenceId = null; @@ -134,8 +136,6 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv id = getArguments().getString(ID); - dataManager = new DataManager(); - mWorkflowDetailPresenter = new WorkflowDetailPresenter(dataManager); } @@ -144,7 +144,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_detail_workflow, container, false); - + ((BaseActivity) getActivity()).getActivityComponent().inject(this); ButterKnife.bind(this, rootView); mWorkflowDetailPresenter.attachView(this); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c421e709/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java index a19bec1..ef2d85d 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailPresenter.java @@ -27,6 +27,8 @@ import org.apache.taverna.mobile.ui.base.BasePresenter; import java.util.HashMap; import java.util.Map; +import javax.inject.Inject; + import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.observers.DisposableObserver; @@ -38,6 +40,7 @@ public class WorkflowDetailPresenter extends BasePresenter<WorkflowDetailMvpView private DataManager mDataManager; private CompositeDisposable compositeDisposable; + @Inject public WorkflowDetailPresenter(DataManager dataManager) { mDataManager = dataManager; compositeDisposable = new CompositeDisposable(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c421e709/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java index 50febae..c06c9e6 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunActivity.java @@ -18,7 +18,6 @@ */ package org.apache.taverna.mobile.ui.workflowrun; - import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; @@ -34,20 +33,27 @@ import org.apache.taverna.mobile.R; import org.apache.taverna.mobile.data.DataManager; import org.apache.taverna.mobile.data.local.PreferencesHelper; import org.apache.taverna.mobile.ui.DownloadingFragment; +import org.apache.taverna.mobile.ui.base.BaseActivity; import org.apache.taverna.mobile.ui.playerlogin.PlayerLoginFragment; import org.apache.taverna.mobile.utils.Constants; import org.apache.taverna.mobile.utils.NonSwipeableViewPager; import org.apache.taverna.mobile.utils.WebViewGenerator; +import javax.inject.Inject; + import butterknife.BindView; import butterknife.ButterKnife; import static com.raizlabs.android.dbflow.config.FlowManager.getContext; -public class WorkflowRunActivity extends FragmentActivity implements WorkflowRunMvpView, +public class WorkflowRunActivity extends BaseActivity implements WorkflowRunMvpView, PlayerLoginFragment.OnSuccessful { - + @Inject + DataManager dataManager; + @Inject + WorkflowRunPresenter mWorkflowRunPresenter; + PagerAdapter mPagerAdapter; @BindView(R.id.stepsView) StepsView mStepsView; @@ -60,23 +66,15 @@ public class WorkflowRunActivity extends FragmentActivity implements WorkflowRun private String[] labels; private String workflowRunURL; - private DataManager dataManager; - - private WorkflowRunPresenter mWorkflowRunPresenter; - - private PagerAdapter mPagerAdapter; - @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + getActivityComponent().inject(this); setContentView(R.layout.activity_workflow_run); ButterKnife.bind(this); - dataManager = new DataManager(new PreferencesHelper(getContext())); - mWorkflowRunPresenter = new WorkflowRunPresenter(dataManager); mWorkflowRunPresenter.attachView(this); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c421e709/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java index a7ffcb8..a45ca76 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowrun/WorkflowRunPresenter.java @@ -18,7 +18,6 @@ */ package org.apache.taverna.mobile.ui.workflowrun; - import android.util.Base64; import android.util.Log; @@ -31,6 +30,8 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import javax.inject.Inject; + import io.reactivex.Observable; import io.reactivex.ObservableSource; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -49,6 +50,7 @@ public class WorkflowRunPresenter extends BasePresenter<WorkflowRunMvpView> { private final DataManager mDataManager; private CompositeDisposable compositeDisposable; + @Inject public WorkflowRunPresenter(DataManager dataManager) { mDataManager = dataManager; compositeDisposable = new CompositeDisposable(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c421e709/app/src/main/res/layout/activity_usage.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_usage.xml b/app/src/main/res/layout/activity_usage.xml index 02b9541..ad2800c 100644 --- a/app/src/main/res/layout/activity_usage.xml +++ b/app/src/main/res/layout/activity_usage.xml @@ -190,4 +190,3 @@ </android.support.v4.widget.NestedScrollView> </LinearLayout> - http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c421e709/app/src/test/java/org/apache/taverna/mobile/AnnouncementPresenterTest.java ---------------------------------------------------------------------- diff --git a/app/src/test/java/org/apache/taverna/mobile/AnnouncementPresenterTest.java b/app/src/test/java/org/apache/taverna/mobile/AnnouncementPresenterTest.java index 876351d..488d36a 100644 --- a/app/src/test/java/org/apache/taverna/mobile/AnnouncementPresenterTest.java +++ b/app/src/test/java/org/apache/taverna/mobile/AnnouncementPresenterTest.java @@ -43,7 +43,7 @@ public class AnnouncementPresenterTest { @Before public void setUp() { - announcementPresenter = new AnnouncementPresenter(dataManager); + announcementPresenter.attachView(announcementMvpView); announcements = FakeRemoteDataSource.getAnnouncements(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/c421e709/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index b628d75..c9c8028 100644 --- a/build.gradle +++ b/build.gradle @@ -48,4 +48,5 @@ ext { butterKnifeVersion = '9.0.0-SNAPSHOT' stetho='1.5.0' leakcanary ='1.5.4' + dagger='2.8' } \ No newline at end of file
