dennisthiessen/RiskAhead-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some bugfixes (especially with inputValidatorMessages) and all dependencies updated

Browse Source
This commit is contained in:
Dennis Thiessen
2018-03-19 23:17:32 +01:00
parent 8f94b075c2
commit 8c03cd1cd5
28 changed files with 316 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/gradle.xml generated
View File

@@ -3,10 +3,9 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
<option name="gradleJvm" value="1.7" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

2
.idea/misc.xml generated
View File

@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
RiskAhead-Android.iml
View File

@@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

BIN
app/app-release.apk
View File

Binary file not shown.

145
app/app.iml
View File

@@ -22,27 +22,28 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -57,6 +58,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -80,72 +88,115 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res_stripped" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="library-1.0.19" level="project" />
<orderEntry type="library" exported="" name="play-services-base-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-tasks-10.2.1" level="project" />
<orderEntry type="library" exported="" name="androidbootstrap-2.3.1" level="project" />
<orderEntry type="library" exported="" name="retrofit-1.6.1" level="project" />
<orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
<orderEntry type="library" exported="" name="play-services-gass-10.2.1" level="project" />
<orderEntry type="library" exported="" name="design-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
<orderEntry type="library" exported="" name="materialize-1.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-location-10.2.1" level="project" />
<orderEntry type="library" exported="" name="android-maps-utils-0.5" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-lite-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-clearcut-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-10.2.1" level="project" />
<orderEntry type="library" exported="" name="bolts-android-1.2.1" level="project" />
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-10.2.1" level="project" />
<orderEntry type="library" exported="" name="google-material-typeface-3.0.1.0.original" level="project" />
<orderEntry type="library" exported="" name="fabric-1.3.4" level="project" />
<orderEntry type="library" exported="" name="gson-2.7" level="project" />
<orderEntry type="library" exported="" name="play-services-plus-10.2.1" level="project" />
<orderEntry type="library" exported="" name="materialdrawer-5.9.0" level="project" />
<orderEntry type="library" exported="" name="play-services-iid-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-gcm-10.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-10.2.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
<orderEntry type="library" exported="" name="twitter-core-1.4.1" level="project" />
<orderEntry type="library" exported="" name="fastadapter-2.5.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
<orderEntry type="library" exported="" name="facebook-android-sdk-4.8.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" exported="" name="iconics-core-2.8.2" level="project" />
<orderEntry type="library" name="com.android.support:appcompat-v7-27.1.0" level="project" />
<orderEntry type="library" name="com.google.code.gson:gson:2.8.0@jar" level="project" />
<orderEntry type="library" name="com.android.support:design-27.1.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-iid-11.8.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-gcm-license-11.8.0" level="project" />
<orderEntry type="library" name="com.squareup.retrofit:retrofit:1.6.1@jar" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-base-license-11.8.0" level="project" />
<orderEntry type="library" name="com.android.support:transition-27.1.0" level="project" />
<orderEntry type="library" name="com.mikepenz:iconics-core-3.0.3" level="project" />
<orderEntry type="library" name="com.android.support:recyclerview-v7-27.1.0" level="project" />
<orderEntry type="library" name="com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.8.0" level="project" />
<orderEntry type="library" name="com.facebook.android:facebook-core-4.31.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-iid-11.8.0" level="project" />
<orderEntry type="library" name="com.facebook.android:facebook-common-4.31.0" level="project" />
<orderEntry type="library" name="com.mikepenz:materialize-1.1.2" level="project" />
<orderEntry type="library" name="com.mikepenz:fastadapter-extensions-expandable-3.2.4" level="project" />
<orderEntry type="library" name="com.mikepenz:google-material-typeface-3.0.1.2.original" level="project" />
<orderEntry type="library" name="com.android.support:customtabs-27.0.2" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-plus-11.8.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-iid-license-11.8.0" level="project" />
<orderEntry type="library" name="com.android.support:cardview-v7-27.0.2" level="project" />
<orderEntry type="library" name="com.twitter.sdk.android:twitter-core-1.4.1" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-ads-11.8.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-basement-11.8.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-common-11.8.0" level="project" />
<orderEntry type="library" name="android.arch.lifecycle:viewmodel-1.1.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.8.0" level="project" />
<orderEntry type="library" name="io.fabric.sdk.android:fabric-1.3.4" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-common-license-11.8.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-core-11.8.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-ads-lite-11.8.0" level="project" />
<orderEntry type="library" name="com.facebook.android:facebook-messenger-4.31.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-location-license-11.8.0" level="project" />
<orderEntry type="library" name="com.google.zxing:core:3.3.0@jar" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-ads-lite-license-11.8.0" level="project" />
<orderEntry type="library" name="com.facebook.android:facebook-share-4.31.0" level="project" />
<orderEntry type="library" name="com.mikepenz:fastadapter-3.2.4" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-base-11.8.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-11.8.0" level="project" />
<orderEntry type="library" name="com.mikepenz:materialdrawer-6.0.6" level="project" />
<orderEntry type="library" name="com.android.support:animated-vector-drawable-27.1.0" level="project" />
<orderEntry type="library" name="com.facebook.android:facebook-applinks-4.31.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-plus-license-11.8.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.8.0" level="project" />
<orderEntry type="library" name="com.mcxiaoke.volley:library:1.0.19@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-core-utils-27.1.0" level="project" />
<orderEntry type="library" name="android.arch.core:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-annotations:27.1.0@jar" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-gass-license-11.8.0" level="project" />
<orderEntry type="library" name="com.parse.bolts:bolts-applinks:1.4.0@jar" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-maps-license-11.8.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-analytics-11.8.0" level="project" />
<orderEntry type="library" name="com.beardedhen:androidbootstrap-2.3.2" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-ads-license-11.8.0" level="project" />
<orderEntry type="library" name="com.facebook.android:facebook-android-sdk-4.31.0" level="project" />
<orderEntry type="library" name="com.facebook.android:facebook-places-4.31.0" level="project" />
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.1.0" level="project" />
<orderEntry type="library" name="com.android.support:support-vector-drawable-27.1.0" level="project" />
<orderEntry type="library" name="com.facebook.android:facebook-login-4.31.0" level="project" />
<orderEntry type="library" name="android.arch.lifecycle:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-maps-11.8.0" level="project" />
<orderEntry type="library" name="com.parse.bolts:bolts-android:1.4.0@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-compat-27.1.0" level="project" />
<orderEntry type="library" name="com.android.support:support-core-ui-27.1.0" level="project" />
<orderEntry type="library" name="android.arch.lifecycle:livedata-core-1.1.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-location-11.8.0" level="project" />
<orderEntry type="library" name="com.android.support:support-media-compat-27.1.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-gass-11.8.0" level="project" />
<orderEntry type="library" name="com.android.support:support-fragment-27.1.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-gcm-11.8.0" level="project" />
<orderEntry type="library" name="com.google.maps.android:android-maps-utils-0.5" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-analytics-license-11.8.0" level="project" />
<orderEntry type="library" name="com.android.support:support-v4-27.1.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-license-11.8.0" level="project" />
<orderEntry type="library" name="android.arch.core:runtime-1.1.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
<orderEntry type="library" name="android-android-27" level="project" />
</component>
</module>

