From 96632f143e072dbb9468c978fc5e11133887255a Mon Sep 17 00:00:00 2001 From: Jo Grimstad Date: Wed, 21 Jun 2017 02:36:53 +0100 Subject: [PATCH] #3 Add TypeMissingNumber activity --- app/src/main/AndroidManifest.xml | 2 +- .../missing_number/MainActivity.java | 2 +- .../TypeMissingNumberActivity.java | 16 ++++- .../layout/activity_type_missing_number.xml | 67 ++++++++++++++++++- 4 files changed, 80 insertions(+), 7 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5f56492..cafc1f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,7 @@ + android:name="org.literacyapp.missing_number.TypeMissingNumberActivity"> \ No newline at end of file diff --git a/app/src/main/java/org/literacyapp/missing_number/MainActivity.java b/app/src/main/java/org/literacyapp/missing_number/MainActivity.java index 95dcd86..d1df02f 100644 --- a/app/src/main/java/org/literacyapp/missing_number/MainActivity.java +++ b/app/src/main/java/org/literacyapp/missing_number/MainActivity.java @@ -37,7 +37,7 @@ protected void onStart() { ContentProvider.initializeDb(this); - Intent intent = new Intent(this, MissingNumberActivity.class); + Intent intent = new Intent(this, TypeMissingNumberActivity.class); startActivity(intent); finish(); diff --git a/app/src/main/java/org/literacyapp/missing_number/TypeMissingNumberActivity.java b/app/src/main/java/org/literacyapp/missing_number/TypeMissingNumberActivity.java index 4c914f4..d30d257 100644 --- a/app/src/main/java/org/literacyapp/missing_number/TypeMissingNumberActivity.java +++ b/app/src/main/java/org/literacyapp/missing_number/TypeMissingNumberActivity.java @@ -1,16 +1,28 @@ package org.literacyapp.missing_number; +import android.media.MediaPlayer; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.util.Log; -public class MissingNumberActivity extends AppCompatActivity { +import org.literacyapp.contentprovider.ContentProvider; +import org.literacyapp.contentprovider.model.content.Number; + +import java.util.List; + +public class TypeMissingNumberActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { Log.i(getClass().getName(), "onCreate"); super.onCreate(savedInstanceState); - setContentView(R.layout.activity_missing_number); + setContentView(R.layout.activity_type_missing_number); + + List unlockedNumbers = ContentProvider.getUnlockedNumbers(); + Log.i(getClass().getName(), "unlockedNumbers: " + unlockedNumbers); + + MediaPlayer mediaPlayer = MediaPlayer.create(getApplicationContext(), R.raw.activity_instruction_number_typing); + mediaPlayer.start(); } } diff --git a/app/src/main/res/layout/activity_type_missing_number.xml b/app/src/main/res/layout/activity_type_missing_number.xml index b0ab776..1f0a582 100644 --- a/app/src/main/res/layout/activity_type_missing_number.xml +++ b/app/src/main/res/layout/activity_type_missing_number.xml @@ -1,10 +1,71 @@ - + android:paddingLeft="@dimen/activity_horizontal_margin" + android:gravity="center"> - + + + + + + + + + + + + + + + +