Minor fixes found during iOS Dev

Former-commit-id: 876ef16b190d11b9b6d86f3211372ac6386342c8

app/app.iml

@@ -70,26 +70,26 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/navigation-args/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" 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/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/navigation-args/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/crashlytics/res/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" 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/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debugAndroidTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debugUnitTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -139,11 +139,11 @@
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
-          <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugAndroidTest" />
-          <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debug" />
           <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugUnitTest" />
           <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/release" />
+          <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debug" />
           <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/releaseUnitTest" />
+          <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugAndroidTest" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

app/src/main/java/org/lindoor/ui/validators/NonEmptyEmailFormatValidator.kt

-package org.lindoor.ui.validators
-
-import android.text.TextUtils
-import org.lindoor.customisation.Texts
-
-class NonEmptyEmailFormatValidator :
-    GenericStringValidator(Texts.get("input_invalid_format_email")) {
-    override fun validity(s: CharSequence): Pair<Boolean, String?> {
-        if (TextUtils.isEmpty(s))
-            return Pair(false, Texts.get("input_invalid_empty_field"))
-        if (!android.util.Patterns.EMAIL_ADDRESS.matcher(s).matches())
-            return Pair(false, errorText)
-        return Pair(true, null)
-    }
-}
\ No newline at end of file

app/src/main/java/org/lindoor/ui/validators/NonEmptyUrlFormatValidator.kt

@@ -3,7 +3,7 @@ package org.lindoor.ui.validators
 import android.text.TextUtils
 import org.lindoor.customisation.Texts
 
-class NonEmptyUrlFormatValidator : GenericStringValidator(Texts.get("input_invalid_format_uri")) {
+class NonEmptyUrlFormatValidator : GenericStringValidator("input_invalid_format_uri") {
     override fun validity(s: CharSequence): Pair<Boolean, String?> {
         if (TextUtils.isEmpty(s))
             return Pair(false, Texts.get("input_invalid_empty_field"))

app/src/main/java/org/lindoor/ui/validators/NonEmptyWithRegExpFormatValidator.kt

@@ -4,7 +4,7 @@ import android.text.TextUtils
 import org.lindoor.customisation.Texts
 
 class NonEmptyWithRegExpFormatValidator(private val reggExp: String, errorTextKey: String) :
-    GenericStringValidator(Texts.get(errorTextKey)) {
+    GenericStringValidator(errorTextKey) {
     override fun validity(s: CharSequence): Pair<Boolean, String?> {
         if (TextUtils.isEmpty(s))
             return Pair(false, Texts.get("input_invalid_empty_field"))

app/src/main/java/org/lindoor/ui/validators/RegExpFormatValidator.kt

@@ -3,7 +3,7 @@ package org.lindoor.ui.validators
 import org.lindoor.customisation.Texts
 
 class RegExpFormatValidator(private val reggExp: String, errorTextKey: String) :
-    GenericStringValidator(Texts.get(errorTextKey)) {
+    GenericStringValidator(errorTextKey) {
     override fun validity(s: CharSequence): Pair<Boolean, String?> {
         if (!reggExp.toRegex().matches(s))
             return Pair(false, errorText)

app/src/main/res/layout/fragment_about.xml

@@ -19,6 +19,7 @@
 
     <ImageView
         android:id="@+id/lindoor_icon"
+        src='@{"others/lindoor_icon"}'
         android:layout_width="0dp"
         android:layout_height="100dp"
         android:scaleType="centerInside"
@@ -27,9 +28,8 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        src='@{"others/lindoor_icon"}'
-        />
+        app:layout_constraintVertical_bias="0.39"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <ImageView
         android:id="@+id/lindoor_text"