Skip to content

Commit c753602

Browse files
committed
Merge branch 'master' of https://github.com/BuildmLearn/BuildmLearn-Toolkit-Android into bug-fixes
2 parents cc36f2b + 1f80476 commit c753602

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

source-code/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
android:theme="@style/AppTheme" >
2020
<activity
2121
android:name=".activity.HomeActivity"
22+
android:configChanges="orientation|screenSize"
2223
android:label="@string/app_name"
2324
android:theme="@style/NoActionBarThemeTransparentStatusBar" >
2425
</activity>

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -654,10 +654,9 @@ private String saveProject() {
654654

655655

656656
FileUtils.saveXmlFile(toolkit.getSavedDir(), saveFileName, doc);
657-
658657
oldFileName = toolkit.getSavedDir() + saveFileName;
659-
660-
return toolkit.getSavedDir() + saveFileName;
658+
Toast.makeText(this, "Project Successfully Saved!", Toast.LENGTH_SHORT).show();
659+
return oldFileName;
661660
} catch (ParserConfigurationException e) {
662661
e.printStackTrace();
663662
}

source-code/app/src/main/java/org/buildmlearn/toolkit/learnspelling/SpellingActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private void submit() {
191191
} else {
192192
mAlert.dismiss();
193193
boolean isCorrect = false;
194-
if (mEt_Spelling.getText().toString()
194+
if (mEt_Spelling.getText().toString().trim()
195195
.equalsIgnoreCase(mWordList.get(count).getWord())) {
196196
isCorrect = true;
197197
mManager.incrementCorrect();

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingTemplate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ public void addItem(final Activity activity) {
127127
public void onClick(View v) {
128128

129129
if (validated(activity, word, meaning)) {
130-
String wordText = word.getText().toString();
131-
String meaningText = meaning.getText().toString();
130+
String wordText = word.getText().toString().trim();
131+
String meaningText = meaning.getText().toString().trim();
132132

133133
LearnSpellingModel temp = new LearnSpellingModel(wordText, meaningText);
134134
mLearnSpellingData.add(temp);

0 commit comments

Comments
 (0)