Bug 40041: Integrate Tor Network Settings (313a51e8) · Commits · The Tor Project / Applications / fenix

app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,6 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.topsites.DefaultTopSite
		import org.mozilla.fenix.onboarding.FenixOnboarding
		import org.mozilla.fenix.settings.SupportUtils
		import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
		import org.mozilla.fenix.tor.TorEvents
		import org.mozilla.fenix.tor.bootstrap.TorQuickStart
		import org.mozilla.fenix.theme.ThemeManager
		import org.mozilla.fenix.utils.FragmentPreDrawManager
		@@ -1133,6 +1132,10 @@ class HomeFragment : Fragment() {
		}

		private fun openTorNetworkSettings() {
		val directions =
		HomeFragmentDirections
		.actionHomeFragmentToTorNetworkSettingsFragment()
		findNavController().navigate(directions)
		}

		companion object {

app/src/main/res/drawable/ic_tor_network_settings.png

deleted100644 → 0

−475 B

Loading image diff...

app/src/main/res/drawable/ic_tor_network_settings.xml

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:pathData="M12,0.75C18.2132,0.75 23.25,5.7865 23.25,11.9997C23.25,18.2132 18.2132,23.25 12,23.25C5.7865,23.25 0.75,18.2132 0.75,11.9997C0.75,5.7865 5.7865,0.75 12,0.75ZM12.0231,2.7958L12.0231,4.1596C16.3429,4.172 19.8408,7.677 19.8408,11.9997C19.8408,16.3227 16.3429,19.8277 12.0231,19.8401L12.0231,19.8401L12.0231,21.2039C17.0961,21.1914 21.2042,17.0758 21.2042,11.9997C21.2042,6.9239 17.0961,2.8086 12.0231,2.7958L12.0231,2.7958ZM12.0231,6.2057L12.0231,7.5691C14.4596,7.5819 16.4318,9.56 16.4318,11.9997C16.4318,14.4397 14.4596,16.4178 12.0231,16.4306L12.0231,16.4306L12.0231,17.794C15.2131,17.7816 17.7956,15.1928 17.7956,11.9997C17.7956,8.8069 15.2131,6.2181 12.0231,6.2057L12.0231,6.2057ZM12.0231,9.6146L12.0231,14.3851C13.3301,14.3726 14.3863,13.3101 14.3863,11.9997C14.3863,10.6896 13.3301,9.6271 12.0231,9.6146L12.0231,9.6146Z"
		android:strokeAlpha="0.8"
		android:strokeWidth="1"
		android:fillColor="?attr/primaryText"
		android:fillType="evenOdd"
		android:strokeColor="#00000000"
		android:fillAlpha="0.8"/>
		</vector>

app/src/main/res/navigation/nav_graph.xml

+31 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,13 @@
		android:defaultValue="@null"
		app:argType="string"
		app:nullable="true" />
		<action
		android:id="@+id/action_homeFragment_to_torNetworkSettingsFragment"
		app:destination="@id/torNetworkSettingsFragment"
		app:enterAnim="@anim/slide_in_right"
		app:exitAnim="@anim/slide_out_left"
		app:popEnterAnim="@anim/slide_in_left"
		app:popExitAnim="@anim/slide_out_right" />
		</fragment>

		<dialog
		@@ -496,6 +503,13 @@
		app:exitAnim="@anim/slide_out_left"
		app:popEnterAnim="@anim/slide_in_left"
		app:popExitAnim="@anim/slide_out_right" />
		<action
		android:id="@+id/action_settingsFragment_to_torNetworkSettingsFragment"
		app:destination="@id/torNetworkSettingsFragment"
		app:enterAnim="@anim/slide_in_right"
		app:exitAnim="@anim/slide_out_left"
		app:popEnterAnim="@anim/slide_in_left"
		app:popExitAnim="@anim/slide_out_right" />
		<action
		android:id="@+id/action_settingsFragment_to_trackingProtectionFragment"
		app:destination="@id/trackingProtectionFragment"
		@@ -645,6 +659,23 @@
		android:id="@+id/privateBrowsingFragment"
		android:name="org.mozilla.fenix.settings.PrivateBrowsingFragment"
		android:label="@string/preferences_private_browsing_options" />
		<fragment
		android:id="@+id/torNetworkSettingsFragment"
		android:name="org.mozilla.fenix.settings.TorNetworkSettingsFragment">
		<action
		android:id="@+id/action_torNetworkSettingsFragment_to_torBridgeConfigFragment"
		app:destination="@id/torBridgeConfigFragment"
		app:enterAnim="@anim/slide_in_right"
		app:exitAnim="@anim/slide_out_left"
		app:popEnterAnim="@anim/slide_in_left"
		app:popExitAnim="@anim/slide_out_right" />
		</fragment>
		<fragment
		android:id="@+id/torBridgeConfigFragment"
		android:name="org.mozilla.fenix.settings.TorBridgeConfigFragment"
		android:label="@string/preferences_tor_network_settings_bridge_config"
		tools:layout="@layout/fragment_tor_bridge_config" >
		</fragment>
		<fragment
		android:id="@+id/trackingProtectionFragment"
		android:name="org.mozilla.fenix.settings.TrackingProtectionFragment">

app/src/main/res/values/torbrowser_strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,8 +52,8 @@
		<string name="preferences_tor_network_settings_status">Current Status</string>
		<string name="preferences_tor_network_settings_tor_ready">Is Tor Ready: %s</string>
		<string name="preferences_tor_network_settings_state">State: %s</string>
		<string name="preferences_tor_network_settings_yes">yes</string>
		<string name="preferences_tor_network_settings_no">no</string>
		<string name="preferences_tor_network_settings_yes">Yes</string>
		<string name="preferences_tor_network_settings_no">No</string>
		<string name="preferences_tor_network_settings_disconnected">Disconnected</string>
		<string name="preferences_tor_network_settings_connecting">Connecting</string>
		<string name="preferences_tor_network_settings_connected">Connected</string>