Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Fix the order of some Android X checks to avoid conflicts with Support v4 #2169

Merged
WonderCsabo merged 5 commits into from
Oct 13, 2018
Merged

Fix the order of some Android X checks to avoid conflicts with Support v4 #2169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02577d3
Only check for support v4 Fragment if AndroidX Fragment is missing
dodgex Oct 13, 2018
0922a08
Check for Android X ActivityCompat first
dodgex Oct 13, 2018
3a6518f
Check for Android X ContextCompat before checking for support v4 version
dodgex Oct 13, 2018
3adc034
Check for Android X OnPreferenceClickListener first
dodgex Oct 13, 2018
508479f
Check for Android X OnPreferenceChangeListener first
dodgex Oct 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../main/java/org/androidannotations/internal/core/handler/ContextCompatAwareResHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ abstract class ContextCompatAwareResHandler extends AbstractResHandler {

@Override
protected IJExpression getInstanceInvocation(EComponentHolder holder, JFieldRef idRef, IJAssignmentTarget fieldRef, JBlock targetBlock) {
if (hasTargetMethodInContextCompat()) {
return getClasses().CONTEXT_COMPAT.staticInvoke(androidRes.getResourceMethodName()).arg(holder.getContextRef()).arg(idRef);
} else if (hasTargetMethodInAndroidxContextCompat()) {
if (hasTargetMethodInAndroidxContextCompat()) {
return getClasses().ANDROIDX_CONTEXT_COMPAT.staticInvoke(androidRes.getResourceMethodName()).arg(holder.getContextRef()).arg(idRef);
} else if (hasTargetMethodInContextCompat()) {
return getClasses().CONTEXT_COMPAT.staticInvoke(androidRes.getResourceMethodName()).arg(holder.getContextRef()).arg(idRef);
} else if (shouldUseContextMethod()) {
return holder.getContextRef().invoke(androidRes.getResourceMethodName()).arg(idRef);
} else if (!shouldUseContextMethod() && hasTargetMethodInContext()) {
Expand Down
4 changes: 2 additions & 2 deletions ...s/src/main/java/org/androidannotations/internal/core/handler/PreferenceChangeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ protected String getSetterName() {

@Override
protected AbstractJClass getListenerClass(HasPreferences holder) {
return holder.usingSupportV7Preference() ? getClasses().SUPPORT_V7_PREFERENCE_CHANGE_LISTENER
: holder.usingAndroidxPreference() ? getClasses().ANDROIDX_PREFERENCE_CHANGE_LISTENER : getClasses().PREFERENCE_CHANGE_LISTENER;
return holder.usingAndroidxPreference() ? getClasses().ANDROIDX_PREFERENCE_CHANGE_LISTENER
: holder.usingSupportV7Preference() ? getClasses().SUPPORT_V7_PREFERENCE_CHANGE_LISTENER : getClasses().PREFERENCE_CHANGE_LISTENER;
}
}
4 changes: 2 additions & 2 deletions ...ns/src/main/java/org/androidannotations/internal/core/handler/PreferenceClickHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ protected String getSetterName() {

@Override
protected AbstractJClass getListenerClass(HasPreferences holder) {
return holder.usingSupportV7Preference() ? getClasses().SUPPORT_V7_PREFERENCE_CLICK_LISTENER
: holder.usingAndroidxPreference() ? getClasses().ANDROIDX_PREFERENCE_CLICK_LISTENER : getClasses().PREFERENCE_CLICK_LISTENER;
return holder.usingAndroidxPreference() ? getClasses().ANDROIDX_PREFERENCE_CLICK_LISTENER
: holder.usingSupportV7Preference() ? getClasses().SUPPORT_V7_PREFERENCE_CLICK_LISTENER : getClasses().PREFERENCE_CLICK_LISTENER;
}

}
26 changes: 12 additions & 14 deletions ...ions/src/main/java/org/androidannotations/internal/core/helper/ActivityIntentBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,16 @@ private void createAdditionalIntentMethods() {
JVar fragmentParam = method.param(getClasses().FRAGMENT, "fragment");
method.body()._return(_new(holder.getIntentBuilderClass()).arg(fragmentParam));
}
if (hasFragmentSupportInClasspath()) {
// intent() with android.support.v4.app.Fragment param
JMethod method = holder.getGeneratedClass().method(STATIC | PUBLIC, holder.getIntentBuilderClass(), "intent");
JVar fragmentParam = method.param(getClasses().SUPPORT_V4_FRAGMENT, "supportFragment");
method.body()._return(_new(holder.getIntentBuilderClass()).arg(fragmentParam));
}
if (hasAndroidxFragmentInClasspath()) {
// intent() with androidx.fragment.app.Fragment param
JMethod method = holder.getGeneratedClass().method(STATIC | PUBLIC, holder.getIntentBuilderClass(), "intent");
JVar fragmentParam = method.param(getClasses().ANDROIDX_FRAGMENT, "supportFragment");
method.body()._return(_new(holder.getIntentBuilderClass()).arg(fragmentParam));
} else if (hasFragmentSupportInClasspath()) {
// intent() with android.support.v4.app.Fragment param
JMethod method = holder.getGeneratedClass().method(STATIC | PUBLIC, holder.getIntentBuilderClass(), "intent");
JVar fragmentParam = method.param(getClasses().SUPPORT_V4_FRAGMENT, "supportFragment");
method.body()._return(_new(holder.getIntentBuilderClass()).arg(fragmentParam));
}
}

Expand All @@ -104,11 +103,10 @@ private void createAdditionalConstructor() {
if (hasFragmentInClasspath()) {
fragmentField = addFragmentConstructor(getClasses().FRAGMENT, "fragment" + generationSuffix());
}
if (hasFragmentSupportInClasspath()) {
fragmentSupportField = addFragmentConstructor(getClasses().SUPPORT_V4_FRAGMENT, "fragmentSupport" + generationSuffix());
}
if (hasAndroidxFragmentInClasspath()) {
fragmentSupportField = addFragmentConstructor(getClasses().ANDROIDX_FRAGMENT, "fragmentSupport" + generationSuffix());
} else if (hasFragmentSupportInClasspath()) {
fragmentSupportField = addFragmentConstructor(getClasses().SUPPORT_V4_FRAGMENT, "fragmentSupport" + generationSuffix());
}
}

Expand Down Expand Up @@ -241,16 +239,16 @@ protected boolean hasActivityOptionsInFragment() {
}

private AbstractJClass getActivityCompat() {
TypeElement activityCompat = elementUtils.getTypeElement(CanonicalNameConstants.ACTIVITY_COMPAT);
if (hasActivityOptions(activityCompat, 2)) {
return getClasses().ACTIVITY_COMPAT;
}

TypeElement androidxActivityCompat = elementUtils.getTypeElement(CanonicalNameConstants.ANDROIDX_ACTIVITY_COMPAT);
if (hasActivityOptions(androidxActivityCompat, 2)) {
return getClasses().ANDROIDX_ACTIVITY_COMPAT;
}

TypeElement activityCompat = elementUtils.getTypeElement(CanonicalNameConstants.ACTIVITY_COMPAT);
if (hasActivityOptions(activityCompat, 2)) {
return getClasses().ACTIVITY_COMPAT;
}

return null;
}

Expand Down