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

Refactored widgets package into the gui.widgets package

Browse Source
This commit is contained in:
Juan Miguel Boyero Corral 2013-10-27 00:35:51 +02:00
parent c61878a3a5
commit ec93d39de0
16 changed files with 55 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SWADroid/res/layout/list_item_multiple_choice.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<es.ugr.swad.swadroid.widget.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<es.ugr.swad.swadroid.gui.widget.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/listItem"
android:orientation="vertical"
android:layout_width="match_parent"
@ -29,4 +29,4 @@
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="@android:color/darker_gray"/>
</es.ugr.swad.swadroid.widget.CheckableLinearLayout>
</es.ugr.swad.swadroid.gui.widget.CheckableLinearLayout>

4
SWADroid/res/layout/list_item_single_choice.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<es.ugr.swad.swadroid.widget.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<es.ugr.swad.swadroid.gui.widget.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/listItem"
android:orientation="vertical"
android:layout_width="match_parent"
@ -29,4 +29,4 @@
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="@android:color/darker_gray"/>
</es.ugr.swad.swadroid.widget.CheckableLinearLayout>
</es.ugr.swad.swadroid.gui.widget.CheckableLinearLayout>

10
SWADroid/res/layout/number_picker.xml
View File

@ -19,13 +19,13 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<es.ugr.swad.swadroid.widget.NumberPickerButton android:id="@+id/increment"
android:layout_width="fill_parent"
<es.ugr.swad.swadroid.gui.widget.NumberPickerButton android:id="@+id/increment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/timepicker_up_btn"/>
<EditText android:id="@+id/timepicker_input"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:singleLine="true"
@ -34,8 +34,8 @@
android:textSize="30sp"
android:background="@drawable/timepicker_input"/>
<es.ugr.swad.swadroid.widget.NumberPickerButton android:id="@+id/decrement"
android:layout_width="fill_parent"
<es.ugr.swad.swadroid.gui.widget.NumberPickerButton android:id="@+id/decrement"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/timepicker_down_btn"/>

2
SWADroid/res/layout/tests_make_questions.xml
View File

@ -53,7 +53,7 @@
android:layout_weight="0.1"
android:background="@drawable/back"/>
<es.ugr.swad.swadroid.widget.TextProgressBar
<es.ugr.swad.swadroid.gui.widget.TextProgressBar
android:id="@+id/test_questions_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dip"

2
SWADroid/res/layout/tests_num_questions.xml
View File

@ -22,7 +22,7 @@
android:textSize="20sp"
android:text="@string/testNumQuestionsMsg"/>
<es.ugr.swad.swadroid.widget.NumberPicker
<es.ugr.swad.swadroid.gui.widget.NumberPicker
android:id="@+id/testNumQuestionsNumberPicker"
android:layout_width="match_parent"
android:layout_height="wrap_content"

3
SWADroid/src/es/ugr/swad/swadroid/Preferences.java
View File

@ -36,13 +36,14 @@ import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceActivity;
import android.preference.PreferenceManager;
import com.bugsense.trace.BugSenseHandler;
import es.ugr.swad.swadroid.gui.widget.SeekBarDialogPreference;
import es.ugr.swad.swadroid.model.DataBaseHelper;
import es.ugr.swad.swadroid.sync.SyncUtils;
import es.ugr.swad.swadroid.utils.Crypto;
import es.ugr.swad.swadroid.utils.Utils;
import es.ugr.swad.swadroid.widget.SeekBarDialogPreference;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;

1
SWADroid/src/es/ugr/swad/swadroid/gui/DialogFactory.java
View File

@ -7,7 +7,6 @@ import org.apache.commons.io.IOUtils;
import android.app.AlertDialog;
import android.content.Context;
import android.content.res.Resources;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.webkit.WebView;

2
SWADroid/src/es/ugr/swad/swadroid/widget/CheckableLinearLayout.java → SWADroid/src/es/ugr/swad/swadroid/gui/widget/CheckableLinearLayout.java
View File

@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with SWADroid. If not, see <http://www.gnu.org/licenses/>.
*/
package es.ugr.swad.swadroid.widget;
package es.ugr.swad.swadroid.gui.widget;
import android.content.Context;
import android.util.AttributeSet;

2
SWADroid/src/es/ugr/swad/swadroid/widget/ExpandedListView.java → SWADroid/src/es/ugr/swad/swadroid/gui/widget/ExpandedListView.java
View File

