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

Fixed Lint errors

Browse Source
This commit is contained in:
Juan Miguel Boyero Corral 2014-08-09 10:40:05 +02:00
parent f05130f6e1
commit 10f2eacac4
15 changed files with 106 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
SWADroid/res/layout-v11/tests_num_questions.xml Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/testNumQuestionsContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/testNumQuestionsText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dip"
android:layout_marginTop="20dip"
android:gravity="center"
android:text="@string/testNumQuestionsMsg"
android:textColor="@color/foreground1"
android:textSize="20sp" />
<NumberPicker
android:id="@+id/testNumQuestionsNumberPicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/testNumQuestionsText"
android:layout_centerInParent="true"
android:width="100dip"
android:visibility="gone" />
</RelativeLayout>
</RelativeLayout>

15
SWADroid/res/layout/capture.xml
View File

@ -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"/>

12
SWADroid/res/layout/group_list_item.xml
View File

@ -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" />
</LinearLayout>

7
SWADroid/res/layout/group_type_list_item.xml
View File

@ -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" />

3
SWADroid/res/layout/image_list_item.xml
View File

@ -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" >
</TextView>

5
SWADroid/res/layout/image_list_item_group.xml
View File

@ -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" >

3
SWADroid/res/layout/list_complex.xml
View File

@ -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">
<TextView

3
SWADroid/res/layout/list_header.xml
View File

@ -5,4 +5,7 @@
android:layout_height="wrap_content"
android:paddingBottom="2dip"
android:paddingLeft="5dip"
android:paddingStart="5dip"
android:paddingRight="0dip"
android:paddingEnd="0dip"
android:paddingTop="2dip"/>

3
SWADroid/res/layout/list_item.xml
View File

@ -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"/>

6
SWADroid/res/layout/preference_child.xml
View File

@ -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" >
<RelativeLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginBottom="6dip"
android:layout_marginEnd="6dip"
android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_weight="1" >
@ -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"

6
SWADroid/res/layout/preference_child_summary_error.xml
View File

@ -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" >
<RelativeLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginBottom="6dip"
android:layout_marginEnd="6dip"
android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_weight="1" >
@ -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"

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

@ -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"/>

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

@ -21,15 +21,6 @@
android:text="@string/testNumQuestionsMsg"
android:textColor="@color/foreground1"
android:textSize="20sp" />
<NumberPicker
android:id="@+id/testNumQuestionsNumberPicker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/testNumQuestionsText"
android:layout_centerInParent="true"
android:width="100dip"
android:visibility="gone" />
<es.ugr.swad.swadroid.gui.widget.NumberPicker
android:id="@+id/testNumQuestionsNumberPickerOld"

6
SWADroid/res/values/strings.xml
View File

@ -141,9 +141,9 @@
<string name="sendMsg">Send</string>
<string name="addRcv">Add Recievers</string>
<string name="selectRcvModuleLabel">Select Recievers</string>
<string name="filterUsersListModuleLabel">Filter Recievers</string>
<string name="addRcv">Add Receivers</string>
<string name="selectRcvModuleLabel">Select Receivers</string>
<string name="filterUsersListModuleLabel">Filter Receivers</string>
<string name="acceptFilters">Filter</string>
<string name="cancelFilters">Cancel</string>

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

@ -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);