diff --git a/CustomFanChallenge/Application/build.gradle b/CustomFanChallenge/Application/build.gradle
index c911e99..74958db 100755
--- a/CustomFanChallenge/Application/build.gradle
+++ b/CustomFanChallenge/Application/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'com.android.application'
// the main sample code.
android {
- compileSdkVersion 25
- buildToolsVersion '26.0.2'
+ compileSdkVersion 26
+ buildToolsVersion '27.0.3'
defaultConfig {
applicationId "com.example.android.customfanchallenge"
minSdkVersion 15
- targetSdkVersion 25
+ targetSdkVersion 26
versionCode 1
versionName "1.0"
}
@@ -23,7 +23,7 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile "com.android.support:appcompat-v7:25.4.0"
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation "com.android.support:appcompat-v7:25.4.0"
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
}
diff --git a/CustomFanChallenge/build.gradle b/CustomFanChallenge/build.gradle
index ca2d9c6..4abf30c 100755
--- a/CustomFanChallenge/build.gradle
+++ b/CustomFanChallenge/build.gradle
@@ -1,10 +1,10 @@
buildscript {
repositories {
- maven { url 'https://maven.google.com' }
+ jcenter()
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.android.tools.build:gradle:3.1.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -14,6 +14,6 @@ buildscript {
allprojects {
repositories {
jcenter()
- maven { url 'https://maven.google.com' }
+ google()
}
}
\ No newline at end of file
diff --git a/CustomFanChallenge/gradle/wrapper/gradle-wrapper.properties b/CustomFanChallenge/gradle/wrapper/gradle-wrapper.properties
index 0edf774..a06c43b 100755
--- a/CustomFanChallenge/gradle/wrapper/gradle-wrapper.properties
+++ b/CustomFanChallenge/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Nov 27 14:47:34 PST 2017
+#Mon Apr 02 12:09:05 PDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
\ No newline at end of file
diff --git a/SimpleVideoView/app/.gitignore b/SimpleVideoView/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/SimpleVideoView/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/SimpleVideoView/app/build.gradle b/SimpleVideoView/app/build.gradle
new file mode 100644
index 0000000..fb7d483
--- /dev/null
+++ b/SimpleVideoView/app/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 26
+ defaultConfig {
+ applicationId "com.example.android.simplevideoview"
+ minSdkVersion 16
+ targetSdkVersion 26
+ versionCode 1
+ versionName "1.0"
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support:appcompat-v7:26.1.0'
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'com.android.support.test:runner:1.0.1'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+}
diff --git a/SimpleVideoView/app/proguard-rules.pro b/SimpleVideoView/app/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/SimpleVideoView/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# 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 *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/SimpleVideoView/app/src/main/AndroidManifest.xml b/SimpleVideoView/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..505a47e
--- /dev/null
+++ b/SimpleVideoView/app/src/main/AndroidManifest.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SimpleVideoView/app/src/main/java/com/example/android/simplevideoview/MainActivity.java b/SimpleVideoView/app/src/main/java/com/example/android/simplevideoview/MainActivity.java
new file mode 100644
index 0000000..9a01e03
--- /dev/null
+++ b/SimpleVideoView/app/src/main/java/com/example/android/simplevideoview/MainActivity.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2018, Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.example.android.simplevideoview;
+
+import android.media.MediaPlayer;
+import android.net.Uri;
+import android.os.Build;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.webkit.URLUtil;
+import android.widget.MediaController;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.VideoView;
+
+public class MainActivity extends AppCompatActivity {
+
+ // Use this string for the first part of the practical (load local media
+ // from the raw directory).
+ // private static final String VIDEO_SAMPLE = "tacoma_narrows";
+
+ // Use this string for part 2 (load media from the internet).
+ private static final String VIDEO_SAMPLE =
+ "https://developers.google.com/training/images/tacoma_narrows.mp4";
+
+ private VideoView mVideoView;
+ private TextView mBufferingTextView;
+
+ // Current playback position (in milliseconds).
+ private int mCurrentPosition = 0;
+
+ // Tag for the instance state bundle.
+ private static final String PLAYBACK_TIME = "play_time";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ mVideoView = findViewById(R.id.videoview);
+ mBufferingTextView = findViewById(R.id.buffering_textview);
+
+ if (savedInstanceState != null) {
+ mCurrentPosition = savedInstanceState.getInt(PLAYBACK_TIME);
+ }
+
+ // Set up the media controller widget and attach it to the video view.
+ MediaController controller = new MediaController(this);
+ controller.setMediaPlayer(mVideoView);
+ mVideoView.setMediaController(controller);
+ }
+
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+
+ // Load the media each time onStart() is called.
+ initializePlayer();
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+
+ // In Android versions less than N (7.0, API 24), onPause() is the
+ // end of the visual lifecycle of the app. Pausing the video here
+ // prevents the sound from continuing to play even after the app
+ // disappears.
+ //
+ // This is not a problem for more recent versions of Android because
+ // onStop() is now the end of the visual lifecycle, and that is where
+ // most of the app teardown should take place.
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+ mVideoView.pause();
+ }
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+
+ // Media playback takes a lot of resources, so everything should be
+ // stopped and released at this time.
+ releasePlayer();
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+
+ // Save the current playback position (in milliseconds) to the
+ // instance state bundle.
+ outState.putInt(PLAYBACK_TIME, mVideoView.getCurrentPosition());
+ }
+
+ private void initializePlayer() {
+ // Show the "Buffering..." message while the video loads.
+ mBufferingTextView.setVisibility(VideoView.VISIBLE);
+
+ // Buffer and decode the video sample.
+ Uri videoUri = getMedia(VIDEO_SAMPLE);
+ mVideoView.setVideoURI(videoUri);
+
+ // Listener for onPrepared() event (runs after the media is prepared).
+ mVideoView.setOnPreparedListener(
+ new MediaPlayer.OnPreparedListener() {
+ @Override
+ public void onPrepared(MediaPlayer mediaPlayer) {
+
+ // Hide buffering message.
+ mBufferingTextView.setVisibility(VideoView.INVISIBLE);
+
+ // Restore saved position, if available.
+ if (mCurrentPosition > 0) {
+ mVideoView.seekTo(mCurrentPosition);
+ } else {
+ // Skipping to 1 shows the first frame of the video.
+ mVideoView.seekTo(1);
+ }
+
+ // Start playing!
+ mVideoView.start();
+ }
+ });
+
+ // Listener for onCompletion() event (runs after media has finished
+ // playing).
+ mVideoView.setOnCompletionListener(
+ new MediaPlayer.OnCompletionListener() {
+ @Override
+ public void onCompletion(MediaPlayer mediaPlayer) {
+ Toast.makeText(MainActivity.this,
+ R.string.toast_message,
+ Toast.LENGTH_SHORT).show();
+
+ // Return the video position to the start.
+ mVideoView.seekTo(0);
+ }
+ });
+ }
+
+
+ // Release all media-related resources. In a more complicated app this
+ // might involve unregistering listeners or releasing audio focus.
+ private void releasePlayer() {
+ mVideoView.stopPlayback();
+ }
+
+ // Get a Uri for the media sample regardless of whether that sample is
+ // embedded in the app resources or available on the internet.
+ private Uri getMedia(String mediaName) {
+ if (URLUtil.isValidUrl(mediaName)) {
+ // Media name is an external URL.
+ return Uri.parse(mediaName);
+ } else {
+ // Media name is a raw resource embedded in the app.
+ return Uri.parse("android.resource://" + getPackageName() +
+ "/raw/" + mediaName);
+ }
+ }
+}
diff --git a/SimpleVideoView/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/SimpleVideoView/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..4f49a0f
--- /dev/null
+++ b/SimpleVideoView/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+