test fixes, code clean up

sampleApp/src/main/java/com/zeyad/usecases/app/components/LoaderLayout.java

@@ -105,6 +105,7 @@ public boolean onInterceptHoverEvent(MotionEvent event) {
      * Show progress bar and hide another views.
      */
     public void showProgress() {
+        mProgressBar.bringToFront();
         mProgressBar.setVisibility(VISIBLE);
         mTxvStatus.setVisibility(GONE);
         setSubViewVisibility(INVISIBLE);
@@ -115,6 +116,7 @@ public void showProgress() {
      * Show progress bar over a semi transparent content.
      */
     public void showProgressOverContent() {
+        mProgressBar.bringToFront();
         mProgressBar.setVisibility(VISIBLE);
         bringChildToFront(mProgressBar);
         mTxvStatus.setVisibility(GONE);

sampleApp/src/main/java/com/zeyad/usecases/app/presentation/screens/user_detail/UserDetailFragment.java

@@ -5,6 +5,7 @@
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.Snackbar;
@@ -13,6 +14,7 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
+import android.transition.TransitionInflater;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -86,10 +88,10 @@ public void initialize() {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//        postponeEnterTransition();
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-//            setSharedElementEnterTransition(TransitionInflater.from(getContext()).inflateTransition(android.R.transition.move));
-//        }
+        postponeEnterTransition();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+            setSharedElementEnterTransition(TransitionInflater.from(getContext())
+                    .inflateTransition(android.R.transition.move));
 //        setSharedElementReturnTransition(null); // supply the correct element for return transition
     }
 

sampleApp/src/main/res/layout/view_loader_layout.xml

@@ -9,15 +9,18 @@
         android:id="@+id/progress_bar_loader"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:layout_gravity="center"
+        android:indeterminate="true"
         android:visibility="visible" />
 
     <TextView
         android:id="@+id/txv_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/progress_bar_loader"
         android:layout_gravity="center"
         android:gravity="center_horizontal"
         android:textColor="@color/black"
-        tools:text="ajsdhgas" />
+        tools:text="loading.." />
 </merge>

sampleApp/src/main/res/layout/view_progress.xml

@@ -8,5 +8,5 @@
     <ProgressBar
         android:layout_width="@dimen/forty_eight_dp"
         android:layout_height="@dimen/forty_eight_dp"
-        android:layout_gravity="center" />
+        android:indeterminate="true" />
 </LinearLayout>

sampleApp/src/test/java/com/zeyad/usecases/app/presentation/screens/user_detail/UserDetailVMTest.java

@@ -1,7 +1,7 @@
 package com.zeyad.usecases.app.presentation.screens.user_detail;
 
 import com.zeyad.usecases.app.presentation.screens.user_list.UserRealm;
-import com.zeyad.usecases.data.db.RealmManager;
+import com.zeyad.usecases.data.requests.GetRequest;
 import com.zeyad.usecases.domain.interactors.data.IDataUseCase;
 
 import org.junit.Before;
@@ -52,14 +52,13 @@ public void getRepositories() throws Exception {
         userRealmList.add(userRealm);
         Observable<List> observableUserRealm = Observable.just(userRealmList);
 
-        when(mockDataUseCase.queryDisk(any(RealmManager.RealmQueryProvider.class), any(Class.class)))
+        when(mockDataUseCase.queryDisk(any(GetRequest.class)))
                 .thenReturn(observableUserRealm);
 
-        Observable observable = userDetailVM.getRepositories(userDetailState);
+        Observable observable = userDetailVM.getRepositories(userRealm.getLogin());
 
         // Verify repository interactions
-        verify(mockDataUseCase, times(1)).queryDisk(any(RealmManager.RealmQueryProvider.class),
-                any(Class.class));
+        verify(mockDataUseCase, times(1)).queryDisk(any(GetRequest.class));
 
         // Assert return type
 //        assertEquals(UserDetailState.class, observable.toBlocking().first().getClass());

sampleApp/src/test/java/com/zeyad/usecases/app/presentation/screens/user_list/UserListVMTest.java

@@ -1,7 +1,6 @@
 package com.zeyad.usecases.app.presentation.screens.user_list;
 
-import com.zeyad.usecases.app.components.mvvm.UIModel;
-import com.zeyad.usecases.data.db.RealmManager;
+import com.zeyad.usecases.app.components.redux.UIModel;
 import com.zeyad.usecases.data.requests.GetRequest;
 import com.zeyad.usecases.data.requests.PostRequest;
 import com.zeyad.usecases.domain.interactors.data.IDataUseCase;
@@ -85,14 +84,13 @@ public void search() throws Exception {
         Observable<List> observableUserRealm = Observable.just(userRealmList);
 
         when(mockDataUseCase.getObject(any(GetRequest.class))).thenReturn(observableUserRealm);
-        when(mockDataUseCase.queryDisk(any(RealmManager.RealmQueryProvider.class), any(Class.class)))
+        when(mockDataUseCase.queryDisk(any(GetRequest.class)))
                 .thenReturn(observableUserRealm);
 
         Observable<UIModel> observable = userListVM.search("m");
 
         // Verify repository interactions
-        verify(mockDataUseCase, times(1)).queryDisk(any(RealmManager.RealmQueryProvider.class),
-                any(Class.class));
+        verify(mockDataUseCase, times(1)).queryDisk(any(GetRequest.class));
 
         // Assert return type
 //        TestSubscriber<UserListState> userListStateTestSubscriber = new TestSubscriber<>();

usecases/src/main/java/com/zeyad/usecases/domain/interactors/data/DataUseCase.java

@@ -11,6 +11,7 @@
 import com.zeyad.usecases.data.requests.PostRequest;
 import com.zeyad.usecases.data.utils.Utils;
 import com.zeyad.usecases.domain.executors.PostExecutionThread;
+import com.zeyad.usecases.domain.executors.UIThread;
 import com.zeyad.usecases.domain.repositories.Data;
 
 import java.util.List;
@@ -73,6 +74,21 @@ static void initWithRealm(IDAOMapperFactory entityMapper, PostExecutionThread po
                 .getInstance(), RestApiImpl.getInstance()), entityMapper), postExecutionThread, thread);
     }
 
+    /**
+     * Testing only!
+     * This function should be called at-least once before calling getInstance() method
+     * This function should not be called multiple times, but only when required.
+     * Ideally this function should be called once when application  is started or created.
+     * This function may be called n number of times if required, during mocking and testing.
+     *
+     * @param dataRepository data repository
+     * @param uiThread       ui thread implementation
+     * @param handlerThread  background thread
+     */
+    public static void init(DataRepository dataRepository, UIThread uiThread, HandlerThread handlerThread) {
+        sDataUseCase = new DataUseCase(dataRepository, uiThread, handlerThread);
+    }
+
     public static DataUseCase getInstance() {
         if (sDataUseCase == null)
             throw new NullPointerException("DataUseCase#initRealm must be called before calling getInstance()");

usecases/src/test/java/com/zeyad/usecases/domain/interactors/DataUseCaseTest.java

@@ -43,6 +43,8 @@ public class DataUseCaseTest {
     private IDataUseCase mDataUseCase;
     private Observable observable = Observable.just(true);
     private Data mData = getMockedDataRepo();
+    private GetRequest getRequest = new GetRequest.GetRequestBuilder(Object.class, false)
+            .build();
 
     private Data getMockedDataRepo() {
         final DataRepository dataRepository = Mockito.mock(DataRepository.class);
@@ -114,7 +116,7 @@ public void testGetObject() {
         when(mData.getObjectDynamicallyById(anyString(), anyString(), anyInt(),
                 any(Class.class), any(Class.class), anyBoolean(), anyBoolean())).thenReturn(observable);
 
-        mDataUseCase.getObject(new GetRequest("", "", 0, Object.class, Object.class, false, false));
+        mDataUseCase.getObject(getRequest);
 
         verify(mData, times(1)).getObjectDynamicallyById(anyString(), anyString(),
                 anyInt(), any(Class.class), any(Class.class), anyBoolean(), anyBoolean());
@@ -125,7 +127,7 @@ public void testGetList() {
         when(mData.getListDynamically(anyString(), any(Class.class), any(Class.class), anyBoolean(),
                 anyBoolean())).thenReturn(observable);
 
-        mDataUseCase.getList(new GetRequest("", "", 0, Object.class, Object.class, false, false));
+        mDataUseCase.getList(getRequest);
 
         verify(mData, times(1)).getListDynamically(anyString(), any(Class.class), any(Class.class),
                 anyBoolean(), anyBoolean());
@@ -182,7 +184,9 @@ public void testPutList() {
     public void testExecuteSearch() {
         when(mData.queryDisk(any(RealmManager.RealmQueryProvider.class), any(Class.class))).thenReturn(observable);
 
-        mDataUseCase.queryDisk(realm -> realm.where(TestRealmModel.class), Object.class);
+        mDataUseCase.queryDisk(new GetRequest.GetRequestBuilder(null, true)
+                .queryFactory(realm -> realm.where(TestRealmModel.class))
+                .build());
 
         verify(mData, times(1)).queryDisk(any(RealmManager.RealmQueryProvider.class), any(Class.class));
     }