@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with SWADroid. If not, see <http://www.gnu.org/licenses/>.
*/
package es.ugr.swad.swadroid.widget;
package es.ugr.swad.swadroid.gui.widget;
import android.content.Context;
import android.graphics.Canvas;

2
SWADroid/src/es/ugr/swad/swadroid/widget/NumberPicker.java → SWADroid/src/es/ugr/swad/swadroid/gui/widget/NumberPicker.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package es.ugr.swad.swadroid.widget;
package es.ugr.swad.swadroid.gui.widget;
import android.content.Context;
import android.os.Handler;

2
SWADroid/src/es/ugr/swad/swadroid/widget/NumberPickerButton.java → SWADroid/src/es/ugr/swad/swadroid/gui/widget/NumberPickerButton.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package es.ugr.swad.swadroid.widget;
package es.ugr.swad.swadroid.gui.widget;
import android.content.Context;
import android.util.AttributeSet;

2
SWADroid/src/es/ugr/swad/swadroid/widget/SeekBarDialogPreference.java → SWADroid/src/es/ugr/swad/swadroid/gui/widget/SeekBarDialogPreference.java
View File

@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with SWADroid. If not, see <http://www.gnu.org/licenses/>.
*/
package es.ugr.swad.swadroid.widget;
package es.ugr.swad.swadroid.gui.widget;
import android.content.Context;
import android.content.res.TypedArray;

2
SWADroid/src/es/ugr/swad/swadroid/widget/TextProgressBar.java → SWADroid/src/es/ugr/swad/swadroid/gui/widget/TextProgressBar.java
View File

@ -17,7 +17,7 @@
* along with SWADroid. If not, see <http://www.gnu.org/licenses/>.
*/
package es.ugr.swad.swadroid.widget;
package es.ugr.swad.swadroid.gui.widget;
import android.content.Context;
import android.graphics.Canvas;

0
SWADroid/src/es/ugr/swad/swadroid/widget/package.html → SWADroid/src/es/ugr/swad/swadroid/gui/widget/package.html
View File

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

@ -31,9 +31,9 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import es.ugr.swad.swadroid.Constants;
import es.ugr.swad.swadroid.R;
import es.ugr.swad.swadroid.gui.widget.CheckableLinearLayout;
import es.ugr.swad.swadroid.model.Test;
import es.ugr.swad.swadroid.model.TestAnswer;
import es.ugr.swad.swadroid.widget.CheckableLinearLayout;
import java.util.List;

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

@ -32,15 +32,16 @@ import android.widget.AdapterView.OnItemClickListener;
import es.ugr.swad.swadroid.Constants;
import es.ugr.swad.swadroid.Preferences;
import es.ugr.swad.swadroid.R;
import es.ugr.swad.swadroid.gui.widget.CheckableLinearLayout;
import es.ugr.swad.swadroid.gui.widget.NumberPicker;
import es.ugr.swad.swadroid.gui.widget.TextProgressBar;
import es.ugr.swad.swadroid.model.Test;
import es.ugr.swad.swadroid.model.TestAnswer;
import es.ugr.swad.swadroid.model.TestQuestion;
import es.ugr.swad.swadroid.model.TestTag;
import es.ugr.swad.swadroid.modules.Module;
import es.ugr.swad.swadroid.utils.Utils;
import es.ugr.swad.swadroid.widget.CheckableLinearLayout;
import es.ugr.swad.swadroid.widget.NumberPicker;
import es.ugr.swad.swadroid.widget.TextProgressBar;
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
@ -120,6 +121,37 @@ public class TestsMake extends Module {
/**
* Screen to select the number of questions in the test
* REQUIRES API 11 OR HIGHER
*/
/*private void setNumQuestions() {
final android.widget.NumberPicker numberPicker;
Button acceptButton;
setLayout(R.layout.tests_num_questions);
numberPicker = (android.widget.NumberPicker) findViewById(R.id.testNumQuestionsNumberPicker);
numberPicker.setMaxValue(test.getMax());
numberPicker.setMinValue(test.getMin());
numberPicker.setValue(test.getDef());
numberPicker.setWrapSelectorWheel(false);
acceptButton = (Button) findViewById(R.id.testNumQuestionsAcceptButton);
acceptButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
numQuestions = numberPicker.getValue();
if (isDebuggable) {
Log.d(TAG, "numQuestions=" + numQuestions);
}
setTags();
}
});
}*/
/**
* Screen to select the number of questions in the test
*
*/
private void setNumQuestions() {
final NumberPicker numberPicker;