Skip to content

Commit c028f3d

Browse files
committed
Field diagram bug fixes
1 parent f2ecc0c commit c028f3d

40 files changed

+339
-157
lines changed

.idea/assetWizardSettings.xml

Lines changed: 127 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/kotlinc.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 1 addition & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml renamed to .idea/vcs.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
google()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.3.0'
10+
classpath 'com.android.tools.build:gradle:3.5.3'
1111
classpath 'com.google.gms:google-services:3.1.1'
1212
}
1313
}
@@ -57,8 +57,8 @@ android {
5757
}
5858
}
5959
compileOptions {
60-
sourceCompatibility JavaVersion.VERSION_1_7
61-
targetCompatibility JavaVersion.VERSION_1_7
60+
sourceCompatibility JavaVersion.VERSION_1_8
61+
targetCompatibility JavaVersion.VERSION_1_8
6262
}
6363
packagingOptions {
6464
pickFirst 'META-INF/DEPENDENCIES.txt'
@@ -93,7 +93,7 @@ dependencies {
9393
implementation 'com.roughike:bottom-bar:2.1.1'
9494
implementation 'com.miguelcatalan:materialsearchview:1.4.0'
9595
implementation 'pub.devrel:easypermissions:0.2.1'
96-
implementation 'com.google.guava:guava:24.1-android'
96+
implementation 'com.google.guava:guava:24.1-jre'
9797
// ignore this warning
9898
implementation 'com.jrummyapps:colorpicker:2.1.6'
9999
implementation 'com.github.infotech-group:CanvasView:release'

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<application
2020
android:name="android.support.multidex.MultiDexApplication"
2121
android:allowBackup="true"
22-
android:icon="@drawable/launcher"
22+
android:icon="@mipmap/ic_launcher"
2323
android:label="@string/app_name"
2424
android:usesCleartextTraffic="true"
2525
android:theme="@style/AppTheme">

0 commit comments

Comments
 (0)