I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit a7fc5090 authored by str4d's avatar str4d
Browse files

Simplified settings layout, pulled strings into resource file

parent 6154f641
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
res/values/strings.xml
+ 31
− 1
View file @ a7fc5090
...@@ -4,7 +4,37 @@ ...@@ -4,7 +4,37 @@
<string name="app_name">I2P</string> <string name="app_name">I2P</string>
<string name="welcome_new_install">Welcome to I2P! This app is ALPHA software and it does not provide strong anonymity. Please read the release notes and license information.</string> <string name="welcome_new_install">Welcome to I2P! This app is ALPHA software and it does not provide strong anonymity. Please read the release notes and license information.</string>
<string name="welcome_new_version">New version installed. Please read the release notes. Version:</string> <string name="welcome_new_version">New version installed. Please read the release notes. Version:</string>
<string name="settings_label_subscriptions">I2P Addressbook Settings</string>
<string name="menu_settings">Settings</string> <string name="menu_settings">Settings</string>
<string name="settings_enable">Enable</string>
<string name="settings_label_subscriptions">I2P Addressbook</string>
<string name="settings_desc_subscriptions">Subscription URLs</string>
<string name="settings_label_bandwidth">Bandwidth and network</string>
<string name="settings_label_bw_inbound">Inbound speed</string>
<string name="settings_desc_bw_inbound">Maximum inbound speed</string>
<string name="settings_label_bw_outbound">Outbound speed</string>
<string name="settings_desc_bw_outbound">Maximum outbound speed</string>
<string name="settings_label_hiddenMode">Participation</string>
<string name="settings_desc_hiddenMode">Turn off hidden mode</string>
<string name="settings_label_maxPartTunnels">Max participating tunnels</string>
<string name="settings_label_sharePercent">Share percentage</string>
<string name="settings_desc_upnp">Open firewall ports automatically</string>
<string name="settings_label_advanced">Advanced</string>
<string name="settings_label_transports">Transports</string>
<string name="settings_label_maxConns">Max connections</string>
<string name="settings_label_i2cp">I2CP interface</string>
<string name="settings_desc_i2cp">Listen on port 7654</string>
<string name="settings_label_exploratory_pool">Exploratory pool</string>
<string name="settings_desc_exploratory_pool">Tunnel parameters</string>
<string name="settings_label_expl_inbound">Inbound tunnels</string>
<string name="settings_label_expl_outbound">Outbound tunnels</string>
<string name="settings_label_expl_length">Length</string>
<string name="settings_desc_expl_length">How many hops to use</string>
<string name="settings_label_expl_lengthVariance">Hop variance</string>
<string name="settings_desc_expl_lengthVariance">How many hops to randomly add</string>
<string name="settings_label_expl_quantity">Quantity</string>
<string name="settings_desc_expl_quantity">How many tunnels</string>
<string name="settings_label_expl_backupQuantity">Backup quantity</string>
<string name="settings_desc_expl_backupQuantity">How many tunnel backups</string>
</resources> </resources>
\ No newline at end of file
res/xml/settings1.xml
+ 151
− 101
View file @ a7fc5090
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:key="settings1"> android:key="settings1">
<Preference <Preference
android:title="@string/settings_label_subscriptions" android:title="@string/settings_label_subscriptions"
android:summary="@string/settings_desc_subscriptions"
android:key="addressbook_preferences"> android:key="addressbook_preferences">
<intent android:targetPackage="net.i2p.android.router" android:targetClass="net.i2p.android.router.activity.AddressbookSettingsActivity" /> <intent android:targetPackage="net.i2p.android.router" android:targetClass="net.i2p.android.router.activity.AddressbookSettingsActivity" />
...@@ -12,13 +13,11 @@ ...@@ -12,13 +13,11 @@
<!-- <!--
Keys and the default values from current installation: Keys and the default values from current installation:
i2cp.disableInterface=true
--> -->
<CheckBoxPreference
android:key="i2cp.disableInterface" <PreferenceCategory
android:defaultValue="false" android:key="settings_bandwidth"
android:title="Disable i2cp interface" android:title="@string/settings_label_bandwidth">
/>
<!-- <!--
i2np.bandwidth.inboundKBytesPerSecond=100 i2np.bandwidth.inboundKBytesPerSecond=100
--> -->
...@@ -26,9 +25,9 @@ ...@@ -26,9 +25,9 @@
android:key="i2np.bandwidth.inboundKBytesPerSecond" android:key="i2np.bandwidth.inboundKBytesPerSecond"
android:defaultValue="100" android:defaultValue="100"
android:max="1000" android:max="1000"
android:title="Inbound speed" android:title="@string/settings_label_bw_inbound"
android:summary="Maximum inbound speed" android:summary="@string/settings_desc_bw_inbound"
android:dialogMessage="Maximum inbound speed" android:dialogMessage="@string/settings_desc_bw_inbound"
android:text=" KBytes/sec" android:text=" KBytes/sec"
/> />
<!-- <!--
...@@ -38,29 +37,74 @@ ...@@ -38,29 +37,74 @@
android:key="i2np.bandwidth.outboundKBytesPerSecond" android:key="i2np.bandwidth.outboundKBytesPerSecond"
android:defaultValue="100" android:defaultValue="100"
android:max="1000" android:max="1000"
android:title="Outbound speed" android:title="@string/settings_label_bw_outbound"
android:summary="Maximum outbound speed" android:summary="@string/settings_desc_bw_outbound"
android:dialogMessage="Maximum outbound speed" android:dialogMessage="@string/settings_desc_bw_outbound"
android:text=" KBytes/sec" android:text=" KBytes/sec"
/> />
<CheckBoxPreference <CheckBoxPreference
android:key="i2np.ntcp.enable" android:key="router.hiddenMode"
android:defaultValue="true" android:defaultValue="false"
android:title="Enable NTCP" android:title="@string/settings_label_hiddenMode"
android:summary="@string/settings_desc_hiddenMode"
/>
<!--
router.maxParticipatingTunnels=0
-->
<com.hlidskialf.android.preference.SeekBarPreference
android:key="router.maxParticipatingTunnels"
android:defaultValue="20"
android:max="500"
android:title="@string/settings_label_maxPartTunnels"
android:summary="Maximum tunnels to participate in (default=20)"
android:dialogMessage="Maximum tunnels to participate in"
android:text=" Tunnels"
android:dependency="router.hiddenMode"
/>
<!--
router.sharePercentage=10
-->
<com.hlidskialf.android.preference.SeekBarPreference
android:key="router.sharePercentage"
android:defaultValue="80"
android:max="100"
android:title="@string/settings_label_sharePercent"
android:summary="Percentage of bandwith to share (default=80)"
android:dialogMessage="Percentage of bandwidth to share"
android:text="%"
android:dependency="router.hiddenMode"
android:shouldDisableView="true"
/> />
<!-- <!--
i2np.udp.enable=false i2np.upnp.enable=false
I might hide this one...
--> -->
<CheckBoxPreference <CheckBoxPreference
android:key="i2np.udp.enable" android:key="i2np.upnp.enable"
android:defaultValue="true" android:defaultValue="true"
android:title="Enable UDP" android:title="UPnP"
android:summary="DO NOT DISABLE THIS" android:summary="@string/settings_desc_upnp"
/> />
</PreferenceCategory>
<PreferenceCategory
android:key="settings_advanced"
android:title="@string/settings_label_advanced">
<PreferenceScreen
android:key="settings_transports"
android:title="@string/settings_label_transports">
<PreferenceCategory
android:key="settings_ntcp"
android:title="NTCP">
<CheckBoxPreference
android:key="i2np.ntcp.enable"
android:defaultValue="true"
android:title="@string/settings_enable"
/>
<!-- <!--
i2np.ntcp.maxConnections=24 i2np.ntcp.maxConnections=24
--> -->
...@@ -68,13 +112,29 @@ ...@@ -68,13 +112,29 @@
android:key="i2np.ntcp.maxConnections" android:key="i2np.ntcp.maxConnections"
android:defaultValue="32" android:defaultValue="32"
android:max="250" android:max="250"
android:title="Max NTCP connections" android:title="@string/settings_label_maxConns"
android:summary="Maximum NTCP connections allowed (default=32)" android:summary="Maximum NTCP connections allowed (default=32)"
android:dialogMessage="Maximum NTCP connections" android:dialogMessage="Maximum NTCP connections"
android:text=" connections" android:text=" connections"
android:dependency="i2np.ntcp.enable" android:dependency="i2np.ntcp.enable"
android:shouldDisableView="true" android:shouldDisableView="true"
/> />
</PreferenceCategory>
<PreferenceCategory
android:key="settings_udp"
android:title="UDP">
<!--
i2np.udp.enable=false
I might hide this one...
-->
<CheckBoxPreference
android:key="i2np.udp.enable"
android:defaultValue="true"
android:title="@string/settings_enable"
android:summary="DO NOT DISABLE THIS"
/>
<!-- <!--
i2np.udp.maxConnections=12 i2np.udp.maxConnections=12
--> -->
...@@ -82,147 +142,137 @@ ...@@ -82,147 +142,137 @@
android:key="i2np.udp.maxConnections" android:key="i2np.udp.maxConnections"
android:defaultValue="32" android:defaultValue="32"
android:max="500" android:max="500"
android:title="Max UDP connections" android:title="@string/settings_label_maxConns"
android:summary="Maximum UDP connections allowed" android:summary="Maximum UDP connections allowed"
android:dialogMessage="Maximum UDP connections" android:dialogMessage="Maximum UDP connections"
android:text=" connections" android:text=" connections"
android:dependency="i2np.udp.enable" android:dependency="i2np.udp.enable"
android:shouldDisableView="true" android:shouldDisableView="true"
/> />
</PreferenceCategory>
</PreferenceScreen>
<!-- <!--
i2np.upnp.enable=false i2cp.disableInterface=true
--> -->
<CheckBoxPreference <CheckBoxPreference
android:key="i2np.upnp.enable" android:key="i2cp.disableInterface"
android:defaultValue="true"
android:title="Enable UPNP"
/>
<CheckBoxPreference
android:key="router.hiddenMode"
android:defaultValue="false" android:defaultValue="false"
android:title="Enable Participation" android:title="@string/settings_label_i2cp"
android:summary="Enabling this option turns off hidden mode" android:summary="@string/settings_desc_i2cp"
/> />
<!--
router.maxParticipatingTunnels=0 <PreferenceScreen
--> android:key="settings_exploratory_pool"
<com.hlidskialf.android.preference.SeekBarPreference android:title="@string/settings_label_exploratory_pool"
android:key="router.maxParticipatingTunnels" android:summary="@string/settings_desc_exploratory_pool">
android:defaultValue="20"
android:max="500"
android:title="Max Participating Tunnels"
android:summary="Maximum tunnels to participate in (default=20)"
android:dialogMessage="Maximum tunnels to participate in"
android:text=" Tunnels"
android:dependency="router.hiddenMode"
/>
<!--
router.sharePercentage=10
-->
<com.hlidskialf.android.preference.SeekBarPreference
android:key="router.sharePercentage"
android:defaultValue="80"
android:max="100"
android:title="Share Percentage"
android:summary="Percentage of bandwith to share (default=80)"
android:dialogMessage="Percentage of bandwith to share"
android:text="%"
android:dependency="router.hiddenMode"
android:shouldDisableView="true"
/>
<PreferenceCategory
android:key="settings_expl_inbound"
android:title="@string/settings_label_expl_inbound">
<!-- <!--
router.inboundPool.length=1 router.inboundPool.length=1
router.outboundPool.length=1
--> -->
<ListPreference <ListPreference
android:key="router.inboundPool.length" android:key="router.inboundPool.length"
android:entries="@array/setting0to3" android:entries="@array/setting0to3"
android:entryValues="@array/setting0to3" android:entryValues="@array/setting0to3"
android:title="inbound length" android:title="@string/settings_label_expl_length"
android:summary="How many hops for inbound tunnel" android:summary="@string/settings_desc_expl_length"
android:defaultValue="2"
/>
<ListPreference
android:key="router.outboundPool.length"
android:entries="@array/setting0to3"
android:entryValues="@array/setting0to3"
android:title="outbound length"
android:summary="How many hops for outbound tunnel"
android:defaultValue="2" android:defaultValue="2"
/> />
<!-- <!--
router.inboundPool.lengthVariance=1 router.inboundPool.lengthVariance=1
router.outboundPool.lengthVariance=1
--> -->
<ListPreference <ListPreference
android:key="router.inboundPool.lengthVariance" android:key="router.inboundPool.lengthVariance"
android:entries="@array/setting2to2" android:entries="@array/setting2to2"
android:entryValues="@array/setting2to2" android:entryValues="@array/setting2to2"
android:title="inbound hop variance" android:title="@string/settings_label_expl_lengthVariance"
android:summary="How many hops to randomly add to inbound tunnels" android:summary="@string/settings_desc_expl_lengthVariance"
android:defaultValue="0"
/>
<ListPreference
android:key="router.outboundPool.lengthVariance"
android:entries="@array/setting2to2"
android:entryValues="@array/setting2to2"
android:title="outbound hop variance"
android:summary="How many hops to randomly add to outbound tunnels"
android:defaultValue="0" android:defaultValue="0"
/> />
<!-- <!--
router.inboundPool.quantity=2 router.inboundPool.quantity=2
router.outboundPool.quantity=2
--> -->
<ListPreference <ListPreference
android:key="router.inboundPool.quantity" android:key="router.inboundPool.quantity"
android:entries="@array/setting0to3" android:entries="@array/setting0to3"
android:entryValues="@array/setting0to3" android:entryValues="@array/setting0to3"
android:title="inbound quantity" android:title="@string/settings_label_expl_quantity"
android:summary="How many inbound tunnels" android:summary="@string/settings_desc_expl_quantity"
android:defaultValue="2" android:defaultValue="2"
/> />
<!--
router.inboundPool.backupQuantity=0
-->
<ListPreference <ListPreference
android:key="router.outboundPool.quantity" android:key="router.inboundPool.backupQuantity"
android:entries="@array/setting0to3" android:entries="@array/setting0to3"
android:entryValues="@array/setting0to3" android:entryValues="@array/setting0to3"
android:title="outbound quantity" android:title="@string/settings_label_expl_backupQuantity"
android:summary="How many outbound tunnels" android:summary="@string/settings_desc_expl_backupQuantity"
android:defaultValue="2" android:defaultValue="0"
/> />
</PreferenceCategory>
<PreferenceCategory
android:key="settings_expl_outbound"
android:title="@string/settings_label_expl_outbound">
<!-- <!--
router.inboundPool.backupQuantity=0 router.outboundPool.length=1
router.outboundPool.backupQuantity=0
--> -->
<ListPreference <ListPreference
android:key="router.inboundPool.backupQuantity" android:key="router.outboundPool.length"
android:entries="@array/setting0to3" android:entries="@array/setting0to3"
android:entryValues="@array/setting0to3" android:entryValues="@array/setting0to3"
android:title="inbound backup quantity" android:title="@string/settings_label_expl_length"
android:summary="How many inbound tunnel backups" android:summary="@string/settings_desc_expl_length"
android:defaultValue="2"
/>
<!--
router.outboundPool.lengthVariance=1
-->
<ListPreference
android:key="router.outboundPool.lengthVariance"
android:entries="@array/setting2to2"
android:entryValues="@array/setting2to2"
android:title="@string/settings_label_expl_lengthVariance"
android:summary="@string/settings_desc_expl_lengthVariance"
android:defaultValue="0" android:defaultValue="0"
/> />
<!--
router.outboundPool.quantity=2
-->
<ListPreference
android:key="router.outboundPool.quantity"
android:entries="@array/setting0to3"
android:entryValues="@array/setting0to3"
android:title="@string/settings_label_expl_quantity"
android:summary="@string/settings_desc_expl_quantity"
android:defaultValue="2"
/>
<!--
router.outboundPool.backupQuantity=0
-->
<ListPreference <ListPreference
android:key="router.outboundPool.backupQuantity" android:key="router.outboundPool.backupQuantity"
android:entries="@array/setting0to3" android:entries="@array/setting0to3"
android:entryValues="@array/setting0to3" android:entryValues="@array/setting0to3"
android:title="outbound backup quantity" android:title="@string/settings_label_expl_backupQuantity"
android:summary="How many outbound tunnel backups" android:summary="@string/settings_desc_expl_backupQuantity"
android:defaultValue="0" android:defaultValue="0"
/> />
</PreferenceCategory>
</PreferenceScreen>
</PreferenceCategory>
<!-- <!--
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]