diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2642d62..33e6203 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,9 +13,15 @@ android:theme="@style/Theme.AndroidProjectCollection" tools:targetApi="31"> + + android:theme="@style/Theme.AndroidProjectCollection"/> + diff --git a/app/src/main/java/com/example/androidprojectcollection/CalculatorExercise.java b/app/src/main/java/com/example/androidprojectcollection/CalculatorExercise.java index 8e1e969..f99dd3d 100644 --- a/app/src/main/java/com/example/androidprojectcollection/CalculatorExercise.java +++ b/app/src/main/java/com/example/androidprojectcollection/CalculatorExercise.java @@ -22,7 +22,7 @@ public class CalculatorExercise extends AppCompatActivity { ArrayList choppedList = new ArrayList<>(); - boolean justOpped = false, decimaled = false; + boolean justOpped = false, decimaled = false,canEqual =false; int opCount = 0; double reserved; @@ -65,9 +65,11 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } justOpped = false; + canEqual = true; inpView.setText(""); inpView.append("0"); }else { @@ -79,8 +81,10 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } + canEqual = true; justOpped = false; inpView.setText(""); inpView.append("1"); @@ -93,8 +97,10 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } + canEqual = true; justOpped = false; inpView.setText(""); inpView.append("2"); @@ -107,8 +113,10 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } + canEqual = true; justOpped = false; inpView.setText(""); inpView.append("3"); @@ -121,8 +129,10 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } + canEqual = true; justOpped = false; inpView.setText(""); inpView.append("4"); @@ -135,8 +145,10 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } + canEqual = true; justOpped = false; inpView.setText(""); inpView.append("5"); @@ -149,8 +161,10 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } + canEqual = true; justOpped = false; inpView.setText(""); inpView.append("6"); @@ -163,8 +177,10 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } + canEqual = true; justOpped = false; inpView.setText(""); inpView.append("7"); @@ -177,8 +193,10 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } + canEqual = true; justOpped = false; inpView.setText(""); inpView.append("8"); @@ -191,8 +209,10 @@ public class CalculatorExercise extends AppCompatActivity { if(justOpped){ if (pressed_Equal){ eqView.setText(""); + choppedList.clear(); pressed_Equal = false; } + canEqual = true; justOpped = false; inpView.setText(""); inpView.append("9"); @@ -244,9 +264,16 @@ public class CalculatorExercise extends AppCompatActivity { if(opCount >= 1){ inpView.setText(ArrAnswerer()); + canEqual = true; - }else { + }else if(pressed_Equal){ + choppedList.clear(); + opActionner("/",justOpped); + canEqual = false; + pressed_Equal =false;} + else { opCount++; + canEqual = false; } btDecimal.setEnabled(true); }); @@ -257,8 +284,15 @@ public class CalculatorExercise extends AppCompatActivity { if(opCount >= 1){ inpView.setText(ArrAnswerer()); - }else { + canEqual = true; + }else if(pressed_Equal){ + choppedList.clear(); + opActionner("/",justOpped); + canEqual = false; + pressed_Equal =false;} + else { opCount++; + canEqual = false; } btDecimal.setEnabled(true); }); @@ -269,8 +303,15 @@ public class CalculatorExercise extends AppCompatActivity { if(opCount >= 1){ inpView.setText(ArrAnswerer()); - }else { + canEqual = true; + }else if(pressed_Equal){ + choppedList.clear(); + opActionner("/",justOpped); + canEqual = false; + pressed_Equal =false;} + else { opCount++; + canEqual = false; } btDecimal.setEnabled(true); }); @@ -282,19 +323,32 @@ public class CalculatorExercise extends AppCompatActivity { if(opCount >= 1){ inpView.setText(ArrAnswerer()); + canEqual = true; + }else if(pressed_Equal){ + choppedList.clear(); + opActionner("/",justOpped); + canEqual = false; + pressed_Equal =false; }else { opCount++; + canEqual = false; } btDecimal.setEnabled(true); }); btEqual.setOnClickListener(v -> { - choppedList.add(String.valueOf(inpView.getText())); - inpView.setText(EqualAnswer(decimaled)); - reserved = Double.parseDouble(EqualAnswer(decimaled)); - pressed_Equal = true; - justOpped = true; - btDecimal.setEnabled(true); + if(canEqual){ + choppedList.add(String.valueOf(inpView.getText())); + inpView.setText(EqualAnswer(decimaled)); + reserved = Double.parseDouble(EqualAnswer(decimaled)); + pressed_Equal = true; + canEqual = false; + justOpped = true; + opCount = 0; + btDecimal.setEnabled(true); + }else { + + } }); @@ -310,7 +364,13 @@ public class CalculatorExercise extends AppCompatActivity { opCount -= 1; } }else { - if (!choppedList.isEmpty()){ + if(pressed_Equal){ + choppedList.clear(); + choppedList.add(String.valueOf(inpView.getText())); + choppedList.add(operation); + pressed_Equal = false; + } + else if (!choppedList.isEmpty()){ choppedList.remove(choppedList.size()-1); choppedList.add(operation); }else { @@ -344,6 +404,7 @@ public class CalculatorExercise extends AppCompatActivity { public String ArrAnswerer(){ double op1=Double.parseDouble(choppedList.get(0)); double op2; + boolean trip =false; String Operation = ""; for (int i = 1 ; i <= choppedList.size()-1; i++){ if (i % 2 == 0){ @@ -363,6 +424,7 @@ public class CalculatorExercise extends AppCompatActivity { return "Not gonna happen."; }else { op1/=op2; + trip = true; } break; } @@ -371,7 +433,10 @@ public class CalculatorExercise extends AppCompatActivity { Operation = choppedList.get(i); } } - + if (trip){ + DecimalFormat dc = new DecimalFormat("0.00"); + return dc.format(op1); + } return String.valueOf(op1); } diff --git a/app/src/main/java/com/example/androidprojectcollection/MainActivity.java b/app/src/main/java/com/example/androidprojectcollection/MainActivity.java index 7dec807..f5ad9d5 100644 --- a/app/src/main/java/com/example/androidprojectcollection/MainActivity.java +++ b/app/src/main/java/com/example/androidprojectcollection/MainActivity.java @@ -13,7 +13,7 @@ import androidx.core.view.WindowInsetsCompat; public class MainActivity extends AppCompatActivity { - Button btn1,btn2,btn3,btn4,btn5,btn6; + Button btn1,btn2,btn3,btn4,btn5,btn6,btn7; @Override protected void onCreate(Bundle savedInstanceState) { @@ -77,6 +77,15 @@ public class MainActivity extends AppCompatActivity { } }); + btn7 = findViewById(R.id.btnMtGm); + btn7.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent startPI1 = new Intent(MainActivity.this, MidtermActivityStartScreen.class); + startActivity(startPI1); + } + }); + } diff --git a/app/src/main/java/com/example/androidprojectcollection/MidtermActiivityGameScreen.java b/app/src/main/java/com/example/androidprojectcollection/MidtermActiivityGameScreen.java new file mode 100644 index 0000000..c3a041f --- /dev/null +++ b/app/src/main/java/com/example/androidprojectcollection/MidtermActiivityGameScreen.java @@ -0,0 +1,296 @@ +package com.example.androidprojectcollection; + +import android.annotation.SuppressLint; +import android.graphics.Color; +import android.os.Bundle; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.TextView; +import android.widget.Toast; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +public class MidtermActiivityGameScreen extends AppCompatActivity { + + Button[] btns = new Button[9]; + LinearLayout[] ln = new LinearLayout[3]; + int Player = 1; + int[] table = {0,0,0,0,0,0,0,0,0}; + TextView txv; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_midterm_actiivity_game_screen); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + txv = findViewById(R.id.PlayerDisp); + ln[0] = findViewById(R.id.L1); + ln[1] = findViewById(R.id.L2); + ln[2] = findViewById(R.id.L3); + + btns[0] = findViewById(R.id.btn1); + btns[1] = findViewById(R.id.btn2); + btns[2] = findViewById(R.id.btn3); + btns[3] = findViewById(R.id.btn4); + btns[4] = findViewById(R.id.btn5); + btns[5] = findViewById(R.id.btn6); + btns[6] = findViewById(R.id.btn7); + btns[7] = findViewById(R.id.btn8); + btns[8] = findViewById(R.id.btn9); + Button reset = findViewById(R.id.Rst); + + PlayerDisplayer(); + for (int i = 0 ; i < 9 ; i++){ + table[i] = 0; + btns[i].setText(""); + btns[i].setBackgroundColor(Color.parseColor("#B2B1AF")); + } + + btns[0].setOnClickListener(view -> { + btns[0]=playerCheck(btns[0],1); + btns[0].setEnabled(false); + WinCheck(); + }); + + btns[1].setOnClickListener(view -> { + btns[1]=playerCheck(btns[1],2); + btns[1].setEnabled(false); + WinCheck(); + }); + + btns[2].setOnClickListener(view -> { + btns[2]=playerCheck(btns[2],3); + btns[2].setEnabled(false); + WinCheck(); + + }); + + btns[3].setOnClickListener(view -> { + btns[3]=playerCheck(btns[3],4); + btns[3].setEnabled(false); + WinCheck(); + + }); + + btns[4].setOnClickListener(view -> { + btns[4]=playerCheck(btns[4],5); + btns[4].setEnabled(false); + WinCheck(); + + }); + + btns[5].setOnClickListener(view -> { + btns[5]=playerCheck(btns[5],6); + btns[5].setEnabled(false); + WinCheck(); + + }); + + btns[6].setOnClickListener(view -> { + btns[6]=playerCheck(btns[6],7); + btns[6].setEnabled(false); + WinCheck(); + + }); + + btns[7].setOnClickListener(view -> { + btns[7]=playerCheck(btns[7],8); + btns[7].setEnabled(false); + WinCheck(); + + }); + + btns[8].setOnClickListener(view -> { + btns[8]=playerCheck(btns[8],9); + btns[8].setEnabled(false); + WinCheck(); + + }); + + reset.setOnClickListener(view -> { + Toast.makeText(getApplicationContext(),"Player Table Reset!",Toast.LENGTH_SHORT).show(); + ButtonEnabler(true); + Player = 1; + for (int i = 0 ; i < 9 ; i++){ + table[i] = 0; + btns[i].setText(""); + btns[i].setBackgroundColor(Color.parseColor("#B2B1AF")); + } + PlayerDisplayer(); + }); + } + + @SuppressLint("SetTextI18n") + public Button playerCheck(Button btn, int idx){ + idx--; + + if(Player == 1){ + btn.setText("O"); + btn.setTextColor(Color.WHITE); + btn.setBackgroundColor(Color.parseColor("#FF6200EE")); + table[idx] = 1; + Player++; + PlayerDisplayer(); + }else { + btn.setText("X"); + btn.setTextColor(Color.WHITE); + btn.setBackgroundColor(Color.parseColor("#FF6200EE")); + table[idx] = 2; + Player--; + PlayerDisplayer(); + } + return btn; + } + + @SuppressLint("SetTextI18n") + public void PlayerDisplayer(){ + if (Player == 1) { + Colorer(); + txv.setText("Player O's Turn"); + }else{ + Colorer(); + txv.setText("Player X' Turn"); + } + } + @SuppressLint("SetTextI18n") + public void WinCheck(){ + boolean flag = true; + if((table[0] == table[1] && table[1] == table[2]) && table[0] != 0){ + if(table[0] == 1){ + txv.setText("Player O Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 1",Toast.LENGTH_SHORT).show(); + }else { + txv.setText("Player X Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 2",Toast.LENGTH_SHORT).show(); + } + ButtonEnabler(false); + flag = false; + + } else if ((table[0] == table[4] && table[4] == table[8]) && table[0] != 0) { + + if(table[0] == 1){ + txv.setText("Player O Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 1",Toast.LENGTH_SHORT).show(); + }else { + txv.setText("Player X Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 2",Toast.LENGTH_SHORT).show(); + } + ButtonEnabler(false); + flag = false; + + }else if ((table[0] == table[3] && table[3] == table[6]) && table[0] != 0){ + + if(table[0] == 1){ + txv.setText("Player O Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 1",Toast.LENGTH_SHORT).show(); + }else { + txv.setText("Player X Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 2",Toast.LENGTH_SHORT).show(); + } + ButtonEnabler(false); + flag = false; + + }else if ((table[3] == table[4] && table[4] == table[5]) && table[3] != 0){ + + if(table[3] == 1){ + txv.setText("Player O Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 1",Toast.LENGTH_SHORT).show(); + }else { + txv.setText("Player X Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 2",Toast.LENGTH_SHORT).show(); + } + ButtonEnabler(false); + flag = false; + + }else if ((table[6] == table[7] && table[7] == table[8]) && table[6] != 0){ + + if(table[6] == 1){ + txv.setText("Player O Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 1",Toast.LENGTH_SHORT).show(); + }else { + txv.setText("Player X Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 2",Toast.LENGTH_SHORT).show(); + } + ButtonEnabler(false); + flag = false; + + }else if ((table[6] == table[4] && table[4] == table[2]) && table[6] != 0){ + + if(table[6] == 1){ + txv.setText("Player O Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 1",Toast.LENGTH_SHORT).show(); + }else { + txv.setText("Player X Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 2",Toast.LENGTH_SHORT).show(); + } + ButtonEnabler(false); + flag = false; + + }else if ((table[1] == table[4] && table[4] == table[7]) && table[1] != 0){ + + if(table[1] == 1){ + txv.setText("Player O Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 1",Toast.LENGTH_SHORT).show(); + }else { + txv.setText("Player X Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 2",Toast.LENGTH_SHORT).show(); + } + ButtonEnabler(false); + flag = false; + + }else if ((table[2] == table[5] && table[5] == table[8]) && table[2] != 0){ + + if(table[2] == 1){ + txv.setText("Player O Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 1",Toast.LENGTH_SHORT).show(); + }else { + txv.setText("Player X Wins"); + Toast.makeText(getApplicationContext(),"You Won Player 2",Toast.LENGTH_SHORT).show(); + } + ButtonEnabler(false); + flag = false; + + }else { + + for(int i = 0 ;i < 9 ; i++){ + if (table[i] == 0) { + flag = false; + break; + } + } + } + if(flag){ + txv.setText("Stalemate"); + Toast.makeText(getApplicationContext(),"It's a Stalemate.",Toast.LENGTH_SHORT).show(); + } + + } + + public void ButtonEnabler(boolean state){ + for (int i = 0 ; i < 9 ; i++){ + btns[i].setEnabled(state); + } + } + + public void Colorer(){ + if(Player == 1){ + for (int i = 0 ; i < 3 ; i++){ + ln[i].setBackgroundColor(Color.BLUE); + } + }else { + for (int i = 0 ; i < 3 ; i++){ + ln[i].setBackgroundColor(Color.RED); + } + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/androidprojectcollection/MidtermActivityStartScreen.java b/app/src/main/java/com/example/androidprojectcollection/MidtermActivityStartScreen.java new file mode 100644 index 0000000..7b963e0 --- /dev/null +++ b/app/src/main/java/com/example/androidprojectcollection/MidtermActivityStartScreen.java @@ -0,0 +1,44 @@ +package com.example.androidprojectcollection; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.Toast; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +public class MidtermActivityStartScreen extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_midterm_start_screen); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + + Button btn = findViewById(R.id.PlyBtn); + + + btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent tttPlay = new Intent( + MidtermActivityStartScreen.this, + MidtermActiivityGameScreen.class + + ); + Toast.makeText(getApplicationContext(),"Brian Steve Pila -- Tic Tac Toe",Toast.LENGTH_SHORT).show(); + startActivity(tttPlay); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/androidprojectcollection/activity_passing_intents_exercise.java b/app/src/main/java/com/example/androidprojectcollection/activity_passing_intents_exercise.java index 062d9fa..9ee5fc4 100644 --- a/app/src/main/java/com/example/androidprojectcollection/activity_passing_intents_exercise.java +++ b/app/src/main/java/com/example/androidprojectcollection/activity_passing_intents_exercise.java @@ -1,6 +1,12 @@ package com.example.androidprojectcollection; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.RadioGroup; +import android.widget.TextView; +import android.widget.Toast; import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; @@ -10,6 +16,26 @@ import androidx.core.view.WindowInsetsCompat; public class activity_passing_intents_exercise extends AppCompatActivity { + + String firstNamE; + String lastNamE; + String gendeR; + String birthDatE; + String agE; + String emaiL; + String nationalitY; + String homeAddresS; + String placeOfBirtH; + String religioN; + String maritalStatuS; + + TextView firstName,lastName; + RadioGroup gender; + TextView birthDate,age,email,nationality,homeAddress,placeOfBirth,religion; + RadioGroup maritalStatus; + Button clear,submit; + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -20,5 +46,97 @@ public class activity_passing_intents_exercise extends AppCompatActivity { v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); return insets; }); + + + firstName = findViewById(R.id.TbFirstName); + lastName = findViewById(R.id.TbLastName); + gender = findViewById(R.id.rgGender); + birthDate = findViewById(R.id.TbBirthDate); + age = findViewById(R.id.TbAge); + email = findViewById(R.id.TbEmail); + nationality = findViewById(R.id.TbNationality); + homeAddress = findViewById(R.id.TbHomeAddress); + placeOfBirth = findViewById(R.id.TbPlaceOfBirth); + religion = findViewById(R.id.TbReligion); + maritalStatus = findViewById(R.id.rgMaritalStatus); + clear = findViewById(R.id.btnClear); + submit = findViewById(R.id.btnSubmit); + + submit.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + firstNamE = String.valueOf(firstName.getText()); + lastNamE = String.valueOf(lastName.getText()); + + birthDatE = String.valueOf(birthDate.getText()); + agE = String.valueOf(age.getText()); + emaiL = String.valueOf(email.getText()); + nationalitY = String.valueOf(nationality.getText()); + homeAddresS = String.valueOf(homeAddress.getText()); + placeOfBirtH = String.valueOf(placeOfBirth.getText()); + religioN = String.valueOf(religion.getText()); + maritalStatuS = String.valueOf(maritalStatus.getCheckedRadioButtonId()); + + if(gender.getCheckedRadioButtonId() == R.id.rbMale){ + gendeR = "Male"; + } else if (gender.getCheckedRadioButtonId() == R.id.rbFemale) { + gendeR = "Female"; + }else { + gendeR = "Others"; + } + + if(maritalStatus.getCheckedRadioButtonId() == R.id.rbSingle){ + maritalStatuS = "Single"; + } else if (maritalStatus.getCheckedRadioButtonId() == R.id.rbMarried) { + maritalStatuS = "Married"; + } else if (maritalStatus.getCheckedRadioButtonId() == R.id.rbDivorced) { + maritalStatuS = "Divorced"; + }else { + maritalStatuS = "Widowed"; + } + Intent intent = new Intent( + activity_passing_intents_exercise.this, activity_passing_intents_exercise2.class + ); + intent.putExtra("FirstName",firstNamE); + intent.putExtra("LastName",lastNamE); + intent.putExtra("Gender",gendeR); + intent.putExtra("BirthDate",birthDatE); + intent.putExtra("Age",agE); + intent.putExtra("Email",emaiL); + intent.putExtra("Nationality",nationalitY); + intent.putExtra("HomeAddress",homeAddresS); + intent.putExtra("PlaceOfBirth",placeOfBirtH); + intent.putExtra("Religion",religioN); + intent.putExtra("MaritalStatus",maritalStatuS); + + if (firstNamE.isEmpty() || lastNamE.isEmpty()|| birthDatE.isEmpty()||agE.isEmpty()|| + emaiL.isEmpty()|| nationalitY.isEmpty()|| homeAddresS.isEmpty()||placeOfBirtH.isEmpty()||religioN.isEmpty() + ){ + Toast.makeText(getApplicationContext(),"Lol",Toast.LENGTH_SHORT).show(); + }else { + startActivity(intent); + } + + } + }); + + clear.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + firstName.setText(""); + lastName.setText(""); + gender.clearCheck(); + birthDate.setText(""); + age.setText(""); + email.setText(""); + nationality.setText(""); + homeAddress.setText(""); + placeOfBirth.setText(""); + religion.setText(""); + maritalStatus.clearCheck(); + } + }); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/androidprojectcollection/activity_passing_intents_exercise2.java b/app/src/main/java/com/example/androidprojectcollection/activity_passing_intents_exercise2.java index 470c7ac..3687e52 100644 --- a/app/src/main/java/com/example/androidprojectcollection/activity_passing_intents_exercise2.java +++ b/app/src/main/java/com/example/androidprojectcollection/activity_passing_intents_exercise2.java @@ -7,9 +7,15 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; +import android.content.Intent; +import android.widget.TextView; +import android.widget.Button; public class activity_passing_intents_exercise2 extends AppCompatActivity { + TextView firstName, lastName, gender, maritalStatus, age, birthDate, nationality, homeAddress, emailAddress,placeofBirth,religion; + Button btnReturn; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -21,6 +27,35 @@ public class activity_passing_intents_exercise2 extends AppCompatActivity { return insets; }); + firstName = findViewById(R.id.formFirstName); + lastName = findViewById(R.id.formLastName); + gender = findViewById(R.id.formGender); + maritalStatus = findViewById(R.id.formMaritalStatus); + age = findViewById(R.id.formAge); + birthDate = findViewById(R.id.formBirthDate); + nationality = findViewById(R.id.formNationality); + homeAddress = findViewById(R.id.formHomeAddress); + emailAddress = findViewById(R.id.formEmailAddress); + placeofBirth = findViewById(R.id.formPlaceofBirth); + religion = findViewById(R.id.formReligion); + + btnReturn = findViewById(R.id.btnPassingIntentsReturn); + + Intent intent = getIntent(); + + firstName.setText(intent.getStringExtra("FirstName")); + lastName.setText(intent.getStringExtra("LastName")); + gender.setText(intent.getStringExtra("Gender")); + maritalStatus.setText(intent.getStringExtra("MaritalStatus")); + age.setText(intent.getStringExtra("Age")); + birthDate.setText(intent.getStringExtra("BirthDate")); + nationality.setText(intent.getStringExtra("Nationality")); + homeAddress.setText(intent.getStringExtra("HomeAddress")); + emailAddress.setText(intent.getStringExtra("Email")); + religion.setText(intent.getStringExtra("Religion")); + placeofBirth.setText(intent.getStringExtra("PlaceOfBirth")); + + btnReturn.setOnClickListener(view -> finish()); } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_layout_exercise.xml b/app/src/main/res/layout/activity_layout_exercise.xml index 5a74bbb..949d55b 100644 --- a/app/src/main/res/layout/activity_layout_exercise.xml +++ b/app/src/main/res/layout/activity_layout_exercise.xml @@ -492,7 +492,7 @@