diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 90099e2..cbbf71c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,10 +3,9 @@ - + diff --git a/RiskAhead-Android.iml b/RiskAhead-Android.iml index d6d1356..69b9b49 100644 --- a/RiskAhead-Android.iml +++ b/RiskAhead-Android.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/app/app-release.apk b/app/app-release.apk deleted file mode 100644 index 324ed24..0000000 Binary files a/app/app-release.apk and /dev/null differ diff --git a/app/app.iml b/app/app.iml index a092e42..1b1623c 100644 --- a/app/app.iml +++ b/app/app.iml @@ -22,27 +22,28 @@ - + + - + - + @@ -57,6 +58,13 @@ + + + + + + + @@ -80,72 +88,115 @@ + + - + - + + - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 76da134..b3e9471 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,26 +1,16 @@ -buildscript { - repositories { - maven { url 'https://maven.fabric.io/public' } - } - - dependencies { - classpath 'io.fabric.tools:gradle:1.+' - } -} apply plugin: 'com.android.application' apply plugin: 'io.fabric' -apply plugin: 'com.google.gms.google-services' android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "org.deke.risk.riskahead" minSdkVersion 15 - targetSdkVersion 23 - versionCode 42 - versionName "3.0.2" + targetSdkVersion 25 + versionCode 43 + versionName "3.1" } buildTypes { release { @@ -41,32 +31,37 @@ android { repositories { jcenter() maven { url 'https://maven.fabric.io/public' } + maven { url 'https://maven.google.com/' } } dependencies { compile fileTree(dir: 'libs', include: 'Parse-*.jar') - compile 'com.facebook.android:facebook-android-sdk:4.8.1' + implementation 'com.facebook.android:facebook-android-sdk:4.31.0' compile('com.twitter.sdk.android:twitter-core:1.4.1@aar') { - transitive = true; - } - compile 'com.mikepenz:iconics-core:2.8.2@aar' - compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar' - compile('com.mikepenz:materialdrawer:5.9.0@aar') { transitive = true } - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:support-v4:25.3.1' - compile 'com.android.support:design:25.3.1' + implementation 'com.mikepenz:iconics-core:3.0.3@aar' + implementation 'com.mikepenz:iconics-core:3.0.3@aar' + implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar' + compile('com.mikepenz:materialdrawer:6.0.6@aar') { + transitive = true + } + + compile 'com.android.support:appcompat-v7:27.1.0' + compile 'com.android.support:support-v4:27.1.0' + compile 'com.android.support:design:27.1.0' + + compile 'com.google.android.gms:play-services-gcm:11.8.0' + compile 'com.google.android.gms:play-services-plus:11.8.0' + compile 'com.google.android.gms:play-services-location:11.8.0' + compile 'com.google.android.gms:play-services-ads:11.8.0' + compile 'com.google.android.gms:play-services-maps:11.8.0' - compile 'com.google.android.gms:play-services-gcm:10.2.1' - compile 'com.google.android.gms:play-services-plus:10.2.1' - compile 'com.google.android.gms:play-services-location:10.2.1' - compile 'com.google.android.gms:play-services-ads:10.2.1' - compile 'com.google.android.gms:play-services-maps:10.2.1' compile 'com.google.maps.android:android-maps-utils:0.5' - - compile 'com.google.code.gson:gson:2.7' - compile 'com.beardedhen:androidbootstrap:2.3.1' + compile 'com.google.code.gson:gson:2.8.0' + compile 'com.beardedhen:androidbootstrap:2.3.2' compile 'com.mcxiaoke.volley:library:1.0.19' } + +apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json index 42f73ec..e3277e1 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1 +1,70 @@ -{"project_info":{"project_id":"riskahead-61dff","project_number":"498007911848","name":"RiskAhead"},"client":[{"client_info":{"client_id":"android:org.deke.risk.riskahead","client_type":1,"android_client_info":{"package_name":"org.deke.risk.riskahead"}},"oauth_client":[{"client_id":"498007911848-ppr7ct4oa2gs5jjnmrnlnutgui8m365n.apps.googleusercontent.com","client_type":1,"android_info":{"package_name":"org.deke.risk.riskahead","certificate_hash":"4b6c989e6c0d6824f5a2d7b1a10ff36560c3397f"}}],"services":{"analytics_service":{"status":1},"cloud_messaging_service":{"status":1,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":2},"ads_service":{"status":1}}}]} \ No newline at end of file +{ + "project_info": { + "project_number": "498007911848", + "firebase_url": "https://riskahead-61dff.firebaseio.com", + "project_id": "riskahead-61dff" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:498007911848:android:89cfbce52ef79add", + "android_client_info": { + "package_name": "org.deke.risk.riskahead" + } + }, + "oauth_client": [ + { + "client_id": "498007911848-bbfoj739tjtlr22faobmg8e4fls6c5ue.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "498007911848-rs2ghjusnngqcb487os1s6nt4i8an8d5.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "org.deke.risk.riskahead", + "certificate_hash": "742d036d112c9a727a8c8aec1718eb1ba1e05a91" + } + }, + { + "client_id": "498007911848-belfueqha30j41gmjqe77db3qdrutcoc.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "org.deke.risk.riskahead", + "certificate_hash": "e4559e601888977e334d387d9e30dadedb855cbc" + } + }, + { + "client_id": "498007911848-ppr7ct4oa2gs5jjnmrnlnutgui8m365n.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "org.deke.risk.riskahead", + "certificate_hash": "4b6c989e6c0d6824f5a2d7b1a10ff36560c3397f" + } + } + ], + "api_key": [ + { + "current_key": "AIzaSyAV9_hgRs5tuDN4Okp0ydLboORO-cJgJtA" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "498007911848-bbfoj739tjtlr22faobmg8e4fls6c5ue.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..47ba25f Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 0000000..c39aa24 --- /dev/null +++ b/app/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":43},"path":"app-release.apk","properties":{"packageId":"org.deke.risk.riskahead","split":"","minSdkVersion":"15"}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5d3dd4b..52d6cb8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -61,8 +61,8 @@ + android:label="@string/app_name" /> + - + diff --git a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java index ee6fd21..e962a3d 100644 --- a/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/LoginActivity.java @@ -63,6 +63,9 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr private TextView input_username; private TextView input_password; + private TextInputLayout inputLayoutEmail; + private TextInputLayout inputLayoutPassword; + private ProgressDialog pDialog; private SessionManager session; @@ -134,10 +137,10 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr setContentView(R.layout.activity_login); input_email = (TextView) findViewById(R.id.input_register_email); - TextInputLayout inputLayoutEmail = (TextInputLayout) findViewById(R.id.input_layout_email); + inputLayoutEmail = (TextInputLayout) findViewById(R.id.input_layout_email); input_password = (TextView) findViewById(R.id.input_register_password); - TextInputLayout inputLayoutPassword = (TextInputLayout) findViewById(R.id.input_layout_password); + inputLayoutPassword = (TextInputLayout) findViewById(R.id.input_layout_password); TextView btn_requestPW = (TextView) findViewById(R.id.lbl_login_resendPW); @@ -157,7 +160,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr String email = input_email.getText().toString(); String password = input_password.getText().toString(); - if (input_password.getError() != null || input_email.getError() != null) { + if (inputLayoutPassword.getError() != null || inputLayoutEmail.getError() != null) { showMessage(getString(R.string.error_validation)); } else { showDialog(); @@ -200,11 +203,11 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr setContentView(R.layout.activity_register); input_username = (TextView) findViewById(R.id.input_register_name); - TextInputLayout inputLayoutUsername = (TextInputLayout) findViewById(R.id.input_layout_username); + final TextInputLayout inputLayoutUsername = (TextInputLayout) findViewById(R.id.input_layout_username); input_email = (TextView) findViewById(R.id.input_register_email); - TextInputLayout inputLayoutEmail = (TextInputLayout) findViewById(R.id.input_layout_email); + final TextInputLayout inputLayoutEmail = (TextInputLayout) findViewById(R.id.input_layout_email); input_password = (TextView) findViewById(R.id.input_register_password); - TextInputLayout inputLayoutPassword = (TextInputLayout) findViewById(R.id.input_layout_password); + final TextInputLayout inputLayoutPassword = (TextInputLayout) findViewById(R.id.input_layout_password); BootstrapButton btn_login = (BootstrapButton) findViewById(R.id.btn_register); TextView btn_switchtologin = (TextView) findViewById(R.id.lbl_register_switchtologin); @@ -248,7 +251,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr String password = input_password.getText().toString(); String name = input_username.getText().toString(); - if (input_password.getError() != null || input_email.getError() != null || input_username.getError() != null || input_email.getText().toString().trim().length() == 0 || input_username.getText().toString().trim().length() == 0 || input_password.getText().toString().trim().length() == 0) { + if (inputLayoutPassword.getError() != null || inputLayoutEmail.getError() != null || inputLayoutUsername.getError() != null || input_email.getText().toString().trim().length() == 0 || input_username.getText().toString().trim().length() == 0 || input_password.getText().toString().trim().length() == 0) { showMessage(getString(R.string.error_validation)); } else { showDialog(); @@ -459,7 +462,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr } public void onRequestNewPasswordClick(View view){ - if((input_email.getText() != null && input_email.getText().toString().isEmpty()) || (input_email.getError() != null)){ + if((input_email.getText() != null && input_email.getText().toString().isEmpty()) || (inputLayoutEmail.getError() != null)){ showMessage(getString(R.string.message_enteremail)); return; } diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java b/app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java index d1b177c..229a422 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java @@ -13,6 +13,7 @@ import android.util.AttributeSet; import android.util.Log; import android.util.Patterns; import android.widget.Button; +import android.widget.LinearLayout; import org.deke.risk.riskahead.R; @@ -63,9 +64,11 @@ public class ValidatedEditTextPreference extends EditTextPreference if((getEditText().getInputType() & InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS) != 0){ if (!Patterns.EMAIL_ADDRESS.matcher(value).matches()) { - ((TextInputLayout) getEditText().getParent()).setError(getEditText().getContext().getResources().getString(R.string.error_email)); - - // getEditText().setError(getEditText().getContext().getResources().getString(R.string.error_email)); + if(getEditText().getParent().getClass() == TextInputLayout.class){ + ((TextInputLayout) getEditText().getParent()).setError(getEditText().getContext().getResources().getString(R.string.error_email)); + }else{ + getEditText().setError(getEditText().getContext().getResources().getString(R.string.error_email)); + } enable = false; } }else{ diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 0c7b419..0948af4 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -421,4 +421,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e8024db..618dd2f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -417,14 +417,13 @@ 60 Vorfall konnte nicht gespeichert werden - Update Eine neue Version ist in deinem AppStore verfügbar. Wir unterstützen diese Version zwar noch, jedoch wird diese bald ablaufen. Bitte aktualisiere RiskAhead bald. Bitte bald aktualisieren! Diese Version wird auf Grund wichtiger Updates nicht mehr unterstützt! Bitte aktualisiere RiskAhead um diese weiter verwenden zu können. Bitte jetzt aktualisieren! - Exit Später Gelöscht + Already have an account? Login here! diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9231638..7f9bbcb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -421,4 +421,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index e99bf7d..8fb3680 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -422,5 +422,12 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index a5bcd1a..03358f7 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -424,4 +424,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a96ff10..7fb57e0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -419,4 +419,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index b331089..711c36c 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -422,4 +422,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml index 6a804d5..06e3575 100644 --- a/app/src/main/res/values-mn/strings.xml +++ b/app/src/main/res/values-mn/strings.xml @@ -424,4 +424,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1a0e341..97ba3b6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -422,4 +422,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2612b7c..360380e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -422,4 +422,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index aac0c53..b1edca5 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -437,5 +437,13 @@ Não foi possível recuperar as configurações do perfil 60 Search + E-Mail was sent to your e-mail address + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1b49cae..177b8bd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -420,4 +420,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9cec85a..89b2f12 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -422,4 +422,11 @@ 30 60 + Please update now! + This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. + Later + Please update soon! + There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. + Deleted + Already have an account? Login here! \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8bfb8d..5a92eeb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -248,9 +248,9 @@ Change Language Please update now! This version is not supported anymore because of important updates. Please update to a new version of RiskAhead by using your marketplace. - Update + Update Later - Exit + Exit Please update soon! There is a new version available in your marketplace. We still support your version but it is recommended to perform an update. The support of your version will end soon. Dennis Thießen diff --git a/build.gradle b/build.gradle index ffb590c..12fcdda 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,14 @@ buildscript { repositories { jcenter() - maven { url 'https://maven.fabric.io/public' } + maven { + url 'https://maven.fabric.io/public' } + maven { + url 'https://maven.google.com/' } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' - classpath 'com.google.gms:google-services:1.3.0-beta3' + classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.google.gms:google-services:3.1.1' classpath 'io.fabric.tools:gradle:1.+' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bf257d0..4780431 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Apr 15 13:30:25 CEST 2017 +#Mon Mar 19 20:32:10 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip