diff --git a/cropper/build.gradle b/cropper/build.gradle index 8b1fd7e..f3971aa 100644 --- a/cropper/build.gradle +++ b/cropper/build.gradle @@ -25,9 +25,10 @@ repositories { } dependencies { - api "com.android.support:appcompat-v7:$supportLibraryVersion" - implementation "com.android.support:exifinterface:$supportLibraryVersion" + api "com.android.support:support-v4:$supportLibraryVersion" + api "com.android.support:exifinterface:$supportLibraryVersion" + api "com.android.support:support-annotations:$support" - implementation 'com.github.Realify:Android-Image-Cropper:master' + // implementation 'com.github.Realify:Android-Image-Cropper:master' } diff --git a/cropper/src/main/java/net/realify/lib/androidimagecropper/CropImageActivity.java b/cropper/src/main/java/net/realify/lib/androidimagecropper/CropImageActivity.java index a4d446e..3d5d0fb 100644 --- a/cropper/src/main/java/net/realify/lib/androidimagecropper/CropImageActivity.java +++ b/cropper/src/main/java/net/realify/lib/androidimagecropper/CropImageActivity.java @@ -24,8 +24,8 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +// import android.support.v7.app.ActionBar; +// import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -38,7 +38,7 @@ * Built-in activity for image cropping.
* Use {@link CropImage#activity(Uri)} to create a builder to start this activity. */ -public class CropImageActivity extends AppCompatActivity +public class CropImageActivity extends Activity implements CropImageView.OnSetImageUriCompleteListener, CropImageView.OnCropImageCompleteListener { @@ -84,15 +84,19 @@ public void onCreate(Bundle savedInstanceState) { } } + CharSequence title = mOptions != null && + mOptions.activityTitle != null && mOptions.activityTitle.length() > 0 + ? mOptions.activityTitle + : getResources().getString(R.string.crop_image_activity_title); + + /* ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { - CharSequence title = mOptions != null && - mOptions.activityTitle != null && mOptions.activityTitle.length() > 0 - ? mOptions.activityTitle - : getResources().getString(R.string.crop_image_activity_title); actionBar.setTitle(title); actionBar.setDisplayHomeAsUpEnabled(true); } + */ + setTitle(title); } @Override diff --git a/cropper/src/main/res/menu/crop_image_menu.xml b/cropper/src/main/res/menu/crop_image_menu.xml index a95ca97..81929cc 100644 --- a/cropper/src/main/res/menu/crop_image_menu.xml +++ b/cropper/src/main/res/menu/crop_image_menu.xml @@ -7,17 +7,17 @@ android:icon="@drawable/crop_image_menu_rotate_left" android:title="@string/crop_image_menu_rotate_left" android:visible="false" - app:showAsAction="ifRoom"/> + android:showAsAction="ifRoom"/> + android:showAsAction="ifRoom"/> + android:showAsAction="ifRoom"> + android:showAsAction="always"/> \ No newline at end of file