Commit 70b09251 authored by Craig Earley's avatar Craig Earley
Browse files

Modernize navigation

parent db3f9e4e
......@@ -51,16 +51,16 @@ public class MainScreenActivity extends AppCompatActivity {
public void activityStart(View view){
switch(view.getId()){
case R.id.imageButtonAbout:
case R.id.buttonAbout:
frag = new AboutFragment();
break;
case R.id.imageButtonSettings:
case R.id.buttonSettings:
frag = new SettingsFragment();
break;
case R.id.imageButtonTakeSample:
frag = new SampleButtonsFragment();
break;
case R.id.imageButtonLabNotebook:
//case R.id.imageButtonTakeSample:
// frag = new SampleButtonsFragment();
// break;
case R.id.buttonNotebook:
frag = new LabNotebookFragment();
break;
default:
......
package fieldscience.cs.earlham.edu.fieldday;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.fragment.app.Fragment;
public class SampleButtonsFragment extends Fragment {
public SampleButtonsFragment() {
// Required empty constructor
}
public void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
}
public View onCreateView (LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.fragment_sensorscreen, container, false);
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
Activity a;
}
}
\ No newline at end of file
<vector android:autoMirrored="true" android:height="149dp"
android:viewportHeight="149.2021" android:viewportWidth="164.98688"
<vector android:autoMirrored="true" android:height="70dp"
android:viewportHeight="70.2021" android:viewportWidth="164.98688"
android:width="164dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="0.0" android:fillColor="#000000"
android:pathData="m0,0l164.99,0l0,149.2l-164.99,0z"
......@@ -7,12 +7,6 @@
<path android:fillAlpha="0.0" android:fillColor="#000000"
android:pathData="m-8.18,78.28l181.35,0l0,61.61l-181.35,0z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#a61c00"
android:pathData="m38.93,78.73l0,6.52l3.27,0q0.69,0 1.27,-0.25q0.59,-0.27 1.03,-0.7q0.45,-0.45 0.7,-1.05q0.27,-0.59 0.27,-1.27q0,-0.66 -0.27,-1.25q-0.25,-0.59 -0.7,-1.03q-0.45,-0.45 -1.05,-0.7q-0.58,-0.27 -1.25,-0.27l-3.27,0zM38.93,88.66l0,9l4.52,0q0.94,0 1.75,-0.34q0.83,-0.36 1.42,-0.97q0.61,-0.61 0.95,-1.44q0.36,-0.83 0.36,-1.75q0,-0.92 -0.36,-1.73q-0.34,-0.83 -0.95,-1.44q-0.61,-0.63 -1.44,-0.97q-0.83,-0.36 -1.73,-0.36l-4.52,0zM42.2,75.31q1.38,0 2.59,0.53q1.22,0.52 2.13,1.44q0.91,0.91 1.42,2.13q0.53,1.2 0.53,2.58q0,2.45 -1.52,4.27q0.98,0.58 1.72,1.34q0.75,0.75 1.25,1.66q0.52,0.89 0.77,1.89q0.27,0.98 0.27,2.03q0,1.63 -0.63,3.06q-0.63,1.44 -1.7,2.53q-1.08,1.08 -2.52,1.7q-1.44,0.63 -3.06,0.63l-6.22,0q-0.36,0 -0.67,-0.14q-0.3,-0.14 -0.53,-0.36q-0.23,-0.22 -0.38,-0.53q-0.14,-0.33 -0.14,-0.67l0,-22.38q0,-0.34 0.14,-0.66q0.14,-0.33 0.38,-0.55q0.23,-0.22 0.53,-0.36q0.31,-0.14 0.67,-0.14l4.97,0zM68.3,90.38q-0.28,-0.88 -0.83,-1.61q-0.53,-0.73 -1.25,-1.25q-0.72,-0.53 -1.58,-0.81q-0.86,-0.3 -1.78,-0.3q-0.92,0 -1.8,0.3q-0.86,0.28 -1.59,0.81q-0.72,0.52 -1.25,1.25q-0.53,0.73 -0.8,1.61l10.88,0zM67.57,96.01q0.73,0 1.2,0.48q0.47,0.47 0.47,1.19q0,0.72 -0.48,1.22q-2.48,2.19 -5.89,2.19q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.31 1.98,2.92q0.67,1.59 0.67,3.45q0,0.73 -0.5,1.22q-0.48,0.47 -1.2,0.47l-12.77,0q0.28,0.88 0.81,1.61q0.53,0.73 1.25,1.27q0.72,0.52 1.58,0.81q0.86,0.28 1.8,0.28q1.06,0 1.95,-0.31q0.89,-0.33 1.64,-0.97q0.48,-0.41 1.11,-0.42zM78.02,84.7q2.14,-1.66 5.05,-1.66q1.69,0 3.2,0.67q1.53,0.66 2.69,1.8q1.16,1.13 1.83,2.67q0.69,1.53 0.69,3.27l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-7.95q0,-1.03 -0.41,-1.94q-0.41,-0.92 -1.09,-1.61q-0.69,-0.69 -1.61,-1.08q-0.91,-0.41 -1.94,-0.41q-1.05,0 -1.97,0.39q-0.91,0.39 -1.59,1.09q-0.69,0.69 -1.09,1.61q-0.39,0.91 -0.39,1.94l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.22,-0.48q-0.48,-0.5 -0.48,-1.2l0,-14.67q0,-0.69 0.48,-1.19q0.5,-0.5 1.22,-0.5q0.69,0 1.17,0.5q0.5,0.5 0.5,1.16zM107.92,95.98q0.73,0 1.2,0.48q0.47,0.47 0.47,1.19q0,0.72 -0.53,1.25q-2.48,2.19 -5.88,2.19q-3.73,0 -6.38,-2.64q-2.66,-2.64 -2.66,-6.39q0,-3.73 2.66,-6.38q2.64,-2.64 6.38,-2.64q3.41,0 5.88,2.19q0.58,0.52 0.58,1.28q0,0.72 -0.47,1.2q-0.47,0.48 -1.2,0.48q-0.61,0 -1.09,-0.39q-0.81,-0.69 -1.72,-1.03q-0.91,-0.36 -1.97,-0.36q-1.17,0 -2.2,0.44q-1.03,0.44 -1.81,1.2q-0.77,0.77 -1.22,1.8q-0.44,1.03 -0.44,2.2q0,1.19 0.44,2.22q0.45,1.03 1.22,1.8q0.78,0.77 1.81,1.2q1.03,0.44 2.2,0.44q1.06,0 1.97,-0.34q0.91,-0.34 1.7,-1.03q0.45,-0.34 1.06,-0.36zM115.78,99.4q0,0.7 -0.5,1.2q-0.48,0.48 -1.19,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-22.41q0,-0.7 0.48,-1.19q0.5,-0.5 1.2,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.52,1.19l0,7.73q2.14,-1.66 5.05,-1.66q1.69,0 3.2,0.67q1.53,0.66 2.69,1.8q1.16,1.13 1.83,2.67q0.69,1.53 0.69,3.27l0,7.92q-0.02,0.7 -0.52,1.2q-0.48,0.48 -1.17,0.48q-0.7,0 -1.19,-0.48q-0.48,-0.5 -0.48,-1.2l0,-7.92q0,-1.03 -0.41,-1.94q-0.41,-0.92 -1.09,-1.61q-0.69,-0.69 -1.61,-1.08q-0.91,-0.41 -1.94,-0.41q-1.05,0 -1.97,0.39q-0.91,0.39 -1.59,1.09q-0.69,0.69 -1.09,1.61q-0.39,0.91 -0.39,1.94l0,7.92z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#a61c00"
android:pathData="m25.93,137.51q-0.34,-0.44 -0.34,-1.03q0,-0.36 0.13,-0.67q0.14,-0.31 0.38,-0.55q0.23,-0.23 0.53,-0.36q0.31,-0.13 0.69,-0.13q0.94,0 1.42,0.78q0.69,1.05 1.7,1.58q1.02,0.53 2.19,0.53q0.92,0 1.73,-0.36q0.81,-0.36 1.41,-0.97q0.61,-0.61 0.97,-1.44q0.36,-0.84 0.36,-1.77q0,-0.89 -0.34,-1.67q-0.33,-0.78 -0.89,-1.36q-0.56,-0.59 -1.31,-0.97q-0.75,-0.38 -1.58,-0.45q-1.3,-0.11 -2.41,-0.67q-1.11,-0.56 -1.95,-1.45q-0.83,-0.91 -1.31,-2.05q-0.47,-1.16 -0.47,-2.45q0,-1.58 0.59,-2.86q0.59,-1.28 1.75,-2.28l-0.02,0q1.86,-1.61 4.36,-1.61q0.8,0 1.59,0.2q0.81,0.2 1.56,0.61q0.75,0.41 1.41,1.03q0.66,0.61 1.17,1.42q0.23,0.42 0.23,0.92q0,0.38 -0.13,0.69q-0.13,0.3 -0.36,0.53q-0.23,0.23 -0.55,0.36q-0.31,0.13 -0.67,0.13q-0.33,0 -0.58,-0.09q-0.25,-0.09 -0.45,-0.27q-0.19,-0.19 -0.38,-0.42q-0.19,-0.23 -0.41,-0.53q-0.38,-0.56 -1.05,-0.84q-0.67,-0.28 -1.44,-0.28q-0.63,0 -1.2,0.25q-0.58,0.25 -1.03,0.69q-0.45,0.42 -0.73,1.03q-0.28,0.59 -0.28,1.28q0,0.63 0.23,1.19q0.23,0.56 0.64,1.02q0.41,0.44 0.94,0.72q0.55,0.28 1.17,0.33q1.5,0.13 2.81,0.78q1.33,0.66 2.31,1.72q1,1.05 1.58,2.42q0.58,1.36 0.58,2.88q0,3.78 -2.78,6.13l0.02,0q-2.23,1.91 -5.09,1.91q-0.95,0 -1.91,-0.23q-0.95,-0.23 -1.83,-0.69q-0.88,-0.45 -1.64,-1.13q-0.77,-0.67 -1.33,-1.53zM51.96,126.41q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45zM57.62,139.41l0,-0.33q-1.2,0.97 -2.63,1.48q-1.42,0.52 -3.03,0.52q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q2.66,2.64 2.66,6.38l0,7.36q0,0.69 -0.5,1.19q-0.48,0.48 -1.19,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.19zM89.24,139.4q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-9.17q0,-0.78 -0.3,-1.47q-0.3,-0.69 -0.81,-1.2q-0.52,-0.53 -1.22,-0.83q-0.69,-0.31 -1.5,-0.31q-0.8,0 -1.48,0.31q-0.69,0.3 -1.22,0.81q-0.52,0.52 -0.81,1.2q-0.3,0.69 -0.3,1.48l0,9.17q0,0.7 -0.5,1.2q-0.48,0.48 -1.19,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-9.17q0,-0.8 -0.31,-1.48q-0.3,-0.69 -0.81,-1.2q-0.52,-0.52 -1.22,-0.81q-0.69,-0.31 -1.47,-0.31q-0.8,0 -1.5,0.3q-0.69,0.3 -1.22,0.83q-0.52,0.52 -0.81,1.2q-0.3,0.69 -0.3,1.48l0,9.17q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-14.69q0,-0.69 0.48,-1.17q0.5,-0.5 1.19,-0.5q0.56,0 1,0.31q0.44,0.31 0.59,0.83q1.72,-1.14 3.92,-1.14q1.61,0 3.02,0.64q1.42,0.63 2.48,1.92q2.25,-2.56 5.5,-2.56q1.47,0 2.78,0.58q1.31,0.56 2.28,1.55q0.98,0.97 1.55,2.28q0.58,1.31 0.58,2.78l0,9.17zM95.77,132.06q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19zM101.43,141.09q-3.23,0 -5.66,-1.98l0,8.05q0,0.72 -0.5,1.19q-0.48,0.48 -1.19,0.48q-0.73,0 -1.2,-0.48q-0.47,-0.47 -0.47,-1.19l0,-15.09q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.31 1.98,2.92q0.67,1.59 0.67,3.45q0,3.78 -2.66,6.39q-1.34,1.33 -2.94,1.98q-1.58,0.66 -3.44,0.66zM113.07,139.41l0,-22.42q0,-0.7 0.47,-1.19q0.48,-0.5 1.2,-0.5q0.73,0 1.2,0.5q0.48,0.48 0.48,1.19l0,20.72l0.77,0q0.7,0 1.19,0.5q0.48,0.48 0.48,1.2q0,0.69 -0.48,1.19q-0.48,0.48 -1.19,0.48l-2.47,0q-0.69,0 -1.17,-0.48q-0.48,-0.5 -0.48,-1.19zM135.51,130.38q-0.28,-0.88 -0.83,-1.61q-0.53,-0.73 -1.25,-1.25q-0.72,-0.53 -1.58,-0.81q-0.86,-0.3 -1.78,-0.3q-0.92,0 -1.8,0.3q-0.86,0.28 -1.59,0.81q-0.72,0.52 -1.25,1.25q-0.53,0.73 -0.8,1.61l10.87,0zM134.78,136.01q0.73,0 1.2,0.48q0.47,0.47 0.47,1.19q0,0.72 -0.48,1.22q-2.48,2.19 -5.89,2.19q-3.73,0 -6.37,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.37,-2.64q3.7,0 6.38,2.64q1.33,1.31 1.98,2.92q0.67,1.59 0.67,3.45q0,0.73 -0.5,1.22q-0.48,0.47 -1.2,0.47l-12.77,0q0.28,0.88 0.81,1.61q0.53,0.73 1.25,1.27q0.72,0.52 1.58,0.81q0.86,0.28 1.8,0.28q1.06,0 1.95,-0.31q0.89,-0.33 1.64,-0.97q0.48,-0.41 1.11,-0.42z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#999999"
android:pathData="m22.75,29.87l0,0c0,-1.58 1.28,-2.86 2.86,-2.86l113.77,0c0.76,0 1.49,0.3 2.02,0.84c0.54,0.54 0.84,1.26 0.84,2.02l0,11.44c0,1.58 -1.28,2.86 -2.86,2.86l-113.77,0c-1.58,0 -2.86,-1.28 -2.86,-2.86z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
......
<vector android:autoMirrored="true" android:height="177dp"
android:viewportHeight="177.41208" android:viewportWidth="153.48557"
<vector android:autoMirrored="true" android:height="100dp"
android:viewportHeight="100.41208" android:viewportWidth="153.48557"
android:width="153dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="0.0" android:fillColor="#000000"
android:pathData="m0,0l153.49,0l0,177.41l-153.49,0z"
......@@ -7,12 +7,6 @@
<path android:fillAlpha="0.0" android:fillColor="#000000"
android:pathData="m-10.36,109.13l174.2,0l0,68.28l-174.2,0z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#a61c00"
android:pathData="m4.54,112.91l0,6.52l3.27,0q0.69,0 1.27,-0.25q0.59,-0.27 1.03,-0.7q0.45,-0.45 0.7,-1.05q0.27,-0.59 0.27,-1.27q0,-0.66 -0.27,-1.25q-0.25,-0.59 -0.7,-1.03q-0.45,-0.45 -1.05,-0.7q-0.58,-0.27 -1.25,-0.27l-3.27,0zM4.54,122.85l0,9l4.52,0q0.94,0 1.75,-0.34q0.83,-0.36 1.42,-0.97q0.61,-0.61 0.95,-1.44q0.36,-0.83 0.36,-1.75q0,-0.92 -0.36,-1.73q-0.34,-0.83 -0.95,-1.44q-0.61,-0.63 -1.44,-0.97q-0.83,-0.36 -1.73,-0.36l-4.52,0zM7.81,109.49q1.38,0 2.59,0.53q1.22,0.52 2.13,1.44q0.91,0.91 1.42,2.13q0.53,1.2 0.53,2.58q0,2.45 -1.52,4.27q0.98,0.58 1.72,1.34q0.75,0.75 1.25,1.66q0.52,0.89 0.77,1.89q0.27,0.98 0.27,2.03q0,1.63 -0.63,3.06q-0.62,1.44 -1.7,2.53q-1.08,1.08 -2.52,1.7q-1.44,0.63 -3.06,0.63l-6.22,0q-0.36,0 -0.67,-0.14q-0.3,-0.14 -0.53,-0.36q-0.23,-0.22 -0.38,-0.53q-0.14,-0.33 -0.14,-0.67l0,-22.38q0,-0.34 0.14,-0.66q0.14,-0.33 0.38,-0.55q0.23,-0.22 0.53,-0.36q0.31,-0.14 0.67,-0.14l4.97,0zM19.28,133.6l0,-22.42q0,-0.7 0.47,-1.19q0.48,-0.5 1.2,-0.5q0.73,0 1.2,0.5q0.48,0.48 0.48,1.19l0,20.72l0.77,0q0.7,0 1.19,0.5q0.48,0.48 0.48,1.2q0,0.69 -0.48,1.19q-0.48,0.48 -1.19,0.48l-2.47,0q-0.69,0 -1.17,-0.48q-0.48,-0.5 -0.48,-1.19zM42.38,135.27q-0.73,0 -1.2,-0.48q-0.45,-0.48 -0.47,-1.17q-1.13,0.86 -2.36,1.27q-1.23,0.39 -2.69,0.39q-1.73,0 -3.27,-0.67q-1.52,-0.67 -2.67,-1.81q-1.14,-1.14 -1.81,-2.67q-0.67,-1.53 -0.67,-3.25l0,-7.97q0,-0.69 0.48,-1.17q0.5,-0.5 1.22,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.5,1.17l0,7.97q0,1.05 0.39,1.97q0.41,0.91 1.08,1.59q0.69,0.69 1.61,1.08q0.92,0.39 1.97,0.39q1.03,0 1.94,-0.39q0.92,-0.39 1.61,-1.08q0.7,-0.7 1.09,-1.61q0.41,-0.91 0.41,-1.95l0,-7.97q0,-0.69 0.48,-1.17q0.48,-0.5 1.2,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.5,1.17l0,14.7q0,0.69 -0.5,1.19q-0.48,0.48 -1.19,0.48zM61.25,124.57q-0.28,-0.88 -0.83,-1.61q-0.53,-0.73 -1.25,-1.25q-0.72,-0.53 -1.58,-0.81q-0.86,-0.3 -1.78,-0.3q-0.92,0 -1.8,0.3q-0.86,0.28 -1.59,0.81q-0.72,0.52 -1.25,1.25q-0.53,0.73 -0.8,1.61l10.88,0zM60.51,130.19q0.73,0 1.2,0.48q0.47,0.47 0.47,1.19q0,0.72 -0.48,1.22q-2.48,2.19 -5.89,2.19q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.31 1.98,2.92q0.67,1.59 0.67,3.45q0,0.73 -0.5,1.22q-0.48,0.47 -1.2,0.47l-12.77,0q0.28,0.88 0.81,1.61q0.53,0.73 1.25,1.27q0.72,0.52 1.58,0.81q0.86,0.28 1.8,0.28q1.06,0 1.95,-0.31q0.89,-0.33 1.64,-0.97q0.48,-0.41 1.11,-0.42zM69.2,117.22l0.75,0l0,-6.06q0,-0.69 0.48,-1.17q0.5,-0.5 1.2,-0.5q0.7,0 1.19,0.5q0.5,0.48 0.5,1.17l0,6.06l2,0q0.7,0 1.19,0.5q0.48,0.48 0.48,1.17q0,0.72 -0.48,1.22q-0.48,0.48 -1.19,0.48l-2,0l0,8.09q0,3.2 3.22,3.2q0.69,0 1.17,0.5q0.48,0.48 0.48,1.19q0,0.7 -0.48,1.2q-0.48,0.48 -1.17,0.48q-6.59,0 -6.59,-6.58l0,-8.09l-0.75,0q-0.69,0 -1.19,-0.48q-0.48,-0.5 -0.48,-1.22q0,-0.69 0.48,-1.17q0.5,-0.5 1.19,-0.5zM98.69,126.24q0,3.78 -2.66,6.39q-2.67,2.64 -6.38,2.64q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.33 1.97,2.92q0.66,1.59 0.69,3.45zM89.66,120.6q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45zM119.52,126.24q0,3.78 -2.66,6.39q-2.67,2.64 -6.38,2.64q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.33 1.97,2.92q0.66,1.59 0.69,3.45zM110.49,120.6q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45zM123.88,117.22l0.75,0l0,-6.06q0,-0.69 0.48,-1.17q0.5,-0.5 1.2,-0.5q0.7,0 1.19,0.5q0.5,0.48 0.5,1.17l0,6.06l2,0q0.7,0 1.19,0.5q0.48,0.48 0.48,1.17q0,0.72 -0.48,1.22q-0.48,0.48 -1.19,0.48l-2,0l0,8.09q0,3.2 3.22,3.2q0.69,0 1.17,0.5q0.48,0.48 0.48,1.19q0,0.7 -0.48,1.2q-0.48,0.48 -1.17,0.48q-6.59,0 -6.59,-6.58l0,-8.09l-0.75,0q-0.69,0 -1.19,-0.48q-0.48,-0.5 -0.48,-1.22q0,-0.69 0.48,-1.17q0.5,-0.5 1.19,-0.5zM138.67,133.58q0,0.7 -0.5,1.2q-0.48,0.48 -1.19,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-22.41q0,-0.7 0.48,-1.19q0.5,-0.5 1.2,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.52,1.19l0,7.73q2.14,-1.66 5.05,-1.66q1.69,0 3.2,0.67q1.53,0.66 2.69,1.8q1.16,1.13 1.83,2.67q0.69,1.53 0.69,3.27l0,7.92q-0.02,0.7 -0.52,1.2q-0.48,0.48 -1.17,0.48q-0.7,0 -1.19,-0.48q-0.48,-0.5 -0.48,-1.2l0,-7.92q0,-1.03 -0.41,-1.94q-0.41,-0.92 -1.09,-1.61q-0.69,-0.69 -1.61,-1.08q-0.91,-0.41 -1.94,-0.41q-1.05,0 -1.97,0.39q-0.91,0.39 -1.59,1.09q-0.69,0.69 -1.09,1.61q-0.39,0.91 -0.39,1.94l0,7.92z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#a61c00"
android:pathData="m13.99,171.69q-0.34,-0.44 -0.34,-1.03q0,-0.36 0.13,-0.67q0.14,-0.31 0.38,-0.55q0.23,-0.23 0.53,-0.36q0.31,-0.13 0.69,-0.13q0.94,0 1.42,0.78q0.69,1.05 1.7,1.58q1.02,0.53 2.19,0.53q0.92,0 1.73,-0.36q0.81,-0.36 1.41,-0.97q0.61,-0.61 0.97,-1.44q0.36,-0.84 0.36,-1.77q0,-0.89 -0.34,-1.67q-0.33,-0.78 -0.89,-1.36q-0.56,-0.59 -1.31,-0.97q-0.75,-0.38 -1.58,-0.45q-1.3,-0.11 -2.41,-0.67q-1.11,-0.56 -1.95,-1.45q-0.83,-0.91 -1.31,-2.05q-0.47,-1.16 -0.47,-2.45q0,-1.58 0.59,-2.86q0.59,-1.28 1.75,-2.28l-0.02,0q1.86,-1.61 4.36,-1.61q0.8,0 1.59,0.2q0.81,0.2 1.56,0.61q0.75,0.41 1.41,1.03q0.66,0.61 1.17,1.42q0.23,0.42 0.23,0.92q0,0.38 -0.13,0.69q-0.13,0.3 -0.36,0.53q-0.23,0.23 -0.55,0.36q-0.31,0.13 -0.67,0.13q-0.33,0 -0.58,-0.09q-0.25,-0.09 -0.45,-0.27q-0.19,-0.19 -0.38,-0.42q-0.19,-0.23 -0.41,-0.53q-0.38,-0.56 -1.05,-0.84q-0.67,-0.28 -1.44,-0.28q-0.63,0 -1.2,0.25q-0.58,0.25 -1.03,0.69q-0.45,0.42 -0.73,1.03q-0.28,0.59 -0.28,1.28q0,0.63 0.23,1.19q0.23,0.56 0.64,1.02q0.41,0.44 0.94,0.72q0.55,0.28 1.17,0.33q1.5,0.13 2.81,0.78q1.33,0.66 2.31,1.72q1,1.05 1.58,2.42q0.58,1.36 0.58,2.88q0,3.78 -2.78,6.13l0.02,0q-2.23,1.91 -5.09,1.91q-0.95,0 -1.91,-0.23q-0.95,-0.23 -1.83,-0.69q-0.88,-0.45 -1.64,-1.13q-0.77,-0.67 -1.33,-1.53zM45.46,164.57q-0.28,-0.88 -0.83,-1.61q-0.53,-0.73 -1.25,-1.25q-0.72,-0.53 -1.58,-0.81q-0.86,-0.3 -1.78,-0.3q-0.92,0 -1.8,0.3q-0.86,0.28 -1.59,0.81q-0.72,0.52 -1.25,1.25q-0.53,0.73 -0.8,1.61l10.88,0zM44.73,170.19q0.73,0 1.2,0.48q0.47,0.47 0.47,1.19q0,0.72 -0.48,1.22q-2.48,2.19 -5.89,2.19q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.31 1.98,2.92q0.67,1.59 0.67,3.45q0,0.73 -0.5,1.22q-0.48,0.47 -1.2,0.47l-12.77,0q0.28,0.88 0.81,1.61q0.53,0.73 1.25,1.27q0.72,0.52 1.58,0.81q0.86,0.28 1.8,0.28q1.06,0 1.95,-0.31q0.89,-0.33 1.64,-0.97q0.48,-0.41 1.11,-0.42zM55.18,158.88q2.14,-1.66 5.05,-1.66q1.69,0 3.2,0.67q1.53,0.66 2.69,1.8q1.16,1.13 1.83,2.67q0.69,1.53 0.69,3.27l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-7.95q0,-1.03 -0.41,-1.94q-0.41,-0.92 -1.09,-1.61q-0.69,-0.69 -1.61,-1.08q-0.91,-0.41 -1.94,-0.41q-1.05,0 -1.97,0.39q-0.91,0.39 -1.59,1.09q-0.69,0.69 -1.09,1.61q-0.39,0.91 -0.39,1.94l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.22,-0.48q-0.48,-0.5 -0.48,-1.2l0,-14.67q0,-0.69 0.48,-1.19q0.5,-0.5 1.22,-0.5q0.69,0 1.17,0.5q0.5,0.5 0.5,1.16zM74.65,166.68q-1.52,-0.58 -2.13,-1.19l0.02,0q-1.23,-1.23 -1.23,-2.92q0,-1.22 0.66,-2.2q0.66,-1 1.7,-1.69q1.05,-0.7 2.36,-1.08q1.31,-0.38 2.64,-0.38q4.02,0 6.91,3.23q0.34,0.42 0.34,1.02q0,0.73 -0.48,1.2q-0.47,0.47 -1.2,0.47q-0.52,0 -0.88,-0.28q-0.36,-0.3 -0.7,-0.63q-1.64,-1.64 -3.98,-1.64q-2.33,0 -3.72,1.41q-0.25,0.27 -0.25,0.72q0,0.45 0.42,0.61l7.53,2.48q1.58,0.61 2.14,1.19l-0.02,0q1.22,1.23 1.22,2.92q0,1.23 -0.66,2.22q-0.66,0.98 -1.7,1.69q-1.05,0.7 -2.36,1.08q-1.3,0.36 -2.61,0.36q-4.06,0 -6.92,-3.2q-0.34,-0.47 -0.34,-1.05q0,-0.73 0.47,-1.2q0.47,-0.48 1.2,-0.48q0.53,0 0.89,0.33q0.38,0.31 0.69,0.59q1.64,1.64 4.02,1.64q2.3,0 3.7,-1.44q0.23,-0.28 0.23,-0.67q0,-0.45 -0.44,-0.63l-7.52,-2.48zM106.66,166.24q0,3.78 -2.66,6.39q-2.67,2.64 -6.38,2.64q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.33 1.97,2.92q0.66,1.59 0.69,3.45zM97.63,160.6q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45zM112.74,158.9l0,0.33q1.2,-0.97 2.63,-1.48q1.42,-0.52 3.03,-0.52q0.7,0 1.52,0.09q0.81,0.09 1.5,0.34q0.69,0.25 1.14,0.69q0.45,0.44 0.45,1.13q0,0.36 -0.14,0.67q-0.14,0.3 -0.38,0.53q-0.22,0.23 -0.53,0.38q-0.3,0.13 -0.64,0.13q-0.31,0 -0.72,-0.19q-1.02,-0.39 -2.2,-0.39q-1.17,0 -2.2,0.44q-1.03,0.44 -1.8,1.2q-0.77,0.77 -1.22,1.8q-0.44,1.03 -0.44,2.2l0,7.36q0,0.69 -0.5,1.19q-0.48,0.48 -1.17,0.48q-0.72,0 -1.22,-0.48q-0.48,-0.5 -0.48,-1.19l0,-14.7q0,-0.69 0.48,-1.17q0.5,-0.5 1.22,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.5,1.17zM128.35,166.68q-1.52,-0.58 -2.13,-1.19l0.02,0q-1.23,-1.23 -1.23,-2.92q0,-1.22 0.66,-2.2q0.66,-1 1.7,-1.69q1.05,-0.7 2.36,-1.08q1.31,-0.38 2.64,-0.38q4.02,0 6.91,3.23q0.34,0.42 0.34,1.02q0,0.73 -0.48,1.2q-0.47,0.47 -1.2,0.47q-0.52,0 -0.88,-0.28q-0.36,-0.3 -0.7,-0.63q-1.64,-1.64 -3.98,-1.64q-2.33,0 -3.72,1.41q-0.25,0.27 -0.25,0.72q0,0.45 0.42,0.61l7.53,2.48q1.58,0.61 2.14,1.19l-0.02,0q1.22,1.23 1.22,2.92q0,1.23 -0.66,2.22q-0.66,0.98 -1.7,1.69q-1.05,0.7 -2.36,1.08q-1.3,0.36 -2.61,0.36q-4.06,0 -6.92,-3.2q-0.34,-0.47 -0.34,-1.05q0,-0.73 0.47,-1.2q0.47,-0.48 1.2,-0.48q0.53,0 0.89,0.33q0.38,0.31 0.69,0.59q1.64,1.64 4.02,1.64q2.3,0 3.7,-1.44q0.23,-0.28 0.23,-0.67q0,-0.45 -0.44,-0.63l-7.52,-2.48z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillAlpha="0.0" android:fillColor="#000000"
android:pathData="m46.57,36.42l59.99,33.44l-35.94,24.96l-1.06,-88.22l40,27.12l-65.63,28.14"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
......
<vector android:autoMirrored="true" android:height="177dp"
android:viewportHeight="177.41208" android:viewportWidth="138.60367"
<vector android:autoMirrored="true" android:height="100dp"
android:viewportHeight="100.41208" android:viewportWidth="138.60367"
android:width="138dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="0.0" android:fillColor="#000000"
android:pathData="m0,0l138.6,0l0,177.41l-138.6,0z"
......@@ -7,12 +7,6 @@
<path android:fillAlpha="0.0" android:fillColor="#000000"
android:pathData="m-4.76,102.14l148.13,0l0,75.28l-148.13,0z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#a61c00"
android:pathData="m20.53,109.41l0,6.52l3.27,0q0.69,0 1.27,-0.25q0.59,-0.27 1.03,-0.7q0.45,-0.45 0.7,-1.05q0.27,-0.59 0.27,-1.27q0,-0.66 -0.27,-1.25q-0.25,-0.59 -0.7,-1.03q-0.45,-0.45 -1.05,-0.7q-0.58,-0.27 -1.25,-0.27l-3.27,0zM20.53,119.35l0,9l4.52,0q0.94,0 1.75,-0.34q0.83,-0.36 1.42,-0.97q0.61,-0.61 0.95,-1.44q0.36,-0.83 0.36,-1.75q0,-0.92 -0.36,-1.73q-0.34,-0.83 -0.95,-1.44q-0.61,-0.63 -1.44,-0.97q-0.83,-0.36 -1.73,-0.36l-4.52,0zM23.8,105.99q1.38,0 2.59,0.53q1.22,0.52 2.13,1.44q0.91,0.91 1.42,2.13q0.53,1.2 0.53,2.58q0,2.45 -1.52,4.27q0.98,0.58 1.72,1.34q0.75,0.75 1.25,1.66q0.52,0.89 0.77,1.89q0.27,0.98 0.27,2.03q0,1.63 -0.63,3.06q-0.63,1.44 -1.7,2.53q-1.08,1.08 -2.52,1.7q-1.44,0.63 -3.06,0.63l-6.22,0q-0.36,0 -0.67,-0.14q-0.3,-0.14 -0.53,-0.36q-0.23,-0.22 -0.38,-0.53q-0.14,-0.33 -0.14,-0.67l0,-22.38q0,-0.34 0.14,-0.66q0.14,-0.33 0.38,-0.55q0.23,-0.22 0.53,-0.36q0.31,-0.14 0.67,-0.14l4.97,0zM50.56,131.77q-0.73,0 -1.2,-0.48q-0.45,-0.48 -0.47,-1.17q-1.13,0.86 -2.36,1.27q-1.23,0.39 -2.69,0.39q-1.73,0 -3.27,-0.67q-1.52,-0.67 -2.67,-1.81q-1.14,-1.14 -1.81,-2.67q-0.67,-1.53 -0.67,-3.25l0,-7.97q0,-0.69 0.48,-1.17q0.5,-0.5 1.22,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.5,1.17l0,7.97q0,1.05 0.39,1.97q0.41,0.91 1.08,1.59q0.69,0.69 1.61,1.08q0.92,0.39 1.97,0.39q1.03,0 1.94,-0.39q0.92,-0.39 1.61,-1.08q0.7,-0.7 1.09,-1.61q0.41,-0.91 0.41,-1.95l0,-7.97q0,-0.69 0.48,-1.17q0.48,-0.5 1.2,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.5,1.17l0,14.7q0,0.69 -0.5,1.19q-0.48,0.48 -1.19,0.48zM59.52,110.52q0,0.81 -0.58,1.41q-0.58,0.58 -1.39,0.58q-0.83,0 -1.41,-0.58q-0.58,-0.59 -0.58,-1.41q0,-0.83 0.58,-1.41q0.58,-0.58 1.41,-0.58q0.81,0 1.39,0.58q0.58,0.58 0.58,1.41zM55.87,130.09l0,-14.67q0,-0.7 0.48,-1.19q0.5,-0.5 1.2,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.52,1.19l0,14.67q-0.02,0.7 -0.52,1.2q-0.48,0.48 -1.17,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2zM62.62,130.1l0,-22.42q0,-0.7 0.47,-1.19q0.48,-0.5 1.2,-0.5q0.73,0 1.2,0.5q0.48,0.48 0.48,1.19l0,20.72l0.77,0q0.7,0 1.19,0.5q0.48,0.48 0.48,1.2q0,0.69 -0.48,1.19q-0.48,0.48 -1.19,0.48l-2.47,0q-0.69,0 -1.17,-0.48q-0.48,-0.5 -0.48,-1.19zM72.18,113.73l0.75,0l0,-6.06q0,-0.69 0.48,-1.17q0.5,-0.5 1.2,-0.5q0.7,0 1.19,0.5q0.5,0.48 0.5,1.17l0,6.06l2,0q0.7,0 1.19,0.5q0.48,0.48 0.48,1.17q0,0.72 -0.48,1.22q-0.48,0.48 -1.19,0.48l-2,0l0,8.09q0,3.2 3.22,3.2q0.69,0 1.17,0.5q0.48,0.48 0.48,1.19q0,0.7 -0.48,1.2q-0.48,0.48 -1.17,0.48q-6.59,0 -6.59,-6.58l0,-8.09l-0.75,0q-0.69,0 -1.19,-0.48q-0.48,-0.5 -0.48,-1.22q0,-0.69 0.48,-1.17q0.5,-0.5 1.19,-0.5zM85.2,124.43q-0.73,0 -1.22,-0.47q-0.47,-0.48 -0.47,-1.22q0,-0.72 0.47,-1.19q0.48,-0.48 1.22,-0.48l7.34,0q0.72,0 1.19,0.48q0.48,0.47 0.48,1.19q0,0.73 -0.48,1.22q-0.47,0.47 -1.19,0.47l-7.34,0zM101.18,110.52q0,0.81 -0.58,1.41q-0.58,0.58 -1.39,0.58q-0.83,0 -1.41,-0.58q-0.58,-0.59 -0.58,-1.41q0,-0.83 0.58,-1.41q0.58,-0.58 1.41,-0.58q0.81,0 1.39,0.58q0.58,0.58 0.58,1.41zM97.53,130.09l0,-14.67q0,-0.7 0.48,-1.19q0.5,-0.5 1.2,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.52,1.19l0,14.67q-0.02,0.7 -0.52,1.2q-0.48,0.48 -1.17,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2zM107.79,115.38q2.14,-1.66 5.05,-1.66q1.69,0 3.2,0.67q1.53,0.66 2.69,1.8q1.16,1.13 1.83,2.67q0.69,1.53 0.69,3.27l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-7.95q0,-1.03 -0.41,-1.94q-0.41,-0.92 -1.09,-1.61q-0.69,-0.69 -1.61,-1.08q-0.91,-0.41 -1.94,-0.41q-1.05,0 -1.97,0.39q-0.91,0.39 -1.59,1.09q-0.69,0.69 -1.09,1.61q-0.39,0.91 -0.39,1.94l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.22,-0.48q-0.48,-0.5 -0.48,-1.2l0,-14.67q0,-0.69 0.48,-1.19q0.5,-0.5 1.22,-0.5q0.69,0 1.17,0.5q0.5,0.5 0.5,1.16z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#a61c00"
android:pathData="m6.55,168.2q-0.34,-0.44 -0.34,-1.03q0,-0.36 0.13,-0.67q0.14,-0.31 0.38,-0.55q0.23,-0.23 0.53,-0.36q0.31,-0.13 0.69,-0.13q0.94,0 1.42,0.78q0.69,1.05 1.7,1.58q1.02,0.53 2.19,0.53q0.92,0 1.73,-0.36q0.81,-0.36 1.41,-0.97q0.61,-0.61 0.97,-1.44q0.36,-0.84 0.36,-1.77q0,-0.89 -0.34,-1.67q-0.33,-0.78 -0.89,-1.36q-0.56,-0.59 -1.31,-0.97q-0.75,-0.38 -1.58,-0.45q-1.3,-0.11 -2.41,-0.67q-1.11,-0.56 -1.95,-1.45q-0.83,-0.91 -1.31,-2.05q-0.47,-1.16 -0.47,-2.45q0,-1.58 0.59,-2.86q0.59,-1.28 1.75,-2.28l-0.02,0q1.86,-1.61 4.36,-1.61q0.8,0 1.59,0.2q0.81,0.2 1.56,0.61q0.75,0.41 1.41,1.03q0.66,0.61 1.17,1.42q0.23,0.42 0.23,0.92q0,0.38 -0.13,0.69q-0.13,0.3 -0.36,0.53q-0.23,0.23 -0.55,0.36q-0.31,0.13 -0.67,0.13q-0.33,0 -0.58,-0.09q-0.25,-0.09 -0.45,-0.27q-0.19,-0.19 -0.38,-0.42q-0.19,-0.23 -0.41,-0.53q-0.38,-0.56 -1.05,-0.84q-0.67,-0.28 -1.44,-0.28q-0.63,0 -1.2,0.25q-0.58,0.25 -1.03,0.69q-0.45,0.42 -0.73,1.03q-0.28,0.59 -0.28,1.28q0,0.63 0.23,1.19q0.23,0.56 0.64,1.02q0.41,0.44 0.94,0.72q0.55,0.28 1.17,0.33q1.5,0.13 2.81,0.78q1.33,0.66 2.31,1.72q1,1.05 1.58,2.42q0.58,1.36 0.58,2.88q0,3.78 -2.78,6.13l0.02,0q-2.23,1.91 -5.09,1.91q-0.95,0 -1.91,-0.23q-0.95,-0.23 -1.83,-0.69q-0.88,-0.45 -1.64,-1.13q-0.77,-0.67 -1.33,-1.53zM38.02,161.07q-0.28,-0.88 -0.83,-1.61q-0.53,-0.73 -1.25,-1.25q-0.72,-0.53 -1.58,-0.81q-0.86,-0.3 -1.78,-0.3q-0.92,0 -1.8,0.3q-0.86,0.28 -1.59,0.81q-0.72,0.52 -1.25,1.25q-0.53,0.73 -0.8,1.61l10.88,0zM37.29,166.7q0.73,0 1.2,0.48q0.47,0.47 0.47,1.19q0,0.72 -0.48,1.22q-2.48,2.19 -5.89,2.19q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.31 1.98,2.92q0.67,1.59 0.67,3.45q0,0.73 -0.5,1.22q-0.48,0.47 -1.2,0.47l-12.77,0q0.28,0.88 0.81,1.61q0.53,0.73 1.25,1.27q0.72,0.52 1.58,0.81q0.86,0.28 1.8,0.28q1.06,0 1.95,-0.31q0.89,-0.33 1.64,-0.97q0.48,-0.41 1.11,-0.42zM47.74,155.38q2.14,-1.66 5.05,-1.66q1.69,0 3.2,0.67q1.53,0.66 2.69,1.8q1.16,1.13 1.83,2.67q0.69,1.53 0.69,3.27l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-7.95q0,-1.03 -0.41,-1.94q-0.41,-0.92 -1.09,-1.61q-0.69,-0.69 -1.61,-1.08q-0.91,-0.41 -1.94,-0.41q-1.05,0 -1.97,0.39q-0.91,0.39 -1.59,1.09q-0.69,0.69 -1.09,1.61q-0.39,0.91 -0.39,1.94l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.22,-0.48q-0.48,-0.5 -0.48,-1.2l0,-14.67q0,-0.69 0.48,-1.19q0.5,-0.5 1.22,-0.5q0.69,0 1.17,0.5q0.5,0.5 0.5,1.16zM67.21,163.18q-1.52,-0.58 -2.13,-1.19l0.02,0q-1.23,-1.23 -1.23,-2.92q0,-1.22 0.66,-2.2q0.66,-1 1.7,-1.69q1.05,-0.7 2.36,-1.08q1.31,-0.38 2.64,-0.38q4.02,0 6.91,3.23q0.34,0.42 0.34,1.02q0,0.73 -0.48,1.2q-0.47,0.47 -1.2,0.47q-0.52,0 -0.88,-0.28q-0.36,-0.3 -0.7,-0.63q-1.64,-1.64 -3.98,-1.64q-2.33,0 -3.72,1.41q-0.25,0.27 -0.25,0.72q0,0.45 0.42,0.61l7.53,2.48q1.58,0.61 2.14,1.19l-0.02,0q1.22,1.23 1.22,2.92q0,1.23 -0.66,2.22q-0.66,0.98 -1.7,1.69q-1.05,0.7 -2.36,1.08q-1.3,0.36 -2.61,0.36q-4.06,0 -6.92,-3.2q-0.34,-0.47 -0.34,-1.05q0,-0.73 0.47,-1.2q0.47,-0.48 1.2,-0.48q0.53,0 0.89,0.33q0.38,0.31 0.69,0.59q1.64,1.64 4.02,1.64q2.3,0 3.7,-1.44q0.23,-0.28 0.23,-0.67q0,-0.45 -0.44,-0.63l-7.52,-2.48zM99.22,162.74q0,3.78 -2.66,6.39q-2.67,2.64 -6.38,2.64q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.33 1.97,2.92q0.66,1.59 0.69,3.45zM90.19,157.1q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45zM105.3,155.4l0,0.33q1.2,-0.97 2.63,-1.48q1.42,-0.52 3.03,-0.52q0.7,0 1.52,0.09q0.81,0.09 1.5,0.34q0.69,0.25 1.14,0.69q0.45,0.44 0.45,1.13q0,0.36 -0.14,0.67q-0.14,0.3 -0.38,0.53q-0.22,0.23 -0.53,0.38q-0.3,0.13 -0.64,0.13q-0.31,0 -0.72,-0.19q-1.02,-0.39 -2.2,-0.39q-1.17,0 -2.2,0.44q-1.03,0.44 -1.8,1.2q-0.77,0.77 -1.22,1.8q-0.44,1.03 -0.44,2.2l0,7.36q0,0.69 -0.5,1.19q-0.48,0.48 -1.17,0.48q-0.72,0 -1.22,-0.48q-0.48,-0.5 -0.48,-1.19l0,-14.7q0,-0.69 0.48,-1.17q0.5,-0.5 1.22,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.5,1.17zM120.91,163.18q-1.52,-0.58 -2.13,-1.19l0.02,0q-1.23,-1.23 -1.23,-2.92q0,-1.22 0.66,-2.2q0.66,-1 1.7,-1.69q1.05,-0.7 2.36,-1.08q1.31,-0.38 2.64,-0.38q4.02,0 6.91,3.23q0.34,0.42 0.34,1.02q0,0.73 -0.48,1.2q-0.47,0.47 -1.2,0.47q-0.52,0 -0.88,-0.28q-0.36,-0.3 -0.7,-0.63q-1.64,-1.64 -3.98,-1.64q-2.33,0 -3.72,1.41q-0.25,0.27 -0.25,0.72q0,0.45 0.42,0.61l7.53,2.48q1.58,0.61 2.14,1.19l-0.02,0q1.22,1.23 1.22,2.92q0,1.23 -0.66,2.22q-0.66,0.98 -1.7,1.69q-1.05,0.7 -2.36,1.08q-1.3,0.36 -2.61,0.36q-4.06,0 -6.92,-3.2q-0.34,-0.47 -0.34,-1.05q0,-0.73 0.47,-1.2q0.47,-0.48 1.2,-0.48q0.53,0 0.89,0.33q0.38,0.31 0.69,0.59q1.64,1.64 4.02,1.64q2.3,0 3.7,-1.44q0.23,-0.28 0.23,-0.67q0,-0.45 -0.44,-0.63l-7.52,-2.48z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#93c47d"
android:pathData="m43.21,10.22l11.15,12.33l0,0c1.46,1.62 2.26,3.29 1.8,3.73c-0.47,0.45 -2.03,-0.5 -3.49,-2.12l-11.15,-12.33l0,0c-1.46,-1.62 -2.26,-3.29 -1.8,-3.73c0.47,-0.45 2.03,0.5 3.49,2.12z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
......
<vector android:autoMirrored="true" android:height="149dp"
android:viewportHeight="149.2021" android:viewportWidth="164.98688"
<vector android:autoMirrored="true" android:height="80dp"
android:viewportHeight="80.2021" android:viewportWidth="164.98688"
android:width="164dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="0.0" android:fillColor="#000000"
android:pathData="m0,0l164.99,0l0,149.2l-164.99,0z"
......@@ -7,12 +7,6 @@
<path android:fillAlpha="0.0" android:fillColor="#000000"
android:pathData="m-8.18,81.72l181.35,0l0,61.61l-181.35,0z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#a61c00"
android:pathData="m12.12,101.1q3.92,0 6.69,-2.77q1.41,-1.41 2.09,-3.05q0.7,-1.66 0.7,-3.66q0,-3.91 -2.8,-6.69q-2.78,-2.78 -6.69,-2.78l-3.25,0l0,18.94l3.25,0zM12.12,78.74q5.33,0 9.11,3.78q1.91,1.91 2.84,4.16q0.94,2.25 0.94,4.95q0,5.33 -3.78,9.13q-3.77,3.77 -9.11,3.77l-4.95,0q-0.36,0 -0.67,-0.14q-0.31,-0.14 -0.55,-0.36q-0.23,-0.22 -0.38,-0.53q-0.14,-0.33 -0.14,-0.67l0,-22.38q0,-0.34 0.14,-0.66q0.14,-0.33 0.38,-0.55q0.23,-0.22 0.55,-0.36q0.31,-0.14 0.67,-0.14l4.95,0zM36.66,89.85q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45zM42.32,102.85l0,-0.33q-1.2,0.97 -2.63,1.48q-1.42,0.52 -3.03,0.52q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q2.66,2.64 2.66,6.38l0,7.36q0,0.69 -0.5,1.19q-0.48,0.48 -1.19,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.19zM50.05,86.47l0.75,0l0,-6.06q0,-0.69 0.48,-1.17q0.5,-0.5 1.2,-0.5q0.7,0 1.19,0.5q0.5,0.48 0.5,1.17l0,6.06l2,0q0.7,0 1.19,0.5q0.48,0.48 0.48,1.17q0,0.72 -0.48,1.22q-0.48,0.48 -1.19,0.48l-2,0l0,8.09q0,3.2 3.22,3.2q0.69,0 1.17,0.5q0.48,0.48 0.48,1.19q0,0.7 -0.48,1.2q-0.48,0.48 -1.17,0.48q-6.59,0 -6.59,-6.58l0,-8.09l-0.75,0q-0.69,0 -1.19,-0.48q-0.48,-0.5 -0.48,-1.22q0,-0.69 0.48,-1.17q0.5,-0.5 1.19,-0.5zM70.51,89.85q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45zM76.17,102.85l0,-0.33q-1.2,0.97 -2.63,1.48q-1.42,0.52 -3.03,0.52q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q2.66,2.64 2.66,6.38l0,7.36q0,0.69 -0.5,1.19q-0.48,0.48 -1.19,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.19zM91.34,101.14q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44zM85.69,88.47q2.41,-2 5.66,-2q3.7,0 6.38,2.64q1.33,1.31 1.98,2.92q0.67,1.59 0.67,3.45q0,3.78 -2.66,6.39q-2.67,2.64 -6.38,2.64q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39l0,-15.08q0,-0.72 0.47,-1.19q0.47,-0.48 1.2,-0.48q0.7,0 1.19,0.48q0.5,0.47 0.5,1.19l0,8.06zM112.17,89.85q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45zM117.83,102.85l0,-0.33q-1.2,0.97 -2.63,1.48q-1.42,0.52 -3.03,0.52q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q2.66,2.64 2.66,6.38l0,7.36q0,0.69 -0.5,1.19q-0.48,0.48 -1.19,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.19zM127.27,95.93q-1.52,-0.58 -2.13,-1.19l0.02,0q-1.23,-1.23 -1.23,-2.92q0,-1.22 0.66,-2.2q0.66,-1 1.7,-1.69q1.05,-0.7 2.36,-1.08q1.31,-0.38 2.64,-0.38q4.02,0 6.91,3.23q0.34,0.42 0.34,1.02q0,0.73 -0.48,1.2q-0.47,0.47 -1.2,0.47q-0.52,0 -0.88,-0.28q-0.36,-0.3 -0.7,-0.63q-1.64,-1.64 -3.98,-1.64q-2.33,0 -3.72,1.41q-0.25,0.27 -0.25,0.72q0,0.45 0.42,0.61l7.53,2.48q1.58,0.61 2.14,1.19l-0.02,0q1.22,1.23 1.22,2.92q0,1.23 -0.66,2.22q-0.66,0.98 -1.7,1.69q-1.05,0.7 -2.36,1.08q-1.3,0.36 -2.61,0.36q-4.06,0 -6.92,-3.2q-0.34,-0.47 -0.34,-1.05q0,-0.73 0.47,-1.2q0.47,-0.48 1.2,-0.48q0.53,0 0.89,0.33q0.38,0.31 0.69,0.59q1.64,1.64 4.02,1.64q2.3,0 3.7,-1.44q0.23,-0.28 0.23,-0.67q0,-0.45 -0.44,-0.63l-7.52,-2.48zM155.69,93.82q-0.28,-0.88 -0.83,-1.61q-0.53,-0.73 -1.25,-1.25q-0.72,-0.53 -1.58,-0.81q-0.86,-0.3 -1.78,-0.3q-0.92,0 -1.8,0.3q-0.86,0.28 -1.59,0.81q-0.72,0.52 -1.25,1.25q-0.53,0.73 -0.8,1.61l10.88,0zM154.95,99.44q0.73,0 1.2,0.48q0.47,0.47 0.47,1.19q0,0.72 -0.48,1.22q-2.48,2.19 -5.89,2.19q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.31 1.98,2.92q0.67,1.59 0.67,3.45q0,0.73 -0.5,1.22q-0.48,0.47 -1.2,0.47l-12.77,0q0.28,0.88 0.81,1.61q0.53,0.73 1.25,1.27q0.72,0.52 1.58,0.81q0.86,0.28 1.8,0.28q1.06,0 1.95,-0.31q0.89,-0.33 1.64,-0.97q0.48,-0.41 1.11,-0.42z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#a61c00"
android:pathData="m36.9,132.39l-2.8,-7.23l-2.81,7.23l5.61,0zM23.87,142.04l8.59,-22.14q0.52,-1.16 1.64,-1.16q1.14,0 1.63,1.16l8.64,22.22q0.13,0.33 0.13,0.7q0,0.7 -0.5,1.2q-0.5,0.5 -1.22,0.5q-0.7,0 -1.19,-0.5q-0.25,-0.25 -0.39,-0.55l-2.97,-7.66l-8.25,0l-3,7.66q-0.13,0.3 -0.39,0.55q-0.5,0.5 -1.2,0.5q-0.72,0 -1.22,-0.5q-0.48,-0.5 -0.48,-1.2q0,-0.39 0.19,-0.78zM60.89,139.41q0.73,0 1.2,0.48q0.47,0.47 0.47,1.19q0,0.72 -0.53,1.25q-2.48,2.19 -5.88,2.19q-3.73,0 -6.38,-2.64q-2.66,-2.64 -2.66,-6.39q0,-3.73 2.66,-6.38q2.64,-2.64 6.38,-2.64q3.41,0 5.88,2.19q0.58,0.52 0.58,1.28q0,0.72 -0.47,1.2q-0.47,0.48 -1.2,0.48q-0.61,0 -1.09,-0.39q-0.81,-0.69 -1.72,-1.03q-0.91,-0.36 -1.97,-0.36q-1.17,0 -2.2,0.44q-1.03,0.44 -1.81,1.2q-0.77,0.77 -1.22,1.8q-0.44,1.03 -0.44,2.2q0,1.19 0.44,2.22q0.45,1.03 1.22,1.8q0.78,0.77 1.81,1.2q1.03,0.44 2.2,0.44q1.06,0 1.97,-0.34q0.91,-0.34 1.7,-1.03q0.45,-0.34 1.06,-0.36zM66.98,126.47l0.75,0l0,-6.06q0,-0.69 0.48,-1.17q0.5,-0.5 1.2,-0.5q0.7,0 1.19,0.5q0.5,0.48 0.5,1.17l0,6.06l2,0q0.7,0 1.19,0.5q0.48,0.48 0.48,1.17q0,0.72 -0.48,1.22q-0.48,0.48 -1.19,0.48l-2,0l0,8.09q0,3.2 3.22,3.2q0.69,0 1.17,0.5q0.48,0.48 0.48,1.19q0,0.7 -0.48,1.2q-0.48,0.48 -1.17,0.48q-6.59,0 -6.59,-6.58l0,-8.09l-0.75,0q-0.69,0 -1.19,-0.48q-0.48,-0.5 -0.48,-1.22q0,-0.69 0.48,-1.17q0.5,-0.5 1.19,-0.5zM82.97,123.27q0,0.81 -0.58,1.41q-0.58,0.58 -1.39,0.58q-0.83,0 -1.41,-0.58q-0.58,-0.59 -0.58,-1.41q0,-0.83 0.58,-1.41q0.58,-0.58 1.41,-0.58q0.81,0 1.39,0.58q0.58,0.58 0.58,1.41zM79.31,142.83l0,-14.67q0,-0.7 0.48,-1.19q0.5,-0.5 1.2,-0.5q0.69,0 1.17,0.5q0.5,0.48 0.52,1.19l0,14.67q-0.02,0.7 -0.52,1.2q-0.48,0.48 -1.17,0.48q-0.7,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2zM104.28,135.49q0,3.78 -2.66,6.39q-2.67,2.64 -6.38,2.64q-3.73,0 -6.38,-2.64q-2.64,-2.64 -2.64,-6.39q0,-3.73 2.64,-6.38q2.64,-2.64 6.38,-2.64q3.7,0 6.38,2.64q1.33,1.33 1.97,2.92q0.66,1.59 0.69,3.45zM95.25,129.85q-1.19,0 -2.22,0.45q-1.03,0.44 -1.8,1.2q-0.75,0.77 -1.2,1.8q-0.44,1.03 -0.44,2.19q0,1.17 0.44,2.2q0.45,1.03 1.2,1.8q0.77,0.77 1.8,1.22q1.03,0.44 2.22,0.44q1.17,0 2.2,-0.44q1.03,-0.45 1.8,-1.22q0.77,-0.78 1.2,-1.8q0.45,-1.03 0.45,-2.2q0,-1.16 -0.45,-2.17q-0.44,-1.03 -1.2,-1.8q-0.77,-0.78 -1.8,-1.22q-1.03,-0.45 -2.2,-0.45zM110.41,128.13q2.14,-1.66 5.05,-1.66q1.69,0 3.2,0.67q1.53,0.66 2.69,1.8q1.16,1.13 1.83,2.67q0.69,1.53 0.69,3.27l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.2,-0.48q-0.48,-0.5 -0.48,-1.2l0,-7.95q0,-1.03 -0.41,-1.94q-0.41,-0.92 -1.09,-1.61q-0.69,-0.69 -1.61,-1.08q-0.91,-0.41 -1.94,-0.41q-1.05,0 -1.97,0.39q-0.91,0.39 -1.59,1.09q-0.69,0.69 -1.09,1.61q-0.39,0.91 -0.39,1.94l0,7.95q0,0.7 -0.5,1.2q-0.48,0.48 -1.17,0.48q-0.72,0 -1.22,-0.48q-0.48,-0.5 -0.48,-1.2l0,-14.67q0,-0.69 0.48,-1.19q0.5,-0.5 1.22,-0.5q0.69,0 1.17,0.5q0.5,0.5 0.5,1.16zM129.87,135.93q-1.52,-0.58 -2.12,-1.19l0.02,0q-1.23,-1.23 -1.23,-2.92q0,-1.22 0.66,-2.2q0.66,-1 1.7,-1.69q1.05,-0.7 2.36,-1.08q1.31,-0.38 2.64,-0.38q4.02,0 6.91,3.23q0.34,0.42 0.34,1.02q0,0.73 -0.48,1.2q-0.47,0.47 -1.2,0.47q-0.52,0 -0.88,-0.28q-0.36,-0.3 -0.7,-0.63q-1.64,-1.64 -3.98,-1.64q-2.33,0 -3.72,1.41q-0.25,0.27 -0.25,0.72q0,0.45 0.42,0.61l7.53,2.48q1.58,0.61 2.14,1.19l-0.02,0q1.22,1.23 1.22,2.92q0,1.23 -0.66,2.22q-0.66,0.98 -1.7,1.69q-1.05,0.7 -2.36,1.08q-1.3,0.36 -2.61,0.36q-4.06,0 -6.92,-3.2q-0.34,-0.47 -0.34,-1.05q0,-0.73 0.47,-1.2q0.47,-0.48 1.2,-0.48q0.53,0 0.89,0.33q0.38,0.31 0.69,0.59q1.64,1.64 4.02,1.64q2.3,0 3.7,-1.44q0.23,-0.28 0.23,-0.67q0,-0.45 -0.44,-0.63l-7.52,-2.48z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
<path android:fillColor="#674ea7"
android:pathData="m48.83,53.48l0,0c0,-2.47 15.07,-4.48 33.66,-4.48c18.59,0 33.66,2.01 33.66,4.48l0,17.92c0,2.47 -15.07,4.48 -33.66,4.48c-18.59,0 -33.66,-2.01 -33.66,-4.48z"
android:strokeColor="#00000000" android:strokeLineCap="square"/>
......
......@@ -2,54 +2,106 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:orientation="vertical"
android:baselineAligned="false">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:orientation="vertical">
<ImageButton
android:id="@+id/imageButtonAbout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:gravity="top|center_horizontal"
android:orientation="horizontal" >
<Button
android:id="@+id/buttonAbout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="activityStart"
app:srcCompat="@drawable/about_icon"
android:background="@null"
android:text="About"
android:fontFamily="@font/comfortaaregular"
style="@style/Widget.AppCompat.Button.Colored"
android:textAllCaps="false"
android:contentDescription="@string/aboutButtonMain"/>
<ImageButton
android:id="@+id/imageButtonTakeSample"
<Button
android:id="@+id/buttonSettings"
android:layout_width="wrap_content"
android:layout_marginTop="38dp"
android:layout_height="wrap_content"
android:background="@null"
android:layout_weight="1"
android:onClick="activityStart"
android:contentDescription="@string/takeSampleButton"
app:srcCompat="@drawable/sampling_icon"/>
app:srcCompat="@drawable/settings_icon"
android:text="Settings"
android:fontFamily="@font/comfortaaregular"
style="@style/Widget.AppCompat.Button.Colored"
android:textAllCaps="false"
android:contentDescription="@string/settingsButtonMain"/>
<Button
android:id="@+id/buttonNotebook"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="activityStart"
android:contentDescription="@string/labNotebookButtonMain"
app:srcCompat="@drawable/lab_notebook_icon"
style="@style/Widget.AppCompat.Button.Colored"
android:textAllCaps="false"
android:text="Notebook"
android:fontFamily="@font/comfortaaregular"
/>
</LinearLayout>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/imageButtonDbActions"
android:drawableStart="@drawable/database_actions_icon"
android:contentDescription="@string/databaseActions"
android:layout_gravity="center"
android:text="Database Actions"
android:fontFamily="@font/comfortaaregular"
android:textAllCaps="false"
android:onClick="startSampleActivity" />
<LinearLayout
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:orientation="vertical" >
<ImageButton
android:id="@+id/imageButtonSettings"
android:layout_width="wrap_content"
android:orientation="horizontal">
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="activityStart"
app:srcCompat="@drawable/settings_icon"
android:layout_weight="1"
android:id="@+id/imageButtonBluetooth"
android:drawableTop="@drawable/bluetooth_devices"
android:contentDescription="@string/bluetoothSensor"
android:background="@null"
android:contentDescription="@string/settingsButtonMain"/>
<ImageButton
android:id="@+id/imageButtonLabNotebook"
android:layout_width="wrap_content"
android:textSize="@dimen/sample_button_font_size"
android:text="Bluetooth Devices"
android:fontFamily="@font/comfortaaregular"
android:textAllCaps="false"
android:onClick="startSampleActivity"/>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/imageButtonBuiltIn"
android:drawableTop="@drawable/builtin_sensors_icon"
android:contentDescription="@string/builtinSensors"
android:background="@null"
android:onClick="activityStart"
android:contentDescription="@string/labNotebookButtonMain"
app:srcCompat="@drawable/lab_notebook_icon"/>
android:textSize="@dimen/sample_button_font_size"
android:text="Builtin Sensors"
android:fontFamily="@font/comfortaaregular"
android:textAllCaps="false"
android:onClick="startSampleActivity" />
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:drawableTop="@drawable/bench_icon"
android:contentDescription="@string/benchSample"
android:background="@null"
android:textSize="@dimen/sample_button_font_size"
android:id="@+id/imageButtonBenchSample"
android:text="Bench Sample"
android:fontFamily="@font/comfortaaregular"
android:textAllCaps="false"
android:onClick="startSampleActivity" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......@@ -102,7 +102,7 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/upload"
android:text="Upload tables"
android:id="@+id/uploadButton"
android:textAllCaps="false"
android:layout_below="@id/setupDbButton"
......@@ -111,7 +111,7 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/exportDatabase"
android:text="Copy to SD card"
android:id="@+id/exportDatabaseButton"
android:textAllCaps="false"
android:layout_below="@id/setupDbButton"
......
......@@ -2,54 +2,103 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:orientation="vertical"
android:baselineAligned="false">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:orientation="vertical">
<ImageButton
android:id="@+id/imageButtonAbout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:gravity="top|center_horizontal"
android:orientation="horizontal" >
<Button
android:id="@+id/buttonAbout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="activityStart"
app:srcCompat="@drawable/about_icon"
android:background="@null"
android:text="About"
android:fontFamily="@font/comfortaaregular"
style="@style/Widget.AppCompat.Button.Colored"
android:textAllCaps="false"
android:contentDescription="@string/aboutButtonMain"/>
<ImageButton
android:id="@+id/imageButtonTakeSample"
android:layout_width="wrap_content"
android:layout_marginTop="38dp"
android:layout_height="wrap_content"
android:background="@null"
android:onClick="activityStart"
android:contentDescription="@string/takeSampleButton"
app:srcCompat="@drawable/sampling_icon"/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:orientation="vertical" >
<ImageButton
android:id="@+id/imageButtonSettings"
<Button
android:id="@+id/buttonSettings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="activityStart"
app:srcCompat="@drawable/settings_icon"
android:background="@null"
android:text="Settings"
android:fontFamily="@font/comfortaaregular"
style="@style/Widget.AppCompat.Button.Colored"
android:textAllCaps="false"
android:contentDescription="@string/settingsButtonMain"/>
<ImageButton
android:id="@+id/imageButtonLabNotebook"
<Button
android:id="@+id/buttonNotebook"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:layout_weight="1"
android:onClick="activityStart"
android:contentDescription="@string/labNotebookButtonMain"
app:srcCompat="@drawable/lab_notebook_icon"/>
app:srcCompat="@drawable/lab_notebook_icon"
style="@style/Widget.AppCompat.Button.Colored"
android:textAllCaps="false"
android:text="Notebook"
android:fontFamily="@font/comfortaaregular"
/>
</LinearLayout>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/imageButtonDbActions"
android:drawableStart="@drawable/database_actions_icon"
android:contentDescription="@string/databaseActions"
android:layout_gravity="center"
android:text="Database Actions"
android:fontFamily="@font/comfortaaregular"
android:textAllCaps="false"
android:onClick="startSampleActivity" />
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:drawableStart="@drawable/bench_icon"
android:contentDescription="@string/benchSample"
android:background="@null"
android:textSize="@dimen/sample_button_font_size"
android:id="@+id/imageButtonBenchSample"
android:text="Bench Sample"
android:fontFamily="@font/comfortaaregular"
android:textAllCaps="false"
android:onClick="startSampleActivity" />
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/imageButtonBuiltIn"
android:drawableStart="@drawable/builtin_sensors_icon"
android:contentDescription="@string/builtinSensors"
android:background="@null"
android:textSize="@dimen/sample_button_font_size"
android:text="Builtin Sensors"
android:fontFamily="@font/comfortaaregular"
android:textAllCaps="false"
android:onClick="startSampleActivity" />
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/imageButtonBluetooth"
android:drawableStart="@drawable/bluetooth_devices"
android:contentDescription="@string/bluetoothSensor"
android:background="@null"
android:textSize="@dimen/sample_button_font_size"
android:text="Bluetooth Devices"
android:fontFamily="@font/comfortaaregular"
android:textAllCaps="false"
android:onClick="startSampleActivity"/>
</LinearLayout>
\ No newline at end of file
......@@ -2,4 +2,5 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="sample_button_font_size">25sp</dimen>
</resources>
......@@ -3,5 +3,6 @@
<style name="MainTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowBackground">@drawable/background</item>
<item name="colorControlActivated">@color/dark_gray_blue</item>
<!--item name="colorButtonNormal">#00FF00</item-->
</style>
</resources>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment