Merge branch 'develop' into 'master'
Release 3.2.0 See merge request RiskAhead/RiskAhead-Android!6
This commit is contained in:
Dennis Thiessen
BIN
.idea/caches/build_file_checksums.ser
generated
Normal file
BIN
.idea/caches/build_file_checksums.ser
generated
Normal file
Binary file not shown.
BIN
.idea/caches/gradle_models.ser
generated
Normal file
BIN
.idea/caches/gradle_models.ser
generated
Normal file
Binary file not shown.
3
.idea/gradle.xml
generated
3
.idea/gradle.xml
generated
@@ -3,6 +3,9 @@
|
|||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
|
<compositeConfiguration>
|
||||||
|
<compositeBuild compositeDefinitionSource="SCRIPT" />
|
||||||
|
</compositeConfiguration>
|
||||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1" />
|
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1" />
|
||||||
|
|||||||
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -24,7 +24,7 @@
|
|||||||
</value>
|
</value>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" 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">
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
234
app/app.iml
234
app/app.iml
@@ -17,30 +17,29 @@
|
|||||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
|
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/fabric/res/debug;file://$MODULE_DIR$/build/generated/res/google-services/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
|
||||||
|
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
|
||||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||||
</configuration>
|
</configuration>
|
||||||
</facet>
|
</facet>
|
||||||
</component>
|
</component>
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
|
||||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
|
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<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/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/aidl_source_output_dir/debug/compileDebugAidl/out" 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/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/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
|
<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/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/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/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/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/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" 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/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/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" 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/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/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$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
|
||||||
@@ -86,126 +85,157 @@
|
|||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
|
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
<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-runtime-classes" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_aapt_derived_proguard_rules" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_main_dex_list" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_application_id" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-files" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
|
<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/reload-dex" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res_stripped" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res_stripped" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
|
<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/symbols" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
|
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
|
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-core-16.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-base-16.0.0" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-lite:17.2.1@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone-15.0.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-15.0.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-base-15.0.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-login-4.31.0" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:crashlytics-core-2.6.3" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-common-4.31.0" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.beardedhen:androidbootstrap-2.3.2" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:customtabs-27.1.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.google.zxing:core:3.3.0@jar" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.zxing:core:3.3.0@jar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-base-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-base:17.2.1@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-lite-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-core:16.0.9@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:multidex-1.0.3" level="project" />
|
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-common:4.42.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-login:4.42.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.0@jar" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-maps:16.1.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.3.0@jar" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.mikepenz:iconics-core-3.0.3" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.mikepenz:materialdrawer-6.0.6" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.3.0@jar" level="project" />
|
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.3.0@jar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
|
<orderEntry type="library" name="Gradle: com.mikepenz:materialize:1.1.2@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:design-27.1.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation-1.0.2" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth:16.0.1@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-15.0.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.mikepenz:google-material-typeface-3.0.1.2.original" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: io.fabric.sdk.android:fabric-1.4.3" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics-16.0.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.8.0@jar" level="project" />
|
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.8.0@jar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:beta-1.2.9" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.1@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-places-placereport-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-plus:16.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.maps.android:android-maps-utils-0.5" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-android-sdk-4.31.0" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.2@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics-impl-16.1.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gcm:16.1.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-share-4.31.0" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.browser:browser:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-applinks-4.31.0" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:transition-27.1.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-plus-15.0.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7-27.1.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.parse.bolts:bolts-android:1.4.0@jar" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-15.0.1" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.13.0@jar" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: com.parse.bolts:bolts-applinks:1.4.0@jar" level="project" />
|
<orderEntry type="library" name="Gradle: com.parse.bolts:bolts-applinks:1.4.0@jar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.mikepenz:fastadapter-extensions-expandable-3.2.4" level="project" />
|
<orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:beta:1.2.9@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.mikepenz:google-material-typeface:3.0.1.2.original@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement:16.5.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-iid:16.0.1@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:16.1.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-core:4.42.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.core:core:1.0.1@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.mikepenz:materialdrawer:6.0.8@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector:17.0.1@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.auto.value:auto-value-annotations:1.6@jar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-sdk-api:16.5.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-base:16.5.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.mikepenz:iconics-core:3.0.4@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.1@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.3.0@jar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:crashlytics-core:2.6.3@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-audience:16.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-location:16.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.2.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone:16.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-places-placereport:16.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid:17.1.2@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.mikepenz:fastadapter-commons:3.2.7@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-sdk:16.5.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-base:16.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads:17.2.1@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.parse.bolts:bolts-android:1.4.0@jar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.13.0@jar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop:16.0.1@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: com.mikepenz:fastadapter-extensions-expandable:3.2.7@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
|
||||||
|
<orderEntry type="library" name="Gradle: io.fabric.sdk.android:fabric:1.4.3@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.mcxiaoke.volley:library:1.0.19@jar" level="project" />
|
<orderEntry type="library" name="Gradle: com.mcxiaoke.volley:library:1.0.19@jar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gass-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-core-4.31.0" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gcm-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.mikepenz:fastadapter:3.2.7@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats:16.0.1@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.mikepenz:fastadapter-3.2.4" level="project" />
|
<orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:answers:1.4.2@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector-impl-16.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.mikepenz:materialize-1.1.2" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics:16.5.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-location-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:16.0.1@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.twitter.sdk.android:twitter-core-3.3.0" level="project" />
|
<orderEntry type="library" name="Gradle: com.twitter.sdk.android:twitter-core:3.3.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-16.0.0" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop-16.0.0" level="project" />
|
<orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:crashlytics:2.9.4@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-maps-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.beardedhen:androidbootstrap:2.3.2@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-iid-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2@jar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-places-4.31.0" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.maps.android:android-maps-utils:0.5@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-api:16.5.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:crashlytics-2.9.4" level="project" />
|
<orderEntry type="library" scope="TEST" name="Gradle: androidx.multidex:multidex-instrumentation:2.0.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector-16.0.0" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-impl:16.5.0@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-common-16.0.0" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gass:17.2.1@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
|
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-audience-15.0.1" level="project" />
|
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:answers-1.4.2" level="project" />
|
<orderEntry type="library" name="Gradle: android-android-28" level="project" />
|
||||||
<orderEntry type="library" name="Gradle: com.facebook.android:facebook-messenger-4.31.0" level="project" />
|
|
||||||
<orderEntry type="library" name="Gradle: android-android-27" level="project" />
|
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
|
|||||||
apply plugin: 'io.fabric'
|
apply plugin: 'io.fabric'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 27
|
compileSdkVersion 28
|
||||||
buildToolsVersion '27.0.3'
|
buildToolsVersion '28.0.3'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "org.deke.risk.riskahead"
|
applicationId "org.deke.risk.riskahead"
|
||||||
minSdkVersion 19
|
minSdkVersion 19
|
||||||
targetSdkVersion 26
|
targetSdkVersion 28
|
||||||
versionCode 50
|
versionCode 55
|
||||||
versionName "3.1.6"
|
versionName "3.2.0"
|
||||||
multiDexEnabled true
|
multiDexEnabled true
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
@@ -42,8 +42,8 @@ repositories {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(dir: 'libs', include: 'Parse-*.jar')
|
implementation fileTree(dir: 'libs', include: 'Parse-*.jar')
|
||||||
|
|
||||||
implementation 'com.android.support:multidex:1.0.3'
|
implementation 'androidx.multidex:multidex:2.0.1'
|
||||||
implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
|
implementation 'com.facebook.android:facebook-login:4.42.0'
|
||||||
implementation('com.twitter.sdk.android:twitter-core:3.3.0@aar') {
|
implementation('com.twitter.sdk.android:twitter-core:3.3.0@aar') {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
@@ -54,28 +54,28 @@ dependencies {
|
|||||||
|
|
||||||
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'
|
implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
|
||||||
implementation('com.mikepenz:materialdrawer:6.0.6@aar') {
|
implementation('com.mikepenz:materialdrawer:6.0.8@aar') {
|
||||||
transitive = true
|
transitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
implementation 'com.android.support:customtabs:27.1.1'
|
implementation 'androidx.browser:browser:1.0.0'
|
||||||
implementation 'com.android.support:cardview-v7:27.1.1'
|
implementation 'androidx.cardview:cardview:1.0.0'
|
||||||
implementation 'com.android.support:appcompat-v7:27.1.1'
|
implementation 'androidx.appcompat:appcompat:1.0.2'
|
||||||
implementation 'com.android.support:support-v4:27.1.1'
|
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
||||||
implementation 'com.android.support:design:27.1.1'
|
implementation 'com.google.android.material:material:1.0.0'
|
||||||
|
|
||||||
implementation 'com.google.android.gms:play-services-auth:15.0.1'
|
implementation 'com.google.android.gms:play-services-auth:16.0.1'
|
||||||
implementation 'com.google.android.gms:play-services-gcm:15.0.1'
|
implementation 'com.google.android.gms:play-services-gcm:16.1.0'
|
||||||
implementation 'com.google.android.gms:play-services-plus:15.0.1'
|
implementation 'com.google.android.gms:play-services-plus:16.0.0'
|
||||||
implementation 'com.google.android.gms:play-services-location:15.0.1'
|
implementation 'com.google.android.gms:play-services-location:16.0.0'
|
||||||
implementation 'com.google.android.gms:play-services-ads:15.0.1'
|
implementation 'com.google.android.gms:play-services-ads:17.2.1'
|
||||||
implementation 'com.google.android.gms:play-services-maps:15.0.1'
|
implementation 'com.google.android.gms:play-services-maps:16.1.0'
|
||||||
|
|
||||||
implementation 'com.google.maps.android:android-maps-utils:0.5'
|
implementation 'com.google.maps.android:android-maps-utils:0.5'
|
||||||
implementation 'com.google.code.gson:gson:2.8.0'
|
implementation 'com.google.code.gson:gson:2.8.2'
|
||||||
implementation 'com.beardedhen:androidbootstrap:2.3.2'
|
implementation 'com.beardedhen:androidbootstrap:2.3.2'
|
||||||
implementation 'com.mcxiaoke.volley:library:1.0.19'
|
implementation 'com.mcxiaoke.volley:library:1.0.19'
|
||||||
implementation 'com.google.firebase:firebase-core:16.0.1'
|
implementation 'com.google.firebase:firebase-core:16.0.9'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'com.google.gms.google-services'
|
apply plugin: 'com.google.gms.google-services'
|
||||||
|
|||||||
Binary file not shown.
@@ -1 +1 @@
|
|||||||
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":50,"versionName":"3.1.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
|
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":55,"versionName":"3.2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
|
||||||
@@ -32,6 +32,9 @@
|
|||||||
<meta-data
|
<meta-data
|
||||||
android:name="asset_statements"
|
android:name="asset_statements"
|
||||||
android:resource="@string/asset_statements" />
|
android:resource="@string/asset_statements" />
|
||||||
|
<meta-data
|
||||||
|
android:name="com.google.android.gms.ads.APPLICATION_ID"
|
||||||
|
android:value="ca-app-pub-6173616333402991~2955794868"/>
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="com.google.android.gms.version"
|
android:name="com.google.android.gms.version"
|
||||||
android:value="@integer/google_play_services_version" />
|
android:value="@integer/google_play_services_version" />
|
||||||
|
|||||||
@@ -7,12 +7,12 @@ import android.content.pm.PackageManager;
|
|||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
import android.net.NetworkInfo;
|
import android.net.NetworkInfo;
|
||||||
import android.support.design.widget.TextInputLayout;
|
import com.google.android.material.textfield.TextInputLayout;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import android.text.method.LinkMovementMethod;
|
import android.text.method.LinkMovementMethod;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.util.Patterns;
|
import android.util.Patterns;
|
||||||
@@ -63,6 +63,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
|
|||||||
private ProgressDialog pDialog;
|
private ProgressDialog pDialog;
|
||||||
private SessionManager session;
|
private SessionManager session;
|
||||||
|
|
||||||
|
static boolean active = false;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
@@ -91,6 +93,18 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStart() {
|
||||||
|
super.onStart();
|
||||||
|
active = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStop() {
|
||||||
|
super.onStop();
|
||||||
|
active = false;
|
||||||
|
}
|
||||||
|
|
||||||
public void isNetworkAvailable() {
|
public void isNetworkAvailable() {
|
||||||
NetworkInfo activeNetworkInfo = null;
|
NetworkInfo activeNetworkInfo = null;
|
||||||
|
|
||||||
@@ -876,7 +890,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
|
|||||||
try {
|
try {
|
||||||
JSONObject jObj = new JSONObject(response);
|
JSONObject jObj = new JSONObject(response);
|
||||||
boolean error = jObj.getBoolean("error");
|
boolean error = jObj.getBoolean("error");
|
||||||
if (!error) {
|
if (!error && active) {
|
||||||
new AlertDialog.Builder(LoginActivity.this)
|
new AlertDialog.Builder(LoginActivity.this)
|
||||||
.setTitle(getString(R.string.alert_accregistration_title))
|
.setTitle(getString(R.string.alert_accregistration_title))
|
||||||
.setMessage(getString(R.string.alert_accregistration_text))
|
.setMessage(getString(R.string.alert_accregistration_text))
|
||||||
@@ -890,7 +904,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
|
|||||||
})
|
})
|
||||||
.setIcon(android.R.drawable.ic_dialog_alert)
|
.setIcon(android.R.drawable.ic_dialog_alert)
|
||||||
.show();
|
.show();
|
||||||
} else {
|
} else if (error){
|
||||||
String errorMsg = jObj.getString("error_msg");
|
String errorMsg = jObj.getString("error_msg");
|
||||||
Crashlytics.log(Log.ERROR, TAG, "Error occured: "+errorMsg);
|
Crashlytics.log(Log.ERROR, TAG, "Error occured: "+errorMsg);
|
||||||
Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show();
|
Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show();
|
||||||
|
|||||||
@@ -13,14 +13,14 @@ import android.location.Location;
|
|||||||
import android.location.LocationManager;
|
import android.location.LocationManager;
|
||||||
import android.location.LocationListener;
|
import android.location.LocationListener;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.design.widget.FloatingActionButton;
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
import android.support.v4.app.ActivityCompat;
|
import androidx.core.app.ActivityCompat;
|
||||||
import android.support.v4.app.LoaderManager;
|
import androidx.loader.app.LoaderManager;
|
||||||
import android.support.v4.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import android.support.v4.content.CursorLoader;
|
import androidx.loader.content.CursorLoader;
|
||||||
import android.support.v4.content.Loader;
|
import androidx.loader.content.Loader;
|
||||||
import android.support.v7.widget.SearchView;
|
import androidx.appcompat.widget.SearchView;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.util.TypedValue;
|
import android.util.TypedValue;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
@@ -826,7 +826,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
|
|||||||
SearchView searchView = (SearchView) menu.findItem(R.id.location_search).getActionView();
|
SearchView searchView = (SearchView) menu.findItem(R.id.location_search).getActionView();
|
||||||
searchView.setSearchableInfo(searchInfo);
|
searchView.setSearchableInfo(searchInfo);
|
||||||
|
|
||||||
EditText txtSearch = searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text);
|
EditText txtSearch = searchView.findViewById(androidx.appcompat.R.id.search_src_text);
|
||||||
txtSearch.setHint(getResources().getString(R.string.search_hint));
|
txtSearch.setHint(getResources().getString(R.string.search_hint));
|
||||||
txtSearch.setHintTextColor(Color.DKGRAY);
|
txtSearch.setHintTextColor(Color.DKGRAY);
|
||||||
txtSearch.setTextColor(Color.BLACK);
|
txtSearch.setTextColor(Color.BLACK);
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ package org.deke.risk.riskahead;
|
|||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.design.widget.TabLayout;
|
import com.google.android.material.tabs.TabLayout;
|
||||||
import android.support.v4.view.PagerAdapter;
|
import androidx.viewpager.widget.PagerAdapter;
|
||||||
import android.support.v4.view.ViewPager;
|
import androidx.viewpager.widget.ViewPager;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import org.deke.risk.riskahead.helper.AppConfig;
|
import org.deke.risk.riskahead.helper.AppConfig;
|
||||||
|
|||||||
@@ -7,20 +7,20 @@ import android.graphics.Bitmap;
|
|||||||
import android.graphics.BitmapFactory;
|
import android.graphics.BitmapFactory;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.provider.MediaStore;
|
import android.provider.MediaStore;
|
||||||
import android.support.v4.app.ActivityCompat;
|
import androidx.core.app.ActivityCompat;
|
||||||
import android.support.v4.app.FragmentTransaction;
|
import androidx.fragment.app.FragmentTransaction;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.location.Address;
|
import android.location.Address;
|
||||||
import android.location.Geocoder;
|
import android.location.Geocoder;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.design.widget.FloatingActionButton;
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import com.android.volley.Request;
|
import com.android.volley.Request;
|
||||||
import com.android.volley.toolbox.StringRequest;
|
import com.android.volley.toolbox.StringRequest;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import android.os.Bundle;
|
|||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
import android.support.v4.view.ViewPager;
|
import androidx.viewpager.widget.ViewPager;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import android.graphics.drawable.Drawable;
|
|||||||
import android.location.Address;
|
import android.location.Address;
|
||||||
import android.location.Geocoder;
|
import android.location.Geocoder;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.design.widget.FloatingActionButton;
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
import android.support.v4.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
package org.deke.risk.riskahead.adapter;
|
package org.deke.risk.riskahead.adapter;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.support.v4.app.FragmentManager;
|
import androidx.fragment.app.FragmentManager;
|
||||||
import android.support.v4.app.FragmentStatePagerAdapter;
|
import androidx.fragment.app.FragmentStatePagerAdapter;
|
||||||
|
|
||||||
import org.deke.risk.riskahead.fragment.ProfileStatisticsFragment;
|
import org.deke.risk.riskahead.fragment.ProfileStatisticsFragment;
|
||||||
import org.deke.risk.riskahead.fragment.ReportListFragment;
|
import org.deke.risk.riskahead.fragment.ReportListFragment;
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ package org.deke.risk.riskahead.adapter;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.database.DataSetObserver;
|
import android.database.DataSetObserver;
|
||||||
|
import android.nfc.Tag;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
@@ -42,14 +44,16 @@ public class SpinnerHintAdapter implements SpinnerAdapter, ListAdapter {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public final View getView(int position, View convertView, ViewGroup parent) {
|
public final View getView(int position, View convertView, ViewGroup parent) {
|
||||||
if (position == 0) {
|
isInInitialState = position == 0;
|
||||||
isInInitialState = true;
|
|
||||||
|
if (isInInitialState) {
|
||||||
return getNothingSelectedView(parent);
|
return getNothingSelectedView(parent);
|
||||||
|
}else{
|
||||||
|
int numOfItems = adapter.getCount();
|
||||||
|
position = (position > numOfItems-1) ? numOfItems-1 : position;
|
||||||
|
|
||||||
|
return adapter.getView(position - EXTRA, null, parent);
|
||||||
}
|
}
|
||||||
isInInitialState = false;
|
|
||||||
|
|
||||||
return adapter.getView(position - EXTRA, null, parent); // Could re-use
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected View getNothingSelectedView(ViewGroup parent) {
|
protected View getNothingSelectedView(ViewGroup parent) {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package org.deke.risk.riskahead.adapter;
|
package org.deke.risk.riskahead.adapter;
|
||||||
|
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.support.v4.app.FragmentManager;
|
import androidx.fragment.app.FragmentManager;
|
||||||
import android.support.v4.app.FragmentStatePagerAdapter;
|
import androidx.fragment.app.FragmentStatePagerAdapter;
|
||||||
|
|
||||||
import org.deke.risk.riskahead.fragment.SubscriptionItemFragment;
|
import org.deke.risk.riskahead.fragment.SubscriptionItemFragment;
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package org.deke.risk.riskahead.fragment;
|
package org.deke.risk.riskahead.fragment;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ import android.app.Activity;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package org.deke.risk.riskahead.fragment;
|
package org.deke.risk.riskahead.fragment;
|
||||||
|
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package org.deke.risk.riskahead.fragment;
|
package org.deke.risk.riskahead.fragment;
|
||||||
|
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
|||||||
@@ -2,12 +2,12 @@ package org.deke.risk.riskahead.fragment;
|
|||||||
|
|
||||||
import android.app.DatePickerDialog;
|
import android.app.DatePickerDialog;
|
||||||
import android.app.Dialog;
|
import android.app.Dialog;
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.v4.app.DialogFragment;
|
import androidx.fragment.app.DialogFragment;
|
||||||
import android.app.TimePickerDialog;
|
import android.app.TimePickerDialog;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.app.FragmentManager;
|
import androidx.fragment.app.FragmentManager;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
import android.text.TextWatcher;
|
import android.text.TextWatcher;
|
||||||
import android.text.format.DateFormat;
|
import android.text.format.DateFormat;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import android.preference.ListPreference;
|
|||||||
import android.preference.Preference;
|
import android.preference.Preference;
|
||||||
import android.preference.PreferenceFragment;
|
import android.preference.PreferenceFragment;
|
||||||
import android.preference.SwitchPreference;
|
import android.preference.SwitchPreference;
|
||||||
import android.support.v7.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.android.volley.Request;
|
import com.android.volley.Request;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package org.deke.risk.riskahead.fragment;
|
package org.deke.risk.riskahead.fragment;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package org.deke.risk.riskahead.fragment;
|
package org.deke.risk.riskahead.fragment;
|
||||||
|
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.support.v4.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
package org.deke.risk.riskahead.helper;
|
package org.deke.risk.riskahead.helper;
|
||||||
|
|
||||||
import android.app.Application;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.support.multidex.MultiDex;
|
import androidx.multidex.MultiDex;
|
||||||
import android.support.multidex.MultiDexApplication;
|
import androidx.multidex.MultiDexApplication;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
|
||||||
import com.android.volley.DefaultRetryPolicy;
|
import com.android.volley.DefaultRetryPolicy;
|
||||||
|
|||||||
@@ -18,9 +18,9 @@ import android.net.ConnectivityManager;
|
|||||||
import android.net.NetworkInfo;
|
import android.net.NetworkInfo;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import android.support.v7.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import android.text.format.DateUtils;
|
import android.text.format.DateUtils;
|
||||||
import android.text.method.LinkMovementMethod;
|
import android.text.method.LinkMovementMethod;
|
||||||
import android.util.DisplayMetrics;
|
import android.util.DisplayMetrics;
|
||||||
@@ -289,7 +289,7 @@ public abstract class BaseActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDrawerClosed(View drawerView) {
|
public void onDrawerClosed(View drawerView) {
|
||||||
android.support.v7.app.ActionBar actionBar = getSupportActionBar();
|
androidx.appcompat.app.ActionBar actionBar = getSupportActionBar();
|
||||||
if (actionBar != null) actionBar.setTitle(getActivityName());
|
if (actionBar != null) actionBar.setTitle(getActivityName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,9 +12,9 @@ import android.location.Location;
|
|||||||
import android.location.LocationListener;
|
import android.location.LocationListener;
|
||||||
import android.location.LocationManager;
|
import android.location.LocationManager;
|
||||||
import android.os.*;
|
import android.os.*;
|
||||||
import android.support.v4.app.ActivityCompat;
|
import androidx.core.app.ActivityCompat;
|
||||||
import android.support.v4.app.NotificationCompat;
|
import androidx.core.app.NotificationCompat;
|
||||||
import android.support.v4.app.TaskStackBuilder;
|
import androidx.core.app.TaskStackBuilder;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.android.volley.Request;
|
import com.android.volley.Request;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import android.content.UriMatcher;
|
|||||||
import android.database.Cursor;
|
import android.database.Cursor;
|
||||||
import android.database.MatrixCursor;
|
import android.database.MatrixCursor;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.support.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.crashlytics.android.Crashlytics;
|
import com.crashlytics.android.Crashlytics;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package org.deke.risk.riskahead.helper;
|
package org.deke.risk.riskahead.helper;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.support.design.widget.TextInputLayout;
|
import com.google.android.material.textfield.TextInputLayout;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
import android.text.TextWatcher;
|
import android.text.TextWatcher;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import android.content.Context;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.preference.EditTextPreference;
|
import android.preference.EditTextPreference;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.support.design.widget.TextInputLayout;
|
import com.google.android.material.textfield.TextInputLayout;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
import android.text.InputType;
|
import android.text.InputType;
|
||||||
import android.text.TextWatcher;
|
import android.text.TextWatcher;
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
android:paddingRight="15dp"
|
android:paddingRight="15dp"
|
||||||
android:paddingBottom="20dp">
|
android:paddingBottom="20dp">
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/input_layout_email"
|
android:id="@+id/input_layout_email"
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -43,9 +43,9 @@
|
|||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:textColor="@color/input_login"
|
android:textColor="@color/input_login"
|
||||||
android:textColorHint="@color/input_login_hint" />
|
android:textColorHint="@color/input_login_hint" />
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/input_layout_password"
|
android:id="@+id/input_layout_password"
|
||||||
android:layout_below="@+id/input_layout_email"
|
android:layout_below="@+id/input_layout_email"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:textColor="@color/input_login"
|
android:textColor="@color/input_login"
|
||||||
android:textColorHint="@color/input_login_hint" />
|
android:textColorHint="@color/input_login_hint" />
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
|
||||||
<com.beardedhen.androidbootstrap.BootstrapButton
|
<com.beardedhen.androidbootstrap.BootstrapButton
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
tools:context=".MapsActivity" >
|
tools:context=".MapsActivity" >
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/fab_reportwf_map"
|
android:id="@+id/fab_reportwf_map"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<android.support.design.widget.TabLayout
|
<com.google.android.material.tabs.TabLayout
|
||||||
android:id="@+id/tab_layout"
|
android:id="@+id/tab_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
android:minHeight="?attr/actionBarSize"
|
android:minHeight="?attr/actionBarSize"
|
||||||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
|
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
|
||||||
|
|
||||||
<android.support.v4.view.ViewPager
|
<androidx.viewpager.widget.ViewPager
|
||||||
android:id="@+id/pager"
|
android:id="@+id/pager"
|
||||||
android:layout_below="@+id/tab_layout"
|
android:layout_below="@+id/tab_layout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
android:paddingRight="15dp"
|
android:paddingRight="15dp"
|
||||||
android:paddingBottom="20dp">
|
android:paddingBottom="20dp">
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/input_layout_username"
|
android:id="@+id/input_layout_username"
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -43,10 +43,10 @@
|
|||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:textColor="@color/input_login"
|
android:textColor="@color/input_login"
|
||||||
android:textColorHint="@color/input_login_hint" />
|
android:textColorHint="@color/input_login_hint" />
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/input_layout_email"
|
android:id="@+id/input_layout_email"
|
||||||
android:layout_below="@+id/input_layout_username"
|
android:layout_below="@+id/input_layout_username"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -62,9 +62,9 @@
|
|||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:textColor="@color/input_login"
|
android:textColor="@color/input_login"
|
||||||
android:textColorHint="@color/input_login_hint" />
|
android:textColorHint="@color/input_login_hint" />
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/input_layout_password"
|
android:id="@+id/input_layout_password"
|
||||||
android:layout_below="@+id/input_layout_email"
|
android:layout_below="@+id/input_layout_email"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -80,7 +80,7 @@
|
|||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:textColor="@color/input_login"
|
android:textColor="@color/input_login"
|
||||||
android:textColorHint="@color/input_login_hint" />
|
android:textColorHint="@color/input_login_hint" />
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<com.beardedhen.androidbootstrap.BootstrapButton
|
<com.beardedhen.androidbootstrap.BootstrapButton
|
||||||
android:id="@+id/btn_register"
|
android:id="@+id/btn_register"
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
android:layout_margin="5dp"
|
android:layout_margin="5dp"
|
||||||
android:textColor="@color/bg_common" />
|
android:textColor="@color/bg_common" />
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/fab_reportwf_map"
|
android:id="@+id/fab_reportwf_map"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
android:layout_marginBottom="10dp"
|
android:layout_marginBottom="10dp"
|
||||||
android:background="#464b4b4b" />
|
android:background="#464b4b4b" />
|
||||||
|
|
||||||
<android.support.v4.view.ViewPager
|
<androidx.viewpager.widget.ViewPager
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/subs_viewpager"
|
android:id="@+id/subs_viewpager"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
android:padding="10dp"
|
android:padding="10dp"
|
||||||
android:layout_marginRight="55dp">
|
android:layout_marginRight="55dp">
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_reportedfrom"
|
android:id="@+id/til_viewreport_reportedfrom"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
@@ -52,9 +52,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_incidentcategory"
|
android:id="@+id/til_viewreport_incidentcategory"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -67,9 +67,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_incidentsubcategory"
|
android:id="@+id/til_viewreport_incidentsubcategory"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -82,9 +82,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_incidentposition"
|
android:id="@+id/til_viewreport_incidentposition"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -97,9 +97,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_time"
|
android:id="@+id/til_viewreport_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -112,9 +112,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_suspect"
|
android:id="@+id/til_viewreport_suspect"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -127,9 +127,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_suspectweapon"
|
android:id="@+id/til_viewreport_suspectweapon"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -142,9 +142,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_suspectcount"
|
android:id="@+id/til_viewreport_suspectcount"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -157,9 +157,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_victim"
|
android:id="@+id/til_viewreport_victim"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -172,9 +172,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_victimorigin"
|
android:id="@+id/til_viewreport_victimorigin"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -187,9 +187,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_suspecttransport"
|
android:id="@+id/til_viewreport_suspecttransport"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -202,9 +202,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_victimaff"
|
android:id="@+id/til_viewreport_victimaff"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -217,9 +217,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_suspectrecon"
|
android:id="@+id/til_viewreport_suspectrecon"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -232,9 +232,9 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/til_viewreport_etcetc"
|
android:id="@+id/til_viewreport_etcetc"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -247,7 +247,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
@@ -291,7 +291,7 @@
|
|||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/btn_viewreport_position"
|
android:id="@+id/btn_viewreport_position"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -302,7 +302,7 @@
|
|||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:src="@android:drawable/ic_dialog_map" />
|
android:src="@android:drawable/ic_dialog_map" />
|
||||||
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/btn_viewreport_user"
|
android:id="@+id/btn_viewreport_user"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:orientation="vertical" android:layout_width="match_parent"
|
android:orientation="vertical" android:layout_width="match_parent"
|
||||||
android:background="@color/tw__blue_default"
|
android:background="@color/white"
|
||||||
android:padding="20dp"
|
android:padding="20dp"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
|
<androidx.appcompat.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<android.support.v7.widget.Toolbar
|
<androidx.appcompat.widget.Toolbar
|
||||||
android:id="@+id/toolbar"
|
android:id="@+id/toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
android:title="@string/lbl_map_search"
|
android:title="@string/lbl_map_search"
|
||||||
android:icon="@android:drawable/ic_menu_search"
|
android:icon="@android:drawable/ic_menu_search"
|
||||||
app:showAsAction="always"
|
app:showAsAction="always"
|
||||||
app:actionViewClass="android.support.v7.widget.SearchView" />
|
app:actionViewClass="androidx.appcompat.widget.SearchView" />
|
||||||
|
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
|
|||||||
@@ -234,13 +234,13 @@
|
|||||||
<string name="txt_notifystatus_activatedbutnotready"> (غير جاهز(لا يوجد اشاره من نظام تحديد المواقع</string>
|
<string name="txt_notifystatus_activatedbutnotready"> (غير جاهز(لا يوجد اشاره من نظام تحديد المواقع</string>
|
||||||
<string name="txt_notifystatus_deactivated">عطل</string>
|
<string name="txt_notifystatus_deactivated">عطل</string>
|
||||||
<string name="txt_map_zoomoutpremium">اصبح عضو مميز للحصول على الخرائط كامله.</string>
|
<string name="txt_map_zoomoutpremium">اصبح عضو مميز للحصول على الخرائط كامله.</string>
|
||||||
<string name="txt_register_privacy">من فضلك أكد انك قرأت وتوافق على <a href="http://www.riskahead.net/privacy/">بوليصة الخصوصيه</a> و <a href="http://www.riskahead.net/terms/">شروط الخدمه</a></string>
|
<string name="txt_register_privacy">من فضلك أكد انك قرأت وتوافق على <a href="https://www.riskahead.net/privacy/">بوليصة الخصوصيه</a> و <a href="https://www.riskahead.net/terms/">شروط الخدمه</a></string>
|
||||||
<string name="txt_register_privacy_text">لقد قرأت بوليصة الخصوصيه وشروط الخدمه وأؤكد علو موافقتي</string>
|
<string name="txt_register_privacy_text">لقد قرأت بوليصة الخصوصيه وشروط الخدمه وأؤكد علو موافقتي</string>
|
||||||
<string name="txt_register_privacy_title">الحفاظ على خصوصيتك يهمنا كثيراً</string>
|
<string name="txt_register_privacy_title">الحفاظ على خصوصيتك يهمنا كثيراً</string>
|
||||||
<string name="txt_about_developedby">تم تطويره من قبل</string>
|
<string name="txt_about_developedby">تم تطويره من قبل</string>
|
||||||
<string name="txt_about_privacy">بوليصة الخصوصيه: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/en/privacy/</a></string>
|
<string name="txt_about_privacy">بوليصة الخصوصيه: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/en/privacy/</a></string>
|
||||||
<string name="txt_about_terms">شروط الخدمه: <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/en/terms/</a></string>
|
<string name="txt_about_terms">شروط الخدمه: <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/en/terms/</a></string>
|
||||||
<string name="txt_about_homepage">الموقع: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">الموقع: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead لنظام أنرويد</string>
|
<string name="txt_about_riskahead">RiskAhead لنظام أنرويد</string>
|
||||||
<string name="menu_action_language">اللغه</string>
|
<string name="menu_action_language">اللغه</string>
|
||||||
<string name="txt_language_title">غيِر اللغه</string>
|
<string name="txt_language_title">غيِر اللغه</string>
|
||||||
|
|||||||
@@ -229,13 +229,13 @@
|
|||||||
<string name="txt_notifystatus_activatedbutnotready">NICHT BEREIT (GPS FEHLT)</string>
|
<string name="txt_notifystatus_activatedbutnotready">NICHT BEREIT (GPS FEHLT)</string>
|
||||||
<string name="txt_notifystatus_deactivated">AUS</string>
|
<string name="txt_notifystatus_deactivated">AUS</string>
|
||||||
<string name="txt_map_zoomoutpremium">Hole dir die Premium-Mitgliedschaft um die ganze Karte zu sehen!</string>
|
<string name="txt_map_zoomoutpremium">Hole dir die Premium-Mitgliedschaft um die ganze Karte zu sehen!</string>
|
||||||
<string name="txt_register_privacy">Bitte bestätige, dass du unsere <a href="http://www.riskahead.de/datenschutzerklarung/">Datenschutzbestimmungen</a> und <a href="http://www.riskahead.de/impressum/">Nutzungsbedingungen</a> gelesen hast und damit einverstanden bist.</string>
|
<string name="txt_register_privacy">Bitte bestätige, dass du unsere <a href="https://www.riskahead.de/datenschutzerklarung/">Datenschutzbestimmungen</a> und <a href="https://www.riskahead.de/impressum/">Nutzungsbedingungen</a> gelesen hast und damit einverstanden bist.</string>
|
||||||
<string name="txt_register_privacy_text">Ich habe die Datenschutzbestimmungen und Nutzungsbedingungen zur Kenntnis genommen und stimme ihnen zu.</string>
|
<string name="txt_register_privacy_text">Ich habe die Datenschutzbestimmungen und Nutzungsbedingungen zur Kenntnis genommen und stimme ihnen zu.</string>
|
||||||
<string name="txt_register_privacy_title">Deine Privatsphäre ist uns sehr wichtig</string>
|
<string name="txt_register_privacy_title">Deine Privatsphäre ist uns sehr wichtig</string>
|
||||||
<string name="txt_about_developedby">Entwickelt von</string>
|
<string name="txt_about_developedby">Entwickelt von</string>
|
||||||
<string name="txt_about_privacy">Datenschutzerklärung:\n<a href="http://www.riskahead.de/datenschutzerklarung/">http://www.riskahead.de/datenschutzerklarung/</a></string>
|
<string name="txt_about_privacy">Datenschutzerklärung:\n<a href="https://www.riskahead.de/datenschutzerklarung/">https://www.riskahead.de/datenschutzerklarung/</a></string>
|
||||||
<string name="txt_about_terms">Nutzungsbedingungen:\n<a href="http://www.riskahead.de/dimpressum/">http://www.riskahead.de/impressum/</a></string>
|
<string name="txt_about_terms">Nutzungsbedingungen:\n<a href="https://www.riskahead.de/dimpressum/">https://www.riskahead.de/impressum/</a></string>
|
||||||
<string name="txt_about_homepage">Website:\n<a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Website:\n<a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead für Android</string>
|
<string name="txt_about_riskahead">RiskAhead für Android</string>
|
||||||
<string name="menu_action_language">Sprache</string>
|
<string name="menu_action_language">Sprache</string>
|
||||||
<string name="txt_language_title">Ändere Sprache</string>
|
<string name="txt_language_title">Ändere Sprache</string>
|
||||||
|
|||||||
@@ -234,13 +234,13 @@
|
|||||||
<string name="txt_notifystatus_activatedbutnotready">NO ESTA LISTO (SIN GPS)</string>
|
<string name="txt_notifystatus_activatedbutnotready">NO ESTA LISTO (SIN GPS)</string>
|
||||||
<string name="txt_notifystatus_deactivated">DESACTIVAR</string>
|
<string name="txt_notifystatus_deactivated">DESACTIVAR</string>
|
||||||
<string name="txt_map_zoomoutpremium">¡Obtener Premium para ver el mapa completo!</string>
|
<string name="txt_map_zoomoutpremium">¡Obtener Premium para ver el mapa completo!</string>
|
||||||
<string name="txt_register_privacy">Por favor confirme que ha leído y acepta nuestra <a href="http://www.riskahead.net/privacy/">Política de Privacidad</a> y <a href="http://www.riskahead.net/terms/">Términos de Servicio</a></string>
|
<string name="txt_register_privacy">Por favor confirme que ha leído y acepta nuestra <a href="https://www.riskahead.net/privacy/">Política de Privacidad</a> y <a href="https://www.riskahead.net/terms/">Términos de Servicio</a></string>
|
||||||
<string name="txt_register_privacy_text">He leído la Política de Privacidad y Términos de Servicio y confirmo su aceptación.</string>
|
<string name="txt_register_privacy_text">He leído la Política de Privacidad y Términos de Servicio y confirmo su aceptación.</string>
|
||||||
<string name="txt_register_privacy_title">Su privacidad es muy importante para nosotros</string>
|
<string name="txt_register_privacy_title">Su privacidad es muy importante para nosotros</string>
|
||||||
<string name="txt_about_developedby">Desarrollado de</string>
|
<string name="txt_about_developedby">Desarrollado de</string>
|
||||||
<string name="txt_about_privacy">Política de Privacidad: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">Política de Privacidad: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Términos de Servicio: <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">Términos de Servicio: <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Página web: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Página web: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead para Android</string>
|
<string name="txt_about_riskahead">RiskAhead para Android</string>
|
||||||
<string name="menu_action_language">Idioma</string>
|
<string name="menu_action_language">Idioma</string>
|
||||||
<string name="txt_language_title">Cambiar Idioma</string>
|
<string name="txt_language_title">Cambiar Idioma</string>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
<string name="lbl_login_title">Sisene RiskAhead-i</string>
|
<string name="lbl_login_title">Sisene RiskAhead-i</string>
|
||||||
<string name="lbl_login_resendPW">Unustasid salasõna? Vajuta siia</string>
|
<string name="lbl_login_resendPW">Unustasid salasõna? Vajuta siia</string>
|
||||||
<string name="lbl_login_policy"><a href="http://www.riskahead.net/terms/">Teenuse tingimused</a> ja <a href="http://www.riskahead.net/privacy/">Privaatsus pol.</a></string>
|
<string name="lbl_login_policy"><a href="https://www.riskahead.net/terms/">Teenuse tingimused</a> ja <a href="https://www.riskahead.net/privacy/">Privaatsus pol.</a></string>
|
||||||
<string name="lbl_login_usesocialnet">Logige sisse ühega neist kontodest</string>
|
<string name="lbl_login_usesocialnet">Logige sisse ühega neist kontodest</string>
|
||||||
|
|
||||||
<string name="lbl_register_title">Registreeri RiskAhead kasutajaks</string>
|
<string name="lbl_register_title">Registreeri RiskAhead kasutajaks</string>
|
||||||
@@ -235,13 +235,13 @@
|
|||||||
<string name="txt_notifystatus_deactivated">Väljas</string>
|
<string name="txt_notifystatus_deactivated">Väljas</string>
|
||||||
<string name="txt_map_zoomoutpremium">Hankige tasuline versioon, et näha kogu kaarti!</string>
|
<string name="txt_map_zoomoutpremium">Hankige tasuline versioon, et näha kogu kaarti!</string>
|
||||||
|
|
||||||
<string name="txt_register_privacy">Palun kinnitage, et olete lugenud ja nõustute meie <a href="http://www.riskahead.net/privacy/">Privaatsus pol.</a> ja <a href="http://www.riskahead.net/terms/">Teenuse tingimustega</a></string>
|
<string name="txt_register_privacy">Palun kinnitage, et olete lugenud ja nõustute meie <a href="https://www.riskahead.net/privacy/">Privaatsus pol.</a> ja <a href="https://www.riskahead.net/terms/">Teenuse tingimustega</a></string>
|
||||||
<string name="txt_register_privacy_text">Ma olen lugenud privaatsus pol. ja teenuse tingimusi ja kinnitan oma nõusolekut.</string>
|
<string name="txt_register_privacy_text">Ma olen lugenud privaatsus pol. ja teenuse tingimusi ja kinnitan oma nõusolekut.</string>
|
||||||
<string name="txt_register_privacy_title">Teie privaatsus on meile väga tähtis</string>
|
<string name="txt_register_privacy_title">Teie privaatsus on meile väga tähtis</string>
|
||||||
<string name="txt_about_developedby">Arendatud</string>
|
<string name="txt_about_developedby">Arendatud</string>
|
||||||
<string name="txt_about_privacy">privaatsus poliitika: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">privaatsus poliitika: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Teenuse tingimused: <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">Teenuse tingimused: <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Veebileht: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Veebileht: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead Androidi jaoks</string>
|
<string name="txt_about_riskahead">RiskAhead Androidi jaoks</string>
|
||||||
<string name="menu_action_language">Keel</string>
|
<string name="menu_action_language">Keel</string>
|
||||||
<string name="txt_language_title">Muuda keelt</string>
|
<string name="txt_language_title">Muuda keelt</string>
|
||||||
|
|||||||
@@ -237,13 +237,13 @@
|
|||||||
<string name="txt_notifystatus_deactivated">POIS PÄÄLTÄ</string>
|
<string name="txt_notifystatus_deactivated">POIS PÄÄLTÄ</string>
|
||||||
<string name="txt_map_zoomoutpremium">Hanki Premium nähdäksesi koko kartan!</string>
|
<string name="txt_map_zoomoutpremium">Hanki Premium nähdäksesi koko kartan!</string>
|
||||||
|
|
||||||
<string name="txt_register_privacy">Vahvista että olet lukenut ja hyväksyt <a href="http://www.riskahead.net">Yksityisyydensuojan</a> ja <a href="http://www.riskahead.net">Käyttöehdot</a></string>
|
<string name="txt_register_privacy">Vahvista että olet lukenut ja hyväksyt <a href="https://www.riskahead.net">Yksityisyydensuojan</a> ja <a href="https://www.riskahead.net">Käyttöehdot</a></string>
|
||||||
<string name="txt_register_privacy_text">Olen lukenut yksityisyydensuojan ja käyttöehdot ja vahvistan hyväksyntäni.</string>
|
<string name="txt_register_privacy_text">Olen lukenut yksityisyydensuojan ja käyttöehdot ja vahvistan hyväksyntäni.</string>
|
||||||
<string name="txt_register_privacy_title">Yksityisyytesi on hyvin tärkeää meille</string>
|
<string name="txt_register_privacy_title">Yksityisyytesi on hyvin tärkeää meille</string>
|
||||||
<string name="txt_about_developedby">Kehitetty</string>
|
<string name="txt_about_developedby">Kehitetty</string>
|
||||||
<string name="txt_about_privacy">Yksityisyydensuoja: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.de/privacy/</a></string>
|
<string name="txt_about_privacy">Yksityisyydensuoja: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.de/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Käyttöehdot: <a href="http://www.riskahead.net/terms/">http://www.riskahead.de/terms/</a></string>
|
<string name="txt_about_terms">Käyttöehdot: <a href="https://www.riskahead.net/terms/">https://www.riskahead.de/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Verkkosivu: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Verkkosivu: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead Androidille</string>
|
<string name="txt_about_riskahead">RiskAhead Androidille</string>
|
||||||
<string name="menu_action_language">Kieli</string>
|
<string name="menu_action_language">Kieli</string>
|
||||||
<string name="txt_language_title">Vaihda kieltä</string>
|
<string name="txt_language_title">Vaihda kieltä</string>
|
||||||
|
|||||||
@@ -232,13 +232,13 @@
|
|||||||
<string name="txt_notifystatus_activatedbutnotready">PAS PRÊT (PAS DE GPS)</string>
|
<string name="txt_notifystatus_activatedbutnotready">PAS PRÊT (PAS DE GPS)</string>
|
||||||
<string name="txt_notifystatus_deactivated">OFF</string>
|
<string name="txt_notifystatus_deactivated">OFF</string>
|
||||||
<string name="txt_map_zoomoutpremium">Devener Premium pour voir la Carte Complète !</string>
|
<string name="txt_map_zoomoutpremium">Devener Premium pour voir la Carte Complète !</string>
|
||||||
<string name="txt_register_privacy">Confirmer svp que vous avez lu et accepté <a href="http://www.riskahead.net/privacy/">nos mentions légales</a> et <a href="http://www.riskahead.net/terms/">conditions de service</a></string>
|
<string name="txt_register_privacy">Confirmer svp que vous avez lu et accepté <a href="https://www.riskahead.net/privacy/">nos mentions légales</a> et <a href="https://www.riskahead.net/terms/">conditions de service</a></string>
|
||||||
<string name="txt_register_privacy_text">J\'ai lu les termes de la politique de confidentialité et les modalités d\'utilisation et confirme mon accord.</string>
|
<string name="txt_register_privacy_text">J\'ai lu les termes de la politique de confidentialité et les modalités d\'utilisation et confirme mon accord.</string>
|
||||||
<string name="txt_register_privacy_title">Votre droit à la confidentialité est très important pour nous</string>
|
<string name="txt_register_privacy_title">Votre droit à la confidentialité est très important pour nous</string>
|
||||||
<string name="txt_about_developedby">Elaboré par</string>
|
<string name="txt_about_developedby">Elaboré par</string>
|
||||||
<string name="txt_about_privacy">Politique de confidentialité : <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">Politique de confidentialité : <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Modalités d\'utilisation : <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">Modalités d\'utilisation : <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Website: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Website: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead pour Android</string>
|
<string name="txt_about_riskahead">RiskAhead pour Android</string>
|
||||||
<string name="menu_action_language">Langue</string>
|
<string name="menu_action_language">Langue</string>
|
||||||
<string name="txt_language_title">Changer Langue</string>
|
<string name="txt_language_title">Changer Langue</string>
|
||||||
|
|||||||
@@ -235,13 +235,13 @@
|
|||||||
<string name="txt_notifystatus_deactivated">Izslēgts</string>
|
<string name="txt_notifystatus_deactivated">Izslēgts</string>
|
||||||
<string name="txt_map_zoomoutpremium">Lai apskatītu kartes pilno versiju, kļūsti par Premium biedru!</string>
|
<string name="txt_map_zoomoutpremium">Lai apskatītu kartes pilno versiju, kļūsti par Premium biedru!</string>
|
||||||
|
|
||||||
<string name="txt_register_privacy">Lūdzu apstiprini, ka esi izlasījis un piekrīti mūsu <a href="http://www.riskahead.net/privacy/">Privātuma politikai</a> un <a href="http://www.riskahead.net/terms/">Pakalpojumu sniegšanas noteikumiem</a></string>
|
<string name="txt_register_privacy">Lūdzu apstiprini, ka esi izlasījis un piekrīti mūsu <a href="https://www.riskahead.net/privacy/">Privātuma politikai</a> un <a href="https://www.riskahead.net/terms/">Pakalpojumu sniegšanas noteikumiem</a></string>
|
||||||
<string name="txt_register_privacy_text">Esmu iepazinies ar privātuma politiku un pakalpojumu sniegšanas noteikumiem un apstiprinu savu piekrišanu.</string>
|
<string name="txt_register_privacy_text">Esmu iepazinies ar privātuma politiku un pakalpojumu sniegšanas noteikumiem un apstiprinu savu piekrišanu.</string>
|
||||||
<string name="txt_register_privacy_title">Jūsu privātums mums ir ļoti svarīgs</string>
|
<string name="txt_register_privacy_title">Jūsu privātums mums ir ļoti svarīgs</string>
|
||||||
<string name="txt_about_developedby">Izstrādāts no</string>
|
<string name="txt_about_developedby">Izstrādāts no</string>
|
||||||
<string name="txt_about_privacy">Privātuma politika: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">Privātuma politika: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Pakalpojumu sniegšanas noteikumi: <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">Pakalpojumu sniegšanas noteikumi: <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Interneta saits: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Interneta saits: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead Android lietotājiem</string>
|
<string name="txt_about_riskahead">RiskAhead Android lietotājiem</string>
|
||||||
<string name="menu_action_language">Valoda</string>
|
<string name="menu_action_language">Valoda</string>
|
||||||
<string name="txt_language_title">Mainīt valodu</string>
|
<string name="txt_language_title">Mainīt valodu</string>
|
||||||
|
|||||||
@@ -237,13 +237,13 @@
|
|||||||
<string name="txt_notifystatus_deactivated">ХААЛТТАЙ</string>
|
<string name="txt_notifystatus_deactivated">ХААЛТТАЙ</string>
|
||||||
<string name="txt_map_zoomoutpremium">Газрын зургыг бүхлээр нь харахын тулд нэмэгдэл авах!</string>
|
<string name="txt_map_zoomoutpremium">Газрын зургыг бүхлээр нь харахын тулд нэмэгдэл авах!</string>
|
||||||
|
|
||||||
<string name="txt_register_privacy">Бидний хувийн бодлогийг уншиж, хүлээн зөвшөөрсөнөө <a href="http://www.riskahead.net/privacy/">баталгаажуулна уу</a> <a href="http://www.riskahead.net/terms/">Үйлчилгээний нөхцөл</a></string>
|
<string name="txt_register_privacy">Бидний хувийн бодлогийг уншиж, хүлээн зөвшөөрсөнөө <a href="https://www.riskahead.net/privacy/">баталгаажуулна уу</a> <a href="https://www.riskahead.net/terms/">Үйлчилгээний нөхцөл</a></string>
|
||||||
<string name="txt_register_privacy_text">Би үйлчилгээний нөхцөлтэй танилцсан ба хүлээн зөвшөөрсөнөө баталгаажуулж байна.</string>
|
<string name="txt_register_privacy_text">Би үйлчилгээний нөхцөлтэй танилцсан ба хүлээн зөвшөөрсөнөө баталгаажуулж байна.</string>
|
||||||
<string name="txt_register_privacy_title">Таны нууцлал бидэнд маш чухал</string>
|
<string name="txt_register_privacy_title">Таны нууцлал бидэнд маш чухал</string>
|
||||||
<string name="txt_about_developedby">Хөгжсөн</string>
|
<string name="txt_about_developedby">Хөгжсөн</string>
|
||||||
<string name="txt_about_privacy">Хувийн бодлого: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">Хувийн бодлого: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Үйлчилгээний нөхцөл: <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">Үйлчилгээний нөхцөл: <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Веб сайт: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Веб сайт: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">Андройд-д зориулсан RiskAhead </string>
|
<string name="txt_about_riskahead">Андройд-д зориулсан RiskAhead </string>
|
||||||
<string name="menu_action_language">Хэл</string>
|
<string name="menu_action_language">Хэл</string>
|
||||||
<string name="txt_language_title">Хэл солих</string>
|
<string name="txt_language_title">Хэл солих</string>
|
||||||
|
|||||||
@@ -235,13 +235,13 @@
|
|||||||
<string name="txt_notifystatus_deactivated">UIT</string>
|
<string name="txt_notifystatus_deactivated">UIT</string>
|
||||||
<string name="txt_map_zoomoutpremium">Neem Premium om de volledige kaart te zien!</string>
|
<string name="txt_map_zoomoutpremium">Neem Premium om de volledige kaart te zien!</string>
|
||||||
|
|
||||||
<string name="txt_register_privacy">Bevestig dat u gelezen heeft en akkoord bent met onze <a href="http://www.riskahead.net/privacy/">Privacybeleid</a> en <a href="http://www.riskahead.net/terms/">Servicevoorwaarden</a></string>
|
<string name="txt_register_privacy">Bevestig dat u gelezen heeft en akkoord bent met onze <a href="https://www.riskahead.net/privacy/">Privacybeleid</a> en <a href="https://www.riskahead.net/terms/">Servicevoorwaarden</a></string>
|
||||||
<string name="txt_register_privacy_text">Ik heb het privacybeleid en de servicevoorwaarden gelezen en bevestig mijn overeenkomst.</string>
|
<string name="txt_register_privacy_text">Ik heb het privacybeleid en de servicevoorwaarden gelezen en bevestig mijn overeenkomst.</string>
|
||||||
<string name="txt_register_privacy_title">Uw privacy is zeer belangrijk voor ons</string>
|
<string name="txt_register_privacy_title">Uw privacy is zeer belangrijk voor ons</string>
|
||||||
<string name="txt_about_developedby">Ontwikkeld van</string>
|
<string name="txt_about_developedby">Ontwikkeld van</string>
|
||||||
<string name="txt_about_privacy">Privacybeleid: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.de/privacy/</a></string>
|
<string name="txt_about_privacy">Privacybeleid: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.de/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Servicevoorwaarden: <a href="http://www.riskahead.net/terms/">http://www.riskahead.de/terms/</a></string>
|
<string name="txt_about_terms">Servicevoorwaarden: <a href="https://www.riskahead.net/terms/">https://www.riskahead.de/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Webpagina: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Webpagina: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead voor Android</string>
|
<string name="txt_about_riskahead">RiskAhead voor Android</string>
|
||||||
<string name="menu_action_language">Taal</string>
|
<string name="menu_action_language">Taal</string>
|
||||||
<string name="txt_language_title">Verander Taal</string>
|
<string name="txt_language_title">Verander Taal</string>
|
||||||
|
|||||||
@@ -235,13 +235,13 @@
|
|||||||
<string name="txt_notifystatus_deactivated">WYŁĄCZONE</string>
|
<string name="txt_notifystatus_deactivated">WYŁĄCZONE</string>
|
||||||
<string name="txt_map_zoomoutpremium">Zdobądź Premium i zobacz całą mapę!</string>
|
<string name="txt_map_zoomoutpremium">Zdobądź Premium i zobacz całą mapę!</string>
|
||||||
|
|
||||||
<string name="txt_register_privacy">Potwierdź, że przeczytałeś i akceptujesz <a href="http://www.riskahead.net/privacy/">Politykę prywatności</a> oraz <a href="http://www.riskahead.net/terms/">Warunki użytkowania</a></string>
|
<string name="txt_register_privacy">Potwierdź, że przeczytałeś i akceptujesz <a href="https://www.riskahead.net/privacy/">Politykę prywatności</a> oraz <a href="https://www.riskahead.net/terms/">Warunki użytkowania</a></string>
|
||||||
<string name="txt_register_privacy_text">Zapoznałem się z Polityką prywatności i Warunkami użytkowania i zgadzam się na nie.</string>
|
<string name="txt_register_privacy_text">Zapoznałem się z Polityką prywatności i Warunkami użytkowania i zgadzam się na nie.</string>
|
||||||
<string name="txt_register_privacy_title">Twoja prywatność jest dla nas bardzo ważna.</string>
|
<string name="txt_register_privacy_title">Twoja prywatność jest dla nas bardzo ważna.</string>
|
||||||
<string name="txt_about_developedby">Opracowywane od</string>
|
<string name="txt_about_developedby">Opracowywane od</string>
|
||||||
<string name="txt_about_privacy">Polityka prywatności: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">Polityka prywatności: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Warunki użytkowania: <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">Warunki użytkowania: <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Strona internetowa: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Strona internetowa: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead fna Androida</string>
|
<string name="txt_about_riskahead">RiskAhead fna Androida</string>
|
||||||
<string name="menu_action_language">Język</string>
|
<string name="menu_action_language">Język</string>
|
||||||
<string name="txt_language_title">Zmień język</string>
|
<string name="txt_language_title">Zmień język</string>
|
||||||
|
|||||||
@@ -248,13 +248,13 @@ Não foi possível recuperar as configurações do perfil
|
|||||||
<string name="txt_notifystatus_deactivated">Desligado</string>
|
<string name="txt_notifystatus_deactivated">Desligado</string>
|
||||||
<string name="txt_map_zoomoutpremium">Obter prémio para visualizar o mapa completo!</string>
|
<string name="txt_map_zoomoutpremium">Obter prémio para visualizar o mapa completo!</string>
|
||||||
|
|
||||||
<string name="txt_register_privacy">Please confirm that you have read and agree to our <a href="http://www.riskahead.net/privacy/">Privacy Policy</a> and <a href="http://www.riskahead.net/terms/">Terms of Service</a></string>
|
<string name="txt_register_privacy">Please confirm that you have read and agree to our <a href="https://www.riskahead.net/privacy/">Privacy Policy</a> and <a href="https://www.riskahead.net/terms/">Terms of Service</a></string>
|
||||||
<string name="txt_register_privacy_text">I have read the privacy policy and terms of service and confirm my agreement.</string>
|
<string name="txt_register_privacy_text">I have read the privacy policy and terms of service and confirm my agreement.</string>
|
||||||
<string name="txt_register_privacy_title">Your privacy is very important to us</string>
|
<string name="txt_register_privacy_title">Your privacy is very important to us</string>
|
||||||
<string name="txt_about_developedby">Developed from</string>
|
<string name="txt_about_developedby">Developed from</string>
|
||||||
<string name="txt_about_privacy">Privacy Policy: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">Privacy Policy: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Terms of Service: <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">Terms of Service: <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Website: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Website: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead for Android</string>
|
<string name="txt_about_riskahead">RiskAhead for Android</string>
|
||||||
<string name="menu_action_language">Language</string>
|
<string name="menu_action_language">Language</string>
|
||||||
<string name="txt_language_title">Change Language</string>
|
<string name="txt_language_title">Change Language</string>
|
||||||
|
|||||||
@@ -233,13 +233,13 @@
|
|||||||
<string name="txt_notifystatus_activatedbutnotready">нет сигнала GPS</string>
|
<string name="txt_notifystatus_activatedbutnotready">нет сигнала GPS</string>
|
||||||
<string name="txt_notifystatus_deactivated">выключено</string>
|
<string name="txt_notifystatus_deactivated">выключено</string>
|
||||||
<string name="txt_map_zoomoutpremium">Получить ПРЕМИУМ для полного обзора</string>
|
<string name="txt_map_zoomoutpremium">Получить ПРЕМИУМ для полного обзора</string>
|
||||||
<string name="txt_register_privacy">Ознакомлен и согласен с <a href="http://www.riskahead.net/privacy/">политикой конфиденциальности</a> и <a href="http://www.riskahead.net/terms/">условиями сервиса</a></string>
|
<string name="txt_register_privacy">Ознакомлен и согласен с <a href="https://www.riskahead.net/privacy/">политикой конфиденциальности</a> и <a href="https://www.riskahead.net/terms/">условиями сервиса</a></string>
|
||||||
<string name="txt_register_privacy_text">Я согласен с условиями</string>
|
<string name="txt_register_privacy_text">Я согласен с условиями</string>
|
||||||
<string name="txt_register_privacy_title">Ваше мнение важно</string>
|
<string name="txt_register_privacy_title">Ваше мнение важно</string>
|
||||||
<string name="txt_about_developedby">разработано</string>
|
<string name="txt_about_developedby">разработано</string>
|
||||||
<string name="txt_about_privacy">политика конфиденциальности: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">политика конфиденциальности: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">условия соглашения: <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">условия соглашения: <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Сайт: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Сайт: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead для андроид</string>
|
<string name="txt_about_riskahead">RiskAhead для андроид</string>
|
||||||
<string name="menu_action_language">язык</string>
|
<string name="menu_action_language">язык</string>
|
||||||
<string name="txt_language_title">изменить язык</string>
|
<string name="txt_language_title">изменить язык</string>
|
||||||
|
|||||||
@@ -235,13 +235,13 @@
|
|||||||
<string name="txt_notifystatus_deactivated">KAPALI</string>
|
<string name="txt_notifystatus_deactivated">KAPALI</string>
|
||||||
<string name="txt_map_zoomoutpremium">Haritanın tamamı için Premium Üyelik alınız!</string>
|
<string name="txt_map_zoomoutpremium">Haritanın tamamı için Premium Üyelik alınız!</string>
|
||||||
|
|
||||||
<string name="txt_register_privacy">Okuyup kabul ettiğinizi onaylayın <a href="http://www.riskahead.net/privacy/">Gizlilik Politikası</a> ve <a href="http://www.riskahead.net/terms/">Hizmet Şartları</a></string>
|
<string name="txt_register_privacy">Okuyup kabul ettiğinizi onaylayın <a href="https://www.riskahead.net/privacy/">Gizlilik Politikası</a> ve <a href="https://www.riskahead.net/terms/">Hizmet Şartları</a></string>
|
||||||
<string name="txt_register_privacy_text">Pol. ve şart. okudum, anlaşmayı onaylıyorum.</string>
|
<string name="txt_register_privacy_text">Pol. ve şart. okudum, anlaşmayı onaylıyorum.</string>
|
||||||
<string name="txt_register_privacy_title">Gizliliğiniz bizim için önemlidir</string>
|
<string name="txt_register_privacy_title">Gizliliğiniz bizim için önemlidir</string>
|
||||||
<string name="txt_about_developedby">Yardımıyla Geliştirildi</string>
|
<string name="txt_about_developedby">Yardımıyla Geliştirildi</string>
|
||||||
<string name="txt_about_privacy">Gizlilik Politikası: <a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">Gizlilik Politikası: <a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Hizmet Şartları: <a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">Hizmet Şartları: <a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">İnternet Sitesi: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">İnternet Sitesi: <a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead Android Sürümü</string>
|
<string name="txt_about_riskahead">RiskAhead Android Sürümü</string>
|
||||||
<string name="menu_action_language">Dil</string>
|
<string name="menu_action_language">Dil</string>
|
||||||
<string name="txt_language_title">Dili değiştir</string>
|
<string name="txt_language_title">Dili değiştir</string>
|
||||||
|
|||||||
@@ -236,13 +236,13 @@
|
|||||||
<string name="txt_notifystatus_deactivated">OFF</string>
|
<string name="txt_notifystatus_deactivated">OFF</string>
|
||||||
<string name="txt_map_zoomoutpremium">Get Premium to view the Full Map!</string>
|
<string name="txt_map_zoomoutpremium">Get Premium to view the Full Map!</string>
|
||||||
|
|
||||||
<string name="txt_register_privacy">Please confirm that you have read and agree to our <a href="http://www.riskahead.net/privacy/">Privacy Policy</a> and <a href="http://www.riskahead.net/terms/">Terms of Service</a></string>
|
<string name="txt_register_privacy">Please confirm that you have read and agree to our <a href="https://www.riskahead.net/privacy/">Privacy Policy</a> and <a href="https://www.riskahead.net/terms/">Terms of Service</a></string>
|
||||||
<string name="txt_register_privacy_text">I have read the privacy policy and terms of service and confirm my agreement.</string>
|
<string name="txt_register_privacy_text">I have read the privacy policy and terms of service and confirm my agreement.</string>
|
||||||
<string name="txt_register_privacy_title">Your privacy is very important to us</string>
|
<string name="txt_register_privacy_title">Your privacy is very important to us</string>
|
||||||
<string name="txt_about_developedby">Developed from</string>
|
<string name="txt_about_developedby">Developed from</string>
|
||||||
<string name="txt_about_privacy">Privacy Policy:\n<a href="http://www.riskahead.net/privacy/">http://www.riskahead.net/privacy/</a></string>
|
<string name="txt_about_privacy">Privacy Policy:\n<a href="https://www.riskahead.net/privacy/">https://www.riskahead.net/privacy/</a></string>
|
||||||
<string name="txt_about_terms">Terms of Service:\n<a href="http://www.riskahead.net/terms/">http://www.riskahead.net/terms/</a></string>
|
<string name="txt_about_terms">Terms of Service:\n<a href="https://www.riskahead.net/terms/">https://www.riskahead.net/terms/</a></string>
|
||||||
<string name="txt_about_homepage">Website:\n<a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
|
<string name="txt_about_homepage">Website:\n<a href="https://www.riskahead.net">https://www.riskahead.net</a></string>
|
||||||
<string name="txt_about_riskahead">RiskAhead for Android</string>
|
<string name="txt_about_riskahead">RiskAhead for Android</string>
|
||||||
<string name="menu_action_language">Language</string>
|
<string name="menu_action_language">Language</string>
|
||||||
<string name="txt_language_title">Change Language</string>
|
<string name="txt_language_title">Change Language</string>
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ buildscript {
|
|||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.1.3'
|
classpath 'com.android.tools.build:gradle:3.4.1'
|
||||||
classpath 'com.google.gms:google-services:3.2.0'
|
classpath 'com.google.gms:google-services:4.2.0'
|
||||||
classpath 'io.fabric.tools:gradle:1.25.4'
|
classpath 'io.fabric.tools:gradle:1.29.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,9 +10,11 @@
|
|||||||
# Specifies the JVM arguments used for the daemon process.
|
# Specifies the JVM arguments used for the daemon process.
|
||||||
# The setting is particularly useful for tweaking memory settings.
|
# The setting is particularly useful for tweaking memory settings.
|
||||||
# Default value: -Xmx10248m -XX:MaxPermSize=256m
|
# Default value: -Xmx10248m -XX:MaxPermSize=256m
|
||||||
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
|
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
|
||||||
|
|
||||||
# When configured, Gradle will run in incubating parallel mode.
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
# This option should only be used with decoupled projects. More details, visit
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
# org.gradle.parallel=true
|
# org.gradle.parallel=true
|
||||||
|
android.enableJetifier=true
|
||||||
|
android.useAndroidX=true
|
||||||
6
gradle/wrapper/gradle-wrapper.properties
vendored
6
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,8 @@
|
|||||||
#Sun Apr 08 15:54:58 CEST 2018
|
#Sat May 25 17:19:03 CEST 2019
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
|
android.enableJetifier=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
|
||||||
|
android.useAndroidX=true
|
||||||
|
|||||||
BIN
java_pid11280.hprof
Normal file
BIN
java_pid11280.hprof
Normal file
Binary file not shown.
Reference in New Issue
Block a user