IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

pushed latest commit

new_design
Santosh Bhandary 4 years ago
parent
f89b2c17b2
commit
cd6fbc5478
16 changed files with 52 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 3
      .idea/gradle.xml
  3. 2
      .idea/misc.xml
  4. 27
      .idea/modules.xml
  5. 2
      app/build.gradle
  6. 49
      app/src/main/java/com/swifttech/remit/jmecustomer/RemitApplication.java
  7. 8
      app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/HttpClientV2.java
  8. 13
      build.gradle
  9. 4
      securitykeypad/build.gradle
  10. 2
      securitykeypad/src/androidTest/java/com/gmeremit/online/gmeremittance_native/securitykeypad/ExampleInstrumentedTest.java
  11. 2
      securitykeypad/src/main/res/drawable/transkey_round_corner.xml
  12. 8
      securitykeypad/src/main/res/layout/demo_ctrlview.xml
  13. 2
      securitykeypad/src/main/res/layout/transkey_main.xml
  14. 2
      securitykeypad/src/main/res/layout/transkey_main_landscape.xml
  15. 6
      securitykeypad/src/main/res/values/styles.xml
  16. 2
      securitykeypad/src/test/java/com/gmeremit/online/gmeremittance_native/securitykeypad/ExampleUnitTest.java

BIN
.idea/caches/build_file_checksums.ser
View File

3
.idea/gradle.xml
View File

@ -5,6 +5,7 @@
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="delegatedBuild" value="false" />
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
@ -17,7 +18,7 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="testRunner" value="PLATFORM" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

2
.idea/misc.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>

27
.idea/modules.xml
View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<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" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Swift-remitandroid-app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Swift-remitandroid-app.iml" group="remitandroid/app" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/httpclient-release/Swift-remitandroid-httpclient-release.iml" filepath="$PROJECT_DIR$/.idea/modules/httpclient-release/Swift-remitandroid-httpclient-release.iml" group="remitandroid/httpclient-release" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/rxbiometric/Swift-remitandroid-rxbiometric.iml" filepath="$PROJECT_DIR$/.idea/modules/rxbiometric/Swift-remitandroid-rxbiometric.iml" group="remitandroid/rxbiometric" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/httpclient-release/httpclient-release.iml" filepath="$PROJECT_DIR$/httpclient-release/httpclient-release.iml" />
<module fileurl="file://$PROJECT_DIR$/remitandroid.iml" filepath="$PROJECT_DIR$/remitandroid.iml" />
<module fileurl="file://$PROJECT_DIR$/SpinnerDatePickerLib-release/remitandroid-SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/SpinnerDatePickerLib-release/remitandroid-SpinnerDatePickerLib-release.iml" group="remitandroid/SpinnerDatePickerLib-release" />
<module fileurl="file://$PROJECT_DIR$/app/remitandroid-app.iml" filepath="$PROJECT_DIR$/app/remitandroid-app.iml" group="remitandroid/app" />
<module fileurl="file://$PROJECT_DIR$/httpclient-release/remitandroid-httpclient-release.iml" filepath="$PROJECT_DIR$/httpclient-release/remitandroid-httpclient-release.iml" group="remitandroid/httpclient-release" />
<module fileurl="file://$PROJECT_DIR$/rxbiometric/remitandroid-rxbiometric.iml" filepath="$PROJECT_DIR$/rxbiometric/remitandroid-rxbiometric.iml" group="remitandroid/rxbiometric" />
<module fileurl="file://$PROJECT_DIR$/rxbiometric/rxbiometric.iml" filepath="$PROJECT_DIR$/rxbiometric/rxbiometric.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/swift1-Swift-remitandroid.iml" filepath="$PROJECT_DIR$/.idea/modules/swift1-Swift-remitandroid.iml" group="remitandroid" />
</modules>
</component>
</project>

2
app/build.gradle
View File

@ -169,4 +169,6 @@ dependencies {
testImplementation "org.mockito:mockito-core:3.0.0"
implementation project(path: ':rxbiometric')
debugImplementation "com.github.ChuckerTeam.Chucker:library:3.0.1"
releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:3.0.1"
}

49
app/src/main/java/com/swifttech/remit/jmecustomer/RemitApplication.java
View File

@ -23,7 +23,26 @@ public class RemitApplication extends MultiDexApplication {
private static SharedPreferences mSharedPreferences = null;
private static StringExtractor stringExtractor = null;
private static Context context;
public static SharedPreferences getStorage() {
return mSharedPreferences;
}
public static AppRelatedMetaData getAppRelatedMetaData(Context context) {
return new AppRelatedMetaData(context);
}
public static StringExtractor getStringExtractor() {
return stringExtractor;
}
public static String getPreferredCountryCode() {
if (mSharedPreferences == null)
return "en";
return mSharedPreferences.getString(USER_PREFERRED_COUNTRY_CODE, "en");
}
@Override
protected void attachBaseContext(Context context) {
@ -34,7 +53,7 @@ public class RemitApplication extends MultiDexApplication {
@Override
public void onCreate() {
super.onCreate();
this.context=this;
RxJavaPlugins.setErrorHandler(e -> {
if (e instanceof UndeliverableException) {
e = e.getCause();
@ -76,20 +95,6 @@ public class RemitApplication extends MultiDexApplication {
stringExtractor = null;
}
public static SharedPreferences getStorage() {
return mSharedPreferences;
}
public static AppRelatedMetaData getAppRelatedMetaData(Context context) {
return new AppRelatedMetaData(context);
}
public static StringExtractor getStringExtractor() {
return stringExtractor;
}
public static class AppRelatedMetaData {
String deviceId;
@ -173,11 +178,11 @@ public class RemitApplication extends MultiDexApplication {
Resources resources;
public void updateResources(Resources resources) {
private StringExtractor(Resources resources) {
this.resources = resources;
}
private StringExtractor(Resources resources) {
public void updateResources(Resources resources) {
this.resources = resources;
}
@ -198,13 +203,7 @@ public class RemitApplication extends MultiDexApplication {
}
public static String getPreferredCountryCode() {
if (mSharedPreferences == null)
return "en";
return mSharedPreferences.getString(USER_PREFERRED_COUNTRY_CODE, "en");
public static Context getContext() {
return context;
}
}

8
app/src/main/java/com/swifttech/remit/jmecustomer/utils/https/HttpClientV2.java
View File

@ -1,9 +1,9 @@
package com.swifttech.remit.jmecustomer.utils.https;
import com.swifttech.remit.jmecustomer.BuildConfig;
import com.swifttech.remit.jmecustomer.RemitApplication;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.swifttech.remit.jmecustomer.BuildConfig;
import com.swifttech.remit.jmecustomer.RemitApplication;
import java.util.concurrent.TimeUnit;
@ -37,9 +37,6 @@ public class HttpClientV2 {
httpClient.connectTimeout(150, TimeUnit.SECONDS);
httpClient.readTimeout(150, TimeUnit.SECONDS);
httpClient.writeTimeout(150, TimeUnit.SECONDS);
Interceptor authInterceptor = chain -> {
Request newRequest = chain.request().newBuilder()
.addHeader("GME-TOKEN", "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru")
@ -49,6 +46,7 @@ public class HttpClientV2 {
};
httpClient.addInterceptor(authInterceptor);
if (BuildConfig.DEBUG) {

13
build.gradle
View File

@ -5,16 +5,14 @@ buildscript {
repositories {
google()
jcenter()
maven {
url 'https://maven.fabric.io/public'
}
maven {url 'https://maven.fabric.io/public' }
maven { url "https://jitpack.io" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.gms:google-services:4.3.4'
classpath 'io.fabric.tools:gradle:1.31.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@ -25,9 +23,10 @@ allprojects {
google()
jcenter()
mavenCentral()
maven { url "https://jitpack.io" }
maven { url 'https://zendesk.jfrog.io/zendesk/repo' }
maven { url 'https://maven.google.com/' }
maven { url "https://jitpack.io" }
}
}

4
securitykeypad/build.gradle
View File

@ -1,4 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'com.jmecustomer.library'
android {
compileSdkVersion 28
@ -19,7 +19,7 @@ android {
release {
debuggable false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-jmecustomer.txt'), 'proguard-rules.pro'
}
livedebug {

2
securitykeypad/src/androidTest/java/com/gmeremit/online/gmeremittance_native/securitykeypad/ExampleInstrumentedTest.java
View File

@ -1,4 +1,4 @@
package com.swifttech.remit.android.securitykeypad;
package com.swifttech.remit.jmecustomer.securitykeypad;
import android.content.Context;
import android.support.test.InstrumentationRegistry;

2
securitykeypad/src/main/res/drawable/transkey_round_corner.xml
View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="#ff0b1935" />
<!-- <stroke android:color="#ff0066cc" android:width="4dp" /> -->
<!-- <stroke jmecustomer:color="#ff0066cc" jmecustomer:width="4dp" /> -->
<padding
android:bottom="2dp"
android:left="2dp"

8
securitykeypad/src/main/res/layout/demo_ctrlview.xml
View File

@ -29,10 +29,10 @@
android:orientation="vertical" >
<!--<ImageView-->
<!--android:id="@+id/demoTitle"-->
<!--android:layout_width="fill_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:background="@drawable/demo_app" />-->
<!--jmecustomer:id="@+id/demoTitle"-->
<!--jmecustomer:layout_width="fill_parent"-->
<!--jmecustomer:layout_height="wrap_content"-->
<!--jmecustomer:background="@drawable/demo_app" />-->
<!-- 첫번째 텍스트 필드 -->
<TextView

2
securitykeypad/src/main/res/layout/transkey_main.xml
View File

@ -28,7 +28,7 @@
</FrameLayout>
<!-- android:gravity="center" -->
<!-- jmecustomer:gravity="center" -->
<TextView
android:id="@+id/label"

2
securitykeypad/src/main/res/layout/transkey_main_landscape.xml
View File

@ -26,7 +26,7 @@
/>
</FrameLayout>
<!-- android:gravity="center" -->
<!-- jmecustomer:gravity="center" -->
<TextView
android:id="@+id/label"

6
securitykeypad/src/main/res/values/styles.xml
View File

@ -3,14 +3,14 @@
<style name="SlideInAnimation" >
<item name="android:windowEnterAnimation">@anim/slide_up</item>
<!--<item name="android:windowExitAnimation">@anim/slide_down</item>-->
<!--<item name="jmecustomer:windowExitAnimation">@anim/slide_down</item>-->
</style>
<style name="ActivityDialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowFrame">@null</item>
<item name="android:windowIsFloating">true</item>
<!--<item name="android:windowIsTranslucent">true</item>-->
<!--<item name="jmecustomer:windowIsTranslucent">true</item>-->
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<!--<item name="android:background">@android:color/transparent</item>-->
<!--<item name="jmecustomer:background">@jmecustomer:color/transparent</item>-->
</style>
</resources>

2
securitykeypad/src/test/java/com/gmeremit/online/gmeremittance_native/securitykeypad/ExampleUnitTest.java
View File

@ -1,4 +1,4 @@
package com.swifttech.remit.android.securitykeypad;
package com.swifttech.remit.jmecustomer.securitykeypad;
import org.junit.Test;

Write Preview
Loading…
Cancel
Save