Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update of master branch #321

Merged
merged 9 commits into from
Dec 22, 2016
+90 −12
Merged

Update of master branch #321

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2780304
Match template dublicacy fixed.
Dec 15, 2016
5f62a27
Fixed issue #271
jainkuniya Dec 15, 2016
e25e22b
Fixed codacy check
jainkuniya Dec 19, 2016
4b9343e
git push origin bug-fixesMerge branch 'vishwesh3-deleteIssue' into bu…
opticod Dec 20, 2016
f5e9970
Fixes #319. Added the rate_app in the settings fragment.
octacode Dec 22, 2016
de249ef
FIXES #315, Draft not saved if meta details is empty
opticod Dec 22, 2016
12cf31e
Merge pull request #320 from octacode/rate_apk
opticod Dec 22, 2016
1161827
FIXES Question's edit input validation in comprehension and quiz temp…
opticod Dec 22, 2016
8b20518
Merge pull request #304 from free4murad/match-bug
opticod Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
FIXES Question's edit input validation in comprehension and quiz temp… 
…late
@opticod
opticod committed Dec 22, 2016
commit 1161827051d220ce1253c2a1a7fb5e944374d152
8 changes: 8 additions & 0 deletions source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionAdapter.java
View file
Original file line number Diff line number Diff line change
@@ -224,6 +224,14 @@ public void onClick(View v) {
isValidated = false;
}

for (int i = 0; i < options.size(); i++) {
for (int j = 0; j < i; j++) {
if (!options.get(i).getText().toString().trim().isEmpty() && options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())) {
Toast.makeText(context, context.getString(R.string.same_options), Toast.LENGTH_SHORT).show();
isValidated = false;
}
}
}
if (isValidated) {
dialog.dismiss();
ArrayList<String> answerOptions = new ArrayList<>();
10 changes: 9 additions & 1 deletion source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizAdapter.java
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
import android.widget.RadioButton;
import android.widget.Toast;


import org.buildmlearn.toolkit.R;
import org.buildmlearn.toolkit.activity.TemplateEditor;
import org.buildmlearn.toolkit.views.TextViewPlus;
@@ -222,6 +221,15 @@ public void onClick(View v) {
isValidated = false;
}

for (int i = 0; i < options.size(); i++) {
for (int j = 0; j < i; j++) {
if (!options.get(i).getText().toString().trim().isEmpty() && options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())) {
Toast.makeText(context, context.getString(R.string.same_options), Toast.LENGTH_SHORT).show();
isValidated = false;
}
}
}

if (isValidated) {
dialog.dismiss();
ArrayList<String> answerOptions = new ArrayList<>();