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

latest issue fixes

new_design
Mohan Shiwakoti 1 year ago
parent
0801072823 87d69e6fb3
commit
01d87cf4ab
5 changed files with 91 additions and 6 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. 12
      app/build.gradle
  2. 5
      app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileFragment.kt
  3. 34
      app/src/main/res/drawable/ic_transaction_history.xml
  4. 10
      app/src/main/res/layout/fragment_ekyc_customer_detail.xml
  5. 36
      app/src/main/res/layout/fragment_profile.xml

12
app/build.gradle
View File

@ -11,8 +11,8 @@ android {
applicationId "com.remit.jmecustomer"
minSdkVersion 24
targetSdkVersion 31
versionCode 14
versionName "1.1"
versionCode 15
versionName "1.2"
multiDexEnabled true
vectorDrawables.useSupportLibrary = true
manifestPlaceholders = [fileProvider: "com.remit.jmecustomer.fileprovider"]
@ -244,8 +244,8 @@ dependencies {
implementation 'androidx.biometric:biometric:1.1.0'
implementation 'io.trustdock.sdk:verification-sandbox-full:2.7.2'
// implementation 'io.trustdock.sdk:verification-full:2.7.4'
implementation 'io.trustdock.sdk:verification-sandbox-full:2.7.4'
//implementation 'io.trustdock.sdk:verification-full:2.7.4'
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation 'me.relex:circleindicator:2.1.4'
@ -258,13 +258,13 @@ dependencies {
allprojects {
repositories {
maven {
//PROD
// //PROD
// url "https://native-app-sdk-repository.trustdock.io/android/release/content/repositories"
// credentials {
// username = "japanremit-1039"
// password = "9sAWcB6ce3GSumTT"
// }
// UAT
// UAT
url "https://native-app-sdk-repository.test.trustdock.io/android/release/content/repositories"
credentials {
username = "japanremit-1039"

5
app/src/main/java/com/remit/jmecustomer/features/userprofile/view/ProfileFragment.kt
View File

@ -145,6 +145,7 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
binding.tvPrivacyPolicy.setOnClickListener(this)
binding.tvTermAndCondition.setOnClickListener(this)
binding.tvFraudGuarantee.setOnClickListener(this)
binding.llAccountStatement.setOnClickListener(this)
viewModel!!.subscribeToUserProfileInfoFetchEvent().observe(
this
) { body: UserProfile? ->
@ -288,6 +289,10 @@ class ProfileFragment : BaseFragment(), View.OnClickListener,
R.id.tv_fraud_guarantee -> {
aboutUsViewModel?.getFraudGuaranteePolicy()
}
R.id.ll_account_statement -> {
startActivity(Intent(requireActivity(), WalletStatementV2Activity::class.java))
}
}
}

34
app/src/main/res/drawable/ic_transaction_history.xml
View File

@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M0,0h24v24h-24z"
android:strokeAlpha="0"
android:fillColor="#fff"
android:fillAlpha="0"/>
<path
android:fillColor="#FF000000"
android:pathData="M20,18v2L4,20L4,18a2,2 0,0 0,0 4L20,22a2,2 0,0 0,0 -4Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M17,3.414h0a1.415,1.415 0,0 1,-2 0h0a1.415,1.415 0,0 0,-2 0h0a1.415,1.415 0,0 1,-2 0h0a1.415,1.415 0,0 0,-2 0L9,3.414a1.415,1.415 0,0 1,-2 0L7,3.414a1.415,1.415 0,0 0,-2 0L4.414,4A1.415,1.415 0,0 0,4 5L4,20L20,20L20,5a1.415,1.415 0,0 0,-0.414 -1L19,3.414A1.415,1.415 0,0 0,17 3.414Z"
android:strokeAlpha="0.35"
android:fillAlpha="0.35"/>
<path
android:fillColor="#FF000000"
android:pathData="M16,10L8,10A1,1 0,0 1,8 8h8a1,1 0,0 1,0 2Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M12,14L8,14a1,1 0,0 1,0 -2h4a1,1 0,0 1,0 2Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M16,13m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"/>
<path
android:fillColor="#FF000000"
android:pathData="M12,18L8,18a1,1 0,0 1,0 -2h4a1,1 0,0 1,0 2Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M16,17m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"/>
</vector>

10
app/src/main/res/layout/fragment_ekyc_customer_detail.xml
View File

@ -234,6 +234,16 @@
app:txtfontName="@string/regular" />
</LinearLayout>
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/text_normal"
android:gravity="bottom"
android:text="@string/saveButtonInfo_text"
android:textSize="@dimen/_12ssp"
app:txtfontName="@string/regular" />
<com.remit.jmecustomer.common.customwidgets.GmeButton
android:id="@+id/btn_submit1"
style="@style/MButton"

36
app/src/main/res/layout/fragment_profile.xml
View File

@ -286,6 +286,42 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/ll_account_statement"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal"
android:padding="@dimen/_13sdp"
android:visibility="visible">
<ImageView
android:id="@+id/ic_account_statement"
android:layout_width="@dimen/_20sdp"
android:layout_height="@dimen/_20sdp"
app:srcCompat="@drawable/account"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_26sdp"
android:layout_marginLeft="@dimen/_26sdp"
android:layout_toEndOf="@+id/ic_account_statement"
android:layout_toRightOf="@+id/ic_account_statement"
android:orientation="vertical">
<TextView
style="@style/TextStyle.SemiBold16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/jme_account_statement_text"
android:textColor="@color/black_opacity_87" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/ll_loyalty_points"
android:layout_width="match_parent"

Write Preview
Loading…
Cancel
Save