Skip to content

Commit f78d486

Browse files
committed
Use CharSequence instead of string for activity title (#297)
1 parent 96a2355 commit f78d486

5 files changed

Lines changed: 12 additions & 10 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ For more information, see the [GitHub Wiki](https://github.com/ArthurHub/Android
123123
## Change log
124124
*2.4.7*
125125
- Fix toolbar menu crop icon sometimes appears with random icon (#305)
126+
- Use CharSequence instead of string for activity title (thx @KentHawkings) (#297)
126127
- Fix class not found exception on some Samsung devices (Huge thanks to @Vantablack) (#332)
127128
- Add original image dimensions to CropResult (Thanks @gazialankus) (#327)
128129
- Making the library JitPack-friendly (Thanks @gazialankus) (#325)

cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ public ActivityBuilder setMaxCropResultSize(int maxCropResultWidth, int maxCropR
756756
* the title of the {@link CropImageActivity}.<br>
757757
* <i>Default: ""</i>
758758
*/
759-
public ActivityBuilder setActivityTitle(String activityTitle) {
759+
public ActivityBuilder setActivityTitle(CharSequence activityTitle) {
760760
mOptions.activityTitle = activityTitle;
761761
return this;
762762
}

cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void onCreate(Bundle savedInstanceState) {
8787

8888
ActionBar actionBar = getSupportActionBar();
8989
if (actionBar != null) {
90-
String title = mOptions.activityTitle != null && !mOptions.activityTitle.isEmpty()
90+
CharSequence title = mOptions.activityTitle != null && mOptions.activityTitle.length() > 0
9191
? mOptions.activityTitle
9292
: getResources().getString(R.string.crop_image_activity_title);
9393
actionBar.setTitle(title);

cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageOptions.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import android.net.Uri;
2020
import android.os.Parcel;
2121
import android.os.Parcelable;
22+
import android.text.TextUtils;
2223
import android.util.DisplayMetrics;
2324
import android.util.TypedValue;
2425

@@ -87,10 +88,10 @@ public CropImageOptions[] newArray(int size) {
8788
*/
8889
public boolean autoZoomEnabled;
8990

90-
/**
91-
* if multi-touch should be enabled on the crop box
92-
* default: false
93-
*/
91+
/**
92+
* if multi-touch should be enabled on the crop box
93+
* default: false
94+
*/
9495
public boolean multiTouchEnabled;
9596

9697
/**
@@ -196,7 +197,7 @@ public CropImageOptions[] newArray(int size) {
196197
/**
197198
* the title of the {@link CropImageActivity}
198199
*/
199-
public String activityTitle;
200+
public CharSequence activityTitle;
200201

201202
/**
202203
* the color to use for action bar items icons
@@ -373,7 +374,7 @@ protected CropImageOptions(Parcel in) {
373374
minCropResultHeight = in.readInt();
374375
maxCropResultWidth = in.readInt();
375376
maxCropResultHeight = in.readInt();
376-
activityTitle = in.readString();
377+
activityTitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
377378
activityMenuIconColor = in.readInt();
378379
outputUri = in.readParcelable(Uri.class.getClassLoader());
379380
outputCompressFormat = Bitmap.CompressFormat.valueOf(in.readString());
@@ -423,7 +424,7 @@ public void writeToParcel(Parcel dest, int flags) {
423424
dest.writeInt(minCropResultHeight);
424425
dest.writeInt(maxCropResultWidth);
425426
dest.writeInt(maxCropResultHeight);
426-
dest.writeString(activityTitle);
427+
TextUtils.writeToParcel(activityTitle, dest, flags);
427428
dest.writeInt(activityMenuIconColor);
428429
dest.writeParcelable(outputUri, flags);
429430
dest.writeString(outputCompressFormat.name());

quick-start/src/main/java/com/theartofdev/edmodo/cropper/quick/start/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
3636
public void onSelectImageClick(View view) {
3737
CropImage.activity()
3838
.setGuidelines(CropImageView.Guidelines.ON)
39-
.setMultiTouchEnabled(true)
39+
.setActivityTitle("My Crop")
4040
.start(this);
4141
}
4242

0 commit comments

Comments
 (0)