anthonycicc/android-finance-tracker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	.idea/misc.xml
#	app/src/main/AndroidManifest.xml
This commit is contained in:
Anthony Cicchetti 2018-11-30 14:16:41 -05:00
commit 3e296ad74f
36 changed files with 584 additions and 374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View file

@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>

3
.idea/gradle.xml generated
View file

@ -6,7 +6,7 @@
<option name="distributionType" value="WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:/Gradle/gradle-4.0.1" />
<option name="gradleJvm" value="JDK 8" />
<option name="gradleJvm" value="1.8 Adopt" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
@ -17,7 +17,6 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useAutoImport" value="true" />
</GradleProjectSettings>
</option>
</component>

37
.idea/misc.xml generated
View file

@ -1,6 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="10">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="9">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8 OpenJDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

32
app/build.gradle
View file

@ -1,5 +1,3 @@
import com.anthonycicchetti.financetracker.DependencyVersions
plugins {
id 'com.android.application'
id 'kotlin-android'
@ -25,7 +23,7 @@ android {
}
buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
@ -33,22 +31,24 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildToolsVersion '28.0.3'
}
dependencies {
implementation project(':common')
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${DependencyVersions.Kotlin}"
implementation "org.jetbrains.kotlin:kotlin-reflect:${DependencyVersions.Kotlin}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${DependencyVersions.Jupiter}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${DependencyVersions.Jupiter}"
implementation "com.android.support:design:${DependencyVersions.Android.SupportLibrary}"
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout-solver:1.1.3'
implementation 'com.google.android.material:material:1.0.0'
androidTestImplementation 'androidx.test:runner:1.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
implementation(Libs.kotlin_stdlib_jdk8)
implementation(Libs.kotlin_reflect)
testImplementation(Libs.junit_jupiter_api)
testRuntimeOnly(Libs.junit_jupiter_engine)
implementation(Libs.material)
implementation(Libs.appcompat)
implementation(Libs.constraintlayout_solver)
androidTestImplementation(Libs.androidx_test_core)
androidTestImplementation(Libs.androidx_test_runner)
androidTestImplementation(Libs.espresso_core)
}
//tasks.named<Delete>("clean") {
// delete(rootProject.buildDir)
//}

2
app/gradle.properties
View file

@ -1 +1,3 @@
org.gradle.configureondemand=false
android.useAndroidX=true
android.enableJetifier=true

6
app/src/androidTest/java/online/anthonycicchetti/financetracker/ExampleInstrumentedTest.kt
View file

@ -1,7 +1,7 @@
package online.anthonycicchetti.financetracker
import android.support.test.InstrumentationRegistry
import android.support.test.runner.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Test
import org.junit.runner.RunWith
@ -18,7 +18,7 @@ class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getTargetContext()
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("online.anthonycicchetti.financetracker", appContext.packageName)
}
}

5
app/src/main/AndroidManifest.xml
View file

@ -11,14 +11,15 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:appComponentFactory">
<!--tools:node="replace">-->
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>

11
app/src/main/java/online/anthonycicchetti/financetracker/MainActivity.kt
View file

@ -20,7 +20,16 @@ class MainActivity : AppCompatActivity() {
setSupportActionBar(toolbar)
fab.setOnClickListener { view ->
Snackbar.make(view, Transaction(Money(3020), category = "Transportation", location = "Arian's", timestamp = "Jan 01, 2018 00:00").toString(), Snackbar.LENGTH_LONG)
Snackbar.make(
view,
Transaction(
Money(3020),
category = "Transportation",
location = "Arian's",
timestamp = "Jan 01, 2018 00:00"
).toString(),
Snackbar.LENGTH_LONG
)
.setAction("Action", null).show()
}
}

6
app/src/main/res/drawable-v24/ic_launcher_foreground.xml
View file

@ -18,10 +18,10 @@
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
android:offset="0.0"/>
<item
android:color="#00000000"
android:offset="1.0" />
android:offset="1.0"/>
</gradient>
</aapt:attr>
</path>
@ -30,5 +30,5 @@
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" />
android:strokeWidth="1"/>
</vector>

66
app/src/main/res/drawable/ic_launcher_background.xml
View file

@ -6,165 +6,165 @@
android:viewportWidth="108">
<path
android:fillColor="#26A69A"
android:pathData="M0,0h108v108h-108z" />
android:pathData="M0,0h108v108h-108z"/>
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:strokeWidth="0.8"/>
</vector>

