Fallback to rowType to FormRowDescriptorTypeDetail

quemb · Mar 14, 2017 · ebdceb2 · ebdceb2
1 parent da4d5a9
commit ebdceb2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Feb 24 15:17:40 CET 2017
+#Tue Mar 14 15:01:01 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/lib/QMBForm/src/main/java/com/quemb/qmbform/CellViewFactory.java b/lib/QMBForm/src/main/java/com/quemb/qmbform/CellViewFactory.java
@@ -76,6 +76,13 @@ public CellViewFactory() {
         int currentapiVersion = Build.VERSION.SDK_INT;
 
         mViewRowTypeMap = new HashMap<String, Class<? extends FormBaseCell>>();
+
+        //---
+        // Deprecated
+        mViewRowTypeMap.put(RowDescriptor.FormRowDescriptorTypeName, FormDetailTextFieldCell.class);
+        mViewRowTypeMap.put(RowDescriptor.FormRowDescriptorTypeNameVertical, FormDetailTextInlineFieldCell.class);
+        // --
+
         mViewRowTypeMap.put(RowDescriptor.FormRowDescriptorTypeDetailInline, FormDetailTextInlineFieldCell.class);
         mViewRowTypeMap.put(RowDescriptor.FormRowDescriptorTypeDetail, FormDetailTextFieldCell.class);
         mViewRowTypeMap.put(RowDescriptor.FormRowDescriptorTypeText, FormEditTextFieldCell.class);
@@ -129,7 +136,13 @@ public Cell createViewForFormItemDescriptor(Context context, FormItemDescriptor
             try {
                 FormBaseCell formBaseCell;
 
-                formBaseCell = mViewRowTypeMap.get(row.getRowType()).getConstructor(Context.class, RowDescriptor.class).newInstance(
+                // Fallback to FormRowDescriptorTypeDetail if no RowType is defined
+                String rowType = row.getRowType();
+                if (!mViewRowTypeMap.containsKey(rowType)){
+                    rowType = RowDescriptor.FormRowDescriptorTypeDetail;
+                }
+
+                formBaseCell = mViewRowTypeMap.get(rowType).getConstructor(Context.class, RowDescriptor.class).newInstance(
                         context, row);
                 rowView = formBaseCell;
             } catch (InstantiationException e) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ buildscript { @@
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:2.2.3'
+            classpath 'com.android.tools.build:gradle:2.3.0'
         }
     }
@@ Expand Down @@