Browse Source

Third part dependencies removed

master
preyearegmi 6 years ago
parent
commit
4b169370b1
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 8
      app/build.gradle
  3. 30
      app/src/main/AndroidManifest.xml
  4. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java
  5. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/GeneralEnquiry.java
  6. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/SuggestionFeedback.java
  7. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/TransactionAmendment.java
  8. 27
      app/src/main/java/com/gmeremit/online/gmeremittance_native/home/view/HomeActivity.java
  9. 117
      app/src/main/java/com/gmeremit/online/gmeremittance_native/home/view/HomeFragment.java
  10. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/int_notification/model/IntNotificationModel.java
  11. 24
      app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteActivity.java
  12. 5
      app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteDetails.java
  13. 5
      app/src/main/java/com/gmeremit/online/gmeremittance_native/invite/view/InviteFormActivity.java
  14. 14
      app/src/main/java/com/gmeremit/online/gmeremittance_native/kycform/presenter/KycDocumentPresenter.java
  15. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/push_notifications/MyFirebaseMessagingService.java
  16. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipient/view/NewRecipientActivity.java
  17. 17
      app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsActivity.java
  18. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/reward_points/view/RewardPointsShippingActivity.java
  19. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ChangePasswordActivity.java
  20. 11
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Utils.java

BIN
.idea/caches/build_file_checksums.ser

8
app/build.gradle

@ -106,19 +106,19 @@ dependencies {
implementation 'com.leavjenn.smoothdaterangepicker:library:0.2.0'
implementation 'com.github.kapilmhr:SizesDP:1.1'
implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'com.facebook.android:facebook-share:[4,5)'
// implementation 'com.facebook.android:facebook-share:[4,5)'
// compile group: 'com.zendesk', name: 'sdk', version: '1.10.0.1'
implementation 'joda-time:joda-time:2.9.9'
// implementation 'joda-time:joda-time:2.9.9'
implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
implementation 'id.zelory:compressor:2.1.0'
// implementation 'id.zelory:compressor:2.1.0'
implementation 'com.zxy.android:tiny:0.1.0'
implementation 'com.android.support:multidex:1.0.3'
implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.1.0'
implementation 'org.greenrobot:eventbus:3.1.1'
// implementation 'org.greenrobot:eventbus:3.1.1'
implementation 'com.android.support:percent:28.0.0'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'

30
app/src/main/AndroidManifest.xml

@ -71,19 +71,19 @@
</intent-filter>
</activity>
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />
<!--<meta-data-->
<!--android:name="com.facebook.sdk.ApplicationId"-->
<!--android:value="@string/facebook_app_id" />-->
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name" />
<!--<activity-->
<!--android:name="com.facebook.FacebookActivity"-->
<!--android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"-->
<!--android:label="@string/app_name" />-->
<provider
android:name="com.facebook.FacebookContentProvider"
android:authorities="com.facebook.app.FacebookContentProvider331163960743784"
android:exported="true" />
<!--<provider-->
<!--android:name="com.facebook.FacebookContentProvider"-->
<!--android:authorities="com.facebook.app.FacebookContentProvider331163960743784"-->
<!--android:exported="true" />-->
<activity
android:name=".sign_in.view.LoginView"
@ -381,10 +381,10 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="stateHidden" />
<activity
android:name="com.yalantis.ucrop.UCropActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<!--<activity-->
<!--android:name="com.yalantis.ucrop.UCropActivity"-->
<!--android:screenOrientation="portrait"-->
<!--android:theme="@style/Theme.AppCompat.Light.NoActionBar" />-->
<activity
android:name=".user_profile.view.ProfileActivity"
android:screenOrientation="portrait"

3
app/src/main/java/com/gmeremit/online/gmeremittance_native/GmeApplication.java

@ -15,7 +15,6 @@ import android.telephony.TelephonyManager;
import android.util.Log;
import com.crashlytics.android.Crashlytics;
import com.facebook.FacebookSdk;
import com.zxy.tiny.Tiny;
import io.fabric.sdk.android.Fabric;
@ -35,7 +34,7 @@ public class GmeApplication extends MultiDexApplication {
public void onCreate() {
super.onCreate();
Fabric.with(this, new Crashlytics());
FacebookSdk.sdkInitialize(getApplicationContext());
// FacebookSdk.sdkInitialize(getApplicationContext());
Tiny.getInstance().init(this);

3
app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/GeneralEnquiry.java

@ -23,7 +23,6 @@ import com.gmeremit.online.gmeremittance_native.static_pages.view.SupportActivit
import com.gmeremit.online.gmeremittance_native.utils.Utils;
import com.gmeremit.online.gmeremittance_native.utils.other.PersistenceStorageManager;
import org.greenrobot.eventbus.EventBus;
import butterknife.BindView;
import butterknife.ButterKnife;
@ -163,7 +162,7 @@ public class GeneralEnquiry extends AppCompatActivity implements CustomerSupport
@Override
public void onClick(View view) {
alertDialog.dismiss();
EventBus.getDefault().post(new DrawerEvent());
// EventBus.getDefault().post(new DrawerEvent());
finish();
}
});

3
app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/SuggestionFeedback.java

@ -22,7 +22,6 @@ import com.gmeremit.online.gmeremittance_native.static_pages.view.SupportActivit
import com.gmeremit.online.gmeremittance_native.utils.Utils;
import com.gmeremit.online.gmeremittance_native.utils.other.PersistenceStorageManager;
import org.greenrobot.eventbus.EventBus;
import butterknife.BindView;
import butterknife.ButterKnife;
@ -143,7 +142,7 @@ public class SuggestionFeedback extends AppCompatActivity implements CustomerSup
@Override
public void onClick(View view) {
alertDialog.dismiss();
EventBus.getDefault().post(new DrawerEvent());
// EventBus.getDefault().post(new DrawerEvent());
finish();
}
});

