commit before pull

.gitignore

@@ -1,10 +1,39 @@
+
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Android Studio
 *.iml
+.idea
+.idea/
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
 .gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
+build/
+.navigation
+captures/
+output.json
+
+#NDK
+obj/
 .externalNativeBuild
 /storekeys

.idea/codeStyles/Project.xml

@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />

.idea/modules.xml

@@ -2,6 +2,11 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/JAPAN-remitandroid.iml" filepath="$PROJECT_DIR$/.idea/modules/JAPAN-remitandroid.iml" group="remitandroid" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/SpinnerDatePickerLib-release/JAPAN-remitandroid-SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/.idea/modules/SpinnerDatePickerLib-release/JAPAN-remitandroid-SpinnerDatePickerLib-release.iml" group="remitandroid/SpinnerDatePickerLib-release" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/JAPAN-remitandroid-app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/JAPAN-remitandroid-app.iml" group="remitandroid/app" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/httpclient-release/JAPAN-remitandroid-httpclient-release.iml" filepath="$PROJECT_DIR$/.idea/modules/httpclient-release/JAPAN-remitandroid-httpclient-release.iml" group="remitandroid/httpclient-release" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/rxbiometric/JAPAN-remitandroid-rxbiometric.iml" filepath="$PROJECT_DIR$/.idea/modules/rxbiometric/JAPAN-remitandroid-rxbiometric.iml" group="remitandroid/rxbiometric" />
       <module fileurl="file://$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" />
       <module fileurl="file://$PROJECT_DIR$/Swift-remitandroid.iml" filepath="$PROJECT_DIR$/Swift-remitandroid.iml" group="remitandroid" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/SpinnerDatePickerLib-release/Swift-remitandroid-SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/.idea/modules/SpinnerDatePickerLib-release/Swift-remitandroid-SpinnerDatePickerLib-release.iml" group="remitandroid/SpinnerDatePickerLib-release" />

app/.gitignore

@@ -1 +1,39 @@
-/build
+
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Android Studio
+*.iml
+.idea
+.idea/
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
+.gradle
+build/
+.navigation
+captures/
+output.json 
+
+#NDK
+obj/
+.externalNativeBuild
+/storekeys

securitykeypad/.gitignore

@@ -1 +1,39 @@
-/build
+
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Android Studio
+*.iml
+.idea
+.idea/
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
+.gradle
+build/
+.navigation
+captures/
+output.json 
+
+#NDK
+obj/
+.externalNativeBuild
+/storekeys