Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Add forceLayoutInjection to @EFragment #1186

Closed
Lochnair wants to merge 3 commits into from
Closed

Add forceLayoutInjection to @EFragment #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dd5bd7
Add forceLayoutInjection to EFragment
Lochnair Oct 9, 2014
fd66f6a
Handle forcing on generation time
Lochnair Oct 9, 2014
970b031
Removed unused import
Lochnair Oct 9, 2014
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
2 changes: 2 additions & 0 deletions 2 ...ns/androidannotations-api/src/main/java/org/androidannotations/annotations/EFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,7 @@
public @interface EFragment {
int value() default ResId.DEFAULT_VALUE;

boolean forceLayoutInjection() default false;

@WonderCsabo WonderCsabo Oct 12, 2014

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make this the last method. Also add some JavaDoc.


String resName() default "";
}
13 changes: 10 additions & 3 deletions 13 ...ons/androidannotations/src/main/java/org/androidannotations/handler/EFragmentHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,16 @@ public void process(Element element, EFragmentHolder holder) {

JFieldVar contentView = holder.getContentView();

block._if(contentView.eq(_null())) //
._then() //
.assign(contentView, inflater.invoke("inflate").arg(contentViewId).arg(container).arg(FALSE));
boolean forceInjection = element.getAnnotation(EFragment.class).forceLayoutInjection();

if (!forceInjection) {
block._if(contentView.eq(_null())) //
._then() //
.assign(contentView, inflater.invoke("inflate").arg(contentViewId).arg(container).arg(FALSE));
} else {
block.assign(contentView, inflater.invoke("inflate").arg(contentViewId).arg(container).arg(FALSE));
}

}

}
Expand Down
7 changes: 6 additions & 1 deletion 7 ...tions/androidannotations/src/main/java/org/androidannotations/holder/EFragmentHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.sun.codemodel.JMod;
import com.sun.codemodel.JTypeVar;
import com.sun.codemodel.JVar;
import org.androidannotations.annotations.EFragment;
import org.androidannotations.helper.ActionBarSherlockHelper;
import org.androidannotations.helper.AnnotationHelper;
import org.androidannotations.process.ProcessHolder;
Expand Down Expand Up @@ -247,8 +248,12 @@ private void setOnCreateView() {

JVar savedInstanceState = onCreateView.param(classes().BUNDLE, "savedInstanceState");

boolean forceInjection = getAnnotatedElement().getAnnotation(EFragment.class).forceLayoutInjection();

@WonderCsabo WonderCsabo Oct 12, 2014

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not really use getAnnotatedElement() for these kind of purposes. But i also do not see other solution to this problem. @yDelouis WDYT?


JBlock body = onCreateView.body();
body.assign(contentView, _super().invoke(onCreateView).arg(inflater).arg(container).arg(savedInstanceState));

if (!forceInjection)
body.assign(contentView, _super().invoke(onCreateView).arg(inflater).arg(container).arg(savedInstanceState));

setContentViewBlock = body.block();

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.