Skip to content

Commit a7efde9

Browse files
committed
Merge pull request #21 from scopeInfinity/changes
Fixed: Issue #12, Hint not shown in Flash Template
2 parents ab6caf5 + 0e76cb3 commit a7efde9

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/MainFragment.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public class MainFragment extends Fragment implements
3535
GlobalData gd = GlobalData.getInstance();
3636
String flashCardanswer;
3737
ImageView questionImage;
38-
TextView flashCardText, flashcardNumber;
39-
TextView questionText;
38+
TextView flashcardNumber;
39+
TextView questionText, hintText;
4040
private Animation animation1;
4141
private Animation animation2;
4242
private View currentView;
@@ -61,8 +61,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
6161
iQuestionIndex = 0;
6262

6363
questionImage = (ImageView) view.findViewById(R.id.questionImage);
64-
flashCardText = (TextView) view.findViewById(R.id.flashCardText);
65-
questionText = (TextView) view.findViewById(R.id.questionhint);
64+
questionText = (TextView) view.findViewById(R.id.flashCardText);
65+
hintText = (TextView) view.findViewById(R.id.questionhint);
6666
flashcardNumber = (TextView) view.findViewById(R.id.flashCardNumber);
6767

6868
flipButton = (Button) view.findViewById(R.id.flip_button);
@@ -141,6 +141,8 @@ public void populateQuestion(int index) {
141141
TextView answerText = (TextView) view.findViewById(R.id.answerText);
142142
if (mFlash.getQuestion() != null)
143143
questionText.setText(mFlash.getQuestion());
144+
if (mFlash.getHint() != null)
145+
hintText.setText(mFlash.getHint());
144146
if (mFlash.getAnswer() != null) {
145147
flashCardanswer = mFlash.getAnswer();
146148
answerText.setText(mFlash.getAnswer());

source-code/app/src/main/res/layout/flash_simu_question.xml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
android:layout_gravity="center"
2222
android:paddingLeft="10dp"
2323
android:text="text"
24+
android:gravity="center_horizontal"
2425
android:paddingRight="10dp"
2526
android:textAppearance="?android:attr/textAppearanceMedium"
2627
android:textColor="@android:color/white" />

0 commit comments

Comments
 (0)