diff --git a/android/4-3-MultipleViews/mvc1/.gitignore b/android/4-3-MultipleViews/mvc1/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..3e45e5cb63ad99afac97acfbeeff4ab2cd464d72 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/.gitignore @@ -0,0 +1,131 @@ +.idea +.idea/ + +# Created by https://www.gitignore.io/api/androidstudio + +### AndroidStudio ### +# Covers files to be ignored for android development using Android Studio. + +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle +.gradle/ +build/ + +# Signing files +.signing/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio +/*/build/ +/*/local.properties +/*/out +/*/*/build +/*/*/production +captures/ +.navigation/ +*.ipr +*~ +*.swp + +# Android Patch +gen-external-apklibs + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# NDK +obj/ + +# IntelliJ IDEA +*.iml +*.iws +/out/ + +# User-specific configurations +.idea/libraries/ +.idea/workspace.xml +.idea/tasks.xml +.idea/.name +.idea/compiler.xml +.idea/copyright/profiles_settings.xml +.idea/encodings.xml +.idea/misc.xml +.idea/modules.xml +.idea/scopes/scope_settings.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml +.idea/datasources.xml +.idea/dataSources.ids +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# OS-specific files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Legacy Eclipse project files +.classpath +.project + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.war +*.ear + +# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml) +hs_err_pid* + +## Plugin-specific files: + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Mongo Explorer plugin +.idea/mongoSettings.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +### AndroidStudio Patch ### + +!/gradle/wrapper/gradle-wrapper.jar + +# End of https://www.gitignore.io/api/androidstudio \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc1/app/.gitignore b/android/4-3-MultipleViews/mvc1/app/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..796b96d1c402326528b4ba3c12ee9d92d0e212e9 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/android/4-3-MultipleViews/mvc1/app/build.gradle b/android/4-3-MultipleViews/mvc1/app/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..cb5a6c9d6c00b97698cf91f7c56aa1640eb39350 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 26 + defaultConfig { + applicationId "cs349.uwaterloo.ca.mvc1" + minSdkVersion 23 + 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/android/4-3-MultipleViews/mvc1/app/proguard-rules.pro b/android/4-3-MultipleViews/mvc1/app/proguard-rules.pro new file mode 100644 index 0000000000000000000000000000000000000000..f1b424510da51fd82143bc74a0a801ae5a1e2fcd --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/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/android/4-3-MultipleViews/mvc1/app/src/androidtest/java/cs349/uwaterloo/ca/mvc1/ExampleInstrumentedTest.java b/android/4-3-MultipleViews/mvc1/app/src/androidtest/java/cs349/uwaterloo/ca/mvc1/ExampleInstrumentedTest.java new file mode 100644 index 0000000000000000000000000000000000000000..45229027eb2d8f9a27d10a56117fbf7f7b4c8b9c --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/androidtest/java/cs349/uwaterloo/ca/mvc1/ExampleInstrumentedTest.java @@ -0,0 +1,28 @@ +package cs349.uwaterloo.ca.mvc1; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest +{ + @Test + public void useAppContext() throws Exception + { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("cs349.uwaterloo.ca.mvc1", appContext.getPackageName()); + } +} diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/AndroidManifest.xml b/android/4-3-MultipleViews/mvc1/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000000000000000000000000000000000..90ce6508671dcfbf753dc5793c7ff2aebdcb5525 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest package="cs349.uwaterloo.ca.mvc1" + xmlns:android="http://schemas.android.com/apk/res/android"> + + <application + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/AppTheme"> + <activity android:name=".MainActivity"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> + </application> + +</manifest> \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/MainActivity.java b/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/MainActivity.java new file mode 100644 index 0000000000000000000000000000000000000000..43dee97e40a67cf435685cc15437e423f5dbcdd4 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/MainActivity.java @@ -0,0 +1,96 @@ +package cs349.uwaterloo.ca.mvc1; + +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.ViewGroup; + +public class MainActivity extends AppCompatActivity +{ + // Private Vars + Model model; + + /** + * OnCreate + * -- Called when application is initially launched. + * @see <a href="https://developer.android.com/guide/components/activities/activity-lifecycle.html">Android LifeCycle</a> + * @param savedInstanceState + */ + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "onCreate called"); + + // Load base UI layout from resources. + setContentView(R.layout.activity_main); + + // Init Model + model = new Model(); + + //////////////////////////////////////// + // Setup Views + //////////////////////////////////////// + View1 view1 = new View1(this, model); + ViewGroup v1 = (ViewGroup) findViewById(R.id.mainactivity_1); + v1.addView(view1); + + View2 view2 = new View2(this, model); + ViewGroup v2 = (ViewGroup) findViewById(R.id.mainactivity_2); + v2.addView(view2); + + // Init Views + model.initObservers(); + } + + + //////////////////////////////////////////////////////////////////////////////////////////////// + // + // Save and Restore State + // + //////////////////////////////////////////////////////////////////////////////////////////////// + + /** + * Save the state of the application + * @param outState + */ + @Override + protected void onSaveInstanceState(Bundle outState) + { + super.onSaveInstanceState(outState); + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "MainActivity: Save model state."); + + // Serialize all sateful values form model + outState.putInt("Counter", model.getCounter()); + } + + /** + * This method is called after {@link #onStart} when the activity is + * being re-initialized from a previously saved state, given here in + * <var>savedInstanceState</var>. Most implementations will simply use {@link #onCreate} + * to restore their state, but it is sometimes convenient to do it here + * after all of the initialization has been done or to allow subclasses to + * decide whether to use your default implementation. The default + * implementation of this method performs a restore of any view state that + * had previously been frozen by {@link #onSaveInstanceState}. + * <p> + * <p>This method is called between {@link #onStart} and + * {@link #onPostCreate}. + * + * @param savedInstanceState the data most recently supplied in {@link #onSaveInstanceState}. + * @see #onCreate + * @see #onPostCreate + * @see #onResume + * @see #onSaveInstanceState + */ + @Override + protected void onRestoreInstanceState(Bundle savedInstanceState) + { + super.onRestoreInstanceState(savedInstanceState); + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "MainActivity: Restore model"); + + // Get all values and restore them to model + model.setCounter(savedInstanceState.getInt("Counter")); + } +} diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/Model.java b/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/Model.java new file mode 100644 index 0000000000000000000000000000000000000000..d2439b3d517653c7ada955f322df888c9dd70ecd --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/Model.java @@ -0,0 +1,139 @@ +package cs349.uwaterloo.ca.mvc1; + +import android.util.Log; +import java.util.Observable; +import java.util.Observer; + +/** + * CS349_AndroidSamples + * <p> + * Created by J. J. Hartmann on 11/19/2017. + * Email: j3hartma@uwaterloo.ca + * Copyright 2017 + */ + + +/** + * Class Model + * - Stores a persistent state for the application. + */ +public class Model extends Observable +{ + // Private Variables + private int mCounter; + + /** + * Model Constructor: + * - Init member variables + */ + Model() { + mCounter = 0; + } + + /** + * Get mCounter Values + * @return Current value mCounter + */ + public int getCounter() + { + return mCounter; + } + + /** + * Set mCounter Value + * @param i + * -- Value to set Counter + */ + public void setCounter(int i) + { + Log.d("DEMO", "Model: set counter to " + mCounter); + this.mCounter = i; + } + + /** + * Increment mCounter by 1 + */ + public void incrementCounter() + { + mCounter++; + Log.d("DEMO", "Model: increment counter to " + mCounter); + + // Observable API + setChanged(); + notifyObservers(); + } + + + //////////////////////////////////////////////////////////////////////////////////////////////// + // + // Observable Methods + // + //////////////////////////////////////////////////////////////////////////////////////////////// + + /** + * Helper method to make it easier to initialize all observers + */ + public void initObservers() + { + setChanged(); + notifyObservers(); + } + + /** + * Deletes an observer from the set of observers of this object. + * Passing <CODE>null</CODE> to this method will have no effect. + * + * @param o the observer to be deleted. + */ + @Override + public synchronized void deleteObserver(Observer o) + { + super.deleteObserver(o); + } + + /** + * Adds an observer to the set of observers for this object, provided + * that it is not the same as some observer already in the set. + * The order in which notifications will be delivered to multiple + * observers is not specified. See the class comment. + * + * @param o an observer to be added. + * @throws NullPointerException if the parameter o is null. + */ + @Override + public synchronized void addObserver(Observer o) + { + super.addObserver(o); + } + + /** + * Clears the observer list so that this object no longer has any observers. + */ + @Override + public synchronized void deleteObservers() + { + super.deleteObservers(); + } + + /** + * If this object has changed, as indicated by the + * <code>hasChanged</code> method, then notify all of its observers + * and then call the <code>clearChanged</code> method to + * indicate that this object has no longer changed. + * <p> + * Each observer has its <code>update</code> method called with two + * arguments: this observable object and <code>null</code>. In other + * words, this method is equivalent to: + * <blockquote><tt> + * notifyObservers(null)</tt></blockquote> + * + * @see Observable#clearChanged() + * @see Observable#hasChanged() + * @see Observer#update(Observable, Object) + */ + @Override + public void notifyObservers() + { + super.notifyObservers(); + } +} diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/View1.java b/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/View1.java new file mode 100644 index 0000000000000000000000000000000000000000..d197d6788f9c3285d2fd394e51f108a917e313cc --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/View1.java @@ -0,0 +1,73 @@ +package cs349.uwaterloo.ca.mvc1; + +import android.content.Context; +import android.util.Log; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.LinearLayout; + +import java.util.Observable; +import java.util.Observer; + +/** + * CS349_AndroidSamples + * <p> + * Created by J. J. Hartmann on 11/19/2017. + * Email: j3hartma@uwaterloo.ca + * Copyright 2017 + */ + +public class View1 extends LinearLayout implements Observer +{ + // Private Vars + private Model model; + private Button button; + + public View1(Context context, Model m) + { + super(context); + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "View1: Constructor"); + + // Get the XML view description and "inflate" it into the display (like rendering) + View.inflate(context, R.layout.view1_layout, this); + + // Save model + model = m; + + // Add view to observer + model.addObserver(this); + + // Get reference for button + button = (Button) findViewById(R.id.view1_button); + + // Create controller for button + button.setOnClickListener(new OnClickListener() + { + @Override + public void onClick(View v) + { + // Increment model when button is clicked + model.incrementCounter(); + } + }); + } + + /** + * This method is called whenever the observed object is changed. An + * application calls an <tt>Observable</tt> object's + * <code>notifyObservers</code> method to have all the object's + * observers notified of the change. + * + * @param o the observable object. + * @param arg an argument passed to the <code>notifyObservers</code> + */ + @Override + public void update(Observable o, Object arg) + { + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "View1: Update Called"); + + // Update button text the click count from model + button.setText(String.valueOf(model.getCounter())); + } +} diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/View2.java b/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/View2.java new file mode 100644 index 0000000000000000000000000000000000000000..3c502ea3738cd015ade5c7a14675901308e136d5 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/java/cs349/uwaterloo/ca/mvc1/View2.java @@ -0,0 +1,80 @@ +package cs349.uwaterloo.ca.mvc1; + +import android.content.Context; +import android.util.Log; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import java.util.Observable; +import java.util.Observer; + +/** + * CS349_AndroidSamples + * <p> + * Created by J. J. Hartmann on 11/19/2017. + * Email: j3hartma@uwaterloo.ca + * Copyright 2017 + */ + +public class View2 extends LinearLayout implements Observer +{ + // Private Vars + private Model model; + private TextView textView; + + public View2(Context context, Model m) + { + super(context); + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "View2: Constructor Called"); + + // Get the XML view description and "inflate" it into the display (like rendering) + View.inflate(context, R.layout.view2_layout, this); + + // Save model ref + this.model = m; + + // Add view to model list of observers + model.addObserver(this); + + // get reference to widgets and manipulate updates + textView = (TextView) findViewById(R.id.view2_textView); + + // Create a controller to increment counter when clicked + textView.setOnClickListener(new OnClickListener() + { + @Override + public void onClick(View v) + { + // Increment counter everytime view text view is clicked. + model.incrementCounter(); + } + }); + + } + + + /** + * This method is called whenever the observed object is changed. An + * application calls an <tt>Observable</tt> object's + * <code>notifyObservers</code> method to have all the object's + * observers notified of the change. + * + * @param o the observable object. + * @param arg an argument passed to the <code>notifyObservers</code> + */ + @Override + public void update(Observable o, Object arg) + { + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "View2: Update TextView"); + + // Build String based on model state + StringBuilder s = new StringBuilder(); + for(int i = 0; i < model.getCounter(); ++i){ + s.append("x"); + } + + // Update textView + textView.setText(s); + } +} diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..3bb4cdbc10196a1c5047ad03a338394aa69f49d6 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ +<vector xmlns:aapt="http://schemas.android.com/aapt" + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportHeight="108" + android:viewportWidth="108"> + <path + android:fillType="evenOdd" + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" + android:strokeColor="#00000000" + android:strokeWidth="1"> + <aapt:attr name="android:fillColor"> + <gradient + android:endX="78.5885" + android:endY="90.9159" + android:startX="48.7653" + android:startY="61.0927" + android:type="linear"> + <item + android:color="#44000000" + android:offset="0.0"/> + <item + android:color="#00000000" + android:offset="1.0"/> + </gradient> + </aapt:attr> + </path> + <path + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" + android:strokeColor="#00000000" + android:strokeWidth="1"/> +</vector> diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/drawable/ic_launcher_background.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..5713f34a5f36cc43cd7f96007e8b154ae5af5baf --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportHeight="108" + android:viewportWidth="108"> + <path + android:fillColor="#26A69A" + android:pathData="M0,0h108v108h-108z"/> + <path + android:fillColor="#00000000" + android:pathData="M9,0L9,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,0L19,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M29,0L29,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M39,0L39,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M49,0L49,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M59,0L59,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M69,0L69,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M79,0L79,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M89,0L89,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M99,0L99,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,9L108,9" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,19L108,19" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,29L108,29" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,39L108,39" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,49L108,49" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,59L108,59" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,69L108,69" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,79L108,79" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,89L108,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,99L108,99" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,29L89,29" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,39L89,39" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,49L89,49" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,59L89,59" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,69L89,69" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,79L89,79" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M29,19L29,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M39,19L39,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M49,19L49,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M59,19L59,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M69,19L69,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M79,19L79,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> +</vector> diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/layout/activity_main.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000000000000000000000000000000000000..4fb8e2a269934aca6b31006f57c1e3418e141787 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="cs349.uwaterloo.ca.mvc1.MainActivity"> + + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginBottom="8dp" + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <LinearLayout + android:id="@+id/mainactivity_1" + android:layout_width="match_parent" + android:layout_height="236dp" + android:orientation="horizontal"> + + </LinearLayout> + + <LinearLayout + android:id="@+id/mainactivity_2" + android:layout_width="match_parent" + android:layout_height="261dp" + android:orientation="horizontal"> + + </LinearLayout> + </LinearLayout> +</android.support.constraint.ConstraintLayout> diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/layout/view1_layout.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/layout/view1_layout.xml new file mode 100644 index 0000000000000000000000000000000000000000..bde9baa5a40cf19ed44ec68465c4566bf07085ab --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/layout/view1_layout.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <Button + android:id="@+id/view1_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="Button" + android:textSize="18sp"/> +</LinearLayout> diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/layout/view2_layout.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/layout/view2_layout.xml new file mode 100644 index 0000000000000000000000000000000000000000..926966a3f6579c042a980fccb219ec7713ff37bc --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/layout/view2_layout.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@+id/view2_textView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="TextView" + android:textSize="24sp"/> +</LinearLayout> diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000000000000000000000000000000000..bbd3e021239ce758474da78cfc2ca3cf85ed0d91 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..bbd3e021239ce758474da78cfc2ca3cf85ed0d91 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..a2f5908281d070150700378b64a84c7db1f97aa1 Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..1b523998081149a985cef0cdf89045b9ed29964a Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..ff10afd6e182edb2b1a63c8f984e9070d9f950ba Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..115a4c768a20c9e13185c17043f4c4d12dd4632a Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..dcd3cd8083358269d6ed7894726283bb9bcbbfea Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..459ca609d3ae0d3943ab44cdc27feef9256dc6d7 Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..8ca12fe024be86e868d14e91120a6902f8e88ac6 Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..8e19b410a1b15ff180f3dacac19395fe3046cdec Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..b824ebdd48db917eea2e67a82260a100371f8a24 Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..4c19a13c239cb67b8a2134ddd5f325db1d2d5bee Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/values/colors.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..3ab3e9cbce07f7cdc941fc8ba424c05e83ed80f0 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="colorPrimary">#3F51B5</color> + <color name="colorPrimaryDark">#303F9F</color> + <color name="colorAccent">#FF4081</color> +</resources> diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/values/strings.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..2c79d9b8f33b98c30ceb216c81ef4c4c25cc00f5 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/values/strings.xml @@ -0,0 +1,5 @@ +<resources> + <string name="app_name">MVC1</string> + <string name="DEBUG_MVC_ID">CS349_DEBUG_MVC</string> + +</resources> diff --git a/android/4-3-MultipleViews/mvc1/app/src/main/res/values/styles.xml b/android/4-3-MultipleViews/mvc1/app/src/main/res/values/styles.xml new file mode 100644 index 0000000000000000000000000000000000000000..5885930df6d10edf3d6df40d6556297d11f953da --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ +<resources> + + <!-- Base application theme. --> + <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <!-- Customize your theme here. --> + <item name="colorPrimary">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + <item name="colorAccent">@color/colorAccent</item> + </style> + +</resources> diff --git a/android/4-3-MultipleViews/mvc1/app/src/test/java/cs349/uwaterloo/ca/mvc1/ExampleUnitTest.java b/android/4-3-MultipleViews/mvc1/app/src/test/java/cs349/uwaterloo/ca/mvc1/ExampleUnitTest.java new file mode 100644 index 0000000000000000000000000000000000000000..dca5396805e8117f73429490f7ade9559753870d --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/app/src/test/java/cs349/uwaterloo/ca/mvc1/ExampleUnitTest.java @@ -0,0 +1,19 @@ +package cs349.uwaterloo.ca.mvc1; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> + */ +public class ExampleUnitTest +{ + @Test + public void addition_isCorrect() throws Exception + { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc1/build.gradle b/android/4-3-MultipleViews/mvc1/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..e6b32bc7884bb98a5024981d37fec787514b56c8 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.0.1' + + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/android/4-3-MultipleViews/mvc1/gradle.properties b/android/4-3-MultipleViews/mvc1/gradle.properties new file mode 100644 index 0000000000000000000000000000000000000000..aac7c9b4614ccfde6c721f24994cf30885a791d0 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/android/4-3-MultipleViews/mvc1/gradle/wrapper/gradle-wrapper.jar b/android/4-3-MultipleViews/mvc1/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659 Binary files /dev/null and b/android/4-3-MultipleViews/mvc1/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/4-3-MultipleViews/mvc1/gradle/wrapper/gradle-wrapper.properties b/android/4-3-MultipleViews/mvc1/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..c8df9ce15aeb88cd1d05f974a4868357ebe20063 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Nov 19 16:05:51 EST 2017 +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 diff --git a/android/4-3-MultipleViews/mvc1/gradlew b/android/4-3-MultipleViews/mvc1/gradlew new file mode 100644 index 0000000000000000000000000000000000000000..9d82f78915133e1c35a6ea51252590fb38efac2f --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/android/4-3-MultipleViews/mvc1/gradlew.bat b/android/4-3-MultipleViews/mvc1/gradlew.bat new file mode 100644 index 0000000000000000000000000000000000000000..8a0b282aa6885fb573c106b3551f7275c5f17e8e --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/4-3-MultipleViews/mvc1/settings.gradle b/android/4-3-MultipleViews/mvc1/settings.gradle new file mode 100644 index 0000000000000000000000000000000000000000..e7b4def49cb53d9aa04228dd3edb14c9e635e003 --- /dev/null +++ b/android/4-3-MultipleViews/mvc1/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/android/4-3-MultipleViews/mvc2/.gitignore b/android/4-3-MultipleViews/mvc2/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..3e45e5cb63ad99afac97acfbeeff4ab2cd464d72 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/.gitignore @@ -0,0 +1,131 @@ +.idea +.idea/ + +# Created by https://www.gitignore.io/api/androidstudio + +### AndroidStudio ### +# Covers files to be ignored for android development using Android Studio. + +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle +.gradle/ +build/ + +# Signing files +.signing/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio +/*/build/ +/*/local.properties +/*/out +/*/*/build +/*/*/production +captures/ +.navigation/ +*.ipr +*~ +*.swp + +# Android Patch +gen-external-apklibs + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# NDK +obj/ + +# IntelliJ IDEA +*.iml +*.iws +/out/ + +# User-specific configurations +.idea/libraries/ +.idea/workspace.xml +.idea/tasks.xml +.idea/.name +.idea/compiler.xml +.idea/copyright/profiles_settings.xml +.idea/encodings.xml +.idea/misc.xml +.idea/modules.xml +.idea/scopes/scope_settings.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml +.idea/datasources.xml +.idea/dataSources.ids +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# OS-specific files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Legacy Eclipse project files +.classpath +.project + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.war +*.ear + +# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml) +hs_err_pid* + +## Plugin-specific files: + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Mongo Explorer plugin +.idea/mongoSettings.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +### AndroidStudio Patch ### + +!/gradle/wrapper/gradle-wrapper.jar + +# End of https://www.gitignore.io/api/androidstudio \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc2/app/.gitignore b/android/4-3-MultipleViews/mvc2/app/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..796b96d1c402326528b4ba3c12ee9d92d0e212e9 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/android/4-3-MultipleViews/mvc2/app/build.gradle b/android/4-3-MultipleViews/mvc2/app/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..77e077079e0478df4d25899f336de5b8f54263e0 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 26 + defaultConfig { + applicationId "cs349.uwaterloo.ca.mvc2" + minSdkVersion 23 + 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/android/4-3-MultipleViews/mvc2/app/proguard-rules.pro b/android/4-3-MultipleViews/mvc2/app/proguard-rules.pro new file mode 100644 index 0000000000000000000000000000000000000000..f1b424510da51fd82143bc74a0a801ae5a1e2fcd --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/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/android/4-3-MultipleViews/mvc2/app/src/androidtest/java/cs349/uwaterloo/ca/mvc2/ExampleInstrumentedTest.java b/android/4-3-MultipleViews/mvc2/app/src/androidtest/java/cs349/uwaterloo/ca/mvc2/ExampleInstrumentedTest.java new file mode 100644 index 0000000000000000000000000000000000000000..874fb9741798a9c74d9216edf6fededc3e6233d7 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/androidtest/java/cs349/uwaterloo/ca/mvc2/ExampleInstrumentedTest.java @@ -0,0 +1,28 @@ +package cs349.uwaterloo.ca.mvc2; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest +{ + @Test + public void useAppContext() throws Exception + { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("cs349.uwaterloo.ca.mvc2", appContext.getPackageName()); + } +} diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/AndroidManifest.xml b/android/4-3-MultipleViews/mvc2/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000000000000000000000000000000000..ad98e1cae53db0a1192b742fbc7bdaf20f9a6020 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/AndroidManifest.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest package="cs349.uwaterloo.ca.mvc2" + xmlns:android="http://schemas.android.com/apk/res/android"> + + <application + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/AppTheme"> + <activity android:name=".MainActivity"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> + <activity android:name=".SecondActivity"> + </activity> + </application> + +</manifest> \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/java/cs349/uwaterloo/ca/mvc2/MainActivity.java b/android/4-3-MultipleViews/mvc2/app/src/main/java/cs349/uwaterloo/ca/mvc2/MainActivity.java new file mode 100644 index 0000000000000000000000000000000000000000..53d2ef63ec14bd039680fc90cf1f5bc2a6bfbed2 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/java/cs349/uwaterloo/ca/mvc2/MainActivity.java @@ -0,0 +1,161 @@ +package cs349.uwaterloo.ca.mvc2; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.widget.Button; + +import java.util.Observable; +import java.util.Observer; + +public class MainActivity extends AppCompatActivity implements Observer +{ + // Private Vars + Model mModel; + Button mIncrementButton; + + /** + * OnCreate + * -- Called when application is initially launched. + * @see <a href="https://developer.android.com/guide/components/activities/activity-lifecycle.html">Android LifeCycle</a> + * @param savedInstanceState + */ + @Override + protected void onCreate(Bundle savedInstanceState) + { + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "MainActivity: OnCreate"); + super.onCreate(savedInstanceState); + + // Set Content View + setContentView(R.layout.activity_main); + + // Get Model instance + mModel = Model.getInstance(); + mModel.addObserver(this); + + // Get button reference. + mIncrementButton = (Button) findViewById(R.id.view1_button); + + // Create controller to increment counter + mIncrementButton.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View v) + { + // Increment mModel counter + mModel.incrementCounter(); + } + }); + + // Init observers + mModel.initObservers(); + } + + @Override + protected void onDestroy() + { + super.onDestroy(); + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "MainActivity: onDestory"); + + // Remove observer when activity is destroyed. + mModel.deleteObserver(this); + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + // + // Options Menu + // + //////////////////////////////////////////////////////////////////////////////////////////////// + + + /** + * Initialize the contents of the Activity's standard options menu. You + * should place your menu items in to <var>menu</var>. + * <p> + * <p>This is only called once, the first time the options menu is + * displayed. To update the menu every time it is displayed, see + * {@link #onPrepareOptionsMenu}. + * <p> + * <p>The default implementation populates the menu with standard system + * menu items. These are placed in the {@link Menu#CATEGORY_SYSTEM} group so that + * they will be correctly ordered with application-defined menu items. + * Deriving classes should always call through to the base implementation. + * <p> + * <p>You can safely hold on to <var>menu</var> (and any items created + * from it), making modifications to it as desired, until the next + * time onCreateOptionsMenu() is called. + * <p> + * <p>When you add items to the menu, you can implement the Activity's + * {@link #onOptionsItemSelected} method to handle them there. + * + * @param menu The options menu in which you place your items. + * @return You must return true for the menu to be displayed; + * if you return false it will not be shown. + * @see #onPrepareOptionsMenu + * @see #onOptionsItemSelected + */ + @Override + public boolean onCreateOptionsMenu(Menu menu) + { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.view1, menu); + + return super.onCreateOptionsMenu(menu); + } + + /** + * This hook is called whenever an item in your options menu is selected. + * The default implementation simply returns false to have the normal + * processing happen (calling the item's Runnable or sending a message to + * its Handler as appropriate). You can use this method for any items + * for which you would like to do processing without those other + * facilities. + * <p> + * <p>Derived classes should call through to the base class for it to + * perform the default menu handling.</p> + * + * @param item The menu item that was selected. + * @return boolean Return false to allow normal menu processing to + * proceed, true to consume it here. + * @see #onCreateOptionsMenu + */ + @Override + public boolean onOptionsItemSelected(MenuItem item) + { + // Handle interaction based on item selection + switch (item.getItemId()) + { + case R.id.menu1_goToView2: + // Create Intent to launch second activity + Intent intent = new Intent(this, SecondActivity.class); + + // Start activity + startActivity(intent); + finish(); + return true; + } + + return super.onOptionsItemSelected(item); + } + + /** + * This method is called whenever the observed object is changed. An + * application calls an <tt>Observable</tt> object's + * <code>notifyObservers</code> method to have all the object's + * observers notified of the change. + * + * @param o the observable object. + * @param arg an argument passed to the <code>notifyObservers</code> + */ + @Override + public void update(Observable o, Object arg) + { + // Update button with click count from model + mIncrementButton.setText(String.valueOf(mModel.getCounter())); + } +} diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/java/cs349/uwaterloo/ca/mvc2/Model.java b/android/4-3-MultipleViews/mvc2/app/src/main/java/cs349/uwaterloo/ca/mvc2/Model.java new file mode 100644 index 0000000000000000000000000000000000000000..4c5f6e77d5d89cb87f0d6b60ee3c13d567662a6e --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/java/cs349/uwaterloo/ca/mvc2/Model.java @@ -0,0 +1,142 @@ +package cs349.uwaterloo.ca.mvc2; + +import android.util.Log; + +import java.util.Observable; +import java.util.Observer; + +/** + * MVC2 Model + * <p> + * Created by J. J. Hartmann on 11/19/2017. + * Email: j3hartma@uwaterloo.ca + * Copyright 2017 + */ + +class Model extends Observable +{ + // Create static instance of this mModel + private static final Model ourInstance = new Model(); + static Model getInstance() + { + return ourInstance; + } + + // Private Variables + private int mCounter; + + /** + * Model Constructor: + * - Init member variables + */ + Model() { + mCounter = 0; + } + + /** + * Get mCounter Values + * @return Current value mCounter + */ + public int getCounter() + { + return mCounter; + } + + /** + * Set mCounter Value + * @param i + * -- Value to set Counter + */ + public void setCounter(int i) + { + Log.d("DEMO", "Model: set counter to " + mCounter); + this.mCounter = i; + } + + /** + * Increment mCounter by 1 + */ + public void incrementCounter() + { + mCounter++; + Log.d("DEMO", "Model: increment counter to " + mCounter); + + // Observable API + setChanged(); + notifyObservers(); + } + + + //////////////////////////////////////////////////////////////////////////////////////////////// + // + // Observable Methods + // + //////////////////////////////////////////////////////////////////////////////////////////////// + + /** + * Helper method to make it easier to initialize all observers + */ + public void initObservers() + { + setChanged(); + notifyObservers(); + } + + /** + * Deletes an observer from the set of observers of this object. + * Passing <CODE>null</CODE> to this method will have no effect. + * + * @param o the observer to be deleted. + */ + @Override + public synchronized void deleteObserver(Observer o) + { + super.deleteObserver(o); + } + + /** + * Adds an observer to the set of observers for this object, provided + * that it is not the same as some observer already in the set. + * The order in which notifications will be delivered to multiple + * observers is not specified. See the class comment. + * + * @param o an observer to be added. + * @throws NullPointerException if the parameter o is null. + */ + @Override + public synchronized void addObserver(Observer o) + { + super.addObserver(o); + } + + /** + * Clears the observer list so that this object no longer has any observers. + */ + @Override + public synchronized void deleteObservers() + { + super.deleteObservers(); + } + + /** + * If this object has changed, as indicated by the + * <code>hasChanged</code> method, then notify all of its observers + * and then call the <code>clearChanged</code> method to + * indicate that this object has no longer changed. + * <p> + * Each observer has its <code>update</code> method called with two + * arguments: this observable object and <code>null</code>. In other + * words, this method is equivalent to: + * <blockquote><tt> + * notifyObservers(null)</tt></blockquote> + * + * @see Observable#clearChanged() + * @see Observable#hasChanged() + * @see Observer#update(Observable, Object) + */ + @Override + public void notifyObservers() + { + super.notifyObservers(); + } +} diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/java/cs349/uwaterloo/ca/mvc2/SecondActivity.java b/android/4-3-MultipleViews/mvc2/app/src/main/java/cs349/uwaterloo/ca/mvc2/SecondActivity.java new file mode 100644 index 0000000000000000000000000000000000000000..0154f4c7a4dda396ad77dff4187b31a023713256 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/java/cs349/uwaterloo/ca/mvc2/SecondActivity.java @@ -0,0 +1,175 @@ +package cs349.uwaterloo.ca.mvc2; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; + +import java.util.Observable; +import java.util.Observer; + +public class SecondActivity extends AppCompatActivity implements Observer +{ + // Private Vars + Model mModel; + TextView mTextView; + + /** + * OnCreate + * -- Called when application is initially launched. + * + * @param savedInstanceState + * @see <a href="https://developer.android.com/guide/components/activities/activity-lifecycle.html">Android LifeCycle</a> + */ + @Override + protected void onCreate(Bundle savedInstanceState) + { + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "SecondActivity: OnCreate"); + super.onCreate(savedInstanceState); + + // Set Content View + setContentView(R.layout.activity_second); + + // Get Model instance + mModel = Model.getInstance(); + mModel.addObserver(this); + + // Get TextView Reference + mTextView = (TextView) findViewById(R.id.view2_textView); + + // Create controller to increment counter + mTextView.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View v) + { + // Increment mModel counter + mModel.incrementCounter(); + } + }); + + // Init observers + mModel.initObservers(); + } + + + @Override + protected void onDestroy() + { + super.onDestroy(); + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "MainActivity: onDestory"); + + // Remove observer when activity is destroyed. + mModel.deleteObserver(this); + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + // + // Options Menu + // + //////////////////////////////////////////////////////////////////////////////////////////////// + + + /** + * Initialize the contents of the Activity's standard options menu. You + * should place your menu items in to <var>menu</var>. + * <p> + * <p>This is only called once, the first time the options menu is + * displayed. To update the menu every time it is displayed, see + * {@link #onPrepareOptionsMenu}. + * <p> + * <p>The default implementation populates the menu with standard system + * menu items. These are placed in the {@link Menu#CATEGORY_SYSTEM} group so that + * they will be correctly ordered with application-defined menu items. + * Deriving classes should always call through to the base implementation. + * <p> + * <p>You can safely hold on to <var>menu</var> (and any items created + * from it), making modifications to it as desired, until the next + * time onCreateOptionsMenu() is called. + * <p> + * <p>When you add items to the menu, you can implement the Activity's + * {@link #onOptionsItemSelected} method to handle them there. + * + * @param menu The options menu in which you place your items. + * @return You must return true for the menu to be displayed; + * if you return false it will not be shown. + * @see #onPrepareOptionsMenu + * @see #onOptionsItemSelected + */ + @Override + public boolean onCreateOptionsMenu(Menu menu) + { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.view2, menu); + + return super.onCreateOptionsMenu(menu); + } + + /** + * This hook is called whenever an item in your options menu is selected. + * The default implementation simply returns false to have the normal + * processing happen (calling the item's Runnable or sending a message to + * its Handler as appropriate). You can use this method for any items + * for which you would like to do processing without those other + * facilities. + * <p> + * <p>Derived classes should call through to the base class for it to + * perform the default menu handling.</p> + * + * @param item The menu item that was selected. + * @return boolean Return false to allow normal menu processing to + * proceed, true to consume it here. + * @see #onCreateOptionsMenu + */ + @Override + public boolean onOptionsItemSelected(MenuItem item) + { + // Handle interaction based on item selection + switch (item.getItemId()) + { + case R.id.menu2_GoToMainActivity: + // Create Intent to launch second activity + Intent intent = new Intent(this, MainActivity.class); + + // Start activity + startActivity(intent); + finish(); + return true; + } + + return super.onOptionsItemSelected(item); + } + + + + /** + * This method is called whenever the observed object is changed. An + * application calls an <tt>Observable</tt> object's + * <code>notifyObservers</code> method to have all the object's + * observers notified of the change. + * + * @param o the observable object. + * @param arg an argument passed to the <code>notifyObservers</code> + */ + @Override + public void update(Observable o, Object arg) + { + Log.d(String.valueOf(R.string.DEBUG_MVC_ID), "View2: Update TextView"); + + // Build String based on model state + StringBuilder s = new StringBuilder(); + for (int i = 0; i < mModel.getCounter(); ++i) + { + s.append("x"); + } + + // Update textView + mTextView.setText(s); + } +} \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..3bb4cdbc10196a1c5047ad03a338394aa69f49d6 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ +<vector xmlns:aapt="http://schemas.android.com/aapt" + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportHeight="108" + android:viewportWidth="108"> + <path + android:fillType="evenOdd" + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" + android:strokeColor="#00000000" + android:strokeWidth="1"> + <aapt:attr name="android:fillColor"> + <gradient + android:endX="78.5885" + android:endY="90.9159" + android:startX="48.7653" + android:startY="61.0927" + android:type="linear"> + <item + android:color="#44000000" + android:offset="0.0"/> + <item + android:color="#00000000" + android:offset="1.0"/> + </gradient> + </aapt:attr> + </path> + <path + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" + android:strokeColor="#00000000" + android:strokeWidth="1"/> +</vector> diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/drawable/ic_launcher_background.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..5713f34a5f36cc43cd7f96007e8b154ae5af5baf --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportHeight="108" + android:viewportWidth="108"> + <path + android:fillColor="#26A69A" + android:pathData="M0,0h108v108h-108z"/> + <path + android:fillColor="#00000000" + android:pathData="M9,0L9,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,0L19,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M29,0L29,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M39,0L39,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M49,0L49,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M59,0L59,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M69,0L69,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M79,0L79,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M89,0L89,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M99,0L99,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,9L108,9" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,19L108,19" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,29L108,29" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,39L108,39" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,49L108,49" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,59L108,59" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,69L108,69" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,79L108,79" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,89L108,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M0,99L108,99" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,29L89,29" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,39L89,39" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,49L89,49" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,59L89,59" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,69L89,69" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M19,79L89,79" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M29,19L29,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M39,19L39,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M49,19L49,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M59,19L59,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M69,19L69,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> + <path + android:fillColor="#00000000" + android:pathData="M79,19L79,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8"/> +</vector> diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/layout/activity_main.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000000000000000000000000000000000000..c47b7179fd6cdbf76576c5acc94203077e855837 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="cs349.uwaterloo.ca.mvc2.MainActivity"> + + <Button + android:id="@+id/view1_button" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:text="Button" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"/> +</android.support.constraint.ConstraintLayout> diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/layout/activity_second.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/layout/activity_second.xml new file mode 100644 index 0000000000000000000000000000000000000000..bd359373f06ea5078106cf28f0f355eb460b437b --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/layout/activity_second.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.constraint.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="cs349.uwaterloo.ca.mvc2.SecondActivity"> + + <TextView + android:id="@+id/view2_textView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:text="TextView" + android:textAppearance="@style/TextAppearance.AppCompat.Title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"/> +</android.support.constraint.ConstraintLayout> diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/menu/view1.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/menu/view1.xml new file mode 100644 index 0000000000000000000000000000000000000000..e572c909e642b15fed13cef2731ab67647a77d8b --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/menu/view1.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/menu1_goToView2" + android:title="@string/view_2_MenuItem"/> +</menu> \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/menu/view2.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/menu/view2.xml new file mode 100644 index 0000000000000000000000000000000000000000..2bedcea9fbcad9679ce9d2a5ab3f1c55f6bdea92 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/menu/view2.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/menu2_GoToMainActivity" + android:title="Main Activity"/> +</menu> \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000000000000000000000000000000000..bbd3e021239ce758474da78cfc2ca3cf85ed0d91 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..bbd3e021239ce758474da78cfc2ca3cf85ed0d91 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..a2f5908281d070150700378b64a84c7db1f97aa1 Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..1b523998081149a985cef0cdf89045b9ed29964a Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..ff10afd6e182edb2b1a63c8f984e9070d9f950ba Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..115a4c768a20c9e13185c17043f4c4d12dd4632a Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..dcd3cd8083358269d6ed7894726283bb9bcbbfea Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..459ca609d3ae0d3943ab44cdc27feef9256dc6d7 Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..8ca12fe024be86e868d14e91120a6902f8e88ac6 Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..8e19b410a1b15ff180f3dacac19395fe3046cdec Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..b824ebdd48db917eea2e67a82260a100371f8a24 Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..4c19a13c239cb67b8a2134ddd5f325db1d2d5bee Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/values/colors.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..3ab3e9cbce07f7cdc941fc8ba424c05e83ed80f0 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="colorPrimary">#3F51B5</color> + <color name="colorPrimaryDark">#303F9F</color> + <color name="colorAccent">#FF4081</color> +</resources> diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/values/strings.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..e2e10bed44822627210c63cbd78ddb3639b5302a --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/values/strings.xml @@ -0,0 +1,5 @@ +<resources> + <string name="app_name">MVC2</string> + <string name="DEBUG_MVC_ID">CS349_DEBUG_MVC2</string> + <string name="view_2_MenuItem">View 2</string> +</resources> diff --git a/android/4-3-MultipleViews/mvc2/app/src/main/res/values/styles.xml b/android/4-3-MultipleViews/mvc2/app/src/main/res/values/styles.xml new file mode 100644 index 0000000000000000000000000000000000000000..5885930df6d10edf3d6df40d6556297d11f953da --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ +<resources> + + <!-- Base application theme. --> + <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <!-- Customize your theme here. --> + <item name="colorPrimary">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + <item name="colorAccent">@color/colorAccent</item> + </style> + +</resources> diff --git a/android/4-3-MultipleViews/mvc2/app/src/test/java/cs349/uwaterloo/ca/mvc2/ExampleUnitTest.java b/android/4-3-MultipleViews/mvc2/app/src/test/java/cs349/uwaterloo/ca/mvc2/ExampleUnitTest.java new file mode 100644 index 0000000000000000000000000000000000000000..4eb13dab38eba48558b218a4094a2a43b6626551 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/app/src/test/java/cs349/uwaterloo/ca/mvc2/ExampleUnitTest.java @@ -0,0 +1,19 @@ +package cs349.uwaterloo.ca.mvc2; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> + */ +public class ExampleUnitTest +{ + @Test + public void addition_isCorrect() throws Exception + { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/android/4-3-MultipleViews/mvc2/build.gradle b/android/4-3-MultipleViews/mvc2/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..e6b32bc7884bb98a5024981d37fec787514b56c8 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.0.1' + + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/android/4-3-MultipleViews/mvc2/gradle.properties b/android/4-3-MultipleViews/mvc2/gradle.properties new file mode 100644 index 0000000000000000000000000000000000000000..aac7c9b4614ccfde6c721f24994cf30885a791d0 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/android/4-3-MultipleViews/mvc2/gradle/wrapper/gradle-wrapper.jar b/android/4-3-MultipleViews/mvc2/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659 Binary files /dev/null and b/android/4-3-MultipleViews/mvc2/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/4-3-MultipleViews/mvc2/gradle/wrapper/gradle-wrapper.properties b/android/4-3-MultipleViews/mvc2/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..f8c961953fc3fafaeb848b9f1b0a329396d2810f --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Nov 19 18:11:15 EST 2017 +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 diff --git a/android/4-3-MultipleViews/mvc2/gradlew b/android/4-3-MultipleViews/mvc2/gradlew new file mode 100644 index 0000000000000000000000000000000000000000..9d82f78915133e1c35a6ea51252590fb38efac2f --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/android/4-3-MultipleViews/mvc2/gradlew.bat b/android/4-3-MultipleViews/mvc2/gradlew.bat new file mode 100644 index 0000000000000000000000000000000000000000..8a0b282aa6885fb573c106b3551f7275c5f17e8e --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/4-3-MultipleViews/mvc2/settings.gradle b/android/4-3-MultipleViews/mvc2/settings.gradle new file mode 100644 index 0000000000000000000000000000000000000000..e7b4def49cb53d9aa04228dd3edb14c9e635e003 --- /dev/null +++ b/android/4-3-MultipleViews/mvc2/settings.gradle @@ -0,0 +1 @@ +include ':app'