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

Merge pull request #307 from ByteHamster/dev

Browse Source 
Added 'home' button to tab drawer, German translation updates
This commit is contained in:
Anthony Restaino 2015-10-07 21:51:51 -04:00
commit f3a9a9a46d
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
View File

@ -340,6 +340,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
setupFrameLayoutButton(R.id.action_forward, R.id.icon_forward);
setupFrameLayoutButton(R.id.action_toggle_desktop, R.id.icon_desktop);
setupFrameLayoutButton(R.id.action_reading, R.id.icon_reading);
setupFrameLayoutButton(R.id.action_home, R.id.icon_home);
// create the search EditText in the ToolBar
mSearch = (AutoCompleteTextView) customView.findViewById(R.id.search);
@ -2321,6 +2322,10 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
case R.id.new_tab_button:
newTab(null, true);
break;
case R.id.action_home:
mCurrentView.loadHomepage();
closeDrawers();
break;
case R.id.button_next:
mWebView.findNext(false);
break;

19
app/src/main/res/layout/tab_drawer.xml
View File

@ -58,7 +58,7 @@
android:background="?attr/dividerColor"
android:baselineAligned="false"
android:orientation="horizontal"
android:weightSum="3">
android:weightSum="4">
<FrameLayout
android:id="@+id/action_back"
@ -94,6 +94,23 @@
android:src="@drawable/ic_action_plus" />
</FrameLayout>
<FrameLayout
android:id="@+id/action_home"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/actionBarItemBackground"
android:clickable="true">
<ImageView
android:id="@+id/icon_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:contentDescription="@string/action_homepage"
android:src="@drawable/ic_action_home" />
</FrameLayout>
<FrameLayout
android:id="@+id/action_forward"
android:layout_width="match_parent"

32
app/src/main/res/values-de/strings.xml
View File

@ -183,4 +183,36 @@
<item >URL</item>
<item >Titel</item>
</string-array>
<string name="action_folder">Ordner</string>
<string name="action_rename">Umbenennen</string>
<string name="black_theme">Schwarzes Design (AMOLED)</string>
<string name="clear_web_storage">Webinhalte leeren</string>
<string name="clear_web_storage_exit">Webinhalte beim Beenden leeren</string>
<string name="dark_theme">Dunkles Design</string>
<string name="dialog_folder">Was möchten Sie mit diesem Ordner tun?</string>
<string name="dialog_history_long_press">Was möchten Sie mit diesem Verlaufs-Eintrag tun?</string>
<string name="folder">Ordnername</string>
<string name="invert_color">Farben invertieren</string>
<string name="light_theme">Helles Design</string>
<string name="manual_proxy">Manueller Proxy</string>
<string name="message_insecure_connection">Die Verbindung zu dieser Seite ist nicht sicher:\n%1$s\nTrotzdem fortfahren?</string>
<string name="message_web_storage_cleared">Webinhalte geleert</string>
<string name="port">Port:</string>
<string name="tabs">Tabs</string>
<string name="theme">App-Design</string>
<string name="title_rename_folder">Ordner umbenennen</string>
<string name="http_proxy">HTTP-Proxy</string>
<string name="i2p_not_running">I2P läuft nicht.</string>
<string name="i2p_tunnels_not_ready">I2P Tunnel sind noch nicht bereit.</string>
<string name="message_certificate_date_invalid">Zertifikats-Datum ungültig</string>
<string name="message_certificate_domain_mismatch">Domain in Zertifikat stimmt nicht mit aktueller Domain überein</string>
<string name="message_certificate_expired">Zertifikat abgelaufen</string>
<string name="message_certificate_invalid">Zertifikat ungültig</string>
<string name="message_certificate_not_yet_valid">Zertifikat noch nicht gültig</string>
<string name="message_certificate_untrusted">Zertifikat wird nicht vertraut</string>
<string name="problem_download">Ungültige Adresse gefunden. Kann nicht herunterladen</string>
<string name="problem_location_download">Kann nicht an den eingestellten Ort herunterladen</string>
<string name="use_i2p_prompt">Es sieht aus, als ob I2P installiert wäre. Möchten Sie es verwenden?</string>
<string name="text_encoding">Textcodierung</string>
<string name="tabs_in_drawer">Tabs in Drawer anzeigen</string>
</resources>