commit b4d1c8ca49e693c64d50e85dbd6dbf434236687f Author: Wyatt J. Miller Date: Fri Sep 11 19:43:38 2020 -0400 added stuff diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.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 +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..88ea3aa --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,122 @@ + + + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..0b54ea6 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d5d35ec --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..08767b5 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,45 @@ +plugins { + id 'com.android.application' + id 'kotlin-android' +} + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + + defaultConfig { + applicationId "com.wyattjmiller.conversionapp" + minSdkVersion 21 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.1' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.+' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/app/src/androidTest/java/com/wyattjmiller/conversionapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/wyattjmiller/conversionapp/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..bfa5563 --- /dev/null +++ b/app/src/androidTest/java/com/wyattjmiller/conversionapp/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.wyattjmiller.conversionapp + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.wyattjmiller.conversionapp", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..c2983c3 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/wyattjmiller/conversionapp/Conversion.kt b/app/src/main/java/com/wyattjmiller/conversionapp/Conversion.kt new file mode 100644 index 0000000..0382140 --- /dev/null +++ b/app/src/main/java/com/wyattjmiller/conversionapp/Conversion.kt @@ -0,0 +1,26 @@ +package com.wyattjmiller.conversionapp + +class Conversion(euroResponse: Double = 0.0, kiloResponse: Double = 0.0) { + private var euro: Double = 0.0 + private var kilo: Double = 0.0 + + val euroToDollars: Double + get() { + return euro.times(TO_DOLLARS) + } + + val kiloToMiles: Double + get() { + return kilo.times(TO_MILES) + } + + companion object { + const val TO_DOLLARS: Double = 0.846956 + const val TO_MILES: Double = 0.62137 + } + + init { + this.euro = euroResponse + this.kilo = kiloResponse + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wyattjmiller/conversionapp/MainActivity.kt b/app/src/main/java/com/wyattjmiller/conversionapp/MainActivity.kt new file mode 100644 index 0000000..c747a2f --- /dev/null +++ b/app/src/main/java/com/wyattjmiller/conversionapp/MainActivity.kt @@ -0,0 +1,101 @@ +package com.wyattjmiller.conversionapp + +// Android imports +import android.os.Bundle +import android.util.Log +import android.view.View +import android.widget.EditText +import android.widget.TextView +import android.widget.Toast +import androidx.appcompat.app.AppCompatDelegate +import androidx.appcompat.app.AppCompatActivity + +// General Java imports +import java.lang.Exception + +class MainActivity : AppCompatActivity() { + + // Wyatt J. Miller + // ISYS 221 - VL1 + // Assignment #2 – Unit Convert App Application + // Due: 9/13/2020 + + // Private member variables + private var mEuroAmountEditText: EditText? = null + private var mKilometersEditText: EditText? = null + private var mDollarsTextView: TextView? = null + private var mMilesTextView: TextView? = null + + // The following methods are for keeping track of the Android lifecycle using Logcat + // Very useful, much wow + // Android's lifecycle is so much fun lol :P + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) + mEuroAmountEditText = findViewById(R.id.eurosEditText) + mKilometersEditText = findViewById(R.id.kiloEditText) + mDollarsTextView = findViewById(R.id.dollarTextView) + mMilesTextView = findViewById(R.id.milesTextView) + } + + override fun onStart() { + Log.d("LIFECYCLE", "onStart invoked!") + super.onStart() + } + + override fun onResume() { + Log.d("LIFECYCLE", "onResume invoked!") + super.onResume() + } + + override fun onPause() { + Log.d("LIFECYCLE", "onPause invoked!") + super.onPause() + } + + override fun onStop() { + Log.d("LIFECYCLE", "onStop invoked!") + super.onStop() + } + + override fun onDestroy() { + Log.d("LIFECYCLE", "onDestroy invoked!") + super.onDestroy() + } + + // calculateEuroClick method that calculates the Euro input and gives Dollar conversion + fun calculateEuroClick(view: View?) { + try { + val euroDouble = mEuroAmountEditText!! + .text + .toString() + .toDouble() + + val conv = Conversion(euroResponse = euroDouble) + val dollarsResponse = conv.euroToDollars + val dollarsText = "US Dollars: $${String.format("%.2f", dollarsResponse)}" + mDollarsTextView!!.text = dollarsText + } catch (e: Exception) { + Toast.makeText(this, "Please enter Euros", Toast.LENGTH_LONG).show() + } + } + + // calculateKilo method that calculates the Kilo input and gives Miles conversion + fun calculateKiloClick(view: View?) { + try { + val kiloDouble = mKilometersEditText!! + .text + .toString() + .toDouble() + + val conv = Conversion(kiloResponse = kiloDouble) + val milesResponse = conv.kiloToMiles + val milesText = "Miles: $milesResponse" + mMilesTextView!!.text = milesText + } catch (e: Exception) { + Toast.makeText(this, "Please enter Kilometers", Toast.LENGTH_LONG).show() + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..23eb9ea --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,72 @@ + + + + + + + + + +