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

Compare commits

base: anthonycicc:361ff69f4bfb156fa3591b5c925942ffc0c4dcb3
Branches Tags
anthonycicc:master
...
compare: anthonycicc:181802f567c39c1e03e03b2fe90fce7fff6ef5d8
Branches Tags
anthonycicc:master

3 commits
361ff69f4b ... 181802f567

Author SHA1 Message Date
Anthony Cicchetti
181802f567 Made it build... Again 2018-11-30 14:34:04 -05:00
Anthony Cicchetti
3e296ad74f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.idea/misc.xml
#	app/src/main/AndroidManifest.xml
 2018-11-30 14:16:41 -05:00
Anthony Cicchetti
9be65a2250 ??? 2018-11-30 14:13:45 -05:00
5 changed files with 13 additions and 16 deletions
Show stats Expand all files Collapse all files

3
.idea/gradle.xml generated
View file

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

4
.idea/kotlinc.xml generated
View file

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="Kotlin2JsCompilerArguments">
<option name="sourceMapEmbedSources" />
<option name="sourceMapPrefix" />
</component>
<component name="Kotlin2JvmCompilerArguments"> <component name="Kotlin2JvmCompilerArguments">
<option name="jvmTarget" value="1.8" /> <option name="jvmTarget" value="1.8" />
</component> </component>

2
.idea/misc.xml generated
View file

@ -35,7 +35,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8 OpenJDK" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8 Nightly" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

2
.idea/vcs.xml generated
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>

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

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="online.anthonycicchetti.financetracker"> package="online.anthonycicchetti.financetracker">
<application <application
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
tools:node="replace"> tools:node="replace">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"