Browse Source

Yalatis removed and abi filter removed

master
preyearegmi 6 years ago
parent
commit
4794b71924
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 8
      app/build.gradle
  3. 33
      app/src/main/java/com/gmeremit/online/gmeremittance_native/home/view/HomeActivity.java
  4. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view3/KYCView3Fragment.java
  5. 57
      app/src/main/java/com/gmeremit/online/gmeremittance_native/socials/view/NewSocialPostActivity.java
  6. 35
      app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ProfileActivity.java
  7. 39
      app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ProfileFragment.java
  8. 123
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/other/DisplayUtils.java

BIN
.idea/caches/build_file_checksums.ser

8
app/build.gradle

@ -25,9 +25,9 @@ android {
versionName "1.0.0" versionName "1.0.0"
multiDexEnabled true multiDexEnabled true
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
ndk {
abiFilters 'armeabi', 'x86'
}
// ndk {
// abiFilters 'armeabi', 'x86'
// }
def dateTime = new Date().format("MMM_dd") def dateTime = new Date().format("MMM_dd")
setProperty("archivesBaseName", "GME_" + dateTime + "_v" + versionCode + "(" + versionName + ")") setProperty("archivesBaseName", "GME_" + dateTime + "_v" + versionCode + "(" + versionName + ")")
} }
@ -93,7 +93,7 @@ dependencies {
implementation 'com.android.support:support-v4:28.0.0' implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.squareup.retrofit2:retrofit:2.4.0' implementation 'com.squareup.retrofit2:retrofit:2.4.0'
implementation 'com.squareup.retrofit2:converter-gson:2.4.0' implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
implementation 'com.github.yalantis:ucrop:2.2.2'
// implementation 'com.github.yalantis:ucrop:2.2.2'
implementation 'com.google.firebase:firebase-core:16.0.4' implementation 'com.google.firebase:firebase-core:16.0.4'
implementation 'com.google.firebase:firebase-messaging:17.3.3' implementation 'com.google.firebase:firebase-messaging:17.3.3'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5' implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'

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

@ -66,7 +66,6 @@ import com.gmeremit.online.gmeremittance_native.withdraw.view.WithDrawActivity;
import com.squareup.picasso.MemoryPolicy; import com.squareup.picasso.MemoryPolicy;
import com.squareup.picasso.Picasso; import com.squareup.picasso.Picasso;
import com.text.drawable.TextDrawable; import com.text.drawable.TextDrawable;
import com.yalantis.ucrop.UCrop;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
@ -643,18 +642,18 @@ public class HomeActivity extends AppCompatActivity implements HomeContract.Home
startCropActivity(data.getData()); startCropActivity(data.getData());
} }
break; break;
case UCrop.REQUEST_CROP:
if (resultCode == RESULT_OK) {
final Uri resultUri = UCrop.getOutput(data);
Bitmap bitmap = DisplayUtils.uriToBitmap(this, resultUri);
presenter.getUserProfilePic(Utils.getEncoded64ImageStringFromBitmap(bitmap), persistenceStorageManager.getUserId());
profilePic.setImageURI(resultUri);
btnCancel.setText("Done");
} else if (resultCode == RESULT_CANCELED) {
Toast.makeText(getApplicationContext(), "Canceled", Toast.LENGTH_LONG).show();
} else {
Toast.makeText(getApplicationContext(), "Please Try Again", Toast.LENGTH_LONG).show();
}
// case UCrop.REQUEST_CROP:
// if (resultCode == RESULT_OK) {
// final Uri resultUri = UCrop.getOutput(data);
// Bitmap bitmap = DisplayUtils.uriToBitmap(this, resultUri);
// presenter.getUserProfilePic(Utils.getEncoded64ImageStringFromBitmap(bitmap), persistenceStorageManager.getUserId());
// profilePic.setImageURI(resultUri);
// btnCancel.setText("Done");
// } else if (resultCode == RESULT_CANCELED) {
// Toast.makeText(getApplicationContext(), "Canceled", Toast.LENGTH_LONG).show();
// } else {
// Toast.makeText(getApplicationContext(), "Please Try Again", Toast.LENGTH_LONG).show();
// }
} }
} }
@ -666,10 +665,10 @@ public class HomeActivity extends AppCompatActivity implements HomeContract.Home
; ;
destinationFileName += ".png"; destinationFileName += ".png";
UCrop uCrop = UCrop.of(uri, Uri.fromFile(new File(getCacheDir(), destinationFileName)));
uCrop = uCrop.withAspectRatio(1, 1);
uCrop = DisplayUtils.advancedConfig(HomeActivity.this, uCrop);
uCrop.start(HomeActivity.this);
// UCrop uCrop = UCrop.of(uri, Uri.fromFile(new File(getCacheDir(), destinationFileName)));
// uCrop = uCrop.withAspectRatio(1, 1);
// uCrop = DisplayUtils.advancedConfig(HomeActivity.this, uCrop);
// uCrop.start(HomeActivity.this);
} }
@Override @Override

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view3/KYCView3Fragment.java

@ -17,7 +17,6 @@ import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.content.FileProvider; import android.support.v4.content.FileProvider;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -30,17 +29,12 @@ import com.gmeremit.online.gmeremittance_native.R;
import com.gmeremit.online.gmeremittance_native.base.BaseFragment; import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
import com.gmeremit.online.gmeremittance_native.kycV2.KYCV2ActionListener; import com.gmeremit.online.gmeremittance_native.kycV2.KYCV2ActionListener;
import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface; import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface;
import com.gmeremit.online.gmeremittance_native.utils.other.DisplayUtils;
import com.gmeremit.online.gmeremittance_native.utils.other.Utility; import com.gmeremit.online.gmeremittance_native.utils.other.Utility;
import com.theartofdev.edmodo.cropper.CropImage; import com.theartofdev.edmodo.cropper.CropImage;
import com.yalantis.ucrop.UCrop;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;

57
app/src/main/java/com/gmeremit/online/gmeremittance_native/socials/view/NewSocialPostActivity.java

@ -53,7 +53,6 @@ import com.shehabic.droppy.DroppyClickCallbackInterface;
import com.shehabic.droppy.DroppyMenuItem; import com.shehabic.droppy.DroppyMenuItem;
import com.shehabic.droppy.DroppyMenuPopup; import com.shehabic.droppy.DroppyMenuPopup;
import com.text.drawable.TextDrawable; import com.text.drawable.TextDrawable;
import com.yalantis.ucrop.UCrop;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
@ -321,39 +320,39 @@ public class NewSocialPostActivity extends AppCompatActivity implements SocialCo
break; break;
case UCrop.REQUEST_CROP:
if (resultCode == RESULT_OK){
ivPostImage.setVisibility(View.VISIBLE);
userPostCheck(userPost);
final Uri resultUri = UCrop.getOutput(data);
ivPostImage.setMinimumWidth(DisplayUtils.getScreenWidth());
ivPostImage.setMaxWidth(DisplayUtils.getScreenWidth());
ivPostImage.setMaxHeight(DisplayUtils.getScreenWidth());
ivPostImage.setMinimumHeight(DisplayUtils.getScreenWidth());
ivPostImage.setImageURI(resultUri);
imageResultUri = resultUri;
isUpdateImageChanged = true;
}else if (resultCode == RESULT_CANCELED){
Toast.makeText(NewSocialPostActivity.this, "Canceled", Toast.LENGTH_LONG).show();
}else {
Toast.makeText(NewSocialPostActivity.this, "Please try again.", Toast.LENGTH_LONG).show();
}
break;
// case UCrop.REQUEST_CROP:
// if (resultCode == RESULT_OK){
// ivPostImage.setVisibility(View.VISIBLE);
// userPostCheck(userPost);
// final Uri resultUri = UCrop.getOutput(data);
// ivPostImage.setMinimumWidth(DisplayUtils.getScreenWidth());
// ivPostImage.setMaxWidth(DisplayUtils.getScreenWidth());
// ivPostImage.setMaxHeight(DisplayUtils.getScreenWidth());
// ivPostImage.setMinimumHeight(DisplayUtils.getScreenWidth());
// ivPostImage.setImageURI(resultUri);
// imageResultUri = resultUri;
// isUpdateImageChanged = true;
//
// }else if (resultCode == RESULT_CANCELED){
// Toast.makeText(NewSocialPostActivity.this, "Canceled", Toast.LENGTH_LONG).show();
// }else {
// Toast.makeText(NewSocialPostActivity.this, "Please try again.", Toast.LENGTH_LONG).show();
// }
// break;
} }
} }
private void startCropActivity(@NonNull Uri uri) { private void startCropActivity(@NonNull Uri uri) {
File f = new File("" + uri);
Log.d("filename",""+f.getName());
String destinationFileName = f.getName();;
destinationFileName += ".png";
UCrop uCrop = UCrop.of(uri, Uri.fromFile(new File(getCacheDir(), destinationFileName)));
uCrop = uCrop.withAspectRatio(1, 1);
uCrop = DisplayUtils.advancedConfig(this,uCrop);
uCrop.start(NewSocialPostActivity.this);
// File f = new File("" + uri);
// Log.d("filename",""+f.getName());
// String destinationFileName = f.getName();;
// destinationFileName += ".png";
//
// UCrop uCrop = UCrop.of(uri, Uri.fromFile(new File(getCacheDir(), destinationFileName)));
// uCrop = uCrop.withAspectRatio(1, 1);
// uCrop = DisplayUtils.advancedConfig(this,uCrop);
// uCrop.start(NewSocialPostActivity.this);
} }
public void userPostCheck(EditText editText) { public void userPostCheck(EditText editText) {

35
app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ProfileActivity.java

@ -45,7 +45,6 @@ import com.squareup.picasso.NetworkPolicy;
import com.squareup.picasso.Picasso; import com.squareup.picasso.Picasso;
import com.squareup.picasso.Target; import com.squareup.picasso.Target;
import com.text.drawable.TextDrawable; import com.text.drawable.TextDrawable;
import com.yalantis.ucrop.UCrop;
import java.io.File; import java.io.File;
@ -215,18 +214,18 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon
startCropActivity(data.getData()); startCropActivity(data.getData());
} }
break; break;
case UCrop.REQUEST_CROP:
if (resultCode == RESULT_OK) {
textProfileImage.setVisibility(View.GONE);
final Uri resultUri = UCrop.getOutput(data);
// profileImage.setImageURI(resultUri);
bitmap = DisplayUtils.uriToBitmap(this, resultUri);
userProfilePresenter.setUserProfilePic(Utils.getEncoded64ImageStringFromBitmap(bitmap), persistenceStorageManager.getUserId());
} else if (resultCode == RESULT_CANCELED) {
Toast.makeText(ProfileActivity.this, "Canceled", Toast.LENGTH_LONG).show();
} else {
Toast.makeText(ProfileActivity.this, "Please Try Again", Toast.LENGTH_LONG).show();
}
// case UCrop.REQUEST_CROP:
// if (resultCode == RESULT_OK) {
// textProfileImage.setVisibility(View.GONE);
// final Uri resultUri = UCrop.getOutput(data);
//// profileImage.setImageURI(resultUri);
// bitmap = DisplayUtils.uriToBitmap(this, resultUri);
// userProfilePresenter.setUserProfilePic(Utils.getEncoded64ImageStringFromBitmap(bitmap), persistenceStorageManager.getUserId());
// } else if (resultCode == RESULT_CANCELED) {
// Toast.makeText(ProfileActivity.this, "Canceled", Toast.LENGTH_LONG).show();
// } else {
// Toast.makeText(ProfileActivity.this, "Please Try Again", Toast.LENGTH_LONG).show();
// }
} }
} }
@ -237,11 +236,11 @@ public class ProfileActivity extends AppCompatActivity implements UserProfileCon
String destinationFileName = f.getName(); String destinationFileName = f.getName();
; ;
destinationFileName += ".png"; destinationFileName += ".png";
UCrop uCrop = UCrop.of(uri, Uri.fromFile(new File(getCacheDir(), destinationFileName)));
uCrop = uCrop.withAspectRatio(1, 1);
uCrop = DisplayUtils.advancedConfig(ProfileActivity.this, uCrop);
uCrop.start(ProfileActivity.this);
//
// UCrop uCrop = UCrop.of(uri, Uri.fromFile(new File(getCacheDir(), destinationFileName)));
// uCrop = uCrop.withAspectRatio(1, 1);
// uCrop = DisplayUtils.advancedConfig(ProfileActivity.this, uCrop);
// uCrop.start(ProfileActivity.this);
} }

