Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update to ABS 4.0.0 Final (changes since RC1)
Three changes: * Remove use of ABS 'plugin-support-lib' as this is back in the ABS lib itself * Adapt our activities to use RoboGuice-supporting subclasses of the ActionBarSherlock activity and fragment classes. * ProGuard rule to ensure that the constructor of the ActionBarSherlock implementation classes aren't over-aggressivly removed (the 'native' one is invoked via reflection).
- Loading branch information
Showing
9 changed files
with
275 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
app/src/main/java/com/github/mobile/gauges/roboguice/RoboSherlockActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| * Copyright 2012 Jake Wharton | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions | ||
| * and limitations under the License. | ||
| */ | ||
| package com.github.mobile.gauges.roboguice; | ||
|
|
||
| import android.content.Intent; | ||
| import android.content.res.Configuration; | ||
| import android.os.Bundle; | ||
|
|
||
| import com.actionbarsherlock.app.SherlockActivity; | ||
| import com.google.inject.Inject; | ||
|
|
||
| import roboguice.RoboGuice; | ||
| import roboguice.activity.event.OnActivityResultEvent; | ||
| import roboguice.activity.event.OnConfigurationChangedEvent; | ||
| import roboguice.activity.event.OnContentChangedEvent; | ||
| import roboguice.activity.event.OnCreateEvent; | ||
| import roboguice.activity.event.OnDestroyEvent; | ||
| import roboguice.activity.event.OnNewIntentEvent; | ||
| import roboguice.activity.event.OnPauseEvent; | ||
| import roboguice.activity.event.OnRestartEvent; | ||
| import roboguice.activity.event.OnResumeEvent; | ||
| import roboguice.activity.event.OnStartEvent; | ||
| import roboguice.activity.event.OnStopEvent; | ||
| import roboguice.event.EventManager; | ||
| import roboguice.inject.ContentViewListener; | ||
| import roboguice.inject.RoboInjector; | ||
|
|
||
| /** | ||
| * An example of how to make your own Robo-enabled Sherlock activity. Feel free | ||
| * to do with with any of the other Sherlock activity types! | ||
| */ | ||
| public class RoboSherlockActivity extends SherlockActivity { | ||
| protected EventManager eventManager; | ||
|
|
||
| @Inject | ||
| ContentViewListener ignored; // BUG find a better place to put this | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| final RoboInjector injector = RoboGuice.getInjector(this); | ||
| eventManager = injector.getInstance(EventManager.class); | ||
| injector.injectMembersWithoutViews(this); | ||
| super.onCreate(savedInstanceState); | ||
| eventManager.fire(new OnCreateEvent(savedInstanceState)); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onRestart() { | ||
| super.onRestart(); | ||
| eventManager.fire(new OnRestartEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onStart() { | ||
| super.onStart(); | ||
| eventManager.fire(new OnStartEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onResume() { | ||
| super.onResume(); | ||
| eventManager.fire(new OnResumeEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onPause() { | ||
| super.onPause(); | ||
| eventManager.fire(new OnPauseEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onNewIntent( Intent intent ) { | ||
| super.onNewIntent(intent); | ||
| eventManager.fire(new OnNewIntentEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onStop() { | ||
| try { | ||
| eventManager.fire(new OnStopEvent()); | ||
| } finally { | ||
| super.onStop(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void onDestroy() { | ||
| try { | ||
| eventManager.fire(new OnDestroyEvent()); | ||
| } finally { | ||
| try { | ||
| RoboGuice.destroyInjector(this); | ||
| } finally { | ||
| super.onDestroy(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onConfigurationChanged(Configuration newConfig) { | ||
| final Configuration currentConfig = getResources().getConfiguration(); | ||
| super.onConfigurationChanged(newConfig); | ||
| eventManager.fire(new OnConfigurationChangedEvent(currentConfig, newConfig)); | ||
| } | ||
|
|
||
| @Override | ||
| public void onContentChanged() { | ||
| super.onContentChanged(); | ||
| RoboGuice.getInjector(this).injectViewMembers(this); | ||
| eventManager.fire(new OnContentChangedEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onActivityResult(int requestCode, int resultCode, Intent data) { | ||
| super.onActivityResult(requestCode, resultCode, data); | ||
| eventManager.fire(new OnActivityResultEvent(requestCode, resultCode, data)); | ||
| } | ||
| } |
109 changes: 109 additions & 0 deletions
109
app/src/main/java/com/github/mobile/gauges/roboguice/RoboSherlockFragmentActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| package com.github.mobile.gauges.roboguice; | ||
|
|
||
| import android.os.Bundle; | ||
| import android.view.View; | ||
|
|
||
| import com.actionbarsherlock.app.SherlockFragmentActivity; | ||
| import com.actionbarsherlock.app.SherlockListFragment; | ||
|
|
||
| import roboguice.RoboGuice; | ||
|
|
||
| import roboguice.RoboGuice; | ||
| import roboguice.activity.event.*; | ||
| import roboguice.event.EventManager; | ||
| import roboguice.inject.ContentViewListener; | ||
| import roboguice.inject.RoboInjector; | ||
|
|
||
| import android.content.Intent; | ||
| import android.content.res.Configuration; | ||
| import android.os.Bundle; | ||
| import android.support.v4.app.FragmentActivity; | ||
|
|
||
| import com.google.inject.Inject; | ||
|
|
||
| public class RoboSherlockFragmentActivity extends SherlockFragmentActivity { | ||
| protected EventManager eventManager; | ||
|
|
||
| @Inject ContentViewListener ignored; // BUG find a better place to put this | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| final RoboInjector injector = RoboGuice.getInjector(this); | ||
| eventManager = injector.getInstance(EventManager.class); | ||
| injector.injectMembersWithoutViews(this); | ||
| super.onCreate(savedInstanceState); | ||
| eventManager.fire(new OnCreateEvent(savedInstanceState)); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onRestart() { | ||
| super.onRestart(); | ||
| eventManager.fire(new OnRestartEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onStart() { | ||
| super.onStart(); | ||
| eventManager.fire(new OnStartEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onResume() { | ||
| super.onResume(); | ||
| eventManager.fire(new OnResumeEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onPause() { | ||
| super.onPause(); | ||
| eventManager.fire(new OnPauseEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onNewIntent( Intent intent ) { | ||
| super.onNewIntent(intent); | ||
| eventManager.fire(new OnNewIntentEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onStop() { | ||
| try { | ||
| eventManager.fire(new OnStopEvent()); | ||
| } finally { | ||
| super.onStop(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void onDestroy() { | ||
| try { | ||
| eventManager.fire(new OnDestroyEvent()); | ||
| } finally { | ||
| try { | ||
| RoboGuice.destroyInjector(this); | ||
| } finally { | ||
| super.onDestroy(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onConfigurationChanged(Configuration newConfig) { | ||
| final Configuration currentConfig = getResources().getConfiguration(); | ||
| super.onConfigurationChanged(newConfig); | ||
| eventManager.fire(new OnConfigurationChangedEvent(currentConfig, newConfig)); | ||
| } | ||
|
|
||
| @Override | ||
| public void onContentChanged() { | ||
| super.onContentChanged(); | ||
| RoboGuice.getInjector(this).injectViewMembers(this); | ||
| eventManager.fire(new OnContentChangedEvent()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onActivityResult(int requestCode, int resultCode, Intent data) { | ||
| super.onActivityResult(requestCode, resultCode, data); | ||
| eventManager.fire(new OnActivityResultEvent(requestCode, resultCode, data)); | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
app/src/main/java/com/github/mobile/gauges/roboguice/RoboSherlockListFragment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.github.mobile.gauges.roboguice; | ||
|
|
||
| import roboguice.RoboGuice; | ||
|
|
||
| import android.os.Bundle; | ||
| import android.support.v4.app.ListFragment; | ||
| import android.view.View; | ||
|
|
||
| import com.actionbarsherlock.app.SherlockActivity; | ||
| import com.actionbarsherlock.app.SherlockListFragment; | ||
|
|
||
| public abstract class RoboSherlockListFragment extends SherlockListFragment { | ||
| @Override | ||
| public void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| RoboGuice.getInjector(getActivity()).injectMembersWithoutViews(this); | ||
| } | ||
|
|
||
| @Override | ||
| public void onViewCreated(View view, Bundle savedInstanceState) { | ||
| super.onViewCreated(view, savedInstanceState); | ||
| RoboGuice.getInjector(getActivity()).injectViewMembers(this); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dd1f558There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry the rendering fix couldn't make it into final. Maintenance releases should come fairly quickly and I hope to get that resolved ASAP.