Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@raffysommy
raffysommy committed Apr 5, 2015
2 parents df5c332 + f426116 commit f5fee78
Show file tree
Hide file tree
Showing 20 changed files with 973 additions and 387 deletions.
8 changes: 7 additions & 1 deletion app/src/main/java/com/example/raffaele/testapp/Register_form.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.example.raffaele.testapp;

import android.content.res.Configuration;
import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.util.Log;
Expand Down Expand Up @@ -34,9 +35,14 @@ protected void onCreate(Bundle savedInstanceState) {
userTxt=(EditText) findViewById(R.id.Reg_username);
passTxt=(EditText) findViewById(R.id.Reg_pass);
schoolTxt =(EditText) findViewById(R.id.Reg_school);
Rbtn =(Button) findViewById(R.id.Reg_button);

}
@Override
public void onConfigurationChanged(Configuration newConfig) {
// TODO Auto-generated method stub
super.onConfigurationChanged(newConfig);
setContentView(R.layout.activity_register_form); //al cambiamento della configurazione dello schermo refresha il layout
}
public void Registrazione(View v) {
if (nomeTxt.getText().toString().equals("") || cognomeTxt.getText().toString().equals("") || emailTxt.getText().toString().equals("") || userTxt.getText().toString().equals("") ||
passTxt.getText().toString().equals("")|| schoolTxt.getText().toString().equals("")){
Expand Down
Binary file added app/src/main/res/drawable/sub.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/titolo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...in/res/layout/activity_argument__page.xml → ...s/layout-land/activity_argument__page.xml
View file
File renamed without changes.
165 changes: 73 additions & 92 deletions app/src/main/res/layout-land/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,106 +6,87 @@
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">
<ImageView
android:layout_width="150dp"
android:layout_height="180dp"
android:id="@+id/imageView5"
android:background="@drawable/titolo"
android:layout_centerHorizontal="true"
android:layout_above="@+id/linearLayout3" />

<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" />
<ImageButton
android:layout_width="120dip"
android:layout_height="40dip"
android:id="@+id/RegisterButton"
android:onClick="Register"
android:background="@drawable/ic_signup"
android:layout_alignParentBottom="true"
android:layout_alignLeft="@+id/imageView4"
android:layout_alignStart="@+id/imageView4" />

<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>
<ImageButton
android:layout_width="120dip"
android:layout_height="40dip"
android:id="@+id/loginButton"
android:onClick="onStartClick"
android:background="@drawable/ic_login"
android:layout_alignParentBottom="true"
android:layout_alignLeft="@+id/imageView5"
android:layout_alignStart="@+id/imageView5" />

<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" />
<LinearLayout
android:orientation="vertical"
android:layout_width="250dp"
android:layout_height="210dp"
android:id="@+id/linearLayout3"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">

<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" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Username"
android:id="@+id/usernameLabel"
android:textColor="#ffff2e3c" />

</TableRow>
<EditText
android:layout_width="1194dp"
android:layout_height="wrap_content"
android:id="@+id/username"
android:textSize="25dp"
android:text="root"
android:layout_column="1"
android:ems="10"
android:layout_alignTop="@+id/linearLayout2"
android:layout_toLeftOf="@+id/loginButton"
android:layout_toStartOf="@+id/loginButton" />

</TableLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Password"
android:id="@+id/passwordLabel"
android:textColor="#ff5042c4" />

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/tableLayout2">
<EditText
android:layout_width="1180dp"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:id="@+id/password"
android:textSize="25dp"
android:text="rootroot"
android:layout_column="1"
android:layout_above="@+id/RegisterButton"
android:layout_alignRight="@+id/imageView4"
android:layout_alignEnd="@+id/imageView4"
android:layout_marginRight="106dp"
android:layout_marginEnd="106dp" />

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

</RelativeLayout>
150 changes: 150 additions & 0 deletions app/src/main/res/layout-land/activity_register_form.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:fillViewport="false"
android:id="@+id/ScrollView">
<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="com.example.raffaele.testapp.Register_form"
android:id="@+id/SecondoTesto"
android:background="#ffffffff">

<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Insert your personal information"
android:id="@+id/textView"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Asterisked (*) fields are mandatory"
android:id="@+id/textView2"
android:layout_below="@+id/textView"
android:layout_alignLeft="@+id/textView"
android:layout_alignStart="@+id/textView"
android:layout_marginLeft="15dp" />

<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
android:id="@+id/Reg_name"
android:layout_below="@+id/textView"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginTop="69dp"
android:hint="Name*"
android:layout_marginRight="70dp" />

<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
android:id="@+id/Reg_surname"
android:layout_below="@+id/Reg_name"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:hint="Surname*"
android:layout_marginRight="70dp" />

<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
android:id="@+id/Reg_school"
android:hint="School*"
android:layout_below="@+id/Reg_surname"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginRight="70dp" />

<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:id="@+id/Reg_pass"
android:hint="Password*"
android:layout_below="@+id/Reg_username"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginRight="70dp" />

<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
android:id="@+id/Reg_address"
android:hint="Address"
android:layout_below="@+id/Reg_school"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginRight="70dp" />

<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:ems="10"
android:id="@+id/Reg_email"
android:hint="E-mail*"
android:layout_below="@+id/Reg_address"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginRight="70dp" />

<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
android:id="@+id/Reg_username"
android:hint="Username*"
android:layout_below="@+id/Reg_email"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginRight="70dp" />


</LinearLayout>

<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="280dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="465dp">

<ImageButton
android:layout_width="330dp"
android:layout_height="120dp"
android:id="@+id/Reg_button"
android:background="@drawable/sub"
android:layout_gravity="center_horizontal"
android:onClick="Registrazione"/>
</LinearLayout>

</RelativeLayout>
</ScrollView>
17 changes: 17 additions & 0 deletions app/src/main/res/layout-land/row.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
<CheckBox
android:id="@+id/checkBox1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textSize="30sp" />
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView" />
</LinearLayout>
25 changes: 25 additions & 0 deletions app/src/main/res/layout-port/activity_argument__page.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
<ListView
android:id="@+id/listView1"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
</ListView>

<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"></LinearLayout>

<Button
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Confirm"
android:id="@+id/Confirm"
android:layout_gravity="right"
android:onClick="toWelcome" />
</LinearLayout>
Loading

0 comments on commit f5fee78

Please sign in to comment.