mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-17 13:19:52 +01:00
Replace illustration for adding a nickname for pending contact
This commit is contained in:
Torsten Grote
@@ -8,8 +8,6 @@ import android.text.Editable;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.google.android.material.textfield.TextInputEditText;
|
||||
@@ -23,6 +21,7 @@ import org.briarproject.bramble.api.identity.Author;
|
||||
import org.briarproject.briar.R;
|
||||
import org.briarproject.briar.android.activity.ActivityComponent;
|
||||
import org.briarproject.briar.android.fragment.BaseFragment;
|
||||
import org.briarproject.briar.android.view.BriarButton;
|
||||
import org.briarproject.nullsafety.MethodsNotNullByDefault;
|
||||
import org.briarproject.nullsafety.ParametersNotNullByDefault;
|
||||
|
||||
@@ -35,13 +34,12 @@ import androidx.appcompat.app.AlertDialog.Builder;
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
|
||||
import static android.view.View.INVISIBLE;
|
||||
import static android.view.View.VISIBLE;
|
||||
import static android.widget.Toast.LENGTH_LONG;
|
||||
import static java.util.Objects.requireNonNull;
|
||||
import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
|
||||
import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong;
|
||||
import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
|
||||
import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
|
||||
|
||||
@MethodsNotNullByDefault
|
||||
@ParametersNotNullByDefault
|
||||
@@ -57,8 +55,6 @@ public class NicknameFragment extends BaseFragment {
|
||||
|
||||
private TextInputLayout contactNameLayout;
|
||||
private TextInputEditText contactNameInput;
|
||||
private Button addButton;
|
||||
private ProgressBar progressBar;
|
||||
|
||||
@Override
|
||||
public String getUniqueTag() {
|
||||
@@ -95,14 +91,18 @@ public class NicknameFragment extends BaseFragment {
|
||||
contactNameLayout = v.findViewById(R.id.contactNameLayout);
|
||||
contactNameInput = v.findViewById(R.id.contactNameInput);
|
||||
|
||||
addButton = v.findViewById(R.id.addButton);
|
||||
BriarButton addButton = v.findViewById(R.id.addButton);
|
||||
addButton.setOnClickListener(view -> onAddButtonClicked());
|
||||
|
||||
progressBar = v.findViewById(R.id.progressBar);
|
||||
|
||||
return v;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSaveInstanceState(@NonNull Bundle outState) {
|
||||
super.onSaveInstanceState(outState);
|
||||
@@ -131,9 +131,6 @@ public class NicknameFragment extends BaseFragment {
|
||||
String name = getNicknameOrNull();
|
||||
if (name == null) return; // invalid nickname
|
||||
|
||||
addButton.setVisibility(INVISIBLE);
|
||||
progressBar.setVisibility(VISIBLE);
|
||||
|
||||
LifecycleOwner owner = getViewLifecycleOwner();
|
||||
viewModel.getAddContactResult().observe(owner, result -> {
|
||||
if (result == null) return;
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="192dp"
|
||||
android:height="192dp"
|
||||
android:viewportWidth="192"
|
||||
android:viewportHeight="192">
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M41.8,13.7H95.8C102,13.7 107,18.7 107,24.9V145.9C107,152.1 102,157.1 95.8,157.1H41.8C35.6,157.1 30.6,152.1 30.6,145.9V25C30.6,18.7 35.6,13.7 41.8,13.7Z" />
|
||||
<path
|
||||
android:fillColor="#0B1120"
|
||||
android:pathData="M100.1,40.6C100.1,36.6 96.9,33.4 92.9,33.4H44.9C40.9,33.4 37.7,36.6 37.7,40.6V136.6C37.7,140.6 40.9,143.8 44.9,143.8H92.9C96.9,143.8 100.1,140.6 100.1,136.6V40.6Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M95.8,13H41.8C35.2,13 29.8,18.4 29.8,25V146C29.8,152.6 35.2,158 41.8,158H95.8C102.4,158 107.8,152.6 107.8,146V25C107.8,18.3 102.5,13 95.8,13ZM106.3,146C106.3,151.8 101.6,156.5 95.8,156.5H41.8C36,156.5 31.3,151.8 31.3,146V25C31.3,19.2 36,14.5 41.8,14.5H95.8C101.6,14.5 106.3,19.2 106.3,25V146Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M68.8,26.9C70.5,26.9 71.8,25.6 71.8,23.9C71.8,22.2 70.5,20.9 68.8,20.9C67.1,20.9 65.8,22.2 65.8,23.9C65.8,25.6 67.2,26.9 68.8,26.9ZM68.8,22.4C69.6,22.4 70.3,23.1 70.3,23.9C70.3,24.7 69.6,25.4 68.8,25.4C68,25.4 67.3,24.7 67.3,23.9C67.3,23.1 68,22.4 68.8,22.4Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M50.8,24.4H60.8C61.2,24.4 61.6,24.1 61.6,23.6C61.6,23.1 61.3,22.8 60.8,22.8H50.8C50.4,22.8 50,23.1 50,23.6C50,24.1 50.4,24.4 50.8,24.4Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M76.8,24.4H86.8C87.2,24.4 87.6,24.1 87.6,23.6C87.6,23.1 87.3,22.8 86.8,22.8H76.8C76.4,22.8 76,23.1 76,23.6C76,24.1 76.4,24.4 76.8,24.4Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M92.8,32.6H44.8C40.4,32.6 36.8,36.2 36.8,40.6V136.6C36.8,141 40.4,144.6 44.8,144.6H92.8C97.2,144.6 100.8,141 100.8,136.6V40.6C100.8,36.2 97.2,32.6 92.8,32.6ZM99.3,136.6C99.3,140.2 96.4,143.1 92.8,143.1H44.8C41.2,143.1 38.3,140.2 38.3,136.6V40.6C38.3,37 41.2,34.1 44.8,34.1H92.8C96.4,34.1 99.3,37 99.3,40.6V136.6Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M90.8,45.8H61.4C61,45.8 60.6,45.5 60.6,45C60.6,44.5 60.9,44.2 61.4,44.2H90.9C91.3,44.2 91.7,44.5 91.7,45C91.7,45.5 91.2,45.8 90.8,45.8Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M77.2,51.7H61.4C61,51.7 60.6,51.4 60.6,50.9C60.6,50.4 60.9,50.1 61.4,50.1H77.2C77.6,50.1 78,50.4 78,50.9C78,51.4 77.6,51.7 77.2,51.7Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M90.8,87.8H61.4C61,87.8 60.6,87.5 60.6,87C60.6,86.5 60.9,86.2 61.4,86.2H90.9C91.3,86.2 91.7,86.5 91.7,87C91.7,87.5 91.2,87.8 90.8,87.8Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M77.2,93.7H61.4C61,93.7 60.6,93.4 60.6,92.9C60.6,92.4 60.9,92.1 61.4,92.1H77.2C77.6,92.1 78,92.4 78,92.9C78,93.4 77.6,93.7 77.2,93.7Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M90.8,66.8H61.4C61,66.8 60.6,66.5 60.6,66C60.6,65.5 60.9,65.2 61.4,65.2H90.9C91.3,65.2 91.7,65.5 91.7,66C91.7,66.5 91.2,66.8 90.8,66.8Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M77.2,72.7H61.4C61,72.7 60.6,72.4 60.6,71.9C60.6,71.4 60.9,71.1 61.4,71.1H77.2C77.6,71.1 78,71.4 78,71.9C78,72.4 77.6,72.7 77.2,72.7Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M90.8,129.8H61.4C61,129.8 60.6,129.5 60.6,129C60.6,128.5 60.9,128.2 61.4,128.2H90.9C91.3,128.2 91.7,128.5 91.7,129C91.7,129.5 91.2,129.8 90.8,129.8Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M77.2,135.7H61.4C61,135.7 60.6,135.4 60.6,134.9C60.6,134.4 60.9,134.1 61.4,134.1H77.2C77.6,134.1 78,134.4 78,134.9C78,135.4 77.6,135.7 77.2,135.7Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M90.8,108.8H61.4C61,108.8 60.6,108.5 60.6,108C60.6,107.5 60.9,107.2 61.4,107.2H90.9C91.3,107.2 91.7,107.5 91.7,108C91.7,108.5 91.2,108.8 90.8,108.8Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M77.2,114.7H61.4C61,114.7 60.6,114.4 60.6,113.9C60.6,113.4 60.9,113.1 61.4,113.1H77.2C77.6,113.1 78,113.4 78,113.9C78,114.4 77.6,114.7 77.2,114.7Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M96.8,34.8H150.8C157,34.8 162,39.8 162,46V167C162,173.2 157,178.2 150.8,178.2H96.8C90.6,178.2 85.6,173.2 85.6,167V46C85.6,39.8 90.6,34.8 96.8,34.8Z" />
|
||||
<path
|
||||
android:fillColor="#0B1120"
|
||||
android:pathData="M155.1,61.6C155.1,57.6 151.9,54.4 147.9,54.4H99.9C95.9,54.4 92.7,57.6 92.7,61.6V157.6C92.7,161.6 95.9,164.8 99.9,164.8H147.9C151.9,164.8 155.1,161.6 155.1,157.6V61.6Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M150.8,34H96.8C90.2,34 84.8,39.4 84.8,46V167C84.8,173.6 90.2,179 96.8,179H150.8C157.4,179 162.8,173.6 162.8,167V46C162.8,39.4 157.5,34 150.8,34ZM161.3,167C161.3,172.8 156.6,177.5 150.8,177.5H96.8C91,177.5 86.3,172.8 86.3,167V46C86.3,40.2 91,35.5 96.8,35.5H150.8C156.6,35.5 161.3,40.2 161.3,46V167Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M123.8,47.9C125.5,47.9 126.8,46.6 126.8,44.9C126.8,43.2 125.5,41.9 123.8,41.9C122.1,41.9 120.8,43.2 120.8,44.9C120.8,46.6 122.2,47.9 123.8,47.9ZM123.8,43.4C124.6,43.4 125.3,44.1 125.3,44.9C125.3,45.7 124.6,46.4 123.8,46.4C123,46.4 122.3,45.7 122.3,44.9C122.3,44.1 123,43.4 123.8,43.4Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M105.8,45.4H115.8C116.2,45.4 116.6,45.1 116.6,44.6C116.6,44.1 116.3,43.8 115.8,43.8H105.8C105.4,43.8 105,44.1 105,44.6C105,45.1 105.4,45.4 105.8,45.4Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M131.8,45.4H141.8C142.2,45.4 142.6,45.1 142.6,44.6C142.6,44.1 142.3,43.8 141.8,43.8H131.8C131.4,43.8 131,44.1 131,44.6C131,45.1 131.4,45.4 131.8,45.4Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M147.8,53.6H99.8C95.4,53.6 91.8,57.2 91.8,61.6V157.6C91.8,162 95.4,165.6 99.8,165.6H147.8C152.2,165.6 155.8,162 155.8,157.6V61.6C155.8,57.2 152.2,53.6 147.8,53.6ZM154.3,157.6C154.3,161.2 151.4,164.1 147.8,164.1H99.8C96.2,164.1 93.3,161.2 93.3,157.6V61.6C93.3,58 96.2,55.1 99.8,55.1H147.8C151.4,55.1 154.3,58 154.3,61.6V157.6Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M49.8,54C53.06,54 55.7,51.31 55.7,48C55.7,44.69 53.06,42 49.8,42C46.54,42 43.9,44.69 43.9,48C43.9,51.31 46.54,54 49.8,54Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M49.8,96C53.06,96 55.7,93.31 55.7,90C55.7,86.69 53.06,84 49.8,84C46.54,84 43.9,86.69 43.9,90C43.9,93.31 46.54,96 49.8,96Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M49.8,75C53.06,75 55.7,72.31 55.7,69C55.7,65.69 53.06,63 49.8,63C46.54,63 43.9,65.69 43.9,69C43.9,72.31 46.54,75 49.8,75Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M49.8,138C53.06,138 55.7,135.31 55.7,132C55.7,128.69 53.06,126 49.8,126C46.54,126 43.9,128.69 43.9,132C43.9,135.31 46.54,138 49.8,138Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M49.8,117C53.06,117 55.7,114.31 55.7,111C55.7,107.69 53.06,105 49.8,105C46.54,105 43.9,107.69 43.9,111C43.9,114.31 46.54,117 49.8,117Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M104.8,75C108.06,75 110.7,72.31 110.7,69C110.7,65.69 108.06,63 104.8,63C101.54,63 98.9,65.69 98.9,69C98.9,72.31 101.54,75 104.8,75Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M104.8,159C108.06,159 110.7,156.31 110.7,153C110.7,149.69 108.06,147 104.8,147C101.54,147 98.9,149.69 98.9,153C98.9,156.31 101.54,159 104.8,159Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M104.8,138C108.06,138 110.7,135.31 110.7,132C110.7,128.69 108.06,126 104.8,126C101.54,126 98.9,128.69 98.9,132C98.9,135.31 101.54,138 104.8,138Z" />
|
||||
<path
|
||||
android:fillColor="#365314"
|
||||
android:pathData="M116.4,66.8H145.9C146.3,66.8 146.7,66.5 146.7,66C146.7,65.5 146.4,65.2 145.9,65.2H116.4C116,65.2 115.6,65.5 115.6,66C115.6,66.5 116,66.8 116.4,66.8Z" />
|
||||
<path
|
||||
android:fillColor="#365314"
|
||||
android:pathData="M116.4,72.7H132.2C132.6,72.7 133,72.4 133,71.9C133,71.4 132.7,71.1 132.2,71.1H116.4C116,71.1 115.6,71.4 115.6,71.9C115.6,72.4 116,72.7 116.4,72.7Z" />
|
||||
<path
|
||||
android:fillColor="#365314"
|
||||
android:pathData="M145.8,149.3H116.4C116,149.3 115.6,149.6 115.6,150.1C115.6,150.6 115.9,150.9 116.4,150.9H145.9C146.3,150.9 146.7,150.6 146.7,150.1C146.7,149.6 146.2,149.3 145.8,149.3Z" />
|
||||
<path
|
||||
android:fillColor="#365314"
|
||||
android:pathData="M132.2,155.2H116.4C116,155.2 115.6,155.5 115.6,156C115.6,156.5 115.9,156.8 116.4,156.8H132.2C132.6,156.8 133,156.5 133,156C133,155.5 132.6,155.2 132.2,155.2Z" />
|
||||
<path
|
||||
android:fillColor="#365314"
|
||||
android:pathData="M145.8,128.3H116.4C116,128.3 115.6,128.6 115.6,129.1C115.6,129.6 115.9,129.9 116.4,129.9H145.9C146.3,129.9 146.7,129.6 146.7,129.1C146.7,128.6 146.2,128.3 145.8,128.3Z" />
|
||||
<path
|
||||
android:fillColor="#365314"
|
||||
android:pathData="M116.4,135.7H132.2C132.6,135.7 133,135.4 133,134.9C133,134.4 132.7,134.1 132.2,134.1H116.4C116,134.1 115.6,134.4 115.6,134.9C115.6,135.4 116,135.7 116.4,135.7Z" />
|
||||
<path
|
||||
android:fillColor="#1649A0"
|
||||
android:pathData="M74.8,83H172.8C175,83 176.8,84.8 176.8,87V114C176.8,116.2 175,118 172.8,118H74.8C72.6,118 70.8,116.2 70.8,114V87C70.8,84.8 72.6,83 74.8,83Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M164.8,95.3H112.8C112.4,95.3 112,95.6 112,96.1C112,96.6 112.3,96.9 112.8,96.9H164.8C165.2,96.9 165.6,96.6 165.6,96.1C165.6,95.6 165.2,95.3 164.8,95.3Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M140.8,104.1H112.8C112.4,104.1 112,104.4 112,104.9C112,105.4 112.3,105.7 112.8,105.7H140.8C141.2,105.7 141.6,105.4 141.6,104.9C141.6,104.4 141.2,104.1 140.8,104.1Z" />
|
||||
<path
|
||||
android:fillColor="#E2E8F0"
|
||||
android:pathData="M92.3,102.2H90.8C86,102.2 82,106.1 82,111V111.1C82,111.5 82.3,111.8 82.8,111.8C83.3,111.8 83.6,111.4 83.6,111C83.6,107 86.9,103.8 90.8,103.8H92.3C96.3,103.8 99.5,107.1 99.5,111.1C99.5,111.5 99.8,111.8 100.3,111.8C100.8,111.8 101.1,111.4 101.1,111C101,106.1 97.1,102.2 92.3,102.2Z" />
|
||||
<path
|
||||
android:fillColor="#E2E8F0"
|
||||
android:pathData="M91.6,99.5C94.3,99.5 96.5,97.3 96.5,94.6C96.5,91.9 94.3,89.7 91.6,89.7C88.9,89.7 86.7,91.9 86.7,94.6C86.7,97.4 88.9,99.5 91.6,99.5ZM91.6,91.3C93.5,91.3 95,92.8 95,94.7C95,96.6 93.4,98 91.6,98C89.8,98 88.2,96.5 88.2,94.6C88.2,92.7 89.7,91.3 91.6,91.3Z" />
|
||||
</vector>
|
||||
@@ -1,57 +0,0 @@
|
||||
<vector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="200dp"
|
||||
android:height="237dp"
|
||||
android:viewportHeight="178"
|
||||
android:viewportWidth="150">
|
||||
<path
|
||||
android:fillAlpha="0.25"
|
||||
android:pathData="M85.19,0.128 L3.357,0.329C2.465,0.331 1.611,0.69 0.981,1.329 0.352,1.967 -0.001,2.832 0,3.733L0.373,156.201c0.001,0.446 0.089,0.888 0.26,1.3 0.17,0.412 0.419,0.786 0.732,1.101 0.313,0.315 0.685,0.564 1.093,0.734 0.409,0.17 0.846,0.257 1.288,0.256l81.834,-0.201c0.892,-0.003 1.746,-0.363 2.375,-1.002 0.629,-0.639 0.981,-1.504 0.98,-2.405L88.554,3.516C88.551,2.617 88.196,1.755 87.565,1.12 86.935,0.485 86.081,0.128 85.19,0.128Z">
|
||||
</path>
|
||||
<path
|
||||
android:fillAlpha="0.175"
|
||||
android:fillColor="#6d6d6d"
|
||||
android:pathData="M84.282,-0.002 L4.276,0.196C2.574,0.2 1.198,1.598 1.202,3.318L1.567,154.298c0.004,1.72 1.387,3.111 3.089,3.107l80.006,-0.198c1.702,-0.004 3.078,-1.402 3.074,-3.122L87.37,3.105C87.366,1.385 85.983,-0.006 84.282,-0.002Z"/>
|
||||
<path
|
||||
android:fillAlpha="0.25"
|
||||
android:fillColor="#646464"
|
||||
android:pathData="M81.939,3.957L65.934,3.996C65.689,5.664 64.862,7.188 63.602,8.293C62.342,9.398 60.732,10.01 59.064,10.02L29.303,10.092C27.635,10.091 26.021,9.487 24.756,8.389C23.49,7.29 22.655,5.77 22.402,4.104L6.637,4.143C5.769,4.145 4.938,4.495 4.326,5.117C3.714,5.739 3.371,6.58 3.373,7.457L3.461,44.068L3.717,150.168C3.721,151.045 4.069,151.885 4.686,152.502C5.302,153.119 6.136,153.464 7.004,153.461L82.307,153.275C83.172,153.27 83.999,152.921 84.609,152.301C85.219,151.681 85.561,150.841 85.561,149.967L85.307,43.563L85.221,7.256C85.218,6.379 84.871,5.539 84.256,4.92C83.641,4.301 82.807,3.955 81.939,3.957zM52.652,5.791L34.357,6.068C34.108,6.072 33.908,6.279 33.912,6.531L33.916,6.83C33.92,7.082 34.125,7.285 34.375,7.281L52.672,7.002C52.921,6.998 53.119,6.791 53.115,6.539L53.111,6.24C53.108,5.988 52.902,5.787 52.652,5.791z"/>
|
||||
<path
|
||||
android:fillAlpha="0.25"
|
||||
android:fillColor="#dbdbdb"
|
||||
android:pathData="M57.204,6.934C57.602,6.928 57.919,6.597 57.913,6.195 57.907,5.793 57.58,5.471 57.182,5.477c-0.398,0.006 -0.716,0.337 -0.71,0.739 0.006,0.402 0.333,0.723 0.731,0.717z"/>
|
||||
<path
|
||||
android:fillAlpha="0.25"
|
||||
android:fillColor="#e0e0e0"
|
||||
android:pathData="m17.641,19.459c-4.185,0 -7.576,3.446 -7.576,7.695 0,4.25 3.392,7.695 7.576,7.695 4.185,0 7.576,-3.446 7.576,-7.695 0,-4.25 -3.392,-7.695 -7.576,-7.695zM37.523,23.637v3.234h40.117v-3.234zM37.523,30.104v3.234L77.641,33.338L77.641,30.104ZM17.641,44.088c-4.185,0 -7.576,3.444 -7.576,7.693 0,4.25 3.392,7.695 7.576,7.695 4.185,0 7.576,-3.446 7.576,-7.695 0,-4.25 -3.392,-7.693 -7.576,-7.693zM37.523,48.266L37.523,51.5h40.117v-3.234zM37.523,54.732v3.232L77.641,57.965L77.641,54.732ZM17.641,68.715c-4.185,0 -7.576,3.446 -7.576,7.695 0,4.25 3.392,7.695 7.576,7.695 4.185,0 7.576,-3.446 7.576,-7.695 0,-4.25 -3.392,-7.695 -7.576,-7.695zM37.523,72.895v3.232h40.117v-3.232zM37.523,79.361L37.523,82.594L77.641,82.594L77.641,79.361ZM17.641,93.344c-4.185,0 -7.576,3.446 -7.576,7.695 0,4.25 3.392,7.695 7.576,7.695 4.185,0 7.576,-3.445 7.576,-7.695 0,-4.25 -3.392,-7.695 -7.576,-7.695zM37.523,97.523v3.232h40.117v-3.232zM37.523,103.988v3.234h40.117v-3.234zM17.641,117.973c-4.185,0 -7.576,3.446 -7.576,7.695 0,4.25 3.392,7.693 7.576,7.693 4.185,0 7.576,-3.443 7.576,-7.693 0,-4.249 -3.392,-7.695 -7.576,-7.695zM37.523,122.15v3.234h40.117v-3.234zM37.523,128.617v3.234h40.117v-3.234z"/>
|
||||
<path
|
||||
android:fillColor="#313131"
|
||||
android:pathData="m136.95,18.407 l-80.006,0.198c-1.702,0.004 -3.078,1.402 -3.074,3.122l0.365,150.981c0.004,1.72 1.387,3.111 3.089,3.107l80.006,-0.198c1.702,-0.004 3.078,-1.402 3.074,-3.122L140.039,21.514c-0.004,-1.72 -1.387,-3.111 -3.089,-3.107z"/>
|
||||
<path
|
||||
android:fillColor="#3e3e3e"
|
||||
android:pathData="M134.609,22.357L118.6,22.395C118.356,24.062 117.528,25.587 116.268,26.691C115.008,27.796 113.398,28.408 111.73,28.418L81.969,28.492C80.301,28.491 78.689,27.886 77.424,26.787C76.158,25.689 75.323,24.168 75.07,22.502L59.305,22.541C58.437,22.543 57.604,22.894 56.992,23.516C56.38,24.137 56.037,24.98 56.039,25.857L56.129,62.469L56.748,62.467L56.129,62.471L56.383,168.57C56.385,169.447 56.733,170.287 57.348,170.906C57.963,171.524 58.796,171.871 59.664,171.869L134.967,171.684C135.835,171.682 136.665,171.331 137.277,170.709C137.889,170.088 138.232,169.246 138.23,168.369L137.973,62.219L137.975,62.219L137.889,25.656C137.887,24.779 137.541,23.939 136.926,23.32C136.311,22.702 135.477,22.356 134.609,22.357z"/>
|
||||
<path
|
||||
android:fillColor="#e0e0e0"
|
||||
android:pathData="M109.85,23.891C109.452,23.897 109.135,24.229 109.141,24.631C109.147,25.033 109.473,25.354 109.871,25.348C110.269,25.342 110.586,25.01 110.58,24.607C110.574,24.205 110.248,23.885 109.85,23.891zM105.32,24.201L87.025,24.479C86.776,24.482 86.576,24.691 86.58,24.943L86.584,25.242C86.588,25.494 86.793,25.695 87.043,25.691L105.34,25.414C105.589,25.41 105.787,25.203 105.783,24.951L105.779,24.65C105.775,24.398 105.569,24.197 105.32,24.201zM63.365,37.568L63.365,53.738L79.365,53.738L79.365,37.568L63.365,37.568zM86.748,37.568L86.748,40.801L126.865,40.801L126.865,37.568L86.748,37.568zM86.748,44.037L86.748,47.27L126.865,47.27L126.865,44.037L86.748,44.037zM71.787,112.996C67.603,112.996 64.211,116.441 64.211,120.691C64.211,124.941 67.603,128.387 71.787,128.387C75.972,128.387 79.365,124.941 79.365,120.691C79.365,116.441 75.972,112.996 71.787,112.996zM86.748,116.928L86.748,120.16L126.865,120.16L126.865,116.928L86.748,116.928zM86.748,123.393L86.748,126.627L126.865,126.627L126.865,123.393L86.748,123.393zM71.787,142.602C67.603,142.602 64.211,146.047 64.211,150.297C64.211,154.547 67.603,157.99 71.787,157.99C75.972,157.99 79.365,154.547 79.365,150.297C79.365,146.047 75.972,142.602 71.787,142.602zM86.748,145.535L86.748,148.768L126.865,148.768L126.865,145.535L86.748,145.535zM86.748,152.002L86.748,155.234L126.865,155.234L126.865,152.002L86.748,152.002z"/>
|
||||
<path
|
||||
android:fillColor="#d5d6d7"
|
||||
android:pathData="M148.744,68.665H45.619v33.583h103.125z"/>
|
||||
<path
|
||||
android:fillColor="#87c214"
|
||||
android:pathData="m97.822,50.504v5.723h17.967v-5.723zM86.748,81.104v3.232h40.117v-3.232zM86.748,87.572v3.232h40.117v-3.232z"/>
|
||||
<path
|
||||
android:fillColor="#f5f5f5"
|
||||
android:pathData="m66.865,92.314c4.185,0 7.577,-3.445 7.577,-7.695 0,-4.25 -3.392,-7.695 -7.577,-7.695 -4.185,0 -7.577,3.445 -7.577,7.695 0,4.25 3.392,7.695 7.577,7.695z"/>
|
||||
<path
|
||||
android:fillColor="#87c214"
|
||||
android:pathData="m70.13,90.006h-6.574c-0.315,0.002 -0.625,0.082 -0.904,0.231 -0.278,0.149 -0.517,0.365 -0.696,0.627 1.477,0.856 3.147,1.311 4.85,1.321 1.702,0.01 3.378,-0.427 4.864,-1.266 -0.167,-0.265 -0.393,-0.486 -0.661,-0.645 -0.268,-0.159 -0.569,-0.251 -0.879,-0.269z"/>
|
||||
<path
|
||||
android:fillColor="#333333"
|
||||
android:pathData="m66.861,80.746c-2.08,0 -3.766,1.704 -3.766,3.807 0,0.394 0.076,0.766 0.186,1.123 -0.328,0.813 -0.822,1.878 -1.158,1.709 0,0 5.07,4.425 9.545,0 -0.355,-0.613 -0.773,-1.184 -1.219,-1.732 0.105,-0.35 0.178,-0.715 0.178,-1.1 0,-2.102 -1.686,-3.807 -3.766,-3.807z"/>
|
||||
<path
|
||||
android:fillColor="#fda57d"
|
||||
android:pathData="m66.861,81.57c-1.801,0 -3.302,1.279 -3.674,2.986 -0.005,-0 -0.009,-0.006 -0.014,-0.006 -0.193,0 -0.35,0.297 -0.35,0.664 0,0.347 0.142,0.623 0.32,0.652 0.181,1.408 1.109,2.569 2.381,3.059v0.732c0,0.323 0.127,0.635 0.354,0.863 0.226,0.229 0.534,0.357 0.854,0.357h0.225c0.159,0 0.316,-0.032 0.463,-0.094 0.147,-0.061 0.28,-0.15 0.393,-0.264 0.112,-0.113 0.201,-0.248 0.262,-0.396 0.061,-0.148 0.092,-0.308 0.092,-0.469v-0.721c1.289,-0.484 2.232,-1.655 2.412,-3.076 0.168,-0.049 0.299,-0.312 0.299,-0.645 0,-0.363 -0.153,-0.656 -0.344,-0.662 -0.373,-1.705 -1.873,-2.982 -3.672,-2.982z"/>
|
||||
<path
|
||||
android:fillColor="#333333"
|
||||
android:pathData="m63.253,83.934h7.179c0,0 -0.612,-2.93 -3.328,-2.74 -2.715,0.19 -3.852,2.74 -3.852,2.74z"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,135 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="192dp"
|
||||
android:height="192dp"
|
||||
android:viewportWidth="192"
|
||||
android:viewportHeight="192">
|
||||
<path
|
||||
android:fillColor="#DDEDFE"
|
||||
android:pathData="M41.3,13.7H95.3C101.5,13.7 106.5,18.7 106.5,24.9V145.9C106.5,152.1 101.5,157.1 95.3,157.1H41.3C35.1,157.1 30.1,152.1 30.1,145.9V25C30.1,18.7 35.1,13.7 41.3,13.7Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M99.6,40.6C99.6,36.6 96.4,33.4 92.4,33.4H44.4C40.4,33.4 37.2,36.6 37.2,40.6V136.6C37.2,140.6 40.4,143.8 44.4,143.8H92.4C96.4,143.8 99.6,140.6 99.6,136.6V40.6Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:pathData="M95.3,13H41.3C34.7,13 29.3,18.4 29.3,25V146C29.3,152.6 34.7,158 41.3,158H95.3C101.9,158 107.3,152.6 107.3,146V25C107.3,18.3 102,13 95.3,13ZM105.8,146C105.8,151.8 101.1,156.5 95.3,156.5H41.3C35.5,156.5 30.8,151.8 30.8,146V25C30.8,19.2 35.5,14.5 41.3,14.5H95.3C101.1,14.5 105.8,19.2 105.8,25V146Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:pathData="M68.3,26.9C70,26.9 71.3,25.6 71.3,23.9C71.3,22.2 70,20.9 68.3,20.9C66.6,20.9 65.3,22.2 65.3,23.9C65.3,25.6 66.7,26.9 68.3,26.9ZM68.3,22.4C69.1,22.4 69.8,23.1 69.8,23.9C69.8,24.7 69.1,25.4 68.3,25.4C67.5,25.4 66.8,24.7 66.8,23.9C66.8,23.1 67.5,22.4 68.3,22.4Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:pathData="M50.3,24.4H60.3C60.7,24.4 61.1,24.1 61.1,23.6C61.1,23.1 60.8,22.8 60.3,22.8H50.3C49.9,22.8 49.5,23.1 49.5,23.6C49.5,24.1 49.9,24.4 50.3,24.4Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:pathData="M76.3,24.4H86.3C86.7,24.4 87.1,24.1 87.1,23.6C87.1,23.1 86.8,22.8 86.3,22.8H76.3C75.9,22.8 75.5,23.1 75.5,23.6C75.5,24.1 75.9,24.4 76.3,24.4Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:pathData="M92.3,32.6H44.3C39.9,32.6 36.3,36.2 36.3,40.6V136.6C36.3,141 39.9,144.6 44.3,144.6H92.3C96.7,144.6 100.3,141 100.3,136.6V40.6C100.3,36.2 96.7,32.6 92.3,32.6ZM98.8,136.6C98.8,140.2 95.9,143.1 92.3,143.1H44.3C40.7,143.1 37.8,140.2 37.8,136.6V40.6C37.8,37 40.7,34.1 44.3,34.1H92.3C95.9,34.1 98.8,37 98.8,40.6V136.6Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M90.3,45.8H60.9C60.5,45.8 60.1,45.5 60.1,45C60.1,44.5 60.4,44.2 60.9,44.2H90.4C90.8,44.2 91.2,44.5 91.2,45C91.2,45.5 90.7,45.8 90.3,45.8Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M76.7,51.7H60.9C60.5,51.7 60.1,51.4 60.1,50.9C60.1,50.4 60.4,50.1 60.9,50.1H76.7C77.1,50.1 77.5,50.4 77.5,50.9C77.5,51.4 77.1,51.7 76.7,51.7Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M90.3,87.8H60.9C60.5,87.8 60.1,87.5 60.1,87C60.1,86.5 60.4,86.2 60.9,86.2H90.4C90.8,86.2 91.2,86.5 91.2,87C91.2,87.5 90.7,87.8 90.3,87.8Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M76.7,93.7H60.9C60.5,93.7 60.1,93.4 60.1,92.9C60.1,92.4 60.4,92.1 60.9,92.1H76.7C77.1,92.1 77.5,92.4 77.5,92.9C77.5,93.4 77.1,93.7 76.7,93.7Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M90.3,66.8H60.9C60.5,66.8 60.1,66.5 60.1,66C60.1,65.5 60.4,65.2 60.9,65.2H90.4C90.8,65.2 91.2,65.5 91.2,66C91.2,66.5 90.7,66.8 90.3,66.8Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M76.7,72.7H60.9C60.5,72.7 60.1,72.4 60.1,71.9C60.1,71.4 60.4,71.1 60.9,71.1H76.7C77.1,71.1 77.5,71.4 77.5,71.9C77.5,72.4 77.1,72.7 76.7,72.7Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M90.3,129.8H60.9C60.5,129.8 60.1,129.5 60.1,129C60.1,128.5 60.4,128.2 60.9,128.2H90.4C90.8,128.2 91.2,128.5 91.2,129C91.2,129.5 90.7,129.8 90.3,129.8Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M76.7,135.7H60.9C60.5,135.7 60.1,135.4 60.1,134.9C60.1,134.4 60.4,134.1 60.9,134.1H76.7C77.1,134.1 77.5,134.4 77.5,134.9C77.5,135.4 77.1,135.7 76.7,135.7Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M90.3,108.8H60.9C60.5,108.8 60.1,108.5 60.1,108C60.1,107.5 60.4,107.2 60.9,107.2H90.4C90.8,107.2 91.2,107.5 91.2,108C91.2,108.5 90.7,108.8 90.3,108.8Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M76.7,114.7H60.9C60.5,114.7 60.1,114.4 60.1,113.9C60.1,113.4 60.4,113.1 60.9,113.1H76.7C77.1,113.1 77.5,113.4 77.5,113.9C77.5,114.4 77.1,114.7 76.7,114.7Z" />
|
||||
<path
|
||||
android:fillColor="#ECFCCB"
|
||||
android:pathData="M96.3,34.8H150.3C156.5,34.8 161.5,39.8 161.5,46V167C161.5,173.2 156.5,178.2 150.3,178.2H96.3C90.1,178.2 85.1,173.2 85.1,167V46C85.1,39.8 90.1,34.8 96.3,34.8Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M154.6,61.6C154.6,57.6 151.4,54.4 147.4,54.4H99.4C95.4,54.4 92.2,57.6 92.2,61.6V157.6C92.2,161.6 95.4,164.8 99.4,164.8H147.4C151.4,164.8 154.6,161.6 154.6,157.6V61.6Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:pathData="M150.3,34H96.3C89.7,34 84.3,39.4 84.3,46V167C84.3,173.6 89.7,179 96.3,179H150.3C156.9,179 162.3,173.6 162.3,167V46C162.3,39.4 157,34 150.3,34ZM160.8,167C160.8,172.8 156.1,177.5 150.3,177.5H96.3C90.5,177.5 85.8,172.8 85.8,167V46C85.8,40.2 90.5,35.5 96.3,35.5H150.3C156.1,35.5 160.8,40.2 160.8,46V167Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:pathData="M123.3,47.9C125,47.9 126.3,46.6 126.3,44.9C126.3,43.2 125,41.9 123.3,41.9C121.6,41.9 120.3,43.2 120.3,44.9C120.3,46.6 121.7,47.9 123.3,47.9ZM123.3,43.4C124.1,43.4 124.8,44.1 124.8,44.9C124.8,45.7 124.1,46.4 123.3,46.4C122.5,46.4 121.8,45.7 121.8,44.9C121.8,44.1 122.5,43.4 123.3,43.4Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:pathData="M105.3,45.4H115.3C115.7,45.4 116.1,45.1 116.1,44.6C116.1,44.1 115.8,43.8 115.3,43.8H105.3C104.9,43.8 104.5,44.1 104.5,44.6C104.5,45.1 104.9,45.4 105.3,45.4Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:pathData="M131.3,45.4H141.3C141.7,45.4 142.1,45.1 142.1,44.6C142.1,44.1 141.8,43.8 141.3,43.8H131.3C130.9,43.8 130.5,44.1 130.5,44.6C130.5,45.1 130.9,45.4 131.3,45.4Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:pathData="M147.3,53.6H99.3C94.9,53.6 91.3,57.2 91.3,61.6V157.6C91.3,162 94.9,165.6 99.3,165.6H147.3C151.7,165.6 155.3,162 155.3,157.6V61.6C155.3,57.2 151.7,53.6 147.3,53.6ZM153.8,157.6C153.8,161.2 150.9,164.1 147.3,164.1H99.3C95.7,164.1 92.8,161.2 92.8,157.6V61.6C92.8,58 95.7,55.1 99.3,55.1H147.3C150.9,55.1 153.8,58 153.8,61.6V157.6Z" />
|
||||
<path
|
||||
android:fillColor="#E5E7EB"
|
||||
android:pathData="M49.3,54C52.56,54 55.2,51.31 55.2,48C55.2,44.69 52.56,42 49.3,42C46.04,42 43.4,44.69 43.4,48C43.4,51.31 46.04,54 49.3,54Z" />
|
||||
<path
|
||||
android:fillColor="#E5E7EB"
|
||||
android:pathData="M49.3,96C52.56,96 55.2,93.31 55.2,90C55.2,86.69 52.56,84 49.3,84C46.04,84 43.4,86.69 43.4,90C43.4,93.31 46.04,96 49.3,96Z" />
|
||||
<path
|
||||
android:fillColor="#E5E7EB"
|
||||
android:pathData="M49.3,75C52.56,75 55.2,72.31 55.2,69C55.2,65.69 52.56,63 49.3,63C46.04,63 43.4,65.69 43.4,69C43.4,72.31 46.04,75 49.3,75Z" />
|
||||
<path
|
||||
android:fillColor="#E5E7EB"
|
||||
android:pathData="M49.3,138C52.56,138 55.2,135.31 55.2,132C55.2,128.69 52.56,126 49.3,126C46.04,126 43.4,128.69 43.4,132C43.4,135.31 46.04,138 49.3,138Z" />
|
||||
<path
|
||||
android:fillColor="#E5E7EB"
|
||||
android:pathData="M49.3,117C52.56,117 55.2,114.31 55.2,111C55.2,107.69 52.56,105 49.3,105C46.04,105 43.4,107.69 43.4,111C43.4,114.31 46.04,117 49.3,117Z" />
|
||||
<path
|
||||
android:fillColor="#E5E7EB"
|
||||
android:pathData="M104.3,75C107.56,75 110.2,72.31 110.2,69C110.2,65.69 107.56,63 104.3,63C101.04,63 98.4,65.69 98.4,69C98.4,72.31 101.04,75 104.3,75Z" />
|
||||
<path
|
||||
android:fillColor="#E5E7EB"
|
||||
android:pathData="M104.3,159C107.56,159 110.2,156.31 110.2,153C110.2,149.69 107.56,147 104.3,147C101.04,147 98.4,149.69 98.4,153C98.4,156.31 101.04,159 104.3,159Z" />
|
||||
<path
|
||||
android:fillColor="#E5E7EB"
|
||||
android:pathData="M104.3,138C107.56,138 110.2,135.31 110.2,132C110.2,128.69 107.56,126 104.3,126C101.04,126 98.4,128.69 98.4,132C98.4,135.31 101.04,138 104.3,138Z" />
|
||||
<path
|
||||
android:fillColor="#D9F99D"
|
||||
android:pathData="M115.9,66.8H145.4C145.8,66.8 146.2,66.5 146.2,66C146.2,65.5 145.9,65.2 145.4,65.2H115.9C115.5,65.2 115.1,65.5 115.1,66C115.1,66.5 115.5,66.8 115.9,66.8Z" />
|
||||
<path
|
||||
android:fillColor="#D9F99D"
|
||||
android:pathData="M115.9,72.7H131.7C132.1,72.7 132.5,72.4 132.5,71.9C132.5,71.4 132.2,71.1 131.7,71.1H115.9C115.5,71.1 115.1,71.4 115.1,71.9C115.1,72.4 115.5,72.7 115.9,72.7Z" />
|
||||
<path
|
||||
android:fillColor="#D9F99D"
|
||||
android:pathData="M145.3,149.3H115.8C115.4,149.3 115,149.6 115,150.1C115,150.6 115.3,150.9 115.8,150.9H145.3C145.7,150.9 146.1,150.6 146.1,150.1C146.1,149.6 145.7,149.3 145.3,149.3Z" />
|
||||
<path
|
||||
android:fillColor="#D9F99D"
|
||||
android:pathData="M131.7,155.2H115.9C115.5,155.2 115.1,155.5 115.1,156C115.1,156.5 115.4,156.8 115.9,156.8H131.7C132.1,156.8 132.5,156.5 132.5,156C132.5,155.5 132.1,155.2 131.7,155.2Z" />
|
||||
<path
|
||||
android:fillColor="#D9F99D"
|
||||
android:pathData="M145.3,128.3H115.8C115.4,128.3 115,128.6 115,129.1C115,129.6 115.3,129.9 115.8,129.9H145.3C145.7,129.9 146.1,129.6 146.1,129.1C146.1,128.6 145.7,128.3 145.3,128.3Z" />
|
||||
<path
|
||||
android:fillColor="#D9F99D"
|
||||
android:pathData="M115.9,135.7H131.7C132.1,135.7 132.5,135.4 132.5,134.9C132.5,134.4 132.2,134.1 131.7,134.1H115.9C115.5,134.1 115.1,134.4 115.1,134.9C115.1,135.4 115.5,135.7 115.9,135.7Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M74.3,83H172.3C174.5,83 176.3,84.8 176.3,87V114C176.3,116.2 174.5,118 172.3,118H74.3C72.1,118 70.3,116.2 70.3,114V87C70.3,84.8 72.1,83 74.3,83Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M164.3,95.3H112.3C111.9,95.3 111.5,95.6 111.5,96.1C111.5,96.6 111.8,96.9 112.3,96.9H164.3C164.7,96.9 165.1,96.6 165.1,96.1C165.1,95.6 164.7,95.3 164.3,95.3Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M140.3,104.1H112.3C111.9,104.1 111.5,104.4 111.5,104.9C111.5,105.4 111.8,105.7 112.3,105.7H140.3C140.7,105.7 141.1,105.4 141.1,104.9C141.1,104.4 140.7,104.1 140.3,104.1Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M91.8,102.2H90.3C85.5,102.2 81.5,106.1 81.5,111V111.1C81.5,111.5 81.8,111.8 82.3,111.8C82.8,111.8 83.1,111.4 83.1,111C83.1,107 86.4,103.8 90.3,103.8H91.8C95.8,103.8 99,107.1 99,111.1C99,111.5 99.3,111.8 99.8,111.8C100.3,111.8 100.6,111.4 100.6,111C100.5,106.1 96.6,102.2 91.8,102.2Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M91.1,99.5C93.8,99.5 96,97.3 96,94.6C96,91.9 93.8,89.7 91.1,89.7C88.4,89.7 86.2,91.9 86.2,94.6C86.2,97.4 88.4,99.5 91.1,99.5ZM91.1,91.3C93,91.3 94.5,92.8 94.5,94.7C94.5,96.6 92.9,98 91.1,98C89.3,98 87.7,96.5 87.7,94.6C87.7,92.7 89.2,91.3 91.1,91.3Z" />
|
||||
</vector>
|
||||
@@ -1,176 +1,166 @@
|
||||
<?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:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true">
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="@dimen/margin_large">
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<androidx.constraintlayout.widget.Guideline
|
||||
android:id="@+id/guideline"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintGuide_percent="0.5" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/stepOne"
|
||||
style="@style/StepBubble.Completed"
|
||||
app:layout_constraintBottom_toTopOf="@+id/stepOneText"
|
||||
app:layout_constraintEnd_toStartOf="@+id/guideline"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.0"
|
||||
app:layout_constraintVertical_chainStyle="packed" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/stepOneText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="8dp"
|
||||
android:text="@string/send_link_title"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView"
|
||||
app:layout_constraintEnd_toStartOf="@+id/guideline"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/stepOne" />
|
||||
|
||||
<View
|
||||
android:id="@+id/stepConnector"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="1dp"
|
||||
android:layout_margin="16dp"
|
||||
android:background="@color/briar_accent"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/stepOne"
|
||||
app:layout_constraintEnd_toStartOf="@+id/stepTwo"
|
||||
app:layout_constraintStart_toEndOf="@+id/stepOne"
|
||||
app:layout_constraintTop_toTopOf="@+id/stepOne" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/stepTwo"
|
||||
style="@style/StepBubble"
|
||||
android:text="@string/step_2"
|
||||
app:layout_constraintBottom_toTopOf="@+id/stepTwoText"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="@+id/guideline"
|
||||
app:layout_constraintTop_toTopOf="@+id/stepOne"
|
||||
app:layout_constraintVertical_bias="0.0"
|
||||
app:layout_constraintVertical_chainStyle="packed" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/stepTwoText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="8dp"
|
||||
android:text="@string/add_contact_choose_nickname"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/guideline"
|
||||
app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="32dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/nicknameIcon"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHeight_max="256dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/stepOneText"
|
||||
app:srcCompat="@drawable/ic_nickname"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/nicknameIcon"
|
||||
android:layout_width="38dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_marginTop="32dp"
|
||||
android:background="@drawable/bubble_accent"
|
||||
android:scaleType="center"
|
||||
app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/imageView"
|
||||
app:srcCompat="@drawable/ic_person"
|
||||
app:tint="@android:color/white" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/nicknameIntro"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:gravity="left|start"
|
||||
android:text="@string/nickname_intro"
|
||||
android:textSize="16sp"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/nicknameIcon"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/nicknameIcon"
|
||||
app:layout_constraintTop_toTopOf="@+id/nicknameIcon" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/contactNameLayout"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
app:errorEnabled="true"
|
||||
app:hintEnabled="false"
|
||||
app:layout_constraintBottom_toTopOf="@+id/space"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/nicknameIcon">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/contactNameInput"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:hint="@string/add_contact_choose_a_nickname"
|
||||
android:importantForAutofill="no"
|
||||
android:inputType="text|textCapWords" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<Space
|
||||
android:id="@+id/space"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constrainedHeight="true"
|
||||
app:layout_constraintBottom_toTopOf="@+id/addButton"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/contactNameLayout" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/addButton"
|
||||
style="@style/BriarButton"
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/add_contact_button"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/contactNameLayout"
|
||||
app:layout_constraintVertical_bias="1.0" />
|
||||
android:padding="@dimen/margin_large">
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progressBar"
|
||||
style="?android:attr/progressBarStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/contactNameLayout"
|
||||
app:layout_constraintVertical_bias="1.0" />
|
||||
<androidx.constraintlayout.widget.Guideline
|
||||
android:id="@+id/guideline"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintGuide_percent="0.5" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/stepOne"
|
||||
style="@style/StepBubble.Completed"
|
||||
app:layout_constraintBottom_toTopOf="@+id/stepOneText"
|
||||
app:layout_constraintEnd_toStartOf="@+id/guideline"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.0"
|
||||
app:layout_constraintVertical_chainStyle="packed" />
|
||||
|
||||
</ScrollView>
|
||||
<TextView
|
||||
android:id="@+id/stepOneText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="8dp"
|
||||
android:text="@string/send_link_title"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView"
|
||||
app:layout_constraintEnd_toStartOf="@+id/guideline"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/stepOne" />
|
||||
|
||||
<View
|
||||
android:id="@+id/stepConnector"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="1dp"
|
||||
android:layout_margin="16dp"
|
||||
android:background="@color/briar_accent"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/stepOne"
|
||||
app:layout_constraintEnd_toStartOf="@+id/stepTwo"
|
||||
app:layout_constraintStart_toEndOf="@+id/stepOne"
|
||||
app:layout_constraintTop_toTopOf="@+id/stepOne" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/stepTwo"
|
||||
style="@style/StepBubble"
|
||||
android:text="@string/step_2"
|
||||
app:layout_constraintBottom_toTopOf="@+id/stepTwoText"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="@+id/guideline"
|
||||
app:layout_constraintTop_toTopOf="@+id/stepOne"
|
||||
app:layout_constraintVertical_bias="0.0"
|
||||
app:layout_constraintVertical_chainStyle="packed" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/stepTwoText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="8dp"
|
||||
android:text="@string/add_contact_choose_nickname"
|
||||
app:layout_constraintBottom_toTopOf="@+id/imageView"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/guideline"
|
||||
app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="32dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/nicknameIcon"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHeight_max="256dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/stepOneText"
|
||||
app:srcCompat="@drawable/il_add_contact_remote_nickname"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/nicknameIcon"
|
||||
android:layout_width="38dp"
|
||||
android:layout_height="38dp"
|
||||
android:layout_marginTop="32dp"
|
||||
android:background="@drawable/bubble_accent"
|
||||
android:scaleType="center"
|
||||
app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/imageView"
|
||||
app:srcCompat="@drawable/ic_person"
|
||||
app:tint="@android:color/white" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/nicknameIntro"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:gravity="left|start"
|
||||
android:text="@string/nickname_intro"
|
||||
android:textSize="16sp"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/nicknameIcon"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/nicknameIcon"
|
||||
app:layout_constraintTop_toTopOf="@+id/nicknameIcon" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/contactNameLayout"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
app:errorEnabled="true"
|
||||
app:hintEnabled="false"
|
||||
app:layout_constraintBottom_toTopOf="@+id/space"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/nicknameIcon">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/contactNameInput"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:hint="@string/add_contact_choose_a_nickname"
|
||||
android:importantForAutofill="no"
|
||||
android:inputType="text|textCapWords" />
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<Space
|
||||
android:id="@+id/space"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constrainedHeight="true"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/contactNameLayout" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
<org.briarproject.briar.android.view.BriarButton
|
||||
android:id="@+id/addButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
app:buttonStyle="@style/BriarButton"
|
||||
app:text="@string/add_contact_button" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
Reference in New Issue
Block a user