Skip to content

Commit

Permalink
adjust layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@li-xin-yi
li-xin-yi committed Jul 15, 2021
1 parent 0c7da41 commit add6f75
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 106 deletions.
33 changes: 31 additions & 2 deletions app/src/main/java/com/example/sql_inject_demo/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.view.KeyEvent;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Switch;
import android.widget.TextView;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand All @@ -33,10 +36,36 @@ protected void onCreate(Bundle savedInstanceState) {
usernameInput = findViewById(R.id.usernameInput);
passwordInput = findViewById(R.id.passwordInput);
safeSwitch = findViewById(R.id.safeSwitch);
// passwordInput.setOnEditorActionListener(new TextView.OnEditorActionListener() {
// @Override
// public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
// if (actionId== EditorInfo.IME_ACTION_DONE){
// signOnClick(v);
// return true;
// }
// return false;
// }
// });
passwordInput.setOnKeyListener(new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if(event.getAction()== KeyEvent.ACTION_DOWN)
{
switch (keyCode)
{
case KeyEvent.KEYCODE_DPAD_CENTER:
case KeyEvent.KEYCODE_ENTER:
signOnClick(v);
return true;
default:
break;
}
}
return false;
}
});
}

;

public void signOnClick(View view) {
String username = usernameInput.getText().toString();
String password = passwordInput.getText().toString();
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_all_employee.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycleViewer"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:fastScrollEnabled="false"
app:layout_constraintStart_toStartOf="parent"
Expand Down
14 changes: 10 additions & 4 deletions app/src/main/res/layout/activity_data_viewer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,18 @@
android:shadowColor="#CC000000"
android:shadowDy="40"
android:shadowRadius="100"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"

>

<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="4dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="8dp"
android:padding="5dp">


Expand Down Expand Up @@ -51,7 +54,8 @@
android:gravity="center"
android:text="ID"
android:textColor="@color/purple_500"
android:textStyle="bold" />
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/ssnViewer"
Expand All @@ -61,6 +65,7 @@
android:layout_marginTop="0dp"
android:gravity="center_vertical"
android:text="SSN"

android:textColor="@color/purple_200" />

<TextView
Expand Down Expand Up @@ -122,6 +127,7 @@
android:layout_marginTop="120dp"
android:gravity="center_vertical"
android:text="Address" />

</androidx.cardview.widget.CardView>
</LinearLayout>

Expand Down
202 changes: 105 additions & 97 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,111 +6,119 @@
android:layout_height="match_parent"
tools:context=".MainActivity">

<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="120dp"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent">

<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="120dp"
android:orientation="vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="parent"
android:stretchColumns="0">

<TableRow>

<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="65dp"
<TableRow>

android:hint="Username">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="65dp"

android:hint="Username">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/usernameInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"

android:ems="15"
android:inputType="text" />
</com.google.android.material.textfield.TextInputLayout>
</TableRow>

<TableRow>

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/usernameInput"
<com.google.android.material.textfield.TextInputLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="15"
android:inputType="text" />
</com.google.android.material.textfield.TextInputLayout>
</TableRow>

<TableRow>

<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="65dp"
android:hint="Password"
app:passwordToggleEnabled="true">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/passwordInput"
android:layout_marginStart="65dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="65dp"
android:hint="Password"
app:passwordToggleEnabled="true">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/passwordInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="15"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
</TableRow>

<TableRow>

<Switch
android:id="@+id/safeSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="15"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
</TableRow>

<TableRow>

<Switch
android:id="@+id/safeSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="65dp"
android:clickable="true"
android:fontFamily="sans-serif-medium"
android:text="Safe Mode"
android:textAllCaps="false"
android:textSize="16sp"
android:textStyle="italic" />
</TableRow>

<TableRow>

<Button
android:id="@+id/signinButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="65dp"
android:onClick="signOnClick"
android:text="Sign in" />
</TableRow>

<TableRow>

<Button
android:id="@+id/resetButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="0dp"
android:layout_marginEnd="65dp"
android:onClick="resetOnClick"
android:text="Reset" />
</TableRow>

<TableRow>

<Button
android:id="@+id/exitButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="0dp"
android:layout_marginEnd="65dp"
android:onClick="exitOnClick"
android:text="Exit" />
</TableRow>


</TableLayout>
android:layout_marginStart="65dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="65dp"
android:clickable="true"
android:fontFamily="sans-serif-medium"
android:text="Safe Mode"
android:textAllCaps="false"
android:textSize="16sp"
android:textStyle="italic"
tools:ignore="UseSwitchCompatOrMaterialXml"
android:focusable="true" />
</TableRow>

<TableRow>

<Button
android:id="@+id/signinButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="65dp"
android:onClick="signOnClick"

android:text="Sign in" />
</TableRow>

<TableRow>

<Button
android:id="@+id/resetButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="0dp"
android:layout_marginEnd="65dp"
android:onClick="resetOnClick"
android:text="Reset" />
</TableRow>

<TableRow>

<Button
android:id="@+id/exitButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:layout_marginTop="0dp"
android:layout_marginEnd="65dp"
android:onClick="exitOnClick"
android:text="Exit" />
</TableRow>


</TableLayout>


</androidx.constraintlayout.widget.ConstraintLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_result.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
android:id="@+id/nameInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
android:ems="15" />
android:ems="15"
android:inputType="text" />
</com.google.android.material.textfield.TextInputLayout>

</TableRow>
Expand Down

0 comments on commit add6f75

Please sign in to comment.