Implement info screens for offline app sharing

briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java

@@ -35,7 +35,10 @@ import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
 import org.briarproject.briar.android.attachment.media.MediaModule;
 import org.briarproject.briar.android.conversation.glide.BriarModelLoader;
+import org.briarproject.briar.android.hotspot.AbstractTabsFragment;
 import org.briarproject.briar.android.hotspot.HotspotIntroFragment;
+import org.briarproject.briar.android.hotspot.HotspotManualFragment;
+import org.briarproject.briar.android.hotspot.HotspotQrFragment;
 import org.briarproject.briar.android.logging.CachingLogHandler;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.settings.ConnectionsFragment;
@@ -213,4 +216,10 @@ public interface AndroidComponent
 	void inject(NotificationsFragment notificationsFragment);
 
 	void inject(HotspotIntroFragment hotspotIntroFragment);
+
+	void inject(AbstractTabsFragment abstractTabsFragment);
+
+	void inject(HotspotQrFragment hotspotQrFragment);
+
+	void inject(HotspotManualFragment hotspotManualFragment);
 }

briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java

@@ -0,0 +1,109 @@
+package org.briarproject.briar.android.hotspot;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+
+import javax.inject.Inject;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+import androidx.viewpager2.widget.ViewPager2;
+
+import static android.widget.Toast.LENGTH_SHORT;
+import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public abstract class AbstractTabsFragment extends Fragment {
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	protected HotspotViewModel viewModel;
+
+	protected Button stopButton;
+	protected Button connectedButton;
+
+	@Override
+	public void onAttach(Context context) {
+		super.onAttach(context);
+		getAndroidComponent(requireContext()).inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(HotspotViewModel.class);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		return inflater
+				.inflate(R.layout.fragment_hotspot_tabs, container, false);
+	}
+
+	@Override
+	@CallSuper
+	public void onViewCreated(@NonNull View view,
+			@Nullable Bundle savedInstanceState) {
+		TabAdapter tabAdapter = new TabAdapter(this);
+		ViewPager2 viewPager = view.findViewById(R.id.pager);
+		viewPager.setAdapter(tabAdapter);
+		TabLayout tabLayout = view.findViewById(R.id.tabLayout);
+		new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> {
+			// tabs are set in XML, but just dummies that don't get not added
+			if (position == 0) {
+				tab.setText(R.string.hotspot_tab_manual);
+				tab.setIcon(R.drawable.forum_item_create_white);
+			} else if (position == 1) {
+				tab.setText(R.string.qr_code);
+				tab.setIcon(R.drawable.ic_qr_code);
+			} else throw new AssertionError();
+		}).attach();
+
+		stopButton = view.findViewById(R.id.stopButton);
+		stopButton.setOnClickListener(v -> {
+			Toast.makeText(requireContext(), "Not yet implemented",
+					LENGTH_SHORT).show();
+		});
+		connectedButton = view.findViewById(R.id.connectedButton);
+	}
+
+	protected abstract Fragment getFirstFragment();
+
+	protected abstract Fragment getSecondFragment();
+
+	private class TabAdapter extends FragmentStateAdapter {
+		private TabAdapter(Fragment fragment) {
+			super(fragment);
+		}
+
+		@NonNull
+		@Override
+		public Fragment createFragment(int position) {
+			if (position == 0) return getFirstFragment();
+			if (position == 1) return getSecondFragment();
+			throw new AssertionError();
+		}
+
+		@Override
+		public int getItemCount() {
+			return 2;
+		}
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java

@@ -1,7 +1,10 @@
 package org.briarproject.briar.android.hotspot;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -16,6 +19,8 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.lifecycle.ViewModelProvider;
 
+import static android.widget.Toast.LENGTH_SHORT;
+
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class HotspotActivity extends BriarActivity {
@@ -42,6 +47,8 @@ public class HotspotActivity extends BriarActivity {
 			ab.setDisplayHomeAsUpEnabled(true);
 		}
 
+		// TODO observe viewmodel state and show error or HotspotFragment
+
 		if (state == null) {
 			getSupportFragmentManager().beginTransaction()
 					.replace(R.id.fragmentContainer, new HotspotIntroFragment(),
@@ -50,11 +57,21 @@ public class HotspotActivity extends BriarActivity {
 		}
 	}
 
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.hotspot_help_action, menu);
+		return super.onCreateOptionsMenu(menu);
+	}
+
 	@Override
 	public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 		if (item.getItemId() == android.R.id.home) {
 			onBackPressed();
 			return true;
+		} else if (item.getItemId() == R.id.action_help) {
+			Toast.makeText(this, "Not yet implemented", LENGTH_SHORT).show();
+			return true;
 		}
 		return super.onOptionsItemSelected(item);
 	}

briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotFragment.java

@@ -0,0 +1,47 @@
+package org.briarproject.briar.android.hotspot;
+
+import android.os.Bundle;
+import android.view.View;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class HotspotFragment extends AbstractTabsFragment {
+
+	public final static String TAG = HotspotFragment.class.getName();
+
+	@Override
+	public void onViewCreated(@NonNull View view,
+			@Nullable Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		// no need to call into the ViewModel here
+		connectedButton.setOnClickListener(v -> {
+			getParentFragmentManager().beginTransaction()
+					.setCustomAnimations(R.anim.step_next_in,
+							R.anim.step_previous_out, R.anim.step_previous_in,
+							R.anim.step_next_out)
+					.replace(R.id.fragmentContainer, new WebsiteFragment(),
+							WebsiteFragment.TAG)
+					.addToBackStack(WebsiteFragment.TAG)
+					.commit();
+		});
+	}
+
+	@Override
+	protected Fragment getFirstFragment() {
+		return HotspotManualFragment.newInstance(true);
+	}
+
+	@Override
+	protected Fragment getSecondFragment() {
+		return HotspotQrFragment.newInstance(true);
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java

@@ -59,6 +59,18 @@ public class HotspotIntroFragment extends Fragment {
 			startButton.setVisibility(INVISIBLE);
 			progressBar.setVisibility(VISIBLE);
 			progressTextView.setVisibility(VISIBLE);
+			// TODO remove below, tell viewModel to start hotspot instead
+			v.postDelayed(() -> {
+				getParentFragmentManager().beginTransaction()
+						.setCustomAnimations(R.anim.step_next_in,
+								R.anim.step_previous_out,
+								R.anim.step_previous_in,
+								R.anim.step_next_out)
+						.replace(R.id.fragmentContainer, new HotspotFragment(),
+								HotspotFragment.TAG)
+						.addToBackStack(HotspotFragment.TAG)
+						.commit();
+			}, 1500);
 		});
 
 		return v;

briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManualFragment.java

@@ -0,0 +1,85 @@
+package org.briarproject.briar.android.hotspot;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+
+import javax.inject.Inject;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import static android.view.View.GONE;
+import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class HotspotManualFragment extends Fragment {
+
+	public final static String TAG = HotspotManualFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private HotspotViewModel viewModel;
+
+	static HotspotManualFragment newInstance(boolean forWifiConnect) {
+		HotspotManualFragment f = new HotspotManualFragment();
+		Bundle bundle = new Bundle();
+		bundle.putBoolean("forWifiConnect", forWifiConnect);
+		f.setArguments(bundle);
+		return f;
+	}
+
+	@Override
+	public void onAttach(Context context) {
+		super.onAttach(context);
+		getAndroidComponent(requireContext()).inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(HotspotViewModel.class);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		return inflater
+				.inflate(R.layout.fragment_hotspot_manual, container, false);
+	}
+
+	@Override
+	public void onViewCreated(View v, @Nullable Bundle savedInstanceState) {
+		super.onViewCreated(v, savedInstanceState);
+
+		TextView manualIntroView = v.findViewById(R.id.manualIntroView);
+		TextView ssidLabelView = v.findViewById(R.id.ssidLabelView);
+		TextView ssidView = v.findViewById(R.id.ssidView);
+		TextView passwordView = v.findViewById(R.id.passwordView);
+		TextView altView = v.findViewById(R.id.altView);
+
+		if (requireArguments().getBoolean("forWifiConnect")) {
+			manualIntroView.setText(R.string.hotspot_manual_wifi);
+			ssidLabelView.setText(R.string.hotspot_manual_wifi_ssid);
+			// TODO observe state in ViewModel and get info from there instead
+			ssidView.setText("DIRECT-42-dfzsgf34ef");
+			passwordView.setText("sdf78shfd8");
+			altView.setText(R.string.hotspot_manual_wifi_alt);
+		} else {
+			manualIntroView.setText(R.string.hotspot_manual_site);
+			ssidLabelView.setText(R.string.hotspot_manual_site_address);
+			// TODO observe state in ViewModel and get info from there instead
+			ssidView.setText("http://192.168.49.1:9999");
+			altView.setText(R.string.hotspot_manual_site_alt);
+			v.findViewById(R.id.passwordLabelView).setVisibility(GONE);
+			passwordView.setVisibility(GONE);
+		}
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotQrFragment.java

@@ -0,0 +1,70 @@
+package org.briarproject.briar.android.hotspot;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+
+import javax.inject.Inject;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+
+import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class HotspotQrFragment extends Fragment {
+
+	public final static String TAG = HotspotQrFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private HotspotViewModel viewModel;
+
+	static HotspotQrFragment newInstance(boolean forWifiConnect) {
+		HotspotQrFragment f = new HotspotQrFragment();
+		Bundle bundle = new Bundle();
+		bundle.putBoolean("forWifiConnect", forWifiConnect);
+		f.setArguments(bundle);
+		return f;
+	}
+
+	@Override
+	public void onAttach(Context context) {
+		super.onAttach(context);
+		getAndroidComponent(requireContext()).inject(this);
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
+				.get(HotspotViewModel.class);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		View v = inflater
+				.inflate(R.layout.fragment_hotspot_qr, container, false);
+
+		TextView qrIntroView = v.findViewById(R.id.qrIntroView);
+		ImageView qrCodeView = v.findViewById(R.id.qrCodeView);
+
+		if (requireArguments().getBoolean("forWifiConnect")) {
+			qrIntroView.setText(R.string.hotspot_qr_wifi);
+			// TODO observe state in ViewModel and get QR code from there
+		} else {
+			qrIntroView.setText(R.string.hotspot_qr_site);
+			// TODO observe state in ViewModel and get QR code from there
+		}
+		return v;
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotViewModel.java

@@ -25,4 +25,6 @@ class HotspotViewModel extends DbViewModel {
 		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
 	}
 
+	// TODO copy actual code from Offline Hotspot app
+
 }

briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java

@@ -0,0 +1,38 @@
+package org.briarproject.briar.android.hotspot;
+
+import android.os.Bundle;
+import android.view.View;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import static android.view.View.INVISIBLE;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class WebsiteFragment extends AbstractTabsFragment {
+
+	public final static String TAG = WebsiteFragment.class.getName();
+
+	@Override
+	public void onViewCreated(@NonNull View view,
+			@Nullable Bundle savedInstanceState) {
+		super.onViewCreated(view, savedInstanceState);
+		connectedButton.setVisibility(INVISIBLE);
+	}
+
+	@Override
+	protected Fragment getFirstFragment() {
+		return HotspotManualFragment.newInstance(false);
+	}
+
+	@Override
+	protected Fragment getSecondFragment() {
+		return HotspotQrFragment.newInstance(false);
+	}
+
+}

briar-android/src/main/res/drawable/ic_portable_wifi_off.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M17.56,14.24c0.28,-0.69 0.44,-1.45 0.44,-2.24 0,-3.31 -2.69,-6 -6,-6 -0.79,0 -1.55,0.16 -2.24,0.44l1.62,1.62c0.2,-0.03 0.41,-0.06 0.62,-0.06 2.21,0 4,1.79 4,4 0,0.21 -0.02,0.42 -0.05,0.63l1.61,1.61zM12,4c4.42,0 8,3.58 8,8 0,1.35 -0.35,2.62 -0.95,3.74l1.47,1.47C21.46,15.69 22,13.91 22,12c0,-5.52 -4.48,-10 -10,-10 -1.91,0 -3.69,0.55 -5.21,1.47l1.46,1.46C9.37,4.34 10.65,4 12,4zM3.27,2.5L2,3.77l2.1,2.1C2.79,7.57 2,9.69 2,12c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,17.53 4,14.96 4,12c0,-1.76 0.57,-3.38 1.53,-4.69l1.43,1.44C6.36,9.68 6,10.8 6,12c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-0.65 0.17,-1.25 0.44,-1.79l1.58,1.58L10,12c0,1.1 0.9,2 2,2l0.21,-0.02 0.01,0.01 7.51,7.51L21,20.23 4.27,3.5l-1,-1z" />
+</vector>

briar-android/src/main/res/drawable/ic_qr_code.xml

@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M3,11h8V3H3V11zM5,5h4v4H5V5z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M3,21h8v-8H3V21zM5,15h4v4H5V15z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M13,3v8h8V3H13zM19,9h-4V5h4V9z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M19,19h2v2h-2z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M13,13h2v2h-2z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M15,15h2v2h-2z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M13,17h2v2h-2z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M15,19h2v2h-2z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M17,17h2v2h-2z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M17,13h2v2h-2z" />
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M19,15h2v2h-2z" />
+</vector>

briar-android/src/main/res/layout/fragment_hotspot_manual.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<TextView
+		android:id="@+id/manualIntroView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:text="@string/hotspot_manual_site"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
+
+	<TextView
+		android:id="@+id/ssidLabelView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:text="@string/hotspot_manual_wifi_ssid"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/manualIntroView" />
+
+	<TextView
+		android:id="@+id/ssidView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
+		android:layout_marginTop="6dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
+		android:background="@color/briar_primary"
+		android:padding="8dp"
+		android:textColor="@color/briar_text_primary_inverse"
+		android:typeface="monospace"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/ssidLabelView"
+		tools:text="DIRECT-42-dfoln3lncsoij23" />
+
+	<TextView
+		android:id="@+id/passwordLabelView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
+		android:text="@string/enter_password"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/ssidView" />
+
+	<TextView
+		android:id="@+id/passwordView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginLeft="16dp"
+		android:layout_marginTop="6dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
+		android:background="@color/briar_primary"
+		android:padding="8dp"
+		android:textColor="@color/briar_text_primary_inverse"
+		android:typeface="monospace"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/passwordLabelView"
+		tools:text="sdfsdgt2334rfw" />
+
+	<TextView
+		android:id="@+id/altView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:text="@string/hotspot_manual_site_alt"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/passwordView" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

briar-android/src/main/res/layout/fragment_hotspot_qr.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<TextView
+		android:id="@+id/qrIntroView"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:text="@string/hotspot_qr_wifi"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/cardView"
+		app:layout_constraintTop_toTopOf="parent" />
+
+	<androidx.cardview.widget.CardView
+		android:id="@+id/cardView"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		android:layout_marginStart="64dp"
+		android:layout_marginLeft="64dp"
+		android:layout_marginTop="32dp"
+		android:layout_marginEnd="64dp"
+		android:layout_marginBottom="32dp"
+		app:cardCornerRadius="16dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintDimensionRatio="1,1"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/qrIntroView"
+		app:layout_constraintVertical_chainStyle="spread_inside">
+
+		<ImageView
+			android:id="@+id/qrCodeView"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:srcCompat="@drawable/ic_qr_code"
+			tools:ignore="ContentDescription" />
+
+	</androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

briar-android/src/main/res/layout/fragment_hotspot_tabs.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<com.google.android.material.tabs.TabLayout
+		android:id="@+id/tabLayout"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:tabBackground="@color/briar_primary"
+		app:tabGravity="fill"
+		app:tabIconTint="@color/action_bar_text"
+		app:tabIndicatorColor="@color/briar_lime_400"
+		app:tabIndicatorHeight="4dp"
+		app:tabInlineLabel="true"
+		app:tabMaxWidth="0dp"
+		app:tabMode="fixed"
+		app:tabTextColor="@color/action_bar_text">
+
+		<com.google.android.material.tabs.TabItem
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:icon="@drawable/forum_item_create_white"
+			android:text="@string/hotspot_tab_manual" />
+
+		<com.google.android.material.tabs.TabItem
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:icon="@drawable/ic_qr_code"
+			android:text="@string/qr_code" />
+	</com.google.android.material.tabs.TabLayout>
+
+	<androidx.viewpager2.widget.ViewPager2
+		android:id="@+id/pager"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		app:layout_constraintBottom_toTopOf="@+id/stopButton"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
+
+	<Button
+		android:id="@+id/stopButton"
+		style="@style/BriarButton"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:drawableStart="@drawable/ic_portable_wifi_off"
+		android:drawableLeft="@drawable/ic_portable_wifi_off"
+		android:drawablePadding="6dp"
+		android:text="@string/hotspot_button_stop_sharing"
+		app:backgroundTint="@color/briar_red_500"
+		app:drawableTint="@color/button_text"
+		app:layout_constraintBottom_toTopOf="@+id/connectedButton"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		tools:visibility="visible" />
+
+	<Button
+		android:id="@+id/connectedButton"
+		style="@style/BriarButton"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:drawableStart="@drawable/ic_check_white"
+		android:drawableLeft="@drawable/ic_check_white"
+		android:drawablePadding="6dp"
+		android:text="@string/hotspot_button_connected"
+		app:drawableTint="@color/button_text"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

briar-android/src/main/res/menu/hotspot_help_action.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/action_help"
+		android:icon="@drawable/ic_help_outline_white"
+		android:title="@string/help"
+		app:showAsAction="always" />
+
+</menu>

briar-android/src/main/res/values/strings.xml

@@ -695,7 +695,18 @@
 		by using your phone\'s Wi-Fi.
 		\n\nYour phone will open a local hotspot and provide a small website with a download of this app.</string>
 	<string name="hotspot_button_start_sharing">Start sharing</string>
+	<string name="hotspot_button_stop_sharing">Stop sharing</string>
 	<string name="hotspot_progress_text_start">Setting up hotspot…</string>
+	<string name="hotspot_button_connected">Confirm connection</string>
+	<string name="hotspot_tab_manual">Manual</string>
+	<string name="hotspot_manual_wifi">To download the app on another phone, please connect to this Wi-Fi network:</string>
+	<string name="hotspot_manual_wifi_ssid">Network name (SSID)</string>
+	<string name="hotspot_manual_wifi_alt">Instead of adding the network manually, you can also scan a QR code.</string>
+	<string name="hotspot_manual_site">After you are connected to the Wi-Fi, carefully enter this address in your browser.</string>
+	<string name="hotspot_manual_site_address">Address (URL)</string>
+	<string name="hotspot_manual_site_alt">Instead of typing the address manually, you can also scan a QR code.</string>
+	<string name="hotspot_qr_wifi">To download the app on another phone, please scan this QR code to connect to this Wi-Fi network:</string>
+	<string name="hotspot_qr_site">After you are connected to the Wi-Fi, scan this QR code to download the app.</string>
 
 	<!-- Screenshots -->