Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Merge branch 'release/0.4.3'

Browse Source
This commit is contained in:
Juan Miguel Boyero Corral 2011-06-15 19:59:42 +02:00
commit cbd85f7a2e
6 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.md
View File

@ -1,3 +1,8 @@
## 0.4.3 (2011-06-15)
* Minor fixes
* Improved tests GUI
## 0.4.2 (2011-06-15)
* Now not answered questions score as 0

2
SWADroid/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="es.ugr.swad.swadroid"
android:installLocation="auto" android:versionCode="19" android:versionName="0.4.2">
android:installLocation="auto" android:versionName="0.4.3" android:versionCode="20">
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher_swadroid" android:debuggable="true">
<activity android:name=".SWADMain"
android:label="@string/app_name"

2
SWADroid/src/es/ugr/swad/swadroid/model/Test.java
View File

@ -471,8 +471,6 @@ public class Test extends Model {
if(ans.getUserAnswer().equals("Y")) {
errors++;
noneSelected = false;
} else {
correctUserAnswers++;
}
}
}

9
SWADroid/src/es/ugr/swad/swadroid/modules/tests/CheckedAnswersArrayAdapter.java
View File

@ -61,6 +61,7 @@ public class CheckedAnswersArrayAdapter extends ArrayAdapter<TestAnswer> {
public View getView(int position, View convertView, ViewGroup parent) {
CheckedTextView tt;
final ListView lv = (ListView) parent;
final int rbPosition = position;
TestAnswer a = items.get(position);
if (convertView == null) {
@ -83,18 +84,14 @@ public class CheckedAnswersArrayAdapter extends ArrayAdapter<TestAnswer> {
tt.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
CheckedTextView rb = (CheckedTextView) v;
int childCount = lv.getChildCount();
int itemPos = 0;
int childCount = lv.getCount();
boolean checked = rb.isChecked();
for(int i=0; i<childCount; i++) {
lv.setItemChecked(i, false);
if(rb == lv.getChildAt(i)) {
itemPos = i;
}
}
lv.setItemChecked(itemPos, !checked);
lv.setItemChecked(rbPosition, !checked);
}
});
}

27
SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java
View File

@ -200,18 +200,17 @@ public class TestsMake extends Module {
acceptButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
int childsCount = checkBoxesList.getCount();
SparseBooleanArray checkedItems = checkBoxesList.getCheckedItemPositions();
tagsList = new ArrayList<TestTag>();
//If "All tags" item checked, add the whole list to the list of selected tags
CheckedTextView allChk = (CheckedTextView) checkBoxesList.getChildAt(0);
if(allChk.isChecked()) {
if(checkedItems.get(0, false)) {
tagsList.add(new TestTag(0, 0, "all", 0));
//If "All tags" item not checked, add the selected items to the list of selected tags
} else {
for(int i=0; i<childsCount; i++) {
CheckedTextView chk = (CheckedTextView) checkBoxesList.getChildAt(i);
if((chk != null) && chk.isChecked()) {
if(checkedItems.get(i, false)) {
tagsList.add(tagsAdapter.getItem(i));
}
}
@ -254,19 +253,18 @@ public class TestsMake extends Module {
acceptButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
int childsCount = checkBoxesList.getCount();
SparseBooleanArray checkedItems = checkBoxesList.getCheckedItemPositions();
answerTypesList = new ArrayList<String>();
/*
* If "All tags" item checked, add the whole list to the list of selected answer types,
* else, add the selected items to the list of selected answer types
*/
CheckedTextView allChk = (CheckedTextView) checkBoxesList.getChildAt(0);
if(allChk.isChecked()) {
if(checkedItems.get(0, false)) {
answerTypesList.add("all");
} else {
for(int i=1; i<childsCount; i++) {
CheckedTextView chk = (CheckedTextView) checkBoxesList.getChildAt(i);
if((chk != null) && chk.isChecked()) {
if(checkedItems.get(i, false)) {
answerTypesList.add((String) answerTypesAdapter.getItem(i));
}
}
@ -472,6 +470,8 @@ public class TestsMake extends Module {
bar.setMax(size);
bar.setProgress(1);
bar.setText(1 + "/" + size);
bar.setTextColor(Color.BLUE);
bar.setTextSize(18);
eval.setVisibility(View.VISIBLE);
title_separator.setVisibility(View.VISIBLE);
@ -675,19 +675,14 @@ public class TestsMake extends Module {
ListView lv = (ListView) parent;
int childCount = lv.getCount();
SparseBooleanArray checkedItems = lv.getCheckedItemPositions();
int checkedItemsCount = checkedItems.size();
boolean allChecked = true;
if(position == 0) {
for(int i=1; i<childCount; i++) {
lv.setItemChecked(i, !chk.isChecked());
}
} else {
if(chk.isChecked()) {
lv.setItemChecked(0, false);
}
for(int i=1; i<checkedItemsCount; i++) {
} else {
for(int i=1; i<childCount; i++) {
if(!checkedItems.get(i, false)) {
allChecked = false;
}
@ -695,6 +690,8 @@ public class TestsMake extends Module {
if (allChecked) {
lv.setItemChecked(0, true);
} else if(chk.isChecked()) {
lv.setItemChecked(0, false);
}
}
}

5
SWADroid/src/es/ugr/swad/swadroid/widget/TextProgressBar.java
View File

@ -69,4 +69,9 @@ public class TextProgressBar extends ProgressBar {
textPaint.setColor(color);
drawableStateChanged();
}
public void setTextSize(float size) {
textPaint.setTextSize(size);
drawableStateChanged();
}
}