diff --git a/.gitignore.txt b/.gitignore.txt new file mode 100644 index 0000000..c0e8700 --- /dev/null +++ b/.gitignore.txt @@ -0,0 +1,82 @@ +# Built application files +*.apk +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +release/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ \ No newline at end of file diff --git a/Challenge 1/.classpath b/Challenge 1/.classpath new file mode 100644 index 0000000..fb50116 --- /dev/null +++ b/Challenge 1/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/Challenge 1/.gitignore b/Challenge 1/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/Challenge 1/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/Challenge 1/.project b/Challenge 1/.project new file mode 100644 index 0000000..5ef0f74 --- /dev/null +++ b/Challenge 1/.project @@ -0,0 +1,17 @@ + + + Challenge 1 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/Challenge 1/src/Main.java b/Challenge 1/src/Main.java new file mode 100644 index 0000000..cf68c4b --- /dev/null +++ b/Challenge 1/src/Main.java @@ -0,0 +1,41 @@ +public class Main +{ + public static void main(String args[]){ + //Question 1 + int[] myArray = {2, 4, 5, 1, 3, 4, 5}; + System.out.println(firstDuplicateIn(myArray)); + int[] myArray2 = {2, 6, 5, 1, 3, 4, 5, 4}; + System.out.println(firstDuplicateIn(myArray2)); + + //Question 2 + System.out.println(isPalindrome("radar")); + System.out.println(isPalindrome("bob")); + System.out.println(isPalindrome("asdfdsa")); + System.out.println(isPalindrome("hello")); + } + + public static int firstDuplicateIn(int[] array){ + //Checks for duplicate numbers, returns when it finds a pair of duplicates + for(int i = 0; i < array.length; i++){ + for(int a = 0; a < array.length; a++){ + if(a != i && array[a] == array[i]){ + return array[a]; + } + } + } + + //Returns the first item in the array if there are no duplicates + return array[0]; + } + + public static boolean isPalindrome(String testString){ + //Creates reverse of string + String reverse = ""; + for(int i = testString.length() - 1; i >= 0; i--){ + reverse += testString.charAt(i); + } + + //Determines whether the reverse and original string are equal + return reverse.equals(testString); + } +} diff --git a/Challenge 2/.gitignore b/Challenge 2/.gitignore new file mode 100644 index 0000000..2b75303 --- /dev/null +++ b/Challenge 2/.gitignore @@ -0,0 +1,13 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/Challenge 2/.idea/codeStyles/Project.xml b/Challenge 2/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/Challenge 2/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Challenge 2/.idea/gradle.xml b/Challenge 2/.idea/gradle.xml new file mode 100644 index 0000000..2996d53 --- /dev/null +++ b/Challenge 2/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/Challenge 2/.idea/misc.xml b/Challenge 2/.idea/misc.xml new file mode 100644 index 0000000..af0bbdd --- /dev/null +++ b/Challenge 2/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Challenge 2/.idea/runConfigurations.xml b/Challenge 2/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/Challenge 2/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/Challenge 2/.idea/vcs.xml b/Challenge 2/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/Challenge 2/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Challenge 2/app/.gitignore b/Challenge 2/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/Challenge 2/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Challenge 2/app/build.gradle b/Challenge 2/app/build.gradle new file mode 100644 index 0000000..d5aecad --- /dev/null +++ b/Challenge 2/app/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "com.example.challenge2" + minSdkVersion 15 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/Challenge 2/app/proguard-rules.pro b/Challenge 2/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/Challenge 2/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/Challenge 2/app/src/androidTest/java/com/example/challenge2/ExampleInstrumentedTest.java b/Challenge 2/app/src/androidTest/java/com/example/challenge2/ExampleInstrumentedTest.java new file mode 100644 index 0000000..e3bae07 --- /dev/null +++ b/Challenge 2/app/src/androidTest/java/com/example/challenge2/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.example.challenge2; + +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 Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.example.challenge2", appContext.getPackageName()); + } +} diff --git a/Challenge 2/app/src/main/AndroidManifest.xml b/Challenge 2/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..66e66d5 --- /dev/null +++ b/Challenge 2/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Challenge 2/app/src/main/java/com/example/challenge2/MainActivity.java b/Challenge 2/app/src/main/java/com/example/challenge2/MainActivity.java new file mode 100644 index 0000000..11f759e --- /dev/null +++ b/Challenge 2/app/src/main/java/com/example/challenge2/MainActivity.java @@ -0,0 +1,73 @@ +package com.example.challenge2; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + ImageView image1; + ImageView image2; + ImageView image3; + ImageView image4; + ImageView image5; + + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + image1 = (ImageView) findViewById(R.id.image1); + image1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + Intent image1Intent = new Intent(MainActivity.this, image1Activity.class); + startActivity(image1Intent); + } + }); + + image2 = (ImageView) findViewById(R.id.image2); + image2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + Intent image2Intent = new Intent(MainActivity.this, image2Activity.class); + startActivity(image2Intent); + } + }); + + image3 = (ImageView) findViewById(R.id.image3); + image3.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + Intent image3Intent = new Intent(MainActivity.this, imag3Activity.class); + startActivity(image3Intent); + } + }); + + image4 = (ImageView) findViewById(R.id.image4); + image4.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + Intent image4Intent = new Intent(MainActivity.this, image4Activity.class); + startActivity(image4Intent); + } + }); + + image5 = (ImageView) findViewById(R.id.image5); + image5.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + Intent image5Intent = new Intent(MainActivity.this, image5Activity.class); + startActivity(image5Intent); + } + }); + + } +} diff --git a/Challenge 2/app/src/main/java/com/example/challenge2/imag3Activity.java b/Challenge 2/app/src/main/java/com/example/challenge2/imag3Activity.java new file mode 100644 index 0000000..a14336f --- /dev/null +++ b/Challenge 2/app/src/main/java/com/example/challenge2/imag3Activity.java @@ -0,0 +1,13 @@ +package com.example.challenge2; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class imag3Activity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_imag3); + } +} diff --git a/Challenge 2/app/src/main/java/com/example/challenge2/image1Activity.java b/Challenge 2/app/src/main/java/com/example/challenge2/image1Activity.java new file mode 100644 index 0000000..ffbef25 --- /dev/null +++ b/Challenge 2/app/src/main/java/com/example/challenge2/image1Activity.java @@ -0,0 +1,13 @@ +package com.example.challenge2; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class image1Activity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_image1); + } +} diff --git a/Challenge 2/app/src/main/java/com/example/challenge2/image2Activity.java b/Challenge 2/app/src/main/java/com/example/challenge2/image2Activity.java new file mode 100644 index 0000000..0434165 --- /dev/null +++ b/Challenge 2/app/src/main/java/com/example/challenge2/image2Activity.java @@ -0,0 +1,13 @@ +package com.example.challenge2; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class image2Activity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_image2); + } +} diff --git a/Challenge 2/app/src/main/java/com/example/challenge2/image4Activity.java b/Challenge 2/app/src/main/java/com/example/challenge2/image4Activity.java new file mode 100644 index 0000000..94b555c --- /dev/null +++ b/Challenge 2/app/src/main/java/com/example/challenge2/image4Activity.java @@ -0,0 +1,13 @@ +package com.example.challenge2; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class image4Activity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_image4); + } +} diff --git a/Challenge 2/app/src/main/java/com/example/challenge2/image5Activity.java b/Challenge 2/app/src/main/java/com/example/challenge2/image5Activity.java new file mode 100644 index 0000000..c9d3c65 --- /dev/null +++ b/Challenge 2/app/src/main/java/com/example/challenge2/image5Activity.java @@ -0,0 +1,13 @@ +package com.example.challenge2; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class image5Activity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_image5); + } +} diff --git a/Challenge 2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Challenge 2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/Challenge 2/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/Challenge 2/app/src/main/res/drawable/ic_launcher_background.xml b/Challenge 2/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/Challenge 2/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Challenge 2/app/src/main/res/drawable/index.jpg b/Challenge 2/app/src/main/res/drawable/index.jpg new file mode 100644 index 0000000..cc8048e Binary files /dev/null and b/Challenge 2/app/src/main/res/drawable/index.jpg differ diff --git a/Challenge 2/app/src/main/res/drawable/index2.jpg b/Challenge 2/app/src/main/res/drawable/index2.jpg new file mode 100644 index 0000000..a4d53e4 Binary files /dev/null and b/Challenge 2/app/src/main/res/drawable/index2.jpg differ diff --git a/Challenge 2/app/src/main/res/drawable/index3.jpg b/Challenge 2/app/src/main/res/drawable/index3.jpg new file mode 100644 index 0000000..96986e2 Binary files /dev/null and b/Challenge 2/app/src/main/res/drawable/index3.jpg differ diff --git a/Challenge 2/app/src/main/res/drawable/index4.jpg b/Challenge 2/app/src/main/res/drawable/index4.jpg new file mode 100644 index 0000000..9265dfc Binary files /dev/null and b/Challenge 2/app/src/main/res/drawable/index4.jpg differ diff --git a/Challenge 2/app/src/main/res/drawable/index5.jpg b/Challenge 2/app/src/main/res/drawable/index5.jpg new file mode 100644 index 0000000..d14c3f0 Binary files /dev/null and b/Challenge 2/app/src/main/res/drawable/index5.jpg differ diff --git a/Challenge 2/app/src/main/res/layout/activity_imag3.xml b/Challenge 2/app/src/main/res/layout/activity_imag3.xml new file mode 100644 index 0000000..6d44db0 --- /dev/null +++ b/Challenge 2/app/src/main/res/layout/activity_imag3.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/Challenge 2/app/src/main/res/layout/activity_image1.xml b/Challenge 2/app/src/main/res/layout/activity_image1.xml new file mode 100644 index 0000000..f3678a4 --- /dev/null +++ b/Challenge 2/app/src/main/res/layout/activity_image1.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/Challenge 2/app/src/main/res/layout/activity_image2.xml b/Challenge 2/app/src/main/res/layout/activity_image2.xml new file mode 100644 index 0000000..cad93d9 --- /dev/null +++ b/Challenge 2/app/src/main/res/layout/activity_image2.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/Challenge 2/app/src/main/res/layout/activity_image4.xml b/Challenge 2/app/src/main/res/layout/activity_image4.xml new file mode 100644 index 0000000..9113cbc --- /dev/null +++ b/Challenge 2/app/src/main/res/layout/activity_image4.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/Challenge 2/app/src/main/res/layout/activity_image5.xml b/Challenge 2/app/src/main/res/layout/activity_image5.xml new file mode 100644 index 0000000..dc87317 --- /dev/null +++ b/Challenge 2/app/src/main/res/layout/activity_image5.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/Challenge 2/app/src/main/res/layout/activity_main.xml b/Challenge 2/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..b6f5ceb --- /dev/null +++ b/Challenge 2/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Challenge 2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Challenge 2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/Challenge 2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Challenge 2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Challenge 2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/Challenge 2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Challenge 2/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Challenge 2/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..898f3ed Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/Challenge 2/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Challenge 2/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..dffca36 Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/Challenge 2/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Challenge 2/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..64ba76f Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/Challenge 2/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Challenge 2/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..dae5e08 Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/Challenge 2/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Challenge 2/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e5ed465 Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/Challenge 2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Challenge 2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..14ed0af Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/Challenge 2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Challenge 2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..b0907ca Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/Challenge 2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Challenge 2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d8ae031 Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/Challenge 2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Challenge 2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..2c18de9 Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/Challenge 2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Challenge 2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..beed3cd Binary files /dev/null and b/Challenge 2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/Challenge 2/app/src/main/res/values/colors.xml b/Challenge 2/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..69b2233 --- /dev/null +++ b/Challenge 2/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #008577 + #00574B + #D81B60 + diff --git a/Challenge 2/app/src/main/res/values/strings.xml b/Challenge 2/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..cbcec89 --- /dev/null +++ b/Challenge 2/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Challenge 2 + diff --git a/Challenge 2/app/src/main/res/values/styles.xml b/Challenge 2/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..0eb88fe --- /dev/null +++ b/Challenge 2/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/Challenge 2/app/src/test/java/com/example/challenge2/ExampleUnitTest.java b/Challenge 2/app/src/test/java/com/example/challenge2/ExampleUnitTest.java new file mode 100644 index 0000000..836db2e --- /dev/null +++ b/Challenge 2/app/src/test/java/com/example/challenge2/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.example.challenge2; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/Challenge 2/build.gradle b/Challenge 2/build.gradle new file mode 100644 index 0000000..3c23acc --- /dev/null +++ b/Challenge 2/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.3.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/Challenge 2/gradle.properties b/Challenge 2/gradle.properties new file mode 100644 index 0000000..82618ce --- /dev/null +++ b/Challenge 2/gradle.properties @@ -0,0 +1,15 @@ +# 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/Challenge 2/gradle/wrapper/gradle-wrapper.jar b/Challenge 2/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/Challenge 2/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Challenge 2/gradle/wrapper/gradle-wrapper.properties b/Challenge 2/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a7e7405 --- /dev/null +++ b/Challenge 2/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed May 15 22:17:54 PDT 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/Challenge 2/gradlew b/Challenge 2/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/Challenge 2/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# 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 +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +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" -a "$nonstop" = "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 + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/Challenge 2/gradlew.bat b/Challenge 2/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/Challenge 2/gradlew.bat @@ -0,0 +1,84 @@ +@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 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@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 Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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/Challenge 2/settings.gradle b/Challenge 2/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/Challenge 2/settings.gradle @@ -0,0 +1 @@ +include ':app'