Merge pull request #21 from scopeInfinity/changes

Fixed: Issue #12, Hint not shown in Flash Template
BuildmLearn · Feb 2, 2016 · a7efde9 · a7efde9
2 parents ab6caf5 + 0e76cb3
commit a7efde9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/MainFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/MainFragment.java
@@ -35,8 +35,8 @@ public class MainFragment extends Fragment implements
     GlobalData gd = GlobalData.getInstance();
     String flashCardanswer;
     ImageView questionImage;
-    TextView flashCardText, flashcardNumber;
-    TextView questionText;
+    TextView flashcardNumber;
+    TextView questionText, hintText;
     private Animation animation1;
     private Animation animation2;
     private View currentView;
@@ -61,8 +61,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         iQuestionIndex = 0;
 
         questionImage = (ImageView) view.findViewById(R.id.questionImage);
-        flashCardText = (TextView) view.findViewById(R.id.flashCardText);
-        questionText = (TextView) view.findViewById(R.id.questionhint);
+        questionText = (TextView) view.findViewById(R.id.flashCardText);
+        hintText = (TextView) view.findViewById(R.id.questionhint);
         flashcardNumber = (TextView) view.findViewById(R.id.flashCardNumber);
 
         flipButton = (Button) view.findViewById(R.id.flip_button);
@@ -141,6 +141,8 @@ public void populateQuestion(int index) {
         TextView answerText = (TextView) view.findViewById(R.id.answerText);
         if (mFlash.getQuestion() != null)
             questionText.setText(mFlash.getQuestion());
+        if (mFlash.getHint() != null)
+            hintText.setText(mFlash.getHint());
         if (mFlash.getAnswer() != null) {
             flashCardanswer = mFlash.getAnswer();
             answerText.setText(mFlash.getAnswer());

diff --git a/source-code/app/src/main/res/layout/flash_simu_question.xml b/source-code/app/src/main/res/layout/flash_simu_question.xml
@@ -21,6 +21,7 @@
         android:layout_gravity="center"
         android:paddingLeft="10dp"
         android:text="text"
+        android:gravity="center_horizontal"
         android:paddingRight="10dp"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="@android:color/white" />