r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Dependency injection for ReadingActivity

Browse Source
This commit is contained in:
Anthony Restaino 2016-01-21 20:42:19 -05:00
parent 6084c9b478
commit 8b44ce12fa
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/acr/browser/lightning/activity/MainActivity.java
View File

@ -22,12 +22,6 @@ public class MainActivity extends BrowserActivity {
cookieManager.setAcceptCookie(mPreferences.getCookiesEnabled()); cookieManager.setAcceptCookie(mPreferences.getCookiesEnabled());
} }
// @Override
// public synchronized void initializeTabs() {
// // restoreOrNewTab();
// // if incognito mode use newTab(null, true); instead
// }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.main, menu); getMenuInflater().inflate(R.menu.main, menu);

22
app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java
View File

@ -23,6 +23,8 @@ import android.widget.TextView;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import javax.inject.Inject;
import acr.browser.lightning.R; import acr.browser.lightning.R;
import acr.browser.lightning.app.BrowserApp; import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.constant.Constants; import acr.browser.lightning.constant.Constants;
@ -31,14 +33,21 @@ import acr.browser.lightning.reading.HtmlFetcher;
import acr.browser.lightning.reading.JResult; import acr.browser.lightning.reading.JResult;
import acr.browser.lightning.utils.ThemeUtils; import acr.browser.lightning.utils.ThemeUtils;
import acr.browser.lightning.utils.Utils; import acr.browser.lightning.utils.Utils;
import butterknife.Bind;
import butterknife.ButterKnife;
public class ReadingActivity extends AppCompatActivity { public class ReadingActivity extends AppCompatActivity {
private TextView mTitle; @Bind(R.id.textViewTitle)
private TextView mBody; TextView mTitle;
@Bind(R.id.textViewBody)
TextView mBody;
@Inject PreferenceManager mPreferences;
private boolean mInvert; private boolean mInvert;
private String mUrl = null; private String mUrl = null;
private PreferenceManager mPreferences;
private int mTextSize; private int mTextSize;
private ProgressDialog mProgressDialog; private ProgressDialog mProgressDialog;
private PageLoader mLoaderReference; private PageLoader mLoaderReference;
@ -52,8 +61,9 @@ public class ReadingActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
BrowserApp.getAppComponent().inject(this);
overridePendingTransition(R.anim.slide_in_from_right, R.anim.fade_out_scale); overridePendingTransition(R.anim.slide_in_from_right, R.anim.fade_out_scale);
mPreferences = BrowserApp.getPreferenceManager();
mInvert = mPreferences.getInvertColors(); mInvert = mPreferences.getInvertColors();
final int color; final int color;
if (mInvert) { if (mInvert) {
@ -67,6 +77,7 @@ public class ReadingActivity extends AppCompatActivity {
} }
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.reading_view); setContentView(R.layout.reading_view);
ButterKnife.bind(this);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
@ -74,9 +85,6 @@ public class ReadingActivity extends AppCompatActivity {
if (getSupportActionBar() != null) if (getSupportActionBar() != null)
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mTitle = (TextView) findViewById(R.id.textViewTitle);
mBody = (TextView) findViewById(R.id.textViewBody);
mTextSize = mPreferences.getReadingTextSize(); mTextSize = mPreferences.getReadingTextSize();
mBody.setTextSize(getTextSize(mTextSize)); mBody.setTextSize(getTextSize(mTextSize));
mTitle.setText(getString(R.string.untitled)); mTitle.setText(getString(R.string.untitled));

3
app/src/main/java/acr/browser/lightning/app/AppComponent.java
View File

@ -3,6 +3,7 @@ package acr.browser.lightning.app;
import javax.inject.Singleton; import javax.inject.Singleton;
import acr.browser.lightning.activity.BrowserActivity; import acr.browser.lightning.activity.BrowserActivity;
import acr.browser.lightning.activity.ReadingActivity;
import acr.browser.lightning.activity.ThemableBrowserActivity; import acr.browser.lightning.activity.ThemableBrowserActivity;
import acr.browser.lightning.constant.BookmarkPage; import acr.browser.lightning.constant.BookmarkPage;
import acr.browser.lightning.dialog.LightningDialogBuilder; import acr.browser.lightning.dialog.LightningDialogBuilder;
@ -43,4 +44,6 @@ public interface AppComponent {
void inject(ProxyUtils proxyUtils); void inject(ProxyUtils proxyUtils);
void inject(ReadingActivity activity);
} }