diff options
-rw-r--r-- | Defogger/res/layout/activity_main.xml | 13 | ||||
-rw-r--r-- | Defogger/src/no/mork/android/defogger/MainActivity.java | 19 | ||||
-rw-r--r-- | Defogger/src/no/mork/android/defogger/ScannerActivity.java | 2 |
3 files changed, 26 insertions, 8 deletions
diff --git a/Defogger/res/layout/activity_main.xml b/Defogger/res/layout/activity_main.xml index fee0838..70dbdfa 100644 --- a/Defogger/res/layout/activity_main.xml +++ b/Defogger/res/layout/activity_main.xml @@ -3,12 +3,13 @@ android:layout_height="match_parent" > <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:text="@string/hello_msg" - tools:context=".MainActivity" /> + android:id="@+id/hello_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:text="@string/hello_msg" + tools:context=".MainActivity" /> <Button android:id="@+id/start_scan" diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java index a3bc0d7..69682ad 100644 --- a/Defogger/src/no/mork/android/defogger/MainActivity.java +++ b/Defogger/src/no/mork/android/defogger/MainActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; +import android.widget.TextView; import no.mork.android.defogger.ScannerActivity; @@ -22,9 +23,25 @@ public class MainActivity extends Activity { @Override public void onClick(View view) { Intent intent = new Intent(view.getContext(), ScannerActivity.class); - view.getContext().startActivity(intent); + startActivityForResult(intent, 1); } }); } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent dataIntent) { + super.onActivityResult(requestCode, resultCode, dataIntent); + + switch (requestCode) + { + case 1: + TextView hello_text = (TextView) findViewById(R.id.hello_text); + if(resultCode == RESULT_OK) + { + String messageReturn = dataIntent.getStringExtra("scan_ret"); + hello_text.setText(messageReturn); + } + } + } } diff --git a/Defogger/src/no/mork/android/defogger/ScannerActivity.java b/Defogger/src/no/mork/android/defogger/ScannerActivity.java index 6389648..482c94e 100644 --- a/Defogger/src/no/mork/android/defogger/ScannerActivity.java +++ b/Defogger/src/no/mork/android/defogger/ScannerActivity.java @@ -9,7 +9,7 @@ public class ScannerActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //setContentView(R.layout.activity_main); + //setContentView(R.layout.scanning); CharSequence text = "Hello toast!"; |