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

clean code

Browse Source
This commit is contained in:
DF1E 2014-06-19 19:19:25 +02:00
parent 94d39dd56b
commit 7ffaf25f5e
15 changed files with 580 additions and 698 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/action_search.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
res/drawable-mdpi/action_search.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
res/drawable-xhdpi/action_search.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
res/drawable-xhdpi/edit_text_bg.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 220 B

5
res/layout-large/activity_main.xml
View File

@ -5,7 +5,6 @@
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_medium"
android:orientation="vertical" >
<LinearLayout
@ -58,7 +57,7 @@
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#e4e4e4"
android:background="@color/drawer_background"
android:clickable="true"
android:orientation="vertical" >
@ -161,7 +160,7 @@
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="#e4e4e4"
android:background="@color/drawer_background"
android:clickable="true"
android:orientation="vertical" >

5
res/layout-xlarge/activity_main.xml
View File

@ -5,7 +5,6 @@
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_medium"
android:orientation="vertical" >
<LinearLayout
@ -58,7 +57,7 @@
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#e4e4e4"
android:background="@color/drawer_background"
android:clickable="true"
android:orientation="vertical" >
@ -161,7 +160,7 @@
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="#e4e4e4"
android:background="@color/drawer_background"
android:clickable="true"
android:orientation="vertical" >

5
res/layout/activity_main.xml
View File

@ -5,7 +5,6 @@
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_medium"
android:orientation="vertical" >
<LinearLayout
@ -58,7 +57,7 @@
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#e4e4e4"
android:background="@color/drawer_background"
android:clickable="true"
android:orientation="vertical" >
@ -161,7 +160,7 @@
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="#e4e4e4"
android:background="@color/drawer_background"
android:clickable="true"
android:orientation="vertical" >

1128
res/layout/advanced_settings.xml
View File

File diff suppressed because it is too large Load Diff

4
res/values-de/strings.xml
View File

@ -19,7 +19,7 @@
<string name="app_name">Lightning</string>
<string name="drawer_open">Navigation-Drawer öffnen</string>
<string name="drawer_close">Navigation-Drawer schliessen</string>
<string name="drawer_close">Navigation-Drawer schließen</string>
<string name="action_websearch">Websuche</string>
<string name="action_refresh">Aktualisieren</string>
<string name="action_new_tab">Neuer Tab</string>
@ -145,7 +145,7 @@
<string name="licenses">Open Source-Lizenzen</string>
<string name="suggestion">Suche nach</string>
<string name="block_ads">Werbung blockieren</string>
<string name="message_untrusted_certificate">Das Zertifikat dieser Webseite ist nicht vertrauenswürdig. Trozdem fortsetzen?</string>
<string name="message_untrusted_certificate">Das Zertifikat dieser Webseite ist nicht vertrauenswürdig. Trotzdem fortsetzen?</string>
<string name="title_form_resubmission">Formularneuzustellung</string>
<string name="message_form_resubmission">Daten erneut senden?</string>
<string name="message_location">\nMeine Position verwenden?</string>

8
res/values-sw600dp/dimens.xml
View File

