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

Some bugfixes (especially with inputValidatorMessages) and all dependencies updated

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

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

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

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

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

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

@@ -13,6 +13,7 @@ import android.util.AttributeSet;
import android.util.Log;
import android.util.Patterns;
import android.widget.Button;
import android.widget.LinearLayout;
import org.deke.risk.riskahead.R;
@@ -63,9 +64,11 @@ public class ValidatedEditTextPreference extends EditTextPreference
if((getEditText().getInputType() & InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS) != 0){
if (!Patterns.EMAIL_ADDRESS.matcher(value).matches()) {
((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{

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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