From 4b169370b1f440853d822c979f40ff07c621c246 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Thu, 1 Nov 2018 09:48:12 +0900 Subject: [PATCH] Third part dependencies removed --- .idea/caches/build_file_checksums.ser | Bin 536 -> 535 bytes app/build.gradle | 8 +- app/src/main/AndroidManifest.xml | 30 ++--- .../gmeremittance_native/GmeApplication.java | 3 +- .../customer_support/view/GeneralEnquiry.java | 3 +- .../view/SuggestionFeedback.java | 3 +- .../view/TransactionAmendment.java | 3 +- .../home/view/HomeActivity.java | 27 ++-- .../home/view/HomeFragment.java | 117 +++++++++--------- .../model/IntNotificationModel.java | 4 +- .../invite/view/InviteActivity.java | 24 ++-- .../invite/view/InviteDetails.java | 5 +- .../invite/view/InviteFormActivity.java | 5 +- .../presenter/KycDocumentPresenter.java | 14 +-- .../MyFirebaseMessagingService.java | 3 +- .../recipient/view/NewRecipientActivity.java | 4 +- .../view/RewardPointsActivity.java | 17 +-- .../view/RewardPointsShippingActivity.java | 3 +- .../view/ChangePasswordActivity.java | 3 +- .../gmeremittance_native/utils/Utils.java | 11 +- 20 files changed, 130 insertions(+), 157 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 26a5529fa24d3e235798e5cc57dd1ed5454a43b3..1161dd8a5acab8d90ddb51e71c49aeb274daa1bb 100644 GIT binary patch delta 203 zcmbQiGM#0@43;yyY?e)&<8RJioLW+nnU`LymtK^Zl9O6m#K08owC1z;4>pdF2TTkM z6$K0o3ZGr+>eL7;t3fav!XlPXc06OMQ^#A|> delta 207 zcmbQvGJ|Ep43<+x0g)5u_@@gb78JxJm1gFo=%p7WrsSlS7BMhIJFWRF{)3Gp - + + + - + + + + - + + + + - + + + + () { - @Override - public void onSuccess(Sharer.Result result) { - if (result.getPostId() != null) { - Toast.makeText(getContext(), "The post has been shared", Toast.LENGTH_SHORT).show(); - } - } - - @Override - public void onCancel() { - - } - - @Override - public void onError(FacebookException error) { - Toast.makeText(getContext(), error.toString(), Toast.LENGTH_SHORT).show(); - } - }); +// callbackManager = CallbackManager.Factory.create(); +// shareDialog = new ShareDialog(this); +// shareDialog.registerCallback(callbackManager, new FacebookCallback() { +// @Override +// public void onSuccess(Sharer.Result result) { +// if (result.getPostId() != null) { +// Toast.makeText(getContext(), "The post has been shared", Toast.LENGTH_SHORT).show(); +// } +// } +// +// @Override +// public void onCancel() { +// +// } +// +// @Override +// public void onError(FacebookException error) { +// Toast.makeText(getContext(), error.toString(), Toast.LENGTH_SHORT).show(); +// } +// }); } @@ -572,7 +567,7 @@ public class HomeFragment extends Fragment implements HomeContract.MenuItemClick @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { // super.onActivityResult(requestCode, resultCode, data); - callbackManager.onActivityResult(requestCode, resultCode, data); +// callbackManager.onActivityResult(requestCode, resultCode, data); switch (requestCode) { case PROFILEIMAGE: if (resultCode == RESULT_OK) { @@ -904,38 +899,38 @@ public class HomeFragment extends Fragment implements HomeContract.MenuItemClick } - tvsharePost.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { -// Toast.makeText(getContext(), "The post has been shared", Toast.LENGTH_SHORT).show(); - if (ShareDialog.canShow(ShareLinkContent.class)) { - ShareLinkContent linkContent = new ShareLinkContent.Builder() -// .setContentUrl(Uri.parse("https://play.google.com/store/apps/details?id=com.gmeremit.online.gmeremittance")) - .setContentUrl(Uri.parse("https://play.google.com/store/apps/details?id=com.gmeremit.online.gmeremittance_native")) - .setQuote(feedsList.get(position).getFeedText() + "\n") - - .build(); - - shareDialog.show(linkContent); - - } - - dialog.dismiss(); - } - }); - - tv_cancel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - dialog.dismiss(); - } - }); - - dialog.show(); - WindowManager.LayoutParams lp = dialog.getWindow().getAttributes(); - lp.dimAmount = 0.8f; - dialog.getWindow().setAttributes(lp); - dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); +// tvsharePost.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View view) { +//// Toast.makeText(getContext(), "The post has been shared", Toast.LENGTH_SHORT).show(); +// if (ShareDialog.canShow(ShareLinkContent.class)) { +//// ShareLinkContent linkContent = new ShareLinkContent.Builder() +//// .setContentUrl(Uri.parse("https://play.google.com/store/apps/details?id=com.gmeremit.online.gmeremittance")) +// .setContentUrl(Uri.parse("https://play.google.com/store/apps/details?id=com.gmeremit.online.gmeremittance_native")) +// .setQuote(feedsList.get(position).getFeedText() + "\n") +// +// .build(); +// +//// shareDialog.show(linkContent); +// +// } +// +// dialog.dismiss(); +// } +// }); +// +// tv_cancel.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View view) { +// dialog.dismiss(); +// } +// }); +// +// dialog.show(); +// WindowManager.LayoutParams lp = dialog.getWindow().getAttributes(); +// lp.dimAmount = 0.8f; +// dialog.getWindow().setAttributes(lp); +// dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); } /** diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/int_notification/model/IntNotificationModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/int_notification/model/IntNotificationModel.java index 1f2d0be7..25fb67f4 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/int_notification/model/IntNotificationModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/int_notification/model/IntNotificationModel.java @@ -14,7 +14,7 @@ import com.gmeremit.online.gmeremittance_native.utils.other.PersistenceStorageMa import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.greenrobot.eventbus.EventBus; + import java.io.IOException; import java.util.HashMap; @@ -115,7 +115,7 @@ public class IntNotificationModel implements IntNotificationContract.IModel { public void onResponse(Call call, Response response) { if (response.isSuccessful()) { Log.e("Notification Read", "TRUE"); - EventBus.getDefault().post(new NotificationEvent()); +// EventBus.getDefault().post(new NotificationEvent()); } else if (response.code() == 401) { RefreshModal modal = new RefreshModal(context); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteActivity.java index e2d14d72..6cd74565 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteActivity.java @@ -18,9 +18,7 @@ import com.gmeremit.online.gmeremittance_native.invite.model.InviteModel; import com.gmeremit.online.gmeremittance_native.invite.presenter.InvitePresenter; import com.gmeremit.online.gmeremittance_native.utils.Utils; -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; + import butterknife.BindView; import butterknife.ButterKnife; @@ -60,7 +58,7 @@ public class InviteActivity extends AppCompatActivity implements InviteContract. pDialog.setIndeterminate(false); pDialog.setMessage("Getting My Invites ..."); - EventBus.getDefault().register(this); +// EventBus.getDefault().register(this); presenter = new InvitePresenter(this, new InviteModel(this)); /* if (Utils.isNetworkConnected(this)){ @@ -111,15 +109,15 @@ public class InviteActivity extends AppCompatActivity implements InviteContract. txt_total_earned.setText(String.format("+%s", Utils.getFrontValue(inviteInfo.totalEarned))); } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onInviteEvent(InviteEvent event) { - finish(); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onBackEvent(BackEvent event) { - InviteModel.back = true; - } +// @Subscribe(threadMode = ThreadMode.MAIN) +// public void onInviteEvent(InviteEvent event) { +// finish(); +// } +// +// @Subscribe(threadMode = ThreadMode.MAIN) +// public void onBackEvent(BackEvent event) { +// InviteModel.back = true; +// } @Override protected void onResume() { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteDetails.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteDetails.java index 03489109..a0b03151 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteDetails.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteDetails.java @@ -17,7 +17,6 @@ import com.gmeremit.online.gmeremittance_native.invite.model.InviteModel; import com.gmeremit.online.gmeremittance_native.invite.presenter.InvitePresenter; import com.gmeremit.online.gmeremittance_native.utils.Utils; -import org.greenrobot.eventbus.EventBus; import butterknife.BindView; import butterknife.ButterKnife; @@ -94,11 +93,11 @@ public class InviteDetails extends AppCompatActivity implements InviteContract.I public void onClick(View view) { switch (view.getId()) { case R.id.iv_back: - EventBus.getDefault().post(new BackEvent()); +// EventBus.getDefault().post(new BackEvent()); finish(); break; case R.id.iv_cancel: - EventBus.getDefault().post(new InviteEvent()); +// EventBus.getDefault().post(new InviteEvent()); finish(); break; case R.id.pendingLayout: diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteFormActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteFormActivity.java index b1d0d6db..e0c25730 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteFormActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteFormActivity.java @@ -21,7 +21,6 @@ import com.gmeremit.online.gmeremittance_native.invite.model.InviteModel; import com.gmeremit.online.gmeremittance_native.invite.presenter.InvitePresenter; import com.gmeremit.online.gmeremittance_native.utils.Utils; -import org.greenrobot.eventbus.EventBus; import butterknife.BindView; import butterknife.ButterKnife; @@ -74,12 +73,12 @@ public class InviteFormActivity extends AppCompatActivity implements InviteContr public void onClick(View view) { switch (view.getId()) { case R.id.iv_back: - EventBus.getDefault().post(new BackEvent()); +// EventBus.getDefault().post(new BackEvent()); finish(); break; case R.id.iv_cancel: InviteEvent event = new InviteEvent(); - EventBus.getDefault().post(event); +// EventBus.getDefault().post(event); finish(); break; case R.id.btn_invite: diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycform/presenter/KycDocumentPresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycform/presenter/KycDocumentPresenter.java index 43e8259b..1a152585 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycform/presenter/KycDocumentPresenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycform/presenter/KycDocumentPresenter.java @@ -18,14 +18,12 @@ import com.gmeremit.online.gmeremittance_native.utils.https.APIRequestErrorRetur import com.zxy.tiny.Tiny; import com.zxy.tiny.callback.BitmapCallback; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import id.zelory.compressor.Compressor; import static android.app.Activity.RESULT_OK; import static com.gmeremit.online.gmeremittance_native.utils.Constants.ERROR; @@ -468,12 +466,12 @@ public class KycDocumentPresenter implements KycFormContract.KycDocPresenter, Ky e.printStackTrace(); } Bitmap compressedImageBitmap = null; - try { - compressedImageBitmap = new Compressor(context).compressToBitmap(f); - } catch (IOException e) { - e.printStackTrace(); - } +// try { +// +// } catch (IOException e) { +// e.printStackTrace(); +// } - return compressedImageBitmap; + return null; } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java index 4dadf731..b0c8fbeb 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java @@ -21,7 +21,6 @@ import com.gmeremit.online.gmeremittance_native.wallet_to_wallet.view.UserReques import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; -import org.greenrobot.eventbus.EventBus; /** * Created by frantic on 2/12/18. @@ -48,7 +47,7 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService { Log.d("message",remoteMessage.getKycRelatedDataModel().get("message")); database.addMessage(message);*/ new PersistenceStorageManager(this).setNotificationStatus(true); - EventBus.getDefault().post(new NotificationEvent()); +// EventBus.getDefault().post(new NotificationEvent()); showNotification(remoteMessage.getNotification().getBody(), "Subject : ", remoteMessage.getData().get("code")); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/view/NewRecipientActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/view/NewRecipientActivity.java index ac58f885..f0e80644 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/view/NewRecipientActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/view/NewRecipientActivity.java @@ -27,7 +27,7 @@ import com.gmeremit.online.gmeremittance_native.utils.Utils; import com.gmeremit.online.gmeremittance_native.utils.other.PersistenceStorageManager; import com.gmeremit.online.gmeremittance_native.utils.other.Utility; -import org.greenrobot.eventbus.EventBus; + import java.util.ArrayList; import java.util.List; @@ -119,7 +119,7 @@ public class NewRecipientActivity extends AppCompatActivity implements Recipient @Override public void onSuccessMessage(AllReceipientResponseData body) { setResult(RESULT_OK); - EventBus.getDefault().post(new NewRecipientEvent()); +// EventBus.getDefault().post(new NewRecipientEvent()); finish(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsActivity.java index 06c5e6f8..d5eb6bf3 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsActivity.java @@ -14,17 +14,12 @@ import android.widget.TextView; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.reward_points.RewardPointsContract; import com.gmeremit.online.gmeremittance_native.reward_points.adapter.RewardsAdapter; -import com.gmeremit.online.gmeremittance_native.reward_points.events.CancelEvent; import com.gmeremit.online.gmeremittance_native.reward_points.model.Reward; import com.gmeremit.online.gmeremittance_native.reward_points.model.RewardsModel; import com.gmeremit.online.gmeremittance_native.reward_points.presenter.RewardsPointPresenter; import com.gmeremit.online.gmeremittance_native.utils.Utils; import com.google.gson.Gson; -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - import java.util.List; import butterknife.BindView; @@ -63,7 +58,7 @@ public class RewardPointsActivity extends AppCompatActivity implements RewardPoi pDialog.setCancelable(false); pDialog.setIndeterminate(false); - EventBus.getDefault().register(this); +// EventBus.getDefault().register(this); rewardsRV.setLayoutManager(new GridLayoutManager(this, 2)); @@ -120,9 +115,9 @@ public class RewardPointsActivity extends AppCompatActivity implements RewardPoi break; } } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onCancelEvent(CancelEvent event) { - finish(); - } +// +// @Subscribe(threadMode = ThreadMode.MAIN) +// public void onCancelEvent(CancelEvent event) { +// finish(); +// } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java index e7400e50..bb7e1fa6 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java @@ -23,7 +23,6 @@ import com.gmeremit.online.gmeremittance_native.reward_points.model.RewardsModel import com.gmeremit.online.gmeremittance_native.reward_points.presenter.RewardsPointPresenter; import com.gmeremit.online.gmeremittance_native.utils.Utils; -import org.greenrobot.eventbus.EventBus; import butterknife.BindView; import butterknife.ButterKnife; @@ -95,7 +94,7 @@ public class RewardPointsShippingActivity extends AppCompatActivity implements R finish(); break; case R.id.iv_cancel: - EventBus.getDefault().post(new CancelEvent()); +// EventBus.getDefault().post(new CancelEvent()); finish(); break; case R.id.btn_submit: diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ChangePasswordActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ChangePasswordActivity.java index 326a848c..0f72833d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ChangePasswordActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ChangePasswordActivity.java @@ -17,7 +17,6 @@ import com.gmeremit.online.gmeremittance_native.utils.other.DisplayUtils; import com.gmeremit.online.gmeremittance_native.utils.other.PersistenceStorageManager; import com.gmeremit.online.gmeremittance_native.utils.other.Utility; -import org.greenrobot.eventbus.EventBus; import butterknife.BindView; import butterknife.ButterKnife; @@ -58,7 +57,7 @@ public class ChangePasswordActivity extends AppCompatActivity implements UserPro @OnClick(R.id.iv_cancel) public void setCancel() { - EventBus.getDefault().post(new PasswordEvent()); +// EventBus.getDefault().post(new PasswordEvent()); finish(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java index aa07229e..2ae73164 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java @@ -39,8 +39,6 @@ import com.gmeremit.online.gmeremittance_native.sign_in.model.data.SignInRespons import com.gmeremit.online.gmeremittance_native.utils.https.RestApi; import com.gmeremit.online.gmeremittance_native.utils.other.PersistenceStorageManager; -import org.joda.time.LocalDate; -import org.joda.time.Years; import java.io.ByteArrayOutputStream; import java.io.File; @@ -390,10 +388,11 @@ public class Utils { } public static int calculateAge(int year, int month, int day) { - LocalDate birthdate = new LocalDate(year, month, day); - LocalDate now = new LocalDate(); - Years age = Years.yearsBetween(birthdate, now); - return age.getYears(); +// LocalDate birthdate = new LocalDate(year, month, day); +// LocalDate now = new LocalDate(); +// Years age = Years.yearsBetween(birthdate, now); +// return age.getYears(); + return 0; } /**