gMerge branch 'new-design' of github.com:fieldsight/fieldsight-mobile…

… into new-design
fieldsight · Jun 7, 2019 · 6e238e1 · 6e238e1
2 parents 97d8579 + c335759
commit 6e238e1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/collect_app/internal/output.json b/collect_app/internal/output.json
@@ -1,2 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1100,"versionName":"2.9.0-beta","enabled":true,"outputFile":"collect-internal2.9.0-beta.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal2.9.0-beta.apk","properties":{}}]
-
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1104,"versionName":"2.9.4-alpha","enabled":true,"outputFile":"collect-internal2.9.4-alpha.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal2.9.4-alpha.apk","properties":{}}]
diff --git a/collect_app/src/main/java/org/bcss/collect/naxa/contact/ProjectContactsFragment.java b/collect_app/src/main/java/org/bcss/collect/naxa/contact/ProjectContactsFragment.java
@@ -13,6 +13,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 
 import org.bcss.collect.android.R;
 import org.bcss.collect.naxa.common.ViewModelFactory;
@@ -33,7 +34,7 @@ public class ProjectContactsFragment extends Fragment implements ContactAdapter.
 
 
     @BindView(R.id.root_layout_empty_layout)
-    View emptyLayout;
+    LinearLayout emptyLayout;
     private Unbinder unbinder;
 
     @BindView(R.id.recycler_view)

diff --git a/collect_app/src/main/java/org/bcss/collect/naxa/generalforms/GeneralFormsFragment.java b/collect_app/src/main/java/org/bcss/collect/naxa/generalforms/GeneralFormsFragment.java
@@ -60,7 +60,7 @@ public class GeneralFormsFragment extends FieldSightFormListFragment implements
     LinearLayout rootLayout;
 
     @BindView(R.id.root_layout_empty_layout)
-    View emptyLayout;
+    LinearLayout emptyLayout;
 
 
     Unbinder unbinder;

diff --git a/collect_app/src/main/java/org/bcss/collect/naxa/scheduled/data/ScheduledFormsFragment.java b/collect_app/src/main/java/org/bcss/collect/naxa/scheduled/data/ScheduledFormsFragment.java
@@ -11,6 +11,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 
 import org.bcss.collect.android.R;
 import org.bcss.collect.android.application.Collect;
@@ -55,7 +56,7 @@ public class ScheduledFormsFragment extends FieldSightFormListFragment implement
     RecyclerViewEmptySupport recyclerView;
 
     @BindView(R.id.root_layout_empty_layout)
-    View emptyLayout;
+    LinearLayout emptyLayout;
 
     private Site loadedSite;
     private Unbinder unbinder;

diff --git a/collect_app/src/main/java/org/bcss/collect/naxa/stages/StageListFragment.java b/collect_app/src/main/java/org/bcss/collect/naxa/stages/StageListFragment.java
@@ -68,7 +68,7 @@ public class StageListFragment extends Fragment implements OnFormItemClickListen
     private StageViewModel viewModel;
 
     @BindView(R.id.root_layout_empty_layout)
-    public RelativeLayout emptyLayout;
+    public LinearLayout emptyLayout;
 
     public static StageListFragment newInstance(@NonNull Site loadedSite) {
         Bundle bundle = new Bundle();

diff --git a/collect_app/src/main/java/org/bcss/collect/naxa/substages/SubStageListFragment.java b/collect_app/src/main/java/org/bcss/collect/naxa/substages/SubStageListFragment.java
@@ -60,7 +60,7 @@ public class SubStageListFragment extends FieldSightFormListFragment implements
     LinearLayout rootLayout;
 
     @BindView(R.id.root_layout_empty_layout)
-    RelativeLayout emptyLayout;
+    LinearLayout emptyLayout;
 
     private SubStageListAdapter listAdapter;
     private Site loadedSite;
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1100,"versionName":"2.9.0-beta","enabled":true,"outputFile":"collect-internal2.9.0-beta.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal2.9.0-beta.apk","properties":{}}]

		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1104,"versionName":"2.9.4-alpha","enabled":true,"outputFile":"collect-internal2.9.4-alpha.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal2.9.4-alpha.apk","properties":{}}]