From 5bce9576516c3ecb1562758b3fa11cce3b1b27c7 Mon Sep 17 00:00:00 2001 From: Santosh Bhandary Date: Fri, 11 Sep 2020 16:49:21 +0545 Subject: [PATCH] additional fixes on Terms and condition and Privacy policy --- .../aboutscreen/view/AboutFastRemit.java | 18 +++++++++++++--- .../viewModel/AboutUsViewModelFactory.java | 21 +++++++++++++++++++ .../main/res/layout/activity_about_gme.xml | 4 ++-- 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/swifttech/remit/android/features/aboutscreen/viewModel/AboutUsViewModelFactory.java diff --git a/app/src/main/java/com/swifttech/remit/android/features/aboutscreen/view/AboutFastRemit.java b/app/src/main/java/com/swifttech/remit/android/features/aboutscreen/view/AboutFastRemit.java index 2e53bc73..705abfb6 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/aboutscreen/view/AboutFastRemit.java +++ b/app/src/main/java/com/swifttech/remit/android/features/aboutscreen/view/AboutFastRemit.java @@ -7,6 +7,7 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.Nullable; +import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProviders; import com.swifttech.remit.android.BuildConfig; @@ -14,8 +15,15 @@ import com.swifttech.remit.android.R; import com.swifttech.remit.android.base.BaseActivity; import com.swifttech.remit.android.features.aboutscreen.viewModel.AboutUsPresenterInterface; import com.swifttech.remit.android.features.aboutscreen.viewModel.AboutUsViewModel; +import com.swifttech.remit.android.features.aboutscreen.viewModel.AboutUsViewModelFactory; +import com.swifttech.remit.android.features.home.HomeViewModel; +import com.swifttech.remit.android.features.home.HomeViewModelFactory; +import com.swifttech.remit.android.features.home.gateway.HomeV2Gateway; import com.swifttech.remit.android.features.sendmoney.presenter.SendMoneyV2Presenter; import com.swifttech.remit.android.features.sendmoney.view.verification.TermsAndConditionV2BrowserActivity; +import com.swifttech.remit.android.features.settings.gateway.LanguageSelectionGateway; +import com.swifttech.remit.android.features.splashscreen.gateway.SplashScreenGateway; +import com.swifttech.remit.android.features.splashscreen.presenter.SplashScreenPresenter; import com.swifttech.remit.android.features.webbrowser.model.WebRequestModel; import butterknife.BindView; @@ -39,6 +47,8 @@ public class AboutFastRemit extends BaseActivity implements AboutUsPresenterInte @BindView(R.id.txt_app_version) TextView txt_app_version; + private AboutUsViewModel viewModel; + private AboutUsViewModelFactory aboutUsViewModelFactory; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -50,7 +60,7 @@ public class AboutFastRemit extends BaseActivity implements AboutUsPresenterInte private void init() { ButterKnife.bind(this); - + aboutUsViewModelFactory = new AboutUsViewModelFactory(this); String version = BuildConfig.VERSION_NAME; String versionCode = " (" + BuildConfig.VERSION_CODE + ")"; String server = ""; @@ -70,11 +80,13 @@ public class AboutFastRemit extends BaseActivity implements AboutUsPresenterInte finish(); break; case R.id.txvTermsAndCondition: - (ViewModelProviders.of(this).get(AboutUsViewModel.class)).getWebRequestDataForTermsAndCondition(); + viewModel= new ViewModelProvider(this, aboutUsViewModelFactory).get(AboutUsViewModel.class); + viewModel.getWebRequestDataForTermsAndCondition(); break; case R.id.txvPrivacyPolicy: - (ViewModelProviders.of(this).get(AboutUsViewModel.class)).getWebRequestDataForPrivacyPolicy(); + viewModel= new ViewModelProvider(this, aboutUsViewModelFactory).get(AboutUsViewModel.class); + viewModel.getWebRequestDataForPrivacyPolicy(); break; } diff --git a/app/src/main/java/com/swifttech/remit/android/features/aboutscreen/viewModel/AboutUsViewModelFactory.java b/app/src/main/java/com/swifttech/remit/android/features/aboutscreen/viewModel/AboutUsViewModelFactory.java new file mode 100644 index 00000000..71e351b2 --- /dev/null +++ b/app/src/main/java/com/swifttech/remit/android/features/aboutscreen/viewModel/AboutUsViewModelFactory.java @@ -0,0 +1,21 @@ +package com.swifttech.remit.android.features.aboutscreen.viewModel; + +import androidx.annotation.NonNull; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; + +import com.swifttech.remit.android.features.home.HomeViewModel; + +public class AboutUsViewModelFactory implements ViewModelProvider.Factory { + private final AboutUsPresenterInterface.AboutUsContractInterface view; + + public AboutUsViewModelFactory(AboutUsPresenterInterface.AboutUsContractInterface view) { + this.view = view; + } + + @NonNull + @Override + public T create(@NonNull Class modelClass) { + return (T) new AboutUsViewModel(view); + } +} diff --git a/app/src/main/res/layout/activity_about_gme.xml b/app/src/main/res/layout/activity_about_gme.xml index 7ecb5bdf..168a8308 100644 --- a/app/src/main/res/layout/activity_about_gme.xml +++ b/app/src/main/res/layout/activity_about_gme.xml @@ -59,7 +59,7 @@ style="@style/MFormLink" android:id="@+id/txvTermsAndCondition" android:layout_width="wrap_content" - android:text="@string/terms_and_condition_title_text" + android:text="@string/terms_and_condition_title_text1" android:textColor="@color/bluebg" android:layout_marginBottom="@dimen/_5sdp" /> @@ -68,7 +68,7 @@ style="@style/MFormLink" android:id="@+id/txvPrivacyPolicy" android:layout_width="wrap_content" - android:text="@string/privacyAndPolicy" + android:text="@string/privacyAndPolicy1" android:layout_marginBottom="@dimen/_5sdp" android:textColor="@color/bluebg" />