mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-17 05:09:53 +01:00
Replace illustration for mailbox download
This commit is contained in:
Torsten Grote
@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.ScrollView;
|
||||
|
||||
import org.briarproject.briar.R;
|
||||
import org.briarproject.nullsafety.MethodsNotNullByDefault;
|
||||
@@ -21,8 +20,8 @@ import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
|
||||
import static android.view.View.FOCUS_DOWN;
|
||||
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
|
||||
import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
|
||||
|
||||
@MethodsNotNullByDefault
|
||||
@ParametersNotNullByDefault
|
||||
@@ -36,7 +35,6 @@ public class SetupDownloadFragment extends Fragment {
|
||||
private MailboxViewModel viewModel;
|
||||
|
||||
private CameraPermissionManager permissionManager;
|
||||
private ScrollView scrollView;
|
||||
|
||||
private final ActivityResultLauncher<String[]> permissionLauncher =
|
||||
registerForActivityResult(new RequestMultiplePermissions(), r -> {
|
||||
@@ -62,7 +60,6 @@ public class SetupDownloadFragment extends Fragment {
|
||||
@Nullable Bundle savedInstanceState) {
|
||||
View v = inflater.inflate(R.layout.fragment_mailbox_setup_download,
|
||||
container, false);
|
||||
scrollView = v.findViewById(R.id.scrollView);
|
||||
|
||||
permissionManager = new CameraPermissionManager(requireActivity(),
|
||||
permissionLauncher::launch);
|
||||
@@ -80,8 +77,7 @@ public class SetupDownloadFragment extends Fragment {
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
requireActivity().setTitle(R.string.mailbox_setup_title);
|
||||
// Scroll down in case the screen is small, so the button is visible
|
||||
scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
|
||||
hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
|
||||
// Permissions may have been granted manually while we were stopped
|
||||
permissionManager.resetPermissions();
|
||||
}
|
||||
|
||||
106
briar-android/src/main/res/drawable-night/il_mailbox_setup.xml
Normal file
106
briar-android/src/main/res/drawable-night/il_mailbox_setup.xml
Normal file
@@ -0,0 +1,106 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="192dp"
|
||||
android:height="192dp"
|
||||
android:viewportWidth="193"
|
||||
android:viewportHeight="192">
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M189.4,29C189.4,22.37 184.03,17 177.4,17H86.4C79.77,17 74.4,22.37 74.4,29V163C74.4,169.63 79.77,175 86.4,175H177.4C184.03,175 189.4,169.63 189.4,163V29Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M86.4,18.5H177.4C183.2,18.5 187.9,23.2 187.9,29V163C187.9,168.8 183.2,173.5 177.4,173.5H86.4C80.6,173.5 75.9,168.8 75.9,163V29C75.9,23.2 80.6,18.5 86.4,18.5ZM177.4,17C184.03,17 189.4,22.37 189.4,29V163C189.4,169.63 184.03,175 177.4,175H86.4C79.77,175 74.4,169.63 74.4,163V29C74.4,22.37 79.77,17 86.4,17H177.4Z" />
|
||||
<path
|
||||
android:fillColor="#0B1120"
|
||||
android:pathData="M183.4,35C183.4,30.58 179.82,27 175.4,27H88.4C83.98,27 80.4,30.58 80.4,35V157C80.4,161.42 83.98,165 88.4,165H175.4C179.82,165 183.4,161.42 183.4,157V35Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M88.4,28.5H175.4C178.99,28.5 181.9,31.41 181.9,35V157C181.9,160.59 178.99,163.5 175.4,163.5H88.4C84.81,163.5 81.9,160.59 81.9,157V35C81.9,31.41 84.81,28.5 88.4,28.5ZM175.4,27C179.82,27 183.4,30.58 183.4,35V157C183.4,161.42 179.82,165 175.4,165H88.4C83.98,165 80.4,161.42 80.4,157V35C80.4,30.58 83.98,27 88.4,27H175.4Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M131.9,38.26C131.07,38.26 130.4,37.58 130.4,36.76C130.4,35.93 131.07,35.26 131.9,35.26C132.73,35.26 133.4,35.93 133.4,36.76C133.4,37.58 132.73,38.26 131.9,38.26ZM131.9,39.76C130.24,39.76 128.9,38.41 128.9,36.76C128.9,35.1 130.24,33.76 131.9,33.76C133.56,33.76 134.9,35.1 134.9,36.76C134.9,38.41 133.56,39.76 131.9,39.76Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M115.85,74H146.96C148.14,74 149.27,74.47 150.1,75.32C150.93,76.16 151.4,77.3 151.4,78.49L151.4,116.97C151.4,118.69 149.42,119.63 148.12,118.53L140.05,112.57H115.85C114.67,112.57 113.54,112.1 112.7,111.26C111.87,110.41 111.4,109.27 111.4,108.08V78.49C111.4,77.3 111.87,76.16 112.7,75.32C113.54,74.47 114.67,74 115.85,74ZM127.67,93.9H118.51V81.18H144.29V93.9H135.29V98.29H138.58C139.17,98.29 139.47,99.02 139.05,99.44L131.95,106.62C131.69,106.88 131.27,106.88 131.01,106.62L123.9,99.44C123.48,99.02 123.78,98.29 124.38,98.29H127.67V93.9Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M3.4,29.03C3.4,22.4 8.77,17.03 15.4,17.03H55.4C62.03,17.03 67.4,22.4 67.4,29.03V125.03C67.4,131.65 62.03,137.03 55.4,137.03H15.4C8.77,137.03 3.4,131.65 3.4,125.03V29.03Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M55.4,18.53H15.4C9.6,18.53 4.9,23.23 4.9,29.03V125.03C4.9,130.82 9.6,135.53 15.4,135.53H55.4C61.2,135.53 65.9,130.82 65.9,125.03V29.03C65.9,23.23 61.2,18.53 55.4,18.53ZM15.4,17.03C8.77,17.03 3.4,22.4 3.4,29.03V125.03C3.4,131.65 8.77,137.03 15.4,137.03H55.4C62.03,137.03 67.4,131.65 67.4,125.03V29.03C67.4,22.4 62.03,17.03 55.4,17.03H15.4Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M35.4,27.01C34.88,27.01 34.44,26.58 34.44,26.03C34.44,25.47 34.88,25.05 35.4,25.05C35.92,25.05 36.36,25.47 36.36,26.03C36.36,26.58 35.92,27.01 35.4,27.01ZM35.4,28.51C34.04,28.51 32.94,27.4 32.94,26.03C32.94,24.66 34.04,23.55 35.4,23.55C36.76,23.55 37.86,24.66 37.86,26.03C37.86,27.4 36.76,28.51 35.4,28.51Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M19.88,25.77C19.88,25.35 20.22,25.02 20.63,25.02H28.84C29.25,25.02 29.59,25.35 29.59,25.77C29.59,26.18 29.25,26.52 28.84,26.52H20.63C20.22,26.52 19.88,26.18 19.88,25.77Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M41.22,25.77C41.22,25.35 41.55,25.02 41.97,25.02L50.17,25.02C50.58,25.02 50.92,25.35 50.92,25.77C50.92,26.18 50.58,26.52 50.17,26.52L41.97,26.52C41.55,26.52 41.22,26.18 41.22,25.77Z" />
|
||||
<path
|
||||
android:fillColor="#0B1120"
|
||||
android:pathData="M61.66,41.25C61.66,36.83 58.08,33.25 53.66,33.25H17.14C12.73,33.25 9.14,36.83 9.14,41.25V117.94C9.14,122.36 12.73,125.94 17.14,125.94H53.66C58.08,125.94 61.66,122.36 61.66,117.94V41.25Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M17.14,34.75H53.66C57.25,34.75 60.16,37.66 60.16,41.25V117.94C60.16,121.53 57.25,124.44 53.66,124.44H17.14C13.56,124.44 10.64,121.53 10.64,117.94V41.25C10.64,37.66 13.56,34.75 17.14,34.75ZM53.66,33.25C58.08,33.25 61.66,36.83 61.66,41.25V117.94C61.66,122.36 58.08,125.94 53.66,125.94H17.14C12.73,125.94 9.14,122.36 9.14,117.94V41.25C9.14,36.83 12.73,33.25 17.14,33.25H53.66Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:pathData="M27.55,74.96V88.42C27.55,89.52 28.43,90.42 29.52,90.42H30.45C31.54,90.42 32.43,89.52 32.43,88.42V74.96H27.55Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:pathData="M32.42,68.47V65.93C32.42,64.84 31.54,63.94 30.45,63.94H29.52C28.44,63.94 27.55,64.84 27.55,65.93V68.47H32.42Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:pathData="M43.26,79.4V65.93C43.26,64.84 42.37,63.94 41.29,63.94H40.36C39.28,63.94 38.38,64.84 38.38,65.93V79.4H43.26Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:pathData="M38.38,85.89V88.42C38.38,89.52 39.28,90.42 40.36,90.42H41.29C42.37,90.42 43.27,89.52 43.27,88.42V85.89H38.38Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M26.76,80.19H24.25C23.17,80.19 22.27,81.08 22.27,82.18V83.12C22.27,84.21 23.16,85.11 24.25,85.11H26.76V80.19Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M46.55,80.19H33.2V85.11H46.55C47.64,85.11 48.53,84.21 48.53,83.12V82.18C48.53,81.08 47.64,80.19 46.55,80.19Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M37.6,69.25H24.25C23.17,69.25 22.27,70.14 22.27,71.25V72.18C22.27,73.28 23.16,74.18 24.25,74.18H37.6V69.25Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M46.55,69.25H44.04V74.18H46.55C47.64,74.18 48.53,73.29 48.53,72.18V71.25C48.53,70.14 47.64,69.25 46.55,69.25Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M67.4,155C67.4,150.58 63.82,147 59.4,147H47.4C42.98,147 39.4,150.58 39.4,155V167C39.4,171.42 42.98,175 47.4,175H59.4C63.82,175 67.4,171.42 67.4,167V155Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M47.4,148.5H59.4C62.99,148.5 65.9,151.41 65.9,155V167C65.9,170.59 62.99,173.5 59.4,173.5H47.4C43.81,173.5 40.9,170.59 40.9,167V155C40.9,151.41 43.81,148.5 47.4,148.5ZM59.4,147C63.82,147 67.4,150.58 67.4,155V167C67.4,171.42 63.82,175 59.4,175H47.4C42.98,175 39.4,171.42 39.4,167V155C39.4,150.58 42.98,147 47.4,147H59.4Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M56.32,155.31H53L48.75,162.62H53L51.74,167.73L58.05,159.63H53.88L56.32,155.31Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M31.4,155C31.4,150.58 27.82,147 23.4,147H11.4C6.98,147 3.4,150.58 3.4,155V167C3.4,171.42 6.98,175 11.4,175H23.4C27.82,175 31.4,171.42 31.4,167V155Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M11.4,148.5H23.4C26.99,148.5 29.9,151.41 29.9,155V167C29.9,170.59 26.99,173.5 23.4,173.5H11.4C7.81,173.5 4.9,170.59 4.9,167V155C4.9,151.41 7.81,148.5 11.4,148.5ZM23.4,147C27.82,147 31.4,150.58 31.4,155V167C31.4,171.42 27.82,175 23.4,175H11.4C6.98,175 3.4,171.42 3.4,167V155C3.4,150.58 6.98,147 11.4,147H23.4Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M11.18,158.86C12,158.05 12.97,157.4 14.03,156.96C15.1,156.51 16.24,156.29 17.4,156.29C18.56,156.29 19.7,156.51 20.77,156.96C21.83,157.4 22.8,158.05 23.62,158.86L22.56,159.92C21.88,159.25 21.08,158.71 20.19,158.34C19.31,157.98 18.36,157.79 17.4,157.79C16.44,157.79 15.49,157.98 14.61,158.34C13.72,158.71 12.92,159.25 12.24,159.92L11.18,158.86Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M13.51,161.19C14.02,160.68 14.62,160.27 15.29,159.99C15.96,159.72 16.68,159.57 17.4,159.57C18.12,159.57 18.84,159.72 19.51,159.99C20.18,160.27 20.78,160.68 21.3,161.19L20.24,162.25C19.86,161.88 19.42,161.58 18.93,161.38C18.45,161.18 17.93,161.07 17.4,161.07C16.87,161.07 16.35,161.18 15.87,161.38C15.38,161.58 14.94,161.88 14.57,162.25L13.51,161.19Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M18.36,164.13C18.36,164.65 17.93,165.08 17.4,165.08C16.87,165.08 16.44,164.65 16.44,164.13C16.44,163.6 16.87,163.17 17.4,163.17C17.93,163.17 18.36,163.6 18.36,164.13Z" />
|
||||
</vector>
|
||||
106
briar-android/src/main/res/drawable/il_mailbox_setup.xml
Normal file
106
briar-android/src/main/res/drawable/il_mailbox_setup.xml
Normal file
@@ -0,0 +1,106 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="192dp"
|
||||
android:height="192dp"
|
||||
android:viewportWidth="193"
|
||||
android:viewportHeight="192">
|
||||
<path
|
||||
android:fillColor="#DDEDFE"
|
||||
android:pathData="M189.85,29C189.85,22.37 184.48,17 177.85,17H86.85C80.23,17 74.85,22.37 74.85,29V163C74.85,169.63 80.23,175 86.85,175H177.85C184.48,175 189.85,169.63 189.85,163V29Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M86.85,18.5H177.85C183.65,18.5 188.35,23.2 188.35,29V163C188.35,168.8 183.65,173.5 177.85,173.5H86.85C81.05,173.5 76.35,168.8 76.35,163V29C76.35,23.2 81.05,18.5 86.85,18.5ZM177.85,17C184.48,17 189.85,22.37 189.85,29V163C189.85,169.63 184.48,175 177.85,175H86.85C80.23,175 74.85,169.63 74.85,163V29C74.85,22.37 80.23,17 86.85,17H177.85Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M183.85,35C183.85,30.58 180.27,27 175.85,27H88.85C84.44,27 80.85,30.58 80.85,35V157C80.85,161.42 84.44,165 88.85,165H175.85C180.27,165 183.85,161.42 183.85,157V35Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M88.85,28.5H175.85C179.44,28.5 182.35,31.41 182.35,35V157C182.35,160.59 179.44,163.5 175.85,163.5H88.85C85.26,163.5 82.35,160.59 82.35,157V35C82.35,31.41 85.26,28.5 88.85,28.5ZM175.85,27C180.27,27 183.85,30.58 183.85,35V157C183.85,161.42 180.27,165 175.85,165H88.85C84.44,165 80.85,161.42 80.85,157V35C80.85,30.58 84.44,27 88.85,27H175.85Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M132.35,38.26C131.52,38.26 130.85,37.58 130.85,36.76C130.85,35.93 131.52,35.26 132.35,35.26C133.18,35.26 133.85,35.93 133.85,36.76C133.85,37.58 133.18,38.26 132.35,38.26ZM132.35,39.76C130.7,39.76 129.35,38.41 129.35,36.76C129.35,35.1 130.7,33.76 132.35,33.76C134.01,33.76 135.35,35.1 135.35,36.76C135.35,38.41 134.01,39.76 132.35,39.76Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M116.3,74H147.41C148.59,74 149.72,74.47 150.55,75.32C151.38,76.16 151.85,77.3 151.85,78.49L151.85,116.97C151.85,118.69 149.87,119.63 148.57,118.53L140.51,112.57H116.3C115.12,112.57 113.99,112.1 113.15,111.26C112.32,110.41 111.85,109.27 111.85,108.08V78.49C111.85,77.3 112.32,76.16 113.15,75.32C113.99,74.47 115.12,74 116.3,74ZM128.12,93.9H118.96V81.18H144.74V93.9H135.74V98.29H139.03C139.63,98.29 139.92,99.02 139.5,99.44L132.4,106.62C132.14,106.88 131.72,106.88 131.46,106.62L124.36,99.44C123.94,99.02 124.23,98.29 124.83,98.29H128.12V93.9Z" />
|
||||
<path
|
||||
android:fillColor="#ECFCCB"
|
||||
android:pathData="M3.85,29.03C3.85,22.4 9.23,17.03 15.85,17.03H55.85C62.48,17.03 67.85,22.4 67.85,29.03V125.03C67.85,131.65 62.48,137.03 55.85,137.03H15.85C9.23,137.03 3.85,131.65 3.85,125.03V29.03Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M55.85,18.53H15.85C10.05,18.53 5.35,23.23 5.35,29.03V125.03C5.35,130.82 10.05,135.53 15.85,135.53H55.85C61.65,135.53 66.35,130.82 66.35,125.03V29.03C66.35,23.23 61.65,18.53 55.85,18.53ZM15.85,17.03C9.23,17.03 3.85,22.4 3.85,29.03V125.03C3.85,131.65 9.23,137.03 15.85,137.03H55.85C62.48,137.03 67.85,131.65 67.85,125.03V29.03C67.85,22.4 62.48,17.03 55.85,17.03H15.85Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M35.85,27.01C35.33,27.01 34.89,26.58 34.89,26.03C34.89,25.47 35.33,25.05 35.85,25.05C36.37,25.05 36.81,25.47 36.81,26.03C36.81,26.58 36.37,27.01 35.85,27.01ZM35.85,28.51C34.49,28.51 33.39,27.4 33.39,26.03C33.39,24.66 34.49,23.55 35.85,23.55C37.21,23.55 38.31,24.66 38.31,26.03C38.31,27.4 37.21,28.51 35.85,28.51Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M20.33,25.77C20.33,25.35 20.67,25.02 21.08,25.02H29.29C29.7,25.02 30.04,25.35 30.04,25.77C30.04,26.18 29.7,26.52 29.29,26.52H21.08C20.67,26.52 20.33,26.18 20.33,25.77Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M41.67,25.77C41.67,25.35 42,25.02 42.42,25.02L50.62,25.02C51.04,25.02 51.37,25.35 51.37,25.77C51.37,26.18 51.04,26.52 50.62,26.52L42.42,26.52C42,26.52 41.67,26.18 41.67,25.77Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M62.11,41.25C62.11,36.83 58.53,33.25 54.11,33.25H17.6C13.18,33.25 9.6,36.83 9.6,41.25V117.94C9.6,122.36 13.18,125.94 17.6,125.94H54.11C58.53,125.94 62.11,122.36 62.11,117.94V41.25Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M17.6,34.75H54.11C57.7,34.75 60.61,37.66 60.61,41.25V117.94C60.61,121.53 57.7,124.44 54.11,124.44H17.6C14.01,124.44 11.1,121.53 11.1,117.94V41.25C11.1,37.66 14.01,34.75 17.6,34.75ZM54.11,33.25C58.53,33.25 62.11,36.83 62.11,41.25V117.94C62.11,122.36 58.53,125.94 54.11,125.94H17.6C13.18,125.94 9.6,122.36 9.6,117.94V41.25C9.6,36.83 13.18,33.25 17.6,33.25H54.11Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:pathData="M28,74.96V88.42C28,89.52 28.88,90.42 29.98,90.42H30.9C31.99,90.42 32.88,89.52 32.88,88.42V74.96H28Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:pathData="M32.87,68.47V65.93C32.87,64.84 31.99,63.94 30.9,63.94H29.98C28.89,63.94 28,64.84 28,65.93V68.47H32.87Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:pathData="M43.71,79.4V65.93C43.71,64.84 42.83,63.94 41.74,63.94H40.81C39.73,63.94 38.84,64.84 38.84,65.93V79.4H43.71Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:pathData="M38.84,85.89V88.42C38.84,89.52 39.73,90.42 40.81,90.42H41.74C42.83,90.42 43.72,89.52 43.72,88.42V85.89H38.84Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M27.22,80.19H24.7C23.62,80.19 22.73,81.08 22.73,82.18V83.12C22.73,84.21 23.61,85.11 24.7,85.11H27.22V80.19Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M47,80.19H33.65V85.11H47C48.09,85.11 48.98,84.21 48.98,83.12V82.18C48.98,81.08 48.09,80.19 47,80.19Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M38.05,69.25H24.7C23.62,69.25 22.73,70.14 22.73,71.25V72.18C22.73,73.28 23.61,74.18 24.7,74.18H38.05V69.25Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M47,69.25H44.49V74.18H47C48.09,74.18 48.98,73.29 48.98,72.18V71.25C48.98,70.14 48.09,69.25 47,69.25Z" />
|
||||
<path
|
||||
android:fillColor="#DDEDFE"
|
||||
android:pathData="M67.85,155C67.85,150.58 64.27,147 59.85,147H47.85C43.44,147 39.85,150.58 39.85,155V167C39.85,171.42 43.44,175 47.85,175H59.85C64.27,175 67.85,171.42 67.85,167V155Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M47.85,148.5H59.85C63.44,148.5 66.35,151.41 66.35,155V167C66.35,170.59 63.44,173.5 59.85,173.5H47.85C44.26,173.5 41.35,170.59 41.35,167V155C41.35,151.41 44.26,148.5 47.85,148.5ZM59.85,147C64.27,147 67.85,150.58 67.85,155V167C67.85,171.42 64.27,175 59.85,175H47.85C43.44,175 39.85,171.42 39.85,167V155C39.85,150.58 43.44,147 47.85,147H59.85Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:pathData="M56.77,155.31H53.45L49.2,162.62H53.45L52.19,167.73L58.5,159.63H54.33L56.77,155.31Z" />
|
||||
<path
|
||||
android:fillColor="#ECFCCB"
|
||||
android:pathData="M31.85,155C31.85,150.58 28.27,147 23.85,147H11.85C7.44,147 3.85,150.58 3.85,155V167C3.85,171.42 7.44,175 11.85,175H23.85C28.27,175 31.85,171.42 31.85,167V155Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M11.85,148.5H23.85C27.44,148.5 30.35,151.41 30.35,155V167C30.35,170.59 27.44,173.5 23.85,173.5H11.85C8.26,173.5 5.35,170.59 5.35,167V155C5.35,151.41 8.26,148.5 11.85,148.5ZM23.85,147C28.27,147 31.85,150.58 31.85,155V167C31.85,171.42 28.27,175 23.85,175H11.85C7.44,175 3.85,171.42 3.85,167V155C3.85,150.58 7.44,147 11.85,147H23.85Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M11.63,158.86C12.45,158.05 13.42,157.4 14.49,156.96C15.55,156.51 16.7,156.29 17.85,156.29C19.01,156.29 20.15,156.51 21.22,156.96C22.29,157.4 23.26,158.05 24.07,158.86L23.01,159.92C22.33,159.25 21.53,158.71 20.64,158.34C19.76,157.98 18.81,157.79 17.85,157.79C16.89,157.79 15.94,157.98 15.06,158.34C14.17,158.71 13.37,159.25 12.69,159.92L11.63,158.86Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M13.96,161.19C14.47,160.68 15.08,160.27 15.75,159.99C16.41,159.72 17.13,159.57 17.85,159.57C18.58,159.57 19.29,159.72 19.96,159.99C20.63,160.27 21.24,160.68 21.75,161.19L20.69,162.25C20.32,161.88 19.87,161.58 19.39,161.38C18.9,161.18 18.38,161.07 17.85,161.07C17.33,161.07 16.81,161.18 16.32,161.38C15.83,161.58 15.39,161.88 15.02,162.25L13.96,161.19Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:pathData="M18.81,164.13C18.81,164.65 18.38,165.08 17.85,165.08C17.32,165.08 16.9,164.65 16.9,164.13C16.9,163.6 17.32,163.17 17.85,163.17C18.38,163.17 18.81,163.6 18.81,164.13Z" />
|
||||
</vector>
|
||||
@@ -1,63 +1,65 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout 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:id="@+id/scrollView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
tools:context=".android.mailbox.MailboxActivity">
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="@dimen/hero_rect_width"
|
||||
android:layout_height="@dimen/hero_rect_width"
|
||||
android:layout_marginHorizontal="@dimen/margin_xlarge"
|
||||
android:layout_marginTop="@dimen/margin_xlarge"
|
||||
app:layout_constraintBottom_toTopOf="@+id/introView"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.25"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
app:srcCompat="@drawable/ic_mailbox"
|
||||
app:tint="@color/briar_brand_green"
|
||||
tools:ignore="ContentDescription" />
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/introView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="@dimen/margin_xlarge"
|
||||
android:layout_marginTop="@dimen/margin_xlarge"
|
||||
android:layout_marginBottom="@dimen/margin_large"
|
||||
android:text="@string/mailbox_setup_download"
|
||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||
app:layout_constraintBottom_toTopOf="@+id/scanButton"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/imageView" />
|
||||
<ImageView
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="@dimen/hero_rect_width"
|
||||
android:layout_height="@dimen/hero_rect_width"
|
||||
android:layout_marginHorizontal="@dimen/margin_xlarge"
|
||||
android:layout_marginTop="@dimen/margin_xlarge"
|
||||
app:layout_constraintBottom_toTopOf="@+id/introView"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.25"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
app:srcCompat="@drawable/il_mailbox_setup"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/scanButton"
|
||||
style="@style/BriarButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/margin_large"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="@string/mailbox_setup_button_scan"
|
||||
app:drawableLeftCompat="@drawable/ic_qr_code"
|
||||
app:drawableStartCompat="@drawable/ic_qr_code"
|
||||
app:drawableTint="@color/button_text"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
tools:visibility="visible" />
|
||||
<TextView
|
||||
android:id="@+id/introView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/margin_large"
|
||||
android:text="@string/mailbox_setup_download"
|
||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/imageView" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</ScrollView>
|
||||
</ScrollView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/scanButton"
|
||||
style="@style/BriarButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="@dimen/margin_large"
|
||||
android:drawablePadding="8dp"
|
||||
android:text="@string/mailbox_setup_button_scan"
|
||||
app:drawableLeftCompat="@drawable/ic_qr_code"
|
||||
app:drawableStartCompat="@drawable/ic_qr_code"
|
||||
app:drawableTint="@color/button_text"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
tools:visibility="visible" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -34,9 +34,7 @@
|
||||
android:id="@+id/introView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="@dimen/margin_xlarge"
|
||||
android:layout_marginTop="@dimen/margin_xlarge"
|
||||
android:layout_marginBottom="@dimen/margin_large"
|
||||
android:layout_margin="@dimen/margin_large"
|
||||
android:text="@string/mailbox_setup_intro"
|
||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
|
||||
Reference in New Issue
Block a user