QuestionHelpFragment: Use ApmeM's FlowLayout.

To avoid the example images going off the right hand side of the screen when there are too many.
murraycu · Oct 12, 2014 · 37afc0d · 37afc0d
1 parent eac42c0
commit 37afc0d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -82,6 +82,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk15on-1.50" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="okio-1.0.0" level="project" />
+    <orderEntry type="library" exported="" name="layouts-1.4" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="okhttp-2.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -27,5 +27,6 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:20.0.0'
+    compile 'org.apmem.tools:layouts:1.4'
     androidTestCompile 'com.squareup.okhttp:mockwebserver:2.0.0'
 }
diff --git a/app/src/main/java/com/murrayc/galaxyzoo/app/QuestionHelpFragment.java b/app/src/main/java/com/murrayc/galaxyzoo/app/QuestionHelpFragment.java
@@ -19,6 +19,8 @@
 
 import com.murrayc.galaxyzoo.app.Config;
 
+import org.apmem.tools.layouts.FlowLayout;
+
 
 /**
  * A simple {@link Fragment} subclass.
@@ -106,8 +108,8 @@ private void addRowForAnswer(Activity activity, TableLayout tableLayout, Decisio
         textViewAnswer.setText(answer.getText());
         layoutVertical.addView(textViewAnswer);
 
-        final LinearLayout layoutHorizontal = new LinearLayout(activity);
-        layoutHorizontal.setOrientation(LinearLayout.HORIZONTAL);
+        final FlowLayout layoutHorizontal = new FlowLayout(activity);
+        //layoutHorizontal.setOrientation(LinearLayout.HORIZONTAL);
         final LinearLayout.LayoutParams paramsHorizontal = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT);
         paramsHorizontal.setMargins(0, UiUtils.getPxForDpResource(activity, R.dimen.standard_margin), 0, 0);