diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 046bcac..23a89bb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,11 +10,12 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37a7509..d5d35ec 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/tech/loedige/myapplication/MainActivity.java b/app/src/main/java/tech/loedige/myapplication/MainActivity.java
index 37f705d..65e75f6 100644
--- a/app/src/main/java/tech/loedige/myapplication/MainActivity.java
+++ b/app/src/main/java/tech/loedige/myapplication/MainActivity.java
@@ -8,6 +8,7 @@ import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
+import android.widget.EditText;
import android.widget.Toast;
public class MainActivity extends AppCompatActivity {
@@ -21,13 +22,28 @@ public class MainActivity extends AppCompatActivity {
toast_btn.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
+ //send toast
Toast.makeText(MainActivity.this, "Toast", Toast.LENGTH_SHORT).show();
+ //make intent
Intent intent = new Intent(MainActivity.this,MainActivity2.class);
- startActivity(intent);
+ // additional data intent
+ EditText editText = (EditText) findViewById(R.id.text_editText);
+ intent.putExtra("text",editText.getText().toString());
+ //sent intent
+ startActivityForResult(intent,100);
}
});
}
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if(data != null){
+ String text = data.getExtras().getString("text");
+ EditText editText = findViewById(R.id.text_editText);
+ editText.setText(text);
+ }
+ }
+
public void call911(View view){
Intent intent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:911"));
startActivity(intent);
diff --git a/app/src/main/java/tech/loedige/myapplication/MainActivity2.java b/app/src/main/java/tech/loedige/myapplication/MainActivity2.java
index 71345cb..84c8e73 100644
--- a/app/src/main/java/tech/loedige/myapplication/MainActivity2.java
+++ b/app/src/main/java/tech/loedige/myapplication/MainActivity2.java
@@ -1,10 +1,14 @@
package tech.loedige.myapplication;
+import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
import android.widget.Toast;
public class MainActivity2 extends AppCompatActivity {
@@ -13,6 +17,13 @@ public class MainActivity2 extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main2);
+
+ Bundle extras= getIntent().getExtras();
+ if(extras!= null) {
+ String text = extras.getString("text");
+ TextView textView = (TextView) findViewById(R.id.tv_textView);
+ textView.setText(text);
+ }
}
public void makeToast(View view){
@@ -20,4 +31,17 @@ public class MainActivity2 extends AppCompatActivity {
Intent intent = new Intent(this, MainActivity.class);
startActivity(intent);
}
+
+ @Override
+ public void finish(){
+ Intent dataIntent = new Intent();
+ EditText editText = (EditText) findViewById(R.id.text_editText);
+ dataIntent.putExtra("text",editText.getText().toString());
+ setResult(RESULT_OK,dataIntent);
+ super.finish();
+ }
+
+ public void sendResult(View view){
+ finish();
+ }
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index def38d0..0dcadf2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -19,6 +19,13 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+
+
diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml
index 4712657..b954b9e 100644
--- a/app/src/main/res/layout/activity_main2.xml
+++ b/app/src/main/res/layout/activity_main2.xml
@@ -10,7 +10,32 @@
+
+
+
+
+
+
+
+
+