8
app/src/main/res/layout/activity_main.xml
View file

@ -16,18 +16,18 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_main" />
<include layout="@layout/content_main"/>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />
app:srcCompat="@android:drawable/ic_dialog_email"/>
</android.support.design.widget.CoordinatorLayout>

2
app/src/main/res/layout/content_main.xml
View file

@ -12,6 +12,6 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!" />
android:text="Hello World!"/>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/menu/menu_main.xml
View file

@ -6,5 +6,5 @@
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never" />
app:showAsAction="never"/>
</menu>

4
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View file

@ -1,5 +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" />
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>

4
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file

@ -1,5 +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" />
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>

4
app/src/main/res/values/styles.xml
View file

@ -13,8 +13,8 @@
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
</resources>

21
build.gradle
View file

@ -1,21 +0,0 @@
import com.anthonycicchetti.financetracker.DependencyVersions
// 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:${DependencyVersions.Android.Gradle}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${DependencyVersions.Kotlin}"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}

19
build.gradle.kts Normal file
View file

@ -0,0 +1,19 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath(Libs.com_android_tools_build_gradle)
classpath(Libs.kotlin_gradle_plugin)
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
plugins {
id("jmfayard.github.io.gradle-kotlin-dsl-libs") version "0.2.6" // $ ./gradlew syncLibs
}

3
buildSrc/.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
.gradle/
build/

