-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
- Loading branch information
Showing
18 changed files
with
795 additions
and
119 deletions.
There are no files selected for viewing
Binary file not shown.
19 changes: 15 additions & 4 deletions
19
app/src/main/java/com/example/raffaele/testapp/MainActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" | ||
| android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin" | ||
| android:paddingRight="@dimen/activity_horizontal_margin" | ||
| android:paddingTop="@dimen/activity_vertical_margin" | ||
| android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity" | ||
| android:id="@+id/MainActivity"> | ||
|
|
||
| <TableLayout | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_alignParentLeft="true" | ||
| android:layout_alignParentStart="true" | ||
| android:id="@+id/tableLayout2"> | ||
|
|
||
| <TableRow | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent"> | ||
|
|
||
| <TextView | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="?android:attr/textAppearanceLarge" | ||
| android:text="Username" | ||
| android:id="@+id/usernameLabel" | ||
| android:layout_alignParentLeft="true" | ||
| android:layout_alignParentStart="true" | ||
| android:textSize="40dp" | ||
| android:layout_column="0" | ||
| android:textColor="#ff1e00ff" /> | ||
|
|
||
| <EditText | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:id="@+id/username" | ||
| android:layout_alignParentTop="true" | ||
| android:layout_alignLeft="@+id/password" | ||
| android:layout_alignStart="@+id/password" | ||
| android:layout_above="@+id/password" | ||
| android:layout_alignRight="@+id/password" | ||
| android:layout_alignEnd="@+id/password" | ||
| android:textSize="40dp" | ||
| android:text="root" | ||
| android:layout_column="1" | ||
| android:layout_marginLeft="73dip" /> | ||
| </TableRow> | ||
|
|
||
| <TableRow | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent"> | ||
|
|
||
| <TextView | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="?android:attr/textAppearanceLarge" | ||
| android:text="Password" | ||
| android:id="@+id/passwordLabel" | ||
| android:textSize="40dp" | ||
| android:layout_centerVertical="true" | ||
| android:layout_toLeftOf="@+id/RegisterButton" | ||
| android:layout_toStartOf="@+id/RegisterButton" | ||
| android:layout_column="0" | ||
| android:textColor="#ff1e00ff" /> | ||
|
|
||
| <EditText | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:inputType="textPassword" | ||
| android:ems="10" | ||
| android:id="@+id/password" | ||
| android:textSize="40dp" | ||
| android:layout_below="@+id/usernameLabel" | ||
| android:layout_toRightOf="@+id/usernameLabel" | ||
| android:layout_marginLeft="73dp" | ||
| android:layout_marginStart="73dp" | ||
| android:text="rootroot" | ||
| android:layout_column="1" /> | ||
|
|
||
| </TableRow> | ||
|
|
||
| </TableLayout> | ||
|
|
||
| <RelativeLayout | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_alignParentLeft="true" | ||
| android:layout_alignParentStart="true" | ||
| android:layout_below="@+id/tableLayout2"> | ||
|
|
||
| <ImageButton | ||
| android:layout_width="180dip" | ||
| android:layout_height="60dip" | ||
| android:id="@+id/RegisterButton" | ||
| android:layout_alignTop="@+id/loginButton" | ||
| android:layout_toLeftOf="@+id/loginButton" | ||
| android:layout_toStartOf="@+id/loginButton" | ||
| android:onClick="Register" | ||
| android:background="@drawable/ic_signup" /> | ||
|
|
||
| <ImageButton | ||
| android:layout_width="180dip" | ||
| android:layout_height="60dip" | ||
| android:id="@+id/loginButton" | ||
| android:onClick="onStartClick" | ||
| android:layout_alignParentEnd="true" | ||
| android:layout_alignParentRight="true" | ||
| android:background="@drawable/ic_login" | ||
| android:layout_alignParentStart="false" /> | ||
| </RelativeLayout> | ||
|
|
||
| </RelativeLayout> |
114 changes: 114 additions & 0 deletions
114
app/src/main/res/layout-land/activity_welcome_student.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:minHeight="350dp" | ||
| android:minWidth="350dp" | ||
| tools:context=".welcome_student"> | ||
|
|
||
| <TableLayout | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_alignTop="@+id/imageView" | ||
| android:layout_toRightOf="@+id/imageView" | ||
| android:layout_toEndOf="@+id/imageView" | ||
| android:id="@+id/tableLayout"> | ||
|
|
||
| <TextView | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="37dp" | ||
| android:textAppearance="?android:attr/textAppearanceLarge" | ||
| android:text="first_name" | ||
| android:id="@+id/first_name" | ||
| android:layout_alignTop="@+id/imageView" | ||
| android:layout_toRightOf="@+id/imageView" | ||
| android:layout_toEndOf="@+id/imageView" | ||
| android:textSize="20dp" | ||
| android:minHeight="80dp" | ||
| android:layout_row="2" | ||
| android:layout_column="1" /> | ||
|
|
||
| <TextView | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="33dp" | ||
| android:textAppearance="?android:attr/textAppearanceLarge" | ||
| android:text="last_name" | ||
| android:id="@+id/last_name" | ||
| android:layout_below="@+id/first_name" | ||
| android:layout_alignLeft="@+id/first_name" | ||
| android:layout_alignStart="@+id/first_name" | ||
| android:textSize="20dp" | ||
| android:minHeight="80dp" | ||
| android:layout_row="3" | ||
| android:layout_column="1" /> | ||
|
|
||
| <TextView | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="31dp" | ||
| android:textAppearance="?android:attr/textAppearanceLarge" | ||
| android:text="school" | ||
| android:id="@+id/school" | ||
| android:layout_below="@+id/last_name" | ||
| android:layout_alignLeft="@+id/last_name" | ||
| android:layout_alignStart="@+id/last_name" | ||
| android:minHeight="80dp" | ||
| android:textSize="20dp" | ||
| android:layout_row="4" | ||
| android:layout_column="1" /> | ||
| </TableLayout> | ||
|
|
||
| <ImageView | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:id="@+id/imageView" | ||
| android:layout_alignParentTop="true" | ||
| android:layout_alignParentLeft="true" | ||
| android:layout_alignParentStart="true" | ||
| android:layout_marginLeft="42dp" | ||
| android:layout_marginStart="42dp" | ||
| android:layout_marginTop="44dp" | ||
| android:src="@mipmap/ic_contact" | ||
| android:minHeight="100dp" | ||
| android:minWidth="100dp" | ||
| android:layout_row="1" | ||
| android:layout_column="0" | ||
| android:maxHeight="100dp" | ||
| android:maxWidth="100dp" /> | ||
|
|
||
| <ImageButton | ||
| android:layout_width="200dip" | ||
| android:layout_height="60dip" | ||
| android:id="@+id/QuestionButton" | ||
| android:background="@drawable/ic_questions" | ||
| android:nestedScrollingEnabled="false" | ||
| android:onClick="toQuestion" | ||
| android:layout_marginRight="20dp" | ||
| android:layout_marginEnd="57dp" | ||
| android:layout_marginBottom="30dp" | ||
| android:layout_alignParentBottom="true" | ||
| android:layout_alignParentRight="true" | ||
| android:layout_alignParentEnd="true" /> | ||
|
|
||
| <ImageButton | ||
| android:layout_width="150dip" | ||
| android:layout_height="60dip" | ||
| android:id="@+id/ScoreButton" | ||
| android:background="@drawable/ic_score" | ||
| android:onClick="onScore" | ||
| android:layout_alignTop="@+id/tableLayout" | ||
| android:layout_alignRight="@+id/QuestionButton" | ||
| android:layout_alignEnd="@+id/QuestionButton" /> | ||
|
|
||
| <ImageButton | ||
| android:layout_width="200dip" | ||
| android:layout_height="60dip" | ||
| android:id="@+id/button2" | ||
| android:onClick="toArgument" | ||
| android:background="@drawable/ic_topic" | ||
| android:layout_alignBottom="@+id/QuestionButton" | ||
| android:layout_alignLeft="@+id/imageView" | ||
| android:layout_alignStart="@+id/imageView" /> | ||
|
|
||
|
|
||
| </RelativeLayout> |
Oops, something went wrong.