From 75c53248831d9cadd73e9d1497775f69a42c0f26 Mon Sep 17 00:00:00 2001 From: Fiona Lai Date: Fri, 17 Jun 2016 09:35:31 -0400 Subject: [PATCH 1/6] almost done code --- app/.gitignore | 1 + app/build.gradle | 27 +++++++++++++++++++ app/proguard-rules.pro | 17 ++++++++++++ .../ApplicationTest.java | 13 +++++++++ .../ExampleUnitTest.java | 15 +++++++++++ 5 files changed, 73 insertions(+) create mode 100644 app/.gitignore create mode 100644 app/build.gradle create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/com/fiona/personalcodingproject/ApplicationTest.java create mode 100644 app/src/test/java/com/fiona/personalcodingproject/ExampleUnitTest.java diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..6721ebf --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,27 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.3" + + defaultConfig { + applicationId "com.fiona.personalcodingproject" + minSdkVersion 15 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + testCompile 'junit:junit:4.12' + compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:support-v4:23.4.0' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..418603c --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\Users\Fiona\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/app/src/androidTest/java/com/fiona/personalcodingproject/ApplicationTest.java b/app/src/androidTest/java/com/fiona/personalcodingproject/ApplicationTest.java new file mode 100644 index 0000000..952b53a --- /dev/null +++ b/app/src/androidTest/java/com/fiona/personalcodingproject/ApplicationTest.java @@ -0,0 +1,13 @@ +package com.fiona.personalcodingproject; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/app/src/test/java/com/fiona/personalcodingproject/ExampleUnitTest.java b/app/src/test/java/com/fiona/personalcodingproject/ExampleUnitTest.java new file mode 100644 index 0000000..1d6cfa5 --- /dev/null +++ b/app/src/test/java/com/fiona/personalcodingproject/ExampleUnitTest.java @@ -0,0 +1,15 @@ +package com.fiona.personalcodingproject; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * To work on unit tests, switch the Test Artifact in the Build Variants view. + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file From c2ed341717f80c904d66d544016b48e68914a781 Mon Sep 17 00:00:00 2001 From: Fiona Lai Date: Sat, 18 Jun 2016 16:44:33 -0400 Subject: [PATCH 2/6] almost done code --- app/src/main/AndroidManifest.xml | 13 ++++ .../LaughingActivity.java | 34 ++++++++++ .../com/fiona/personalcodingproject/main.java | 37 +++++++++++ .../fiona/personalcodingproject/openpic.java | 33 ++++++++++ .../com/fiona/personalcodingproject/pic.java | 16 +++++ .../main/res/layout/activity_play_video.xml | 20 ++++++ app/src/main/res/layout/image.xml | 13 ++++ .../main/res/layout/laughing_fullscreen.xml | 62 +++++++++++++++++++ app/src/main/res/layout/starting.xml | 15 +++++ 9 files changed, 243 insertions(+) create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/fiona/personalcodingproject/LaughingActivity.java create mode 100644 app/src/main/java/com/fiona/personalcodingproject/main.java create mode 100644 app/src/main/java/com/fiona/personalcodingproject/openpic.java create mode 100644 app/src/main/java/com/fiona/personalcodingproject/pic.java create mode 100644 app/src/main/res/layout/activity_play_video.xml create mode 100644 app/src/main/res/layout/image.xml create mode 100644 app/src/main/res/layout/laughing_fullscreen.xml create mode 100644 app/src/main/res/layout/starting.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..07eb1df --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/app/src/main/java/com/fiona/personalcodingproject/LaughingActivity.java b/app/src/main/java/com/fiona/personalcodingproject/LaughingActivity.java new file mode 100644 index 0000000..effb585 --- /dev/null +++ b/app/src/main/java/com/fiona/personalcodingproject/LaughingActivity.java @@ -0,0 +1,34 @@ +package com.fiona.personalcodingproject; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.view.View.OnClickListener; + + +public class LaughingActivity extends Activity { + + Button button; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.laughing_fullscreen); + addListenerOnButton(); + } + + public void addListenerOnButton() { + final Context context = this; + button = (Button)findViewById(R.id.RapunzelButton); + button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(context, main.class); + startActivity(intent); + } + }); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/fiona/personalcodingproject/main.java b/app/src/main/java/com/fiona/personalcodingproject/main.java new file mode 100644 index 0000000..4838019 --- /dev/null +++ b/app/src/main/java/com/fiona/personalcodingproject/main.java @@ -0,0 +1,37 @@ +package com.fiona.personalcodingproject; + +import android.app.Activity; +import android.net.Uri; +import android.os.Bundle; +import android.widget.Button; +import android.widget.MediaController; +import android.support.v7.app.AppCompatActivity; +import android.widget.VideoView; + + +public class main extends Activity { + Button button; + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_play_video); + } +} +// Rapunzel video +public class main2 extends AppCompatActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.laughing_fullscreen); + + VideoView videoView = (VideoView)findViewById(R.id.videoView); + MediaController mediaController=new MediaController(this); + mediaController.setAnchorView(videoView); + Uri uri=Uri.parse("rtsp://r13---sn-vgqs7ner.googlevideo.com/Cj0LENy73wIaNAlIBfErgNgqRxMYDSANFC0Z82FXMOCoAUIASARgtdjU2NCE9btPigELRWxtS3N2ZHdDN00M/35338A718972CBCCF0C6F3E86A99F7CC7DB64B5C.50242B3E06D30B98C682E6F92F1A9C2018BB5A65/yt6/1/video.3gp"); + videoView.setMediaController(mediaController); + videoView.setVideoURI(uri); + videoView.requestFocus(); + videoView.start(); + } +} + diff --git a/app/src/main/java/com/fiona/personalcodingproject/openpic.java b/app/src/main/java/com/fiona/personalcodingproject/openpic.java new file mode 100644 index 0000000..3a44ba4 --- /dev/null +++ b/app/src/main/java/com/fiona/personalcodingproject/openpic.java @@ -0,0 +1,33 @@ +package com.fiona.personalcodingproject; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + + +public class OpenPic extends Activity { + + Button button; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.starting); + addListenerOnButton(); + } + + public void addListenerOnButton() { + final Context context = this; + button = (Button)findViewById(R.id.imagebutton); + button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(context, pic.class); + startActivity(intent); + } + }); + } +} diff --git a/app/src/main/java/com/fiona/personalcodingproject/pic.java b/app/src/main/java/com/fiona/personalcodingproject/pic.java new file mode 100644 index 0000000..a0deee7 --- /dev/null +++ b/app/src/main/java/com/fiona/personalcodingproject/pic.java @@ -0,0 +1,16 @@ +package com.fiona.personalcodingproject; + +import android.os.Bundle; +import android.widget.Button; + + +public class pic extends OpenPic { + Button button; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.image); + onBackPressed(); + } +} diff --git a/app/src/main/res/layout/activity_play_video.xml b/app/src/main/res/layout/activity_play_video.xml new file mode 100644 index 0000000..296b4e5 --- /dev/null +++ b/app/src/main/res/layout/activity_play_video.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/app/src/main/res/layout/image.xml b/app/src/main/res/layout/image.xml new file mode 100644 index 0000000..66a5870 --- /dev/null +++ b/app/src/main/res/layout/image.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/laughing_fullscreen.xml b/app/src/main/res/layout/laughing_fullscreen.xml new file mode 100644 index 0000000..47e1fe4 --- /dev/null +++ b/app/src/main/res/layout/laughing_fullscreen.xml @@ -0,0 +1,62 @@ + + + // Rapunzel Button + + + // Lion King Button + + + // Elsa Button + + + // Aladdin Button + + + // Mulan Button + + + // Pocahontas Button + + + diff --git a/app/src/main/res/layout/starting.xml b/app/src/main/res/layout/starting.xml new file mode 100644 index 0000000..247056f --- /dev/null +++ b/app/src/main/res/layout/starting.xml @@ -0,0 +1,15 @@ + + + +