1
0
Fork 0
mirror of https://github.com/ethauvin/Clever.git synced 2025-04-25 17:07:10 -07:00

Formatting with Eclipse

This commit is contained in:
Russell Beattie 2012-09-10 17:25:05 -07:00
parent eadd6e7963
commit d1f4326ca7
2 changed files with 176 additions and 181 deletions

View file

@ -6,22 +6,23 @@
<uses-sdk <uses-sdk
android:minSdkVersion="15" android:minSdkVersion="15"
android:targetSdkVersion="15" /> android:targetSdkVersion="15" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application <application
android:icon="@drawable/icon" android:icon="@drawable/icon"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
>
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:hardwareAccelerated="true"
android:immersive="true"
android:label="@string/title_activity_main" android:label="@string/title_activity_main"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" >
android:windowSoftInputMode="adjustResize"
android:immersive="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>

View file

@ -15,7 +15,6 @@ import android.webkit.WebSettings.*;
import android.widget.*; import android.widget.*;
import android.widget.TextView.OnEditorActionListener; import android.widget.TextView.OnEditorActionListener;
public class MainActivity extends Activity { public class MainActivity extends Activity {
WebView webView; WebView webView;
@ -27,58 +26,57 @@ public class MainActivity extends Activity {
public static final String HOME_PAGE = "file:///android_asset/www/index.html"; public static final String HOME_PAGE = "file:///android_asset/www/index.html";
public static final String PREFS_NAME = "CleverPrefs"; public static final String PREFS_NAME = "CleverPrefs";
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
linearLayout = (LinearLayout) findViewById(R.id.linearLayout); linearLayout = (LinearLayout) findViewById(R.id.linearLayout);
linearLayout.setBackgroundColor(Color.BLACK); linearLayout.setBackgroundColor(Color.BLACK);
// Navbar setup // Navbar setup
navbar = (LinearLayout) findViewById(R.id.navbar); navbar = (LinearLayout) findViewById(R.id.navbar);
goButton = (Button)findViewById(R.id.go_button); goButton = (Button) findViewById(R.id.go_button);
urlField = (EditText)findViewById(R.id.url); urlField = (EditText) findViewById(R.id.url);
goButton.setOnClickListener(new View.OnClickListener() { goButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
doNav(); doNav();
} }
}); });
urlField.setOnEditorActionListener(new OnEditorActionListener() { urlField.setOnEditorActionListener(new OnEditorActionListener() {
@Override @Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { public boolean onEditorAction(TextView v, int actionId,
boolean handled = false; KeyEvent event) {
if (actionId == EditorInfo.IME_ACTION_GO) { boolean handled = false;
if (actionId == EditorInfo.IME_ACTION_GO) {
doNav(); doNav();
handled = true; handled = true;
} }
return handled; return handled;
} }
}); });
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0); SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
String lastUrl = settings.getString("lastUrl", ""); String lastUrl = settings.getString("lastUrl", "");
urlField.setText(lastUrl); urlField.setText(lastUrl);
// Navbar animation settings
// Navbar animation settings
AnimationListener slideListener = new AnimationListener() { AnimationListener slideListener = new AnimationListener() {
@Override @Override
public void onAnimationEnd(Animation animation) { public void onAnimationEnd(Animation animation) {
if(animation.equals(slideUp)){ if (animation.equals(slideUp)) {
navbar.setVisibility(View.GONE); navbar.setVisibility(View.GONE);
} }
} }
@Override @Override
public void onAnimationRepeat(Animation animation) { public void onAnimationRepeat(Animation animation) {
@ -86,139 +84,135 @@ public class MainActivity extends Activity {
@Override @Override
public void onAnimationStart(Animation animation) { public void onAnimationStart(Animation animation) {
if(animation.equals(slideDown)){ if (animation.equals(slideDown)) {
navbar.setVisibility(View.VISIBLE); navbar.setVisibility(View.VISIBLE);
} }
} }
}; };
slideUp = new TranslateAnimation( slideUp = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0.0f,
Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF,
Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, -1.0f 0.0f, Animation.RELATIVE_TO_SELF, -1.0f);
); slideUp.setDuration(500);
slideUp.setDuration(500); slideUp.setAnimationListener(slideListener);
slideUp.setAnimationListener(slideListener);
slideDown = new TranslateAnimation( slideDown = new TranslateAnimation(Animation.RELATIVE_TO_SELF, 0.0f,
Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF,
Animation.RELATIVE_TO_SELF, -1.0f, Animation.RELATIVE_TO_SELF, 0.0f -1.0f, Animation.RELATIVE_TO_SELF, 0.0f);
); slideDown.setDuration(500);
slideDown.setDuration(500); slideDown.setAnimationListener(slideListener);
slideDown.setAnimationListener(slideListener);
// WebView setup
// WebView setup webView = (WebView) findViewById(R.id.webView);
webView = (WebView) findViewById(R.id.webView); WebSettings webSettings = webView.getSettings();
WebSettings webSettings = webView.getSettings(); webView.setWebChromeClient(new WebChromeClient());
webView.setWebChromeClient(new WebChromeClient()); webView.setWebViewClient(new WebViewClient() {
webView.setWebViewClient(new WebViewClient() { @Override
public void onPageFinished(WebView view, String url) {
@Override Log.d("scale", view.getScale() + "");
public void onPageFinished(WebView view, String url) {
Log.d("scale", view.getScale() + ""); Log.d("pageFinished", url);
Log.d("pageFinished",url); if (url.equalsIgnoreCase(HOME_PAGE)) {
// navbar.setVisibility(View.VISIBLE);
navbar.startAnimation(slideDown);
}
if(url.equalsIgnoreCase(HOME_PAGE)){ }
// navbar.setVisibility(View.VISIBLE);
navbar.startAnimation(slideDown);
}
} @Override
public void onScaleChanged(WebView view, float oldScale,
float newScale) {
@Override Log.d("scale changed", oldScale + " - " + newScale);
public void onScaleChanged (WebView view, float oldScale, float newScale){
Log.d("scale changed", oldScale + " - " + newScale); if (newScale > 0.7) {
if(newScale > 0.7){ Log.d("scale", "reset");
// view.setInitialScale(70);
Log.d("scale","reset"); }
//view.setInitialScale(70);
} }
} });
webView.setInitialScale(70);
}); webView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
webView.setVerticalScrollBarEnabled(false);
webView.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);
webView.setOverScrollMode(WebView.OVER_SCROLL_NEVER);
webView.setInitialScale(70); webSettings.setBuiltInZoomControls(false);
webSettings.setSupportZoom(false);
webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
webSettings.setPluginState(WebSettings.PluginState.ON);
webSettings.setJavaScriptEnabled(true);
webSettings.setDomStorageEnabled(true);
webSettings.setDatabaseEnabled(true);
webSettings.setDatabasePath("/data/data/"
+ webView.getContext().getPackageName() + "/databases/");
webSettings.setSaveFormData(false);
webSettings.setLightTouchEnabled(false);
webSettings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL);
webSettings.setRenderPriority(RenderPriority.HIGH);
webSettings
.setUserAgentString("Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.77 Large Screen Safari/534.24 GoogleTV");
webView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE); webView.loadUrl(HOME_PAGE);
webView.setVerticalScrollBarEnabled(false); webView.requestFocus();
webView.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY); }
webView.setOverScrollMode(WebView.OVER_SCROLL_NEVER);
webSettings.setBuiltInZoomControls(false); @Override
webSettings.setSupportZoom(false); protected void onStop() {
webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
webSettings.setPluginState(WebSettings.PluginState.ON);
webSettings.setJavaScriptEnabled(true);
webSettings.setDomStorageEnabled(true);
webSettings.setDatabaseEnabled(true);
webSettings.setDatabasePath("/data/data/" + webView.getContext().getPackageName() + "/databases/");
webSettings.setSaveFormData(false);
webSettings.setLightTouchEnabled(false);
webSettings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL);
webSettings.setRenderPriority( RenderPriority.HIGH);
webSettings.setUserAgentString("Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.77 Large Screen Safari/534.24 GoogleTV");
webView.loadUrl(HOME_PAGE); super.onStop();
webView.requestFocus();
}
@Override SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
protected void onStop(){ SharedPreferences.Editor editor = settings.edit();
editor.putString("lastUrl", urlField.getText().toString());
super.onStop(); editor.commit();
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0); }
SharedPreferences.Editor editor = settings.edit();
editor.putString("lastUrl", urlField.getText().toString());
editor.commit(); @Override
public void onBackPressed() {
if (webView.canGoBack()) {
} webView.goBack();
webView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
@Override } else {
public void onBackPressed()
{
if(webView.canGoBack()){
webView.goBack(); super.onBackPressed();
webView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
} else { }
}
super.onBackPressed(); public void doNav() {
} String url = urlField.getText().toString();
}
public void doNav(){
String url = urlField.getText().toString();
if(URLUtil.isValidUrl(url) == false){
url = "http://" + url;
}
if (URLUtil.isValidUrl(url) == false) {
url = "http://" + url;
}
urlField.setText(url); urlField.setText(url);
webView.requestFocus(); webView.requestFocus();
webView.loadUrl(url); webView.loadUrl(url);
navbar.startAnimation(slideUp); navbar.startAnimation(slideUp);
}
}
} }