Skip to content

Commit 72b7e1a

Browse files
committed
further uncluttering MainActivity
1 parent be1ff91 commit 72b7e1a

File tree

2 files changed

+29
-11
lines changed

2 files changed

+29
-11
lines changed

app/src/main/java/at/xtools/pwawrapper/MainActivity.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,43 @@
22

33
import android.support.v7.app.AppCompatActivity;
44
import android.os.Bundle;
5-
import android.webkit.WebView;
65

76
import at.xtools.pwawrapper.ui.UIManager;
87
import at.xtools.pwawrapper.webview.WebViewHelper;
98

109
public class MainActivity extends AppCompatActivity {
1110
// Globals
12-
private WebView webView;
1311
private UIManager uiManager;
1412
private WebViewHelper webViewHelper;
1513

1614
@Override
1715
protected void onCreate(Bundle savedInstanceState) {
16+
// Setup Theme
1817
setTheme(R.style.AppTheme_NoActionBar);
1918
super.onCreate(savedInstanceState);
2019
setContentView(R.layout.activity_main);
2120

22-
// Setup App
23-
webView = (WebView) this.findViewById(R.id.webView);
21+
// Setup Helpers
2422
uiManager = new UIManager(this);
2523
webViewHelper = new WebViewHelper(this, uiManager);
24+
25+
// Setup App
2626
webViewHelper.setupWebView();
2727
uiManager.changeRecentAppsIcon();
2828

29-
// load up the Web App
30-
webView.loadUrl(Constants.WEBAPP_URL);
29+
// Load up the Web App
30+
webViewHelper.loadHome();
3131
}
3232

3333
@Override
3434
protected void onPause() {
35-
webView.onPause();
35+
webViewHelper.onPause();
3636
super.onPause();
3737
}
3838

3939
@Override
4040
protected void onResume() {
41-
webView.onResume();
41+
webViewHelper.onResume();
4242
// retrieve content from cache primarily if not connected,
4343
// fetch from web otherwise to get updates.
4444
webViewHelper.useCache(
@@ -50,9 +50,7 @@ protected void onResume() {
5050
// Handle back-press in browser
5151
@Override
5252
public void onBackPressed() {
53-
if (webView.canGoBack()) {
54-
webView.goBack();
55-
} else {
53+
if (!webViewHelper.goBack()) {
5654
super.onBackPressed();
5755
}
5856
}

app/src/main/java/at/xtools/pwawrapper/webview/WebViewHelper.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,24 @@ public void onReceivedError(WebView view, WebResourceRequest request, WebResourc
162162
}
163163
});
164164
}
165+
166+
public void onPause() {
167+
webView.onPause();
168+
}
169+
170+
public void onResume() {
171+
webView.onResume();
172+
}
173+
174+
public boolean goBack() {
175+
if (webView.canGoBack()) {
176+
webView.goBack();
177+
return true;
178+
}
179+
return false;
180+
}
181+
182+
public void loadHome() {
183+
webView.loadUrl(Constants.WEBAPP_URL);
184+
}
165185
}

0 commit comments

Comments
 (0)