39
app/src/main/java/com/gmeremit/online/gmeremittance_native/user_profile/view/ProfileFragment.java

@ -33,7 +33,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.PersistenceStorageManager;
import com.gmeremit.online.gmeremittance_native.withdraw.view.WithDrawActivity; import com.gmeremit.online.gmeremittance_native.withdraw.view.WithDrawActivity;
import com.text.drawable.TextDrawable; import com.text.drawable.TextDrawable;
import com.yalantis.ucrop.UCrop;
import java.io.File; import java.io.File;
@ -175,29 +174,29 @@ public class ProfileFragment extends Fragment implements UserProfileContract.Use
startCropActivity(data.getData()); startCropActivity(data.getData());
} }
break; break;
case UCrop.REQUEST_CROP:
if (resultCode == getActivity().RESULT_OK) {
text_profile_image.setVisibility(View.GONE);
final Uri resultUri = UCrop.getOutput(data);
text_profile_image.setImageURI(resultUri);
} else {
Toast.makeText(getActivity(), "error", Toast.LENGTH_LONG).show();
}
// case UCrop.REQUEST_CROP:
// if (resultCode == getActivity().RESULT_OK) {
// text_profile_image.setVisibility(View.GONE);
// final Uri resultUri = UCrop.getOutput(data);
// text_profile_image.setImageURI(resultUri);
// } else {
// Toast.makeText(getActivity(), "error", Toast.LENGTH_LONG).show();
// }
} }
} }
private void startCropActivity(@NonNull Uri uri) { private void startCropActivity(@NonNull Uri uri) {
File f = new File("" + uri);
Log.d("filename", "" + f.getName());
String destinationFileName = f.getName();
;
destinationFileName += ".png";
UCrop uCrop = UCrop.of(uri, Uri.fromFile(new File(getActivity().getCacheDir(), destinationFileName)));
uCrop = uCrop.withAspectRatio(1, 1);
uCrop = DisplayUtils.advancedConfig(getActivity(), uCrop);
uCrop.start(getActivity());
//
// File f = new File("" + uri);
// Log.d("filename", "" + f.getName());
// String destinationFileName = f.getName();
// ;
// destinationFileName += ".png";
//
// UCrop uCrop = UCrop.of(uri, Uri.fromFile(new File(getActivity().getCacheDir(), destinationFileName)));
// uCrop = uCrop.withAspectRatio(1, 1);
// uCrop = DisplayUtils.advancedConfig(getActivity(), uCrop);
// uCrop.start(getActivity());
} }