6
buildSrc/build.gradle.kts
View file

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
java
kotlin("jvm") version "1.2.61"
kotlin("jvm") version "1.3.0"
}
repositories {
@ -10,8 +10,8 @@ repositories {
google()
}
val android_gradle_plugin_version = "3.1.3"
val kotlin_version = "1.2.61"
val android_gradle_plugin_version = "3.2.1"
val kotlin_version = "1.3.0"
dependencies {
implementation("com.android.tools.build:gradle:$android_gradle_plugin_version")

0
buildSrc/settings.gradle.kts Normal file
View file

94
buildSrc/src/main/kotlin/Libs.kt Normal file
View file

@ -0,0 +1,94 @@
import kotlin.String
/**
* Generated by [gradle-kotlin-dsl-libs](https://github.com/jmfayard/gradle-kotlin-dsl-libs)
*
* Run again
* `$ ./gradlew syncLibs`
* to update this file */
object Libs {
/**
* [appcompat website](http://developer.android.com/tools/extras/support-library.html) */
const val appcompat: String = "androidx.appcompat:appcompat:" + Versions.appcompat
/**
* [constraintlayout-solver website](http://tools.android.com) */
const val constraintlayout_solver: String =
"androidx.constraintlayout:constraintlayout-solver:" + Versions.constraintlayout_solver
/**
* [espresso-core website](https://developer.android.com/testing) */
const val espresso_core: String =
"androidx.test.espresso:espresso-core:" + Versions.espresso_core
/**
* [core website](https://developer.android.com/testing) */
const val androidx_test_core: String = "androidx.test:core:" + Versions.androidx_test_core
/**
* [runner website](https://developer.android.com/testing) */
const val androidx_test_runner: String = "androidx.test:runner:" + Versions.androidx_test_runner
/**
* [aapt2 website](https://developer.android.com/studio) */
const val aapt2: String = "com.android.tools.build:aapt2:" + Versions.aapt2
const val com_android_tools_build_gradle: String =
"com.android.tools.build:gradle:" + Versions.com_android_tools_build_gradle
/**
* [lint-gradle website](https://developer.android.com/studio) */
const val lint_gradle: String = "com.android.tools.lint:lint-gradle:" + Versions.lint_gradle
/**
* [jackson-module-kotlin website](https://github.com/FasterXML/jackson-module-kotlin) */
const val jackson_module_kotlin: String =
"com.fasterxml.jackson.module:jackson-module-kotlin:" + Versions.jackson_module_kotlin
const val shadow: String = "com.github.jengelman.gradle.plugins:shadow:" + Versions.shadow
const val com_github_johnrengelman_shadow_gradle_plugin: String =
"com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:" + Versions.com_github_johnrengelman_shadow_gradle_plugin
/**
* [material website](http://developer.android.com/tools/extras/support-library.html) */
const val material: String = "com.google.android.material:material:" + Versions.material
const val jmfayard_github_io_gradle_kotlin_dsl_libs_gradle_plugin: String =
"jmfayard.github.io.gradle-kotlin-dsl-libs:jmfayard.github.io.gradle-kotlin-dsl-libs.gradle.plugin:" + Versions.jmfayard_github_io_gradle_kotlin_dsl_libs_gradle_plugin
/**
* [kotlin-android-extensions website](https://kotlinlang.org/) */
const val kotlin_android_extensions: String =
"org.jetbrains.kotlin:kotlin-android-extensions:" + Versions.org_jetbrains_kotlin
/**
* [kotlin-gradle-plugin website](https://kotlinlang.org/) */
const val kotlin_gradle_plugin: String =
"org.jetbrains.kotlin:kotlin-gradle-plugin:" + Versions.org_jetbrains_kotlin
/**
* [kotlin-reflect website](https://kotlinlang.org/) */
const val kotlin_reflect: String =
"org.jetbrains.kotlin:kotlin-reflect:" + Versions.org_jetbrains_kotlin
/**
* [kotlin-scripting-compiler-embeddable website](https://kotlinlang.org/) */
const val kotlin_scripting_compiler_embeddable: String =
"org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + Versions.org_jetbrains_kotlin
/**
* [kotlin-stdlib-jdk8 website](https://kotlinlang.org/) */
const val kotlin_stdlib_jdk8: String =
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:" + Versions.org_jetbrains_kotlin
/**
* [junit-jupiter-api website](http://junit.org/junit5/) */
const val junit_jupiter_api: String =
"org.junit.jupiter:junit-jupiter-api:" + Versions.org_junit_jupiter
/**
* [junit-jupiter-engine website](http://junit.org/junit5/) */
const val junit_jupiter_engine: String =
"org.junit.jupiter:junit-jupiter-engine:" + Versions.org_junit_jupiter
}

54
buildSrc/src/main/kotlin/Versions.kt Normal file
View file

@ -0,0 +1,54 @@
import kotlin.String
/**
* Find which updates are available by running
* `$ ./gradlew syncLibs`
* This will only update the comments.
*
* YOU are responsible for updating manually the dependency version. */
object Versions {
const val appcompat: String = "1.0.0"
const val constraintlayout_solver: String = "1.1.3"
const val espresso_core: String = "3.1.0"
const val androidx_test_core: String = "1.0.0"
const val androidx_test_runner: String = "1.1.0"
const val aapt2: String = "3.2.1-4818971"
const val com_android_tools_build_gradle: String = "3.2.1"
const val lint_gradle: String = "26.2.1"
const val jackson_module_kotlin: String = "2.9.7"
const val shadow: String = "4.0.2"
const val com_github_johnrengelman_shadow_gradle_plugin: String = "4.0.2"
const val material: String = "1.0.0"
const val jmfayard_github_io_gradle_kotlin_dsl_libs_gradle_plugin: String = "0.2.6"
const val org_jetbrains_kotlin: String = "1.3.0"
const val org_junit_jupiter: String = "5.3.1"
/**
*
* To update Gradle, edit the wrapper file at path:
* ./gradle/wrapper/gradle-wrapper.properties
*/
object Gradle {
const val runningVersion: String = "4.10.2"
const val currentVersion: String = "4.10.2"
const val nightlyVersion: String = "5.1-20181103000035+0000"
const val releaseCandidate: String = "5.0-rc-1"
}
}

17
buildSrc/src/main/kotlin/com/anthonycicchetti/financetracker/DependencyVersions.kt
View file

@ -1,17 +0,0 @@
package com.anthonycicchetti.financetracker
object DependencyVersions {
const val Kotlin = "1.2.70"
const val Jupiter = "5.2.0"
const val Jackson = "2.9.6"
object Server {
const val Capsule = "1.0.2"
}
object Android {
const val SupportLibrary = "28.0.0"
const val Gradle = "3.2.0"
}
}

14
common/build.gradle.kts
View file

@ -1,5 +1,4 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import com.anthonycicchetti.financetracker.DependencyVersions
plugins {
`java-library`
@ -16,10 +15,11 @@ repositories {
}
dependencies {
api("com.fasterxml.jackson.module:jackson-module-kotlin:${DependencyVersions.Jackson}")
api(Libs.jackson_module_kotlin)
api(Libs.kotlin_reflect)
testImplementation("org.junit.jupiter:junit-jupiter-api:${DependencyVersions.Jupiter}")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${DependencyVersions.Jupiter}")
testImplementation(Libs.junit_jupiter_api)
testRuntimeOnly(Libs.junit_jupiter_engine)
}
tasks.withType<KotlinCompile> {
@ -28,6 +28,10 @@ tasks.withType<KotlinCompile> {
}
}
tasks.named<Test>("test"){
tasks.named<Test>("test") {
useJUnitPlatform()
}
tasks.named<Delete>("clean") {
delete(rootProject.buildDir)
}

12
common/src/main/kotlin/Money.kt
View file

@ -29,11 +29,15 @@ data class Money(@JsonValue private val cents: Int) {
val dollarSplit = splitString.get(0).split('$')
return if (dollarSplit.get(0) == "-") {
fromDollarsAndCents(dollars = dollarSplit.get(1).toInt().unaryMinus(),
cents = cents)
fromDollarsAndCents(
dollars = dollarSplit.get(1).toInt().unaryMinus(),
cents = cents
)
} else {
fromDollarsAndCents(dollars = dollarSplit.get(1).toInt(),
cents = cents)
fromDollarsAndCents(
dollars = dollarSplit.get(1).toInt(),
cents = cents
)
}
}
}

6
common/src/main/kotlin/Transaction.kt
View file

@ -1,10 +1,12 @@
import com.fasterxml.jackson.module.kotlin.*
data class Transaction(val cost: Money,
data class Transaction(
val cost: Money,
val category: String,
val subcategory: String = "",
val location: String,
val timestamp: String) {
val timestamp: String
) {
fun serialize(): String {
val mapper = jacksonObjectMapper().registerModule(KotlinModule())
return mapper.writeValueAsString(this)

1
gradle.properties
View file

@ -12,6 +12,5 @@ org.gradle.jvmargs=-Xmx1536m
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
org.gradle.configureondemand=false
# Makes gradle run builds in parallel whenever possible
org.gradle.parallel=true

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradlew vendored
View file

@ -28,7 +28,7 @@ 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=""
DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

2
gradlew.bat vendored
View file

@ -14,7 +14,7 @@ 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=
set DEFAULT_JVM_OPTS="-Xmx64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

44
server/build.gradle
View file

@ -1,44 +0,0 @@
import com.anthonycicchetti.financetracker.DependencyVersions
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${DependencyVersions.Kotlin}"
}
}
plugins {
id "us.kirchmeier.capsule" version '1.0.2'
id 'application'
id 'kotlin'
}
group 'online.anthonycicchetti'
version '0.1.0'
mainClassName = 'MainKt'
repositories {
mavenCentral()
google()
jcenter()
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${DependencyVersions.Kotlin}"
implementation project(":common")
}
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.8"
}
task fatCapsule(type: FatCapsule) {
applicationClass 'MainKt'
}

53
server/build.gradle.kts Normal file
View file

@ -0,0 +1,53 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath(Libs.kotlin_gradle_plugin)
classpath(Libs.shadow)
}
}
plugins {
id("com.github.johnrengelman.shadow") version "4.0.2"
id("application")
id("kotlin")
}
application {
group = "com.anthonyciccheti"
version = "0.1.0"
mainClassName = "MainKt"
}
repositories {
mavenCentral()
google()
jcenter()
}
dependencies {
implementation(Libs.kotlin_stdlib_jdk8)
implementation(project(":common"))
}
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "1.8"
}
}
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "1.8"
}
}
tasks.named<Delete>("clean") {
delete(rootProject.buildDir)
}

2
server/settings.gradle
View file

@ -1,2 +0,0 @@
rootProject.name = 'server'

2
server/settings.gradle.kts Normal file
View file

@ -0,0 +1,2 @@
rootProject.name = "server"

15
server/src/main/kotlin/Main.kt
View file

@ -1,10 +1,19 @@
fun main(args: Array<String>) {
println(Transaction(Money(3020), category = "Transportation", location = "Arian's", timestamp = "Jan 01, 2018 00:00"))
println(
Transaction(
Money(3020),
category = "Transportation",
location = "Arian's",
timestamp = "Jan 01, 2018 00:00"
)
)
val t = Transaction.fromJSON("{\"cost\": 2168," +
val t = Transaction.fromJSON(
"{\"cost\": 2168," +
" \"category\": \"Transportation\"," +
" \"location\": \"Arian's\"," +
" \"timestamp\": \"Jan 01, 2018 00:00\"}")
" \"timestamp\": \"Jan 01, 2018 00:00\"}"
)
println(t)