3
app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/TransactionAmendment.java

@ -23,7 +23,6 @@ import com.gmeremit.online.gmeremittance_native.static_pages.view.SupportActivit
import com.gmeremit.online.gmeremittance_native.utils.Utils;
import com.gmeremit.online.gmeremittance_native.utils.other.PersistenceStorageManager;
import org.greenrobot.eventbus.EventBus;
import butterknife.BindView;
import butterknife.ButterKnife;
@ -153,7 +152,7 @@ public class TransactionAmendment extends AppCompatActivity implements CustomerS
@Override
public void onClick(View view) {
alertDialog.dismiss();
EventBus.getDefault().post(new DrawerEvent());
// EventBus.getDefault().post(new DrawerEvent());
finish();
}
});

27
app/src/main/java/com/gmeremit/online/gmeremittance_native/home/view/HomeActivity.java

@ -67,9 +67,6 @@ import com.squareup.picasso.MemoryPolicy;
import com.squareup.picasso.Picasso;
import com.text.drawable.TextDrawable;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.io.File;
import java.util.List;
@ -165,7 +162,7 @@ public class HomeActivity extends AppCompatActivity implements HomeContract.Home
presenter = new HomePresenter(this, new HomeModel(this));
EventBus.getDefault().register(this);
// EventBus.getDefault().register(this);
persistenceStorageManager = new PersistenceStorageManager(this);
// persistenceStorageManager.setLoggedin("HOME");
@ -402,17 +399,17 @@ public class HomeActivity extends AppCompatActivity implements HomeContract.Home
private void showToast(String message) {
Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onDrawerEvent(DrawerEvent event) {
showDrawer(false);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onNotificationEvent(NotificationEvent event) {
Log.e("TAG", "onNotificationEvent");
presenter.getNotificationStatus();
}
//
// @Subscribe(threadMode = ThreadMode.MAIN)
// public void onDrawerEvent(DrawerEvent event) {
// showDrawer(false);
// }
//
// @Subscribe(threadMode = ThreadMode.MAIN)
// public void onNotificationEvent(NotificationEvent event) {
// Log.e("TAG", "onNotificationEvent");
// presenter.getNotificationStatus();
// }
@OnClick({R.id.bottom_home_layout, R.id.bottom_invite_layout, R.id.bottom_sendmoney_layout, R.id.bottom_agent_layout, R.id.bottom_profile_layout})
public void onViewClicked(View view) {

117
app/src/main/java/com/gmeremit/online/gmeremittance_native/home/view/HomeFragment.java

@ -33,12 +33,7 @@ import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
import com.facebook.CallbackManager;
import com.facebook.FacebookCallback;
import com.facebook.FacebookException;
import com.facebook.share.Sharer;
import com.facebook.share.model.ShareLinkContent;
import com.facebook.share.widget.ShareDialog;
import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView;
@ -173,8 +168,8 @@ public class HomeFragment extends Fragment implements HomeContract.MenuItemClick
SocialPresenter presenter;
volatile boolean running;
CallbackManager callbackManager;
ShareDialog shareDialog;
// CallbackManager callbackManager;
// ShareDialog shareDialog;
private ItemTouchHelper mItemTouchHelper;
private ViewTreeObserver.OnScrollChangedListener mOnScrollChangedListener;
@ -213,26 +208,26 @@ public class HomeFragment extends Fragment implements HomeContract.MenuItemClick
presenter = new SocialPresenter(this, new SocialModel(getActivity()));
presenter.getPublicFeeds(persistenceStorageManager.getUserId(), "");
callbackManager = CallbackManager.Factory.create();
shareDialog = new ShareDialog(this);
shareDialog.registerCallback(callbackManager, new FacebookCallback<Sharer.Result>() {
@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<Sharer.Result>() {
// @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);
}
/**

4
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<ResponseBody> call, Response<ResponseBody> 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);

24
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() {

5
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:

5
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:

14
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;
}
}

3
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"));
}

4
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();
}

17
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();
// }
}

3
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:

3
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();
}

11
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;
}
/**

Loading…
Cancel
Save