123
app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/other/DisplayUtils.java

@ -19,7 +19,6 @@ import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.R;
import com.yalantis.ucrop.UCrop;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
@ -37,67 +36,67 @@ public class DisplayUtils {
return Resources.getSystem().getDisplayMetrics().heightPixels; return Resources.getSystem().getDisplayMetrics().heightPixels;
} }
public static UCrop advancedConfig(Context context, UCrop uCrop) {
UCrop.Options options = new UCrop.Options();
// options.setHideBottomControls(true);
options.setFreeStyleCropEnabled(false);
// Color palette
options.setToolbarColor(ContextCompat.getColor(context, R.color.colorPrimary));
options.setStatusBarColor(ContextCompat.getColor(context, R.color.colorPrimaryDark));
options.setActiveWidgetColor(ContextCompat.getColor(context, R.color.colorPrimary));
options.setToolbarWidgetColor(ContextCompat.getColor(context, R.color.white));
/*
If you want to configure how gestures work for all UCropActivity tabs
options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.ROTATE, UCropActivity.ALL);
* */
/*
This sets max size for bitmap that will be decoded from source Uri.
More size - more memory allocation, default implementation uses screen diagonal.
options.setMaxBitmapSize(640);
* */
/*
Tune everything ()*:
options.setMaxScaleMultiplier(5);
options.setImageToCropBoundsAnimDuration(666);
options.setDimmedLayerColor(Color.CYAN);
options.setCircleDimmedLayer(true);
options.setShowCropFrame(false);
options.setCropGridStrokeWidth(20);
options.setCropGridColor(Color.GREEN);
options.setCropGridColumnCount(2);
options.setCropGridRowCount(1);
options.setToolbarCropDrawable(R.drawable.your_crop_icon);
options.setToolbarCancelDrawable(R.drawable.your_cancel_icon);
// Color palette
options.setToolbarColor(ContextCompat.getColor(this, R.color.your_color_res));
options.setStatusBarColor(ContextCompat.getColor(this, R.color.your_color_res));
options.setActiveWidgetColor(ContextCompat.getColor(this, R.color.your_color_res));
options.setToolbarWidgetColor(ContextCompat.getColor(this, R.color.your_color_res));
options.setRootViewBackgroundColor(ContextCompat.getColor(this, R.color.your_color_res));
// Aspect ratio options
options.setAspectRatioOptions(1,
new AspectRatio("WOW", 1, 2),
new AspectRatio("MUCH", 3, 4),
new AspectRatio("RATIO", CropImageView.DEFAULT_ASPECT_RATIO, CropImageView.DEFAULT_ASPECT_RATIO),
new AspectRatio("SO", 16, 9),
new AspectRatio("ASPECT", 1, 1));
*/
return uCrop.withOptions(options);
}
// public static UCrop advancedConfig(Context context, UCrop uCrop) {
// UCrop.Options options = new UCrop.Options();
//
//// options.setHideBottomControls(true);
// options.setFreeStyleCropEnabled(false);
//
// // Color palette
// options.setToolbarColor(ContextCompat.getColor(context, R.color.colorPrimary));
// options.setStatusBarColor(ContextCompat.getColor(context, R.color.colorPrimaryDark));
// options.setActiveWidgetColor(ContextCompat.getColor(context, R.color.colorPrimary));
// options.setToolbarWidgetColor(ContextCompat.getColor(context, R.color.white));
//
// /*
// If you want to configure how gestures work for all UCropActivity tabs
//
// options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.ROTATE, UCropActivity.ALL);
// * */
//
// /*
// This sets max size for bitmap that will be decoded from source Uri.
// More size - more memory allocation, default implementation uses screen diagonal.
//
// options.setMaxBitmapSize(640);
// * */
//
//
// /*
//
// Tune everything ()*:
//
// options.setMaxScaleMultiplier(5);
// options.setImageToCropBoundsAnimDuration(666);
// options.setDimmedLayerColor(Color.CYAN);
// options.setCircleDimmedLayer(true);
// options.setShowCropFrame(false);
// options.setCropGridStrokeWidth(20);
// options.setCropGridColor(Color.GREEN);
// options.setCropGridColumnCount(2);
// options.setCropGridRowCount(1);
// options.setToolbarCropDrawable(R.drawable.your_crop_icon);
// options.setToolbarCancelDrawable(R.drawable.your_cancel_icon);
//
// // Color palette
// options.setToolbarColor(ContextCompat.getColor(this, R.color.your_color_res));
// options.setStatusBarColor(ContextCompat.getColor(this, R.color.your_color_res));
// options.setActiveWidgetColor(ContextCompat.getColor(this, R.color.your_color_res));
// options.setToolbarWidgetColor(ContextCompat.getColor(this, R.color.your_color_res));
// options.setRootViewBackgroundColor(ContextCompat.getColor(this, R.color.your_color_res));
//
// // Aspect ratio options
// options.setAspectRatioOptions(1,
// new AspectRatio("WOW", 1, 2),
// new AspectRatio("MUCH", 3, 4),
// new AspectRatio("RATIO", CropImageView.DEFAULT_ASPECT_RATIO, CropImageView.DEFAULT_ASPECT_RATIO),
// new AspectRatio("SO", 16, 9),
// new AspectRatio("ASPECT", 1, 1));
//
// */
//
// return uCrop.withOptions(options);
// }
public static void hideKeyboard(Context context, View view){ public static void hideKeyboard(Context context, View view){
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);

Loading…
Cancel
Save