diff --git a/SWADroid/res/layout-v11/tests_num_questions.xml b/SWADroid/res/layout-v11/tests_num_questions.xml new file mode 100644 index 00000000..1d70387d --- /dev/null +++ b/SWADroid/res/layout-v11/tests_num_questions.xml @@ -0,0 +1,34 @@ + + + + + + + + + + \ No newline at end of file diff --git a/SWADroid/res/layout/capture.xml b/SWADroid/res/layout/capture.xml index 4bf9913a..38ca66ab 100644 --- a/SWADroid/res/layout/capture.xml +++ b/SWADroid/res/layout/capture.xml @@ -72,7 +72,10 @@ android:id="@+id/format_text_view_label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingLeft="0dip" + android:paddingStart="0dip" android:paddingRight="4dip" + android:paddingEnd="4dip" android:text="@string/msg_default_format" android:textColor="@color/result_minor_text" android:textSize="14sp" @@ -95,7 +98,10 @@ android:id="@+id/type_text_view_label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingLeft="0dip" + android:paddingStart="0dip" android:paddingRight="4dip" + android:paddingEnd="4dip" android:text="@string/msg_default_type" android:textColor="@color/result_minor_text" android:textSize="14sp" @@ -118,7 +124,10 @@ android:id="@+id/time_text_view_label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingLeft="0dip" + android:paddingStart="0dip" android:paddingRight="4dip" + android:paddingEnd="4dip" android:text="@string/msg_default_time" android:textColor="@color/result_minor_text" android:textSize="14sp" @@ -141,7 +150,10 @@ android:id="@+id/meta_text_view_label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingLeft="0dip" + android:paddingStart="0dip" android:paddingRight="4dip" + android:paddingEnd="4dip" android:text="@string/msg_default_meta" android:textColor="@color/result_minor_text" android:textSize="14sp" @@ -171,6 +183,9 @@ android:layout_height="wrap_content" android:autoLink="web" android:paddingLeft="12dip" + android:paddingStart="12dip" + android:paddingRight="0dip" + android:paddingEnd="0dip" android:textColor="@color/result_text" android:textColorLink="@color/result_text" android:textSize="22sp"/> diff --git a/SWADroid/res/layout/group_list_item.xml b/SWADroid/res/layout/group_list_item.xml index 710be938..808dce8f 100644 --- a/SWADroid/res/layout/group_list_item.xml +++ b/SWADroid/res/layout/group_list_item.xml @@ -13,6 +13,9 @@ android:clickable="false" android:focusable="false" android:paddingLeft="5dip" + android:paddingStart="5dip" + android:paddingRight="0dip" + android:paddingEnd="0dip" android:paddingTop="5dip" android:src="@drawable/padlock_red" /> @@ -47,6 +50,9 @@ android:focusable="false" android:gravity="center" android:paddingLeft="7dip" + android:paddingStart="7dip" + android:paddingRight="0dip" + android:paddingEnd="0dip" android:text="@string/vacants" android:textColor="@color/sgilight_gray_32" /> @@ -58,6 +64,9 @@ android:focusable="false" android:gravity="center" android:paddingLeft="7dip" + android:paddingStart="7dip" + android:paddingRight="0dip" + android:paddingEnd="0dip" android:text="@string/numStudent" android:textColor="@color/sgilight_gray_32" /> @@ -69,6 +78,9 @@ android:focusable="false" android:gravity="center" android:paddingLeft="7dip" + android:paddingStart="7dip" + android:paddingRight="0dip" + android:paddingEnd="0dip" android:text="@string/maxStudent" android:textColor="@color/sgilight_gray_32" /> diff --git a/SWADroid/res/layout/group_type_list_item.xml b/SWADroid/res/layout/group_type_list_item.xml index 27a4c4e8..ba985428 100644 --- a/SWADroid/res/layout/group_type_list_item.xml +++ b/SWADroid/res/layout/group_type_list_item.xml @@ -10,8 +10,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/padlockIcon" + android:layout_toEndOf="@id/padlockIcon" android:paddingLeft="35dp" + android:paddingStart="35dp" android:paddingRight="10dp" + android:paddingEnd="10dp" android:textColor="@android:color/black" android:textSize="20sp" android:textStyle="bold" /> @@ -22,7 +25,11 @@ android:layout_height="wrap_content" android:layout_below="@id/groupTypeText" android:layout_toRightOf="@id/padlockIcon" + android:layout_toEndOf="@id/padlockIcon" android:paddingLeft="35dp" + android:paddingStart="35dp" + android:paddingRight="0dp" + android:paddingEnd="0dp" android:textColor="@android:color/black" android:visibility="gone" /> diff --git a/SWADroid/res/layout/image_list_item.xml b/SWADroid/res/layout/image_list_item.xml index e995de98..228891d1 100644 --- a/SWADroid/res/layout/image_list_item.xml +++ b/SWADroid/res/layout/image_list_item.xml @@ -12,6 +12,9 @@ android:gravity="center_vertical" android:paddingBottom="5dip" android:paddingLeft="30dip" + android:paddingStart="30dip" + android:paddingRight="0dip" + android:paddingEnd="0dip" android:paddingTop="5dip" android:textColor="@color/foreground1" > diff --git a/SWADroid/res/layout/image_list_item_group.xml b/SWADroid/res/layout/image_list_item_group.xml index 69af4ae0..98b170dc 100644 --- a/SWADroid/res/layout/image_list_item_group.xml +++ b/SWADroid/res/layout/image_list_item_group.xml @@ -12,8 +12,11 @@ android:gravity="center_vertical" android:paddingBottom="5dip" android:paddingLeft="30dip" + android:paddingStart="30dip" + android:paddingRight="0dip" + android:paddingEnd="0dip" android:paddingTop="5dip" - android:textSize="20dip" + android:textSize="20sp" android:textStyle="bold" android:textColor="@color/foreground1" android:background="@color/gray_goose" > diff --git a/SWADroid/res/layout/list_complex.xml b/SWADroid/res/layout/list_complex.xml index 24b33edb..593e41f8 100644 --- a/SWADroid/res/layout/list_complex.xml +++ b/SWADroid/res/layout/list_complex.xml @@ -4,6 +4,9 @@ android:orientation="vertical" android:paddingBottom="10dip" android:paddingLeft="15dip" + android:paddingStart="15dip" + android:paddingRight="0dip" + android:paddingEnd="0dip" android:paddingTop="10dip"> diff --git a/SWADroid/res/layout/list_item.xml b/SWADroid/res/layout/list_item.xml index 6add632d..2b92a4e8 100644 --- a/SWADroid/res/layout/list_item.xml +++ b/SWADroid/res/layout/list_item.xml @@ -4,6 +4,9 @@ android:layout_height="match_parent" android:paddingBottom="10dip" android:paddingLeft="15dip" + android:paddingStart="15dip" + android:paddingRight="0dip" + android:paddingEnd="0dip" android:paddingTop="10dip" android:textColor="@color/foreground1" android:textAppearance="?android:attr/textAppearanceLarge"/> diff --git a/SWADroid/res/layout/preference_child.xml b/SWADroid/res/layout/preference_child.xml index 66701298..a8a83dd1 100644 --- a/SWADroid/res/layout/preference_child.xml +++ b/SWADroid/res/layout/preference_child.xml @@ -24,13 +24,16 @@ android:gravity="center_vertical" android:minHeight="?android:attr/listPreferredItemHeight" android:paddingEnd="?android:attr/scrollbarSize" - android:paddingStart="16dip" > + android:paddingRight="?android:attr/scrollbarSize" + android:paddingStart="16dip" + android:paddingLeft="16dip" > @@ -48,6 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignStart="@android:id/title" + android:layout_alignLeft="@android:id/title" android:layout_below="@android:id/title" android:maxLines="4" android:textAppearance="?android:attr/textAppearanceSmall" diff --git a/SWADroid/res/layout/preference_child_summary_error.xml b/SWADroid/res/layout/preference_child_summary_error.xml index d0cead4a..54de1678 100644 --- a/SWADroid/res/layout/preference_child_summary_error.xml +++ b/SWADroid/res/layout/preference_child_summary_error.xml @@ -6,13 +6,16 @@ android:baselineAligned="false" android:minHeight="?android:attr/listPreferredItemHeight" android:paddingEnd="?android:attr/scrollbarSize" - android:paddingStart="16dip" > + android:paddingRight="?android:attr/scrollbarSize" + android:paddingStart="16dip" + android:paddingLeft="16dip" > @@ -30,6 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignStart="@android:id/title" + android:layout_alignLeft="@android:id/title" android:layout_below="@android:id/title" android:maxLines="4" android:textAppearance="?android:attr/textAppearanceSmall" diff --git a/SWADroid/res/layout/tests_make_questions.xml b/SWADroid/res/layout/tests_make_questions.xml index 2d76caf6..af01e933 100644 --- a/SWADroid/res/layout/tests_make_questions.xml +++ b/SWADroid/res/layout/tests_make_questions.xml @@ -9,6 +9,9 @@ android:id="@+id/testMakeQuestionScore" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingStart="0dip" + android:paddingLeft="0dip" + android:paddingEnd="10dip" android:paddingRight="10dip" android:textStyle="bold" android:visibility="gone"/> diff --git a/SWADroid/res/layout/tests_num_questions.xml b/SWADroid/res/layout/tests_num_questions.xml index 2df2ae0f..8e22f8eb 100644 --- a/SWADroid/res/layout/tests_num_questions.xml +++ b/SWADroid/res/layout/tests_num_questions.xml @@ -21,15 +21,6 @@ android:text="@string/testNumQuestionsMsg" android:textColor="@color/foreground1" android:textSize="20sp" /> - - Send - Add Recievers - Select Recievers - Filter Recievers + Add Receivers + Select Receivers + Filter Receivers Filter Cancel diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java index 7ef42a97..96f58b7c 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java @@ -18,8 +18,10 @@ */ package es.ugr.swad.swadroid.modules.tests; +import android.annotation.TargetApi; import android.database.Cursor; import android.graphics.Color; +import android.os.Build; import android.os.Bundle; import android.support.v4.view.MenuItemCompat; import android.text.Html; @@ -41,7 +43,6 @@ import android.widget.ListView; import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; - import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.gui.MenuActivity; @@ -52,7 +53,6 @@ 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.utils.Utils; - import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; @@ -118,7 +118,8 @@ public class TestsMake extends MenuActivity { setContentView(layout); } - private void setNumQuestions() { + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + private void setNumQuestions() { if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) { android.widget.NumberPicker numberPicker = (android.widget.NumberPicker) findViewById(R.id.testNumQuestionsNumberPicker); @@ -141,7 +142,8 @@ public class TestsMake extends MenuActivity { /** * Screen to select the number of questions in the test */ - private void selectNumQuestions() { + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + private void selectNumQuestions() { screenStep = ScreenStep.NUM_QUESTIONS; setLayout(R.layout.tests_num_questions);