@ -1,8 +0,0 @@
<resources>
<!--
Customize dimensions originally defined in res/values/dimens.xml (such as
screen margins) for sw600dp devices (e.g. 7" tablets) here.
-->
</resources>

9
res/values-sw720dp-land/dimens.xml
View File

@ -1,9 +0,0 @@
<resources>
<!--
Customize dimensions originally defined in res/values/dimens.xml (such as
screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-->
<dimen name="activity_horizontal_margin">128dp</dimen>
</resources>

8
res/values/colors.xml
View File

@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="clear">#00000000</color>
<color name="blue">#b433b5e5</color>
<color name="press">#3333b5e5</color>
<color name="drawer_background">#e4e4e4</color>
<color name="black">#ff000000</color>
<color name="dark">#ff3f3f3f</color>
<color name="light">#ffa0a0a0</color>
<color name="gray_dark">#222222</color>
<color name="gray_light">#dddddd</color>
<color name="gray_medium">#cdcdcd</color>
<color name="white">#ffffff</color>
<color name="gray_extra_dark">#1b1b1b</color>
</resources>

55
src/acr/browser/lightning/BrowserActivity.java
View File

@ -422,12 +422,6 @@ public class BrowserActivity extends Activity implements BrowserController {
}
}
@Override
public void onDrawerSlide(View drawerView, float slideOffset) {
super.onDrawerSlide(drawerView, slideOffset);
}
};
mNewTab.setOnClickListener(new OnClickListener() {
@ -456,18 +450,15 @@ public class BrowserActivity extends Activity implements BrowserController {
else
checkForTor();
}
/*
* If Orbot/Tor is installed, prompt the user if they want to enable proxying for this session
*/
public boolean checkForTor ()
{
public boolean checkForTor () {
OrbotHelper oh = new OrbotHelper(this);
if (oh.isOrbotInstalled())
{
if (oh.isOrbotInstalled()) {
DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@ -501,8 +492,7 @@ public class BrowserActivity extends Activity implements BrowserController {
/*
* Initialize WebKit Proxying for Tor
*/
public void initializeTor ()
{
public void initializeTor() {
OrbotHelper oh = new OrbotHelper(this);
if (!oh.isOrbotRunning())
@ -539,7 +529,7 @@ public class BrowserActivity extends Activity implements BrowserController {
String mem = mPreferences.getString(PreferenceConstants.URL_MEMORY,
"");
mEditPrefs.putString(PreferenceConstants.URL_MEMORY, "");
String[] array = getArray(mem);
String[] array = Utils.getArray(mem);
int count = 0;
for (int n = 0; n < array.length; n++) {
if (array[n].length() > 0) {
@ -558,10 +548,6 @@ public class BrowserActivity extends Activity implements BrowserController {
}
public static String[] getArray(String input) {
return input.split("\\|\\$\\|SEPARATOR\\|\\$\\|");
}
public void initializePreferences() {
if (mPreferences == null) {
mPreferences = getSharedPreferences(
@ -640,15 +626,6 @@ public class BrowserActivity extends Activity implements BrowserController {
return super.onCreateOptionsMenu(menu);
}
/* Called whenever we call invalidateOptionsMenu() */
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
// If the nav drawer is open, hide action items related to the content
// view
return super.onPrepareOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// The action bar home/up action should open or close the drawer.
@ -1190,30 +1167,6 @@ public class BrowserActivity extends Activity implements BrowserController {
super.onDestroy();
}
@Override
protected void onPostResume() {
Log.i("Lightning", "onPostResume");
super.onPostResume();
}
@Override
protected void onRestart() {
Log.i("Lightning", "onRestart");
super.onRestart();
}
@Override
protected void onStart() {
Log.i("Lightning", "onStart");
super.onStart();
}
@Override
protected void onStop() {
Log.i("Lightning", "onStop");
super.onStop();
}
@Override
protected void onResume() {
super.onResume();

43
src/acr/browser/lightning/IncognitoActivity.java
View File

@ -417,12 +417,6 @@ public class IncognitoActivity extends Activity implements BrowserController {
}
}
@Override
public void onDrawerSlide(View drawerView, float slideOffset) {
super.onDrawerSlide(drawerView, slideOffset);
}
};
mNewTab.setOnClickListener(new OnClickListener() {
@ -454,10 +448,6 @@ public class IncognitoActivity extends Activity implements BrowserController {
}
public static String[] getArray(String input) {
return input.split("\\|\\$\\|SEPARATOR\\|\\$\\|");
}
public void initializePreferences() {
if (mPreferences == null) {
mPreferences = getSharedPreferences(
@ -536,15 +526,6 @@ public class IncognitoActivity extends Activity implements BrowserController {
return super.onCreateOptionsMenu(menu);
}
/* Called whenever we call invalidateOptionsMenu() */
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
// If the nav drawer is open, hide action items related to the content
// view
return super.onPrepareOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// The action bar home/up action should open or close the drawer.
@ -1071,30 +1052,6 @@ public class IncognitoActivity extends Activity implements BrowserController {
super.onDestroy();
}
@Override
protected void onPostResume() {
Log.i("Lightning", "onPostResume");
super.onPostResume();
}
@Override
protected void onRestart() {
Log.i("Lightning", "onRestart");
super.onRestart();
}
@Override
protected void onStart() {
Log.i("Lightning", "onStart");
super.onStart();
}
@Override
protected void onStop() {
Log.i("Lightning", "onStop");
super.onStop();
}
@Override
protected void onResume() {
super.onResume();

8
src/acr/browser/lightning/Utils.java
View File

@ -26,10 +26,6 @@ import android.widget.Toast;
public class Utils {
public Utils() {
// TODO Auto-generated constructor stub
}
public static void downloadFile(final Activity activity, final String url, final String userAgent, final String contentDisposition, final boolean privateBrowsing){
String fileName = URLUtil.guessFileName(url, null,
null);
@ -146,4 +142,8 @@ public class Utils {
}
return bookmarks;
}
public static String[] getArray(String input) {
return input.split("\\|\\$\\|SEPARATOR\\|\\$\\|");
}
}