59
app/build.gradle
View File

@@ -1,26 +1,16 @@
buildscript {
repositories {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'io.fabric.tools:gradle:1.+'
}
}
apply plugin: 'com.android.application'
apply plugin: 'io.fabric'
apply plugin: 'com.google.gms.google-services'
android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "org.deke.risk.riskahead"
minSdkVersion 15
targetSdkVersion 23
versionCode 42
versionName "3.0.2"
targetSdkVersion 25
versionCode 43
versionName "3.1"
}
buildTypes {
release {
@@ -41,32 +31,37 @@ android {
repositories {
jcenter()
maven { url 'https://maven.fabric.io/public' }
maven { url 'https://maven.google.com/' }
}
dependencies {
compile fileTree(dir: 'libs', include: 'Parse-*.jar')
compile 'com.facebook.android:facebook-android-sdk:4.8.1'
implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
compile('com.twitter.sdk.android:twitter-core:1.4.1@aar') {
transitive = true;
}
compile 'com.mikepenz:iconics-core:2.8.2@aar'
compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar'
compile('com.mikepenz:materialdrawer:5.9.0@aar') {
transitive = true
}
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:design:25.3.1'
implementation 'com.mikepenz:iconics-core:3.0.3@aar'
implementation 'com.mikepenz:iconics-core:3.0.3@aar'
implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
compile('com.mikepenz:materialdrawer:6.0.6@aar') {
transitive = true
}
compile 'com.android.support:appcompat-v7:27.1.0'
compile 'com.android.support:support-v4:27.1.0'
compile 'com.android.support:design:27.1.0'
compile 'com.google.android.gms:play-services-gcm:11.8.0'
compile 'com.google.android.gms:play-services-plus:11.8.0'
compile 'com.google.android.gms:play-services-location:11.8.0'
compile 'com.google.android.gms:play-services-ads:11.8.0'
compile 'com.google.android.gms:play-services-maps:11.8.0'
compile 'com.google.android.gms:play-services-gcm:10.2.1'
compile 'com.google.android.gms:play-services-plus:10.2.1'
compile 'com.google.android.gms:play-services-location:10.2.1'
compile 'com.google.android.gms:play-services-ads:10.2.1'
compile 'com.google.android.gms:play-services-maps:10.2.1'
compile 'com.google.maps.android:android-maps-utils:0.5'
compile 'com.google.code.gson:gson:2.7'
compile 'com.beardedhen:androidbootstrap:2.3.1'
compile 'com.google.code.gson:gson:2.8.0'
compile 'com.beardedhen:androidbootstrap:2.3.2'
compile 'com.mcxiaoke.volley:library:1.0.19'
}
apply plugin: 'com.google.gms.google-services'

71
app/google-services.json
View File

@@ -1 +1,70 @@
{"project_info":{"project_id":"riskahead-61dff","project_number":"498007911848","name":"RiskAhead"},"client":[{"client_info":{"client_id":"android:org.deke.risk.riskahead","client_type":1,"android_client_info":{"package_name":"org.deke.risk.riskahead"}},"oauth_client":[{"client_id":"498007911848-ppr7ct4oa2gs5jjnmrnlnutgui8m365n.apps.googleusercontent.com","client_type":1,"android_info":{"package_name":"org.deke.risk.riskahead","certificate_hash":"4b6c989e6c0d6824f5a2d7b1a10ff36560c3397f"}}],"services":{"analytics_service":{"status":1},"cloud_messaging_service":{"status":1,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":2},"ads_service":{"status":1}}}]}
{
"project_info": {
"project_number": "498007911848",
"firebase_url": "https://riskahead-61dff.firebaseio.com",
"project_id": "riskahead-61dff"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:498007911848:android:89cfbce52ef79add",
"android_client_info": {
"package_name": "org.deke.risk.riskahead"
}
},
"oauth_client": [
{
"client_id": "498007911848-bbfoj739tjtlr22faobmg8e4fls6c5ue.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "498007911848-rs2ghjusnngqcb487os1s6nt4i8an8d5.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "org.deke.risk.riskahead",
"certificate_hash": "742d036d112c9a727a8c8aec1718eb1ba1e05a91"
}
},
{
"client_id": "498007911848-belfueqha30j41gmjqe77db3qdrutcoc.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "org.deke.risk.riskahead",
"certificate_hash": "e4559e601888977e334d387d9e30dadedb855cbc"
}
},
{
"client_id": "498007911848-ppr7ct4oa2gs5jjnmrnlnutgui8m365n.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "org.deke.risk.riskahead",
"certificate_hash": "4b6c989e6c0d6824f5a2d7b1a10ff36560c3397f"
}
}
],
"api_key": [
{
"current_key": "AIzaSyAV9_hgRs5tuDN4Okp0ydLboORO-cJgJtA"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "498007911848-bbfoj739tjtlr22faobmg8e4fls6c5ue.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}

BIN
app/release/app-release.apk Normal file
View File

Binary file not shown.

1
app/release/output.json Normal file
View File

@@ -0,0 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":43},"path":"app-release.apk","properties":{"packageId":"org.deke.risk.riskahead","split":"","minSdkVersion":"15"}}]

6
app/src/main/AndroidManifest.xml
View File

@@ -61,8 +61,8 @@
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
android:label="@string/app_name" />
<!-- android:theme="@android:style/Theme.Translucent.NoTitleBar" -->
<activity
android:name=".MapsActivity"
android:label="@string/title_activity_maps"
@@ -121,6 +121,6 @@
</category>
</intent-filter>
</receiver>
</application>
</application>
</manifest>

19
app/src/main/java/org/deke/risk/riskahead/LoginActivity.java
View File

@@ -63,6 +63,9 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
private TextView input_username;
private TextView input_password;
private TextInputLayout inputLayoutEmail;
private TextInputLayout inputLayoutPassword;
private ProgressDialog pDialog;
private SessionManager session;
@@ -134,10 +137,10 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
setContentView(R.layout.activity_login);
input_email = (TextView) findViewById(R.id.input_register_email);
TextInputLayout inputLayoutEmail = (TextInputLayout) findViewById(R.id.input_layout_email);
inputLayoutEmail = (TextInputLayout) findViewById(R.id.input_layout_email);
input_password = (TextView) findViewById(R.id.input_register_password);
TextInputLayout inputLayoutPassword = (TextInputLayout) findViewById(R.id.input_layout_password);
inputLayoutPassword = (TextInputLayout) findViewById(R.id.input_layout_password);
TextView btn_requestPW = (TextView) findViewById(R.id.lbl_login_resendPW);
@@ -157,7 +160,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
String email = input_email.getText().toString();
String password = input_password.getText().toString();
if (input_password.getError() != null || input_email.getError() != null) {
if (inputLayoutPassword.getError() != null || inputLayoutEmail.getError() != null) {
showMessage(getString(R.string.error_validation));
} else {
showDialog();
@@ -200,11 +203,11 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
setContentView(R.layout.activity_register);
input_username = (TextView) findViewById(R.id.input_register_name);
TextInputLayout inputLayoutUsername = (TextInputLayout) findViewById(R.id.input_layout_username);
final TextInputLayout inputLayoutUsername = (TextInputLayout) findViewById(R.id.input_layout_username);
input_email = (TextView) findViewById(R.id.input_register_email);
TextInputLayout inputLayoutEmail = (TextInputLayout) findViewById(R.id.input_layout_email);
final TextInputLayout inputLayoutEmail = (TextInputLayout) findViewById(R.id.input_layout_email);
input_password = (TextView) findViewById(R.id.input_register_password);
TextInputLayout inputLayoutPassword = (TextInputLayout) findViewById(R.id.input_layout_password);
final TextInputLayout inputLayoutPassword = (TextInputLayout) findViewById(R.id.input_layout_password);
BootstrapButton btn_login = (BootstrapButton) findViewById(R.id.btn_register);
TextView btn_switchtologin = (TextView) findViewById(R.id.lbl_register_switchtologin);
@@ -248,7 +251,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
String password = input_password.getText().toString();
String name = input_username.getText().toString();
if (input_password.getError() != null || input_email.getError() != null || input_username.getError() != null || input_email.getText().toString().trim().length() == 0 || input_username.getText().toString().trim().length() == 0 || input_password.getText().toString().trim().length() == 0) {
if (inputLayoutPassword.getError() != null || inputLayoutEmail.getError() != null || inputLayoutUsername.getError() != null || input_email.getText().toString().trim().length() == 0 || input_username.getText().toString().trim().length() == 0 || input_password.getText().toString().trim().length() == 0) {
showMessage(getString(R.string.error_validation));
} else {
showDialog();
@@ -459,7 +462,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
}
public void onRequestNewPasswordClick(View view){
if((input_email.getText() != null && input_email.getText().toString().isEmpty()) || (input_email.getError() != null)){
if((input_email.getText() != null && input_email.getText().toString().isEmpty()) || (inputLayoutEmail.getError() != null)){
showMessage(getString(R.string.message_enteremail));
return;
}

7
app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java
View File

@@ -13,6 +13,7 @@ import android.util.AttributeSet;
import android.util.Log;
import android.util.Patterns;
import android.widget.Button;
import android.widget.LinearLayout;
import org.deke.risk.riskahead.R;
@@ -63,9 +64,11 @@ public class ValidatedEditTextPreference extends EditTextPreference
if((getEditText().getInputType() & InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS) != 0){
if (!Patterns.EMAIL_ADDRESS.matcher(value).matches()) {
if(getEditText().getParent().getClass() == TextInputLayout.class){
((TextInputLayout) getEditText().getParent()).setError(getEditText().getContext().getResources().getString(R.string.error_email));
// getEditText().setError(getEditText().getContext().getResources().getString(R.string.error_email));
}else{
getEditText().setError(getEditText().getContext().getResources().getString(R.string.error_email));
}
enable = false;
}
}else{

7
app/src/main/res/values-ar/strings.xml
View File

@@ -421,4 +421,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

3
app/src/main/res/values-de/strings.xml
View File

@@ -417,14 +417,13 @@
<item>60</item>
</string-array>
<string name="txt_errormsg_createincident">Vorfall konnte nicht gespeichert werden</string>
<string name="update">Update</string>
<string name="alert_notrecommended_text">Eine neue Version ist in deinem AppStore verfügbar. Wir unterstützen diese Version zwar noch, jedoch wird diese bald ablaufen. Bitte aktualisiere RiskAhead bald.</string>
<string name="alert_notrecommended_title">Bitte bald aktualisieren!</string>
<string name="alert_notsupported_text">Diese Version wird auf Grund wichtiger Updates nicht mehr unterstützt! Bitte aktualisiere RiskAhead um diese weiter verwenden zu können.</string>
<string name="alert_notsupported_title">Bitte jetzt aktualisieren!</string>
<string name="exit">Exit</string>
<string name="later">Später</string>
<string name="txt_reportlist_deleted">Gelöscht</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-es/strings.xml
View File

@@ -421,4 +421,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-et/strings.xml
View File

@@ -422,5 +422,12 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-fi/strings.xml
View File

@@ -424,4 +424,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-fr/strings.xml
View File

@@ -419,4 +419,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-lv/strings.xml
View File

@@ -422,4 +422,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-mn/strings.xml
View File

@@ -424,4 +424,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-nl/strings.xml
View File

@@ -422,4 +422,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-pl/strings.xml
View File

@@ -422,4 +422,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

8
app/src/main/res/values-pt/strings.xml
View File

@@ -437,5 +437,13 @@ Não foi possível recuperar as configurações do perfil
<item>60</item>
</string-array>
<string name="lbl_map_search">Search</string>
<string name="alert_accactivation_confirmation">E-Mail was sent to your e-mail address</string>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-ru/strings.xml
View File

@@ -420,4 +420,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

7
app/src/main/res/values-tr/strings.xml
View File

@@ -422,4 +422,11 @@
<item>30</item>
<item>60</item>
</string-array>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="later">Later</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_reportlist_deleted">Deleted</string>
<string name="txt_register_switchtologin">Already have an account? Login here!</string>
</resources>

4
app/src/main/res/values/strings.xml
View File

@@ -248,9 +248,9 @@
<string name="txt_language_title">Change Language</string>
<string name="alert_notsupported_title">Please update now!</string>
<string name="alert_notsupported_text">This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace.</string>
<string name="update">Update</string>
<string name="update" translatable="false">Update</string>
<string name="later">Later</string>
<string name="exit">Exit</string>
<string name="exit" translatable="false">Exit</string>
<string name="alert_notrecommended_title">Please update soon!</string>
<string name="alert_notrecommended_text">There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon.</string>
<string name="txt_about_dt" translatable="false">Dennis Thießen</string>

9
build.gradle
View File

@@ -3,11 +3,14 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.fabric.io/public' }
maven {
url 'https://maven.fabric.io/public' }
maven {
url 'https://maven.google.com/' }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.google.gms:google-services:1.3.0-beta3'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.google.gms:google-services:3.1.1'
classpath 'io.fabric.tools:gradle:1.+'
}
}

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Sat Apr 15 13:30:25 CEST 2017
#Mon Mar 19 20:32:10 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip