From a10075d6f54315daf7d0fd14959925329b77d433 Mon Sep 17 00:00:00 2001 From: serso Date: Sat, 23 Jan 2016 12:28:53 +0100 Subject: [PATCH] EditFunctionFragment styling --- .../function/FunctionParamsView.java | 89 +++++++++++------- .../res/drawable-hdpi/ic_add_black_24dp.png | Bin 0 -> 124 bytes .../res/drawable-hdpi/ic_add_white_24dp.png | Bin 0 -> 127 bytes .../ic_arrow_downward_black_24dp.png | Bin 0 -> 183 bytes .../ic_arrow_downward_white_24dp.png | Bin 0 -> 183 bytes .../ic_arrow_upward_black_24dp.png | Bin 0 -> 197 bytes .../ic_arrow_upward_white_24dp.png | Bin 0 -> 208 bytes .../drawable-hdpi/ic_remove_black_24dp.png | Bin 0 -> 103 bytes .../drawable-hdpi/ic_remove_white_24dp.png | Bin 0 -> 104 bytes .../res/drawable-mdpi/ic_add_black_24dp.png | Bin 0 -> 86 bytes .../res/drawable-mdpi/ic_add_white_24dp.png | Bin 0 -> 88 bytes .../ic_arrow_downward_black_24dp.png | Bin 0 -> 140 bytes .../ic_arrow_downward_white_24dp.png | Bin 0 -> 137 bytes .../ic_arrow_upward_black_24dp.png | Bin 0 -> 147 bytes .../ic_arrow_upward_white_24dp.png | Bin 0 -> 155 bytes .../drawable-mdpi/ic_remove_black_24dp.png | Bin 0 -> 81 bytes .../drawable-mdpi/ic_remove_white_24dp.png | Bin 0 -> 82 bytes .../res/drawable-xhdpi/ic_add_black_24dp.png | Bin 0 -> 108 bytes .../res/drawable-xhdpi/ic_add_white_24dp.png | Bin 0 -> 97 bytes .../ic_arrow_downward_black_24dp.png | Bin 0 -> 207 bytes .../ic_arrow_downward_white_24dp.png | Bin 0 -> 198 bytes .../ic_arrow_upward_black_24dp.png | Bin 0 -> 204 bytes .../ic_arrow_upward_white_24dp.png | Bin 0 -> 217 bytes .../drawable-xhdpi/ic_remove_black_24dp.png | Bin 0 -> 93 bytes .../drawable-xhdpi/ic_remove_white_24dp.png | Bin 0 -> 90 bytes .../res/drawable-xxhdpi/ic_add_black_24dp.png | Bin 0 -> 114 bytes .../res/drawable-xxhdpi/ic_add_white_24dp.png | Bin 0 -> 97 bytes .../ic_arrow_downward_black_24dp.png | Bin 0 -> 287 bytes .../ic_arrow_downward_white_24dp.png | Bin 0 -> 275 bytes .../ic_arrow_upward_black_24dp.png | Bin 0 -> 302 bytes .../ic_arrow_upward_white_24dp.png | Bin 0 -> 319 bytes .../drawable-xxhdpi/ic_remove_black_24dp.png | Bin 0 -> 99 bytes .../drawable-xxhdpi/ic_remove_white_24dp.png | Bin 0 -> 94 bytes .../drawable-xxxhdpi/ic_add_black_24dp.png | Bin 0 -> 119 bytes .../drawable-xxxhdpi/ic_add_white_24dp.png | Bin 0 -> 102 bytes .../ic_arrow_downward_black_24dp.png | Bin 0 -> 380 bytes .../ic_arrow_downward_white_24dp.png | Bin 0 -> 374 bytes .../ic_arrow_upward_black_24dp.png | Bin 0 -> 341 bytes .../ic_arrow_upward_white_24dp.png | Bin 0 -> 354 bytes .../drawable-xxxhdpi/ic_remove_black_24dp.png | Bin 0 -> 109 bytes .../drawable-xxxhdpi/ic_remove_white_24dp.png | Bin 0 -> 97 bytes app/src/main/res/values/dimens.xml | 2 + 42 files changed, 59 insertions(+), 32 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_add_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_downward_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_downward_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_upward_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_upward_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_remove_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_remove_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_add_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_downward_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_downward_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_upward_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_upward_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_remove_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_remove_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_downward_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_downward_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_upward_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_upward_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_remove_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_downward_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_downward_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_upward_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_upward_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_remove_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_arrow_downward_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_arrow_downward_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_arrow_upward_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_arrow_upward_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_remove_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png diff --git a/app/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java b/app/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java index fd4bfdc1..d2cf2a29 100644 --- a/app/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java +++ b/app/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java @@ -24,29 +24,28 @@ package org.solovyev.android.calculator.function; import android.annotation.TargetApi; import android.content.Context; +import android.content.res.Resources; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; +import android.support.annotation.NonNull; import android.support.design.widget.TextInputLayout; import android.util.AttributeSet; +import android.util.TypedValue; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; -import android.widget.Button; -import android.widget.EditText; -import android.widget.LinearLayout; -import android.widget.TextView; - +import android.widget.*; import org.solovyev.android.Check; import org.solovyev.android.calculator.App; +import org.solovyev.android.calculator.Preferences; import org.solovyev.android.calculator.R; -import java.util.ArrayList; -import java.util.List; - import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; @@ -55,11 +54,22 @@ public class FunctionParamsView extends LinearLayout { @Nonnull public static final String PARAM_VIEW_TAG = "param-view"; - private static final int HEADERS = 1; + private static final int FOOTERS = 1; private static final int PARAM_VIEW_INDEX = 3; private static final int START_ROW_ID = App.generateViewId(); + private final int clickableAreaSize; + private final int imageButtonSize; + private final int imageButtonPadding; + @Nonnull + private final Preferences.Gui.Theme theme = App.getTheme(); private int maxRowId = START_ROW_ID; - private final int clickableAreaSize = getResources().getDimensionPixelSize(R.dimen.cpp_clickable_area_size); + + { + final Resources resources = getResources(); + clickableAreaSize = resources.getDimensionPixelSize(R.dimen.cpp_clickable_area_size); + imageButtonSize = resources.getDimensionPixelSize(R.dimen.cpp_image_button_size); + imageButtonPadding = resources.getDimensionPixelSize(R.dimen.cpp_image_button_padding); + } public FunctionParamsView(Context context) { super(context); @@ -82,19 +92,31 @@ public class FunctionParamsView extends LinearLayout { final Context context = getContext(); final LinearLayout headerView = makeRowView(context); - final Button addButton = new Button(context); - addButton.setText("+"); + final ImageButton addButton = makeButton(theme.light ? R.drawable.ic_add_black_24dp : R.drawable.ic_add_white_24dp); addButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { addParam(null); } }); - headerView.addView(addButton, new LayoutParams(clickableAreaSize, WRAP_CONTENT)); - headerView.addView(new View(context), new LayoutParams(0, WRAP_CONTENT, 1)); + headerView.addView(addButton, makeButtonParams()); + headerView.addView(new View(context), new LayoutParams(3 * clickableAreaSize, WRAP_CONTENT)); addView(headerView, new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT)); } + @NonNull + private ImageButton makeButton(int icon) { + final ImageButton addButton = new ImageButton(getContext()); + addButton.setImageResource(icon); + addButton.setScaleType(ImageView.ScaleType.CENTER_INSIDE); + addButton.setPadding(imageButtonPadding, imageButtonPadding, imageButtonPadding, imageButtonPadding); + final TypedValue value = new TypedValue(); + if (getContext().getTheme().resolveAttribute(R.attr.selectableItemBackgroundBorderless, value, true)) { + addButton.setBackgroundResource(value.resourceId); + } + return addButton; + } + @Nonnull private LinearLayout makeRowView(@Nonnull Context context) { final LinearLayout rowView = new LinearLayout(context); @@ -118,35 +140,32 @@ public class FunctionParamsView extends LinearLayout { final Context context = getContext(); final LinearLayout rowView = makeRowView(context); - final Button removeButton = new Button(context); + final ImageButton removeButton = makeButton(theme.light ? R.drawable.ic_remove_black_24dp : R.drawable.ic_remove_white_24dp); removeButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { removeRow(rowView); } }); - removeButton.setText("−"); - rowView.addView(removeButton, new LayoutParams(clickableAreaSize, WRAP_CONTENT)); + rowView.addView(removeButton, makeButtonParams()); - final Button upButton = new Button(context); + final ImageButton upButton = makeButton(theme.light ? R.drawable.ic_arrow_upward_black_24dp : R.drawable.ic_arrow_upward_white_24dp); upButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { upRow(rowView); } }); - upButton.setText("↑"); - rowView.addView(upButton, new LayoutParams(clickableAreaSize, WRAP_CONTENT)); + rowView.addView(upButton, makeButtonParams()); - final Button downButton = new Button(context); + final ImageButton downButton = makeButton(theme.light ? R.drawable.ic_arrow_downward_black_24dp : R.drawable.ic_arrow_downward_white_24dp); downButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { downRow(rowView); } }); - downButton.setText("↓"); - rowView.addView(downButton, new LayoutParams(clickableAreaSize, WRAP_CONTENT)); + rowView.addView(downButton, makeButtonParams()); final TextInputLayout paramLabel = new TextInputLayout(context); final EditText paramView = new EditText(context); @@ -162,19 +181,25 @@ public class FunctionParamsView extends LinearLayout { rowView.addView(paramLabel, new LayoutParams(0, WRAP_CONTENT, 1)); - addView(rowView, new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT)); + // for row is added at 0 position, the consequent rows + addView(rowView, Math.max(0, getChildCount() - 1), new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT)); + } + + @NonNull + private LayoutParams makeButtonParams() { + return new LayoutParams(imageButtonSize, imageButtonSize); } private void downRow(@Nonnull ViewGroup row) { final int index = indexOfChild(row); - if (index < getChildCount() - 1) { + if (index < getChildCount() - 1 - FOOTERS) { swap(row, getRow(index + 1)); } } private void upRow(@Nonnull ViewGroup row) { final int index = indexOfChild(row); - if (index > 1) { + if (index > 0) { swap(row, getRow(index - 1)); } } @@ -194,7 +219,7 @@ public class FunctionParamsView extends LinearLayout { @Nonnull private ViewGroup getRow(int index) { - Check.isTrue(index >= 0 && index < getChildCount()); + Check.isTrue(index >= 0 && index < getChildCount() - FOOTERS); return (ViewGroup) getChildAt(index); } @@ -206,7 +231,7 @@ public class FunctionParamsView extends LinearLayout { public List getParams() { final List params = new ArrayList<>(getChildCount()); - for (int i = HEADERS; i < getChildCount(); i++) { + for (int i = 0; i < getChildCount() - FOOTERS; i++) { final ViewGroup row = getRow(i); final EditText paramView = getParamView(row); params.add(paramView.getText().toString()); @@ -235,11 +260,11 @@ public class FunctionParamsView extends LinearLayout { @Nonnull private int[] getRowIds() { final int childCount = getChildCount(); - final int[] rowIds = new int[childCount - 1]; - for (int i = HEADERS; i < childCount; i++) { + final int[] rowIds = new int[childCount - FOOTERS]; + for (int i = 0; i < childCount - FOOTERS; i++) { final ViewGroup row = getRow(i); final EditText paramView = getParamView(row); - rowIds[i - 1] = paramView.getId(); + rowIds[i] = paramView.getId(); } return rowIds; } @@ -263,7 +288,7 @@ public class FunctionParamsView extends LinearLayout { @Nonnull public TextInputLayout getParamLabel(int param) { - return getParamLabel(getRow(param + HEADERS)); + return getParamLabel(getRow(param)); } public static final class SavedState extends BaseSavedState { diff --git a/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c04b523c482b77824608a836515e865579f8b00c GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;v!{z=NCji^0d}{88U+a%3{LE) zc(W3I@VD?TX6u!5iTdQ+%zl7P_JBaSLWcds4UNy(0^e=DSmGkkBjwV6s9vOpiQ(Iw WlC8ByowtC-F?hQAxvX|k0wldT1B8K;o2QFoh{y5d1PRu~4CX)Hf7s8+ zA**4&;-Ni|k0wldT1B8K8ou`XqNCo5D%SRbo90Xi0#@%0Y zT~%4d$j_qmpq==ftQa{X<87%EcScXSQY(|uZ1#dLRA0& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_downward_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_downward_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6686f16403887d82e2360a3b94457e1c5ba13aa9 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8ou`XqNCo5DD@Pfb3>jDhWp*7~ zs=UM~ule?a*WZ+ni~FzbSb35 za>KH8kDdkVrzjfN2bjO$ce~PckN4MX!_vkxfBbbVQWBrlXH~yG`o~c->EGfrEz8+f h)+sML6Qb!+cKJu#!*4$;X9Hcr;OXk;vd$@?2>=a7NQeLc literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_upward_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_upward_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..705f7ae89780fa1afc22dde983a033c6fd6575bb GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8kEe@cNCo5D%e%Rl40u`}GJC!D z?wvF0hs4*34?w v?@Z%ydDUlXrCS$u>*@V%_KMR2%%b!2mQMA!WnH2RbQgoCtDnm{r-UW|C3r`J literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_upward_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_upward_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c39725cbac4b2ee61face3f5ae2e24169f727932 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpbWaz@kP61Pm(OxB8S=0^Xu9<4 z(jxU*x%v<94}P(TE}G!AZRUfe8&sIzF0Hw+%ro$`&YNr@Zrgx~QFDq6AleC~%AfjvJPTdK|l_hc&i z3cgV3X%gAGdA(W>E9cik(`>(;GTri;@$!FrkpKsq#|sh(Pgg&e IbxsLQ0JL{k5dZ)H literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_remove_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_remove_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5dbe79ca97cdfcde2673efdd588b329ce25707fe GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;o~MgrNCjiE#F7M&o~A$pE*S}_ zjuyU(vy56l{8e%mv^!3z&V6uDLxOd2f(QdcUz**`7lIC7fI1mGUHx3vIVCg!08>XA Am;e9( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_remove_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_remove_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..68f65ddbd52d6f97bdb7a0035fcef69307afb4bd GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;zNd?0h{y5d1PRu~2_ijBj-3Cj y|KuwOSv@dc@z8$bf<`~Kz|+}asX&7S28IJKrZt|p=IQ~|%HZkh=d#Wzp$P!<<{lOR literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..23bf119211e02b139ad2e0961bc71662ce1caf1e GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Sx*_&aj!VDzSo@fq7N>%r!;1bAd`3JYD@<);T3K0RTZ}7R&$u literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_downward_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_downward_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5c935c71edbdd9adba0e7b17942e1010f4e60442 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iU{4pvkP61Pr#CV>1PHKP%=NHc zFf-Vk!OUpFqxY@m{_^)$7&6AN9gvS$?8n+v_3wz_kvTIYEaZ7Rrm#&hUddyTzKP-7 o%ry1TZiMa?fPf z`Fxglx!2PLty^}6?=5Gr-w?=sLiy(jpX`RlnVZ;IotP#$H%!z!P^?_r@Z5{x!yV3s l=YB@#=c?@YowUDDdf(z{Mq3_=XaUV;@O1TaS?83{1OV3%FCPE^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_upward_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_upward_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..368eb65f6e5e93d71ed2a38fdcb7bc090dcf843a GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iC{Gv1kP61Prvtef40u>BTJ}G` zSS5XOZ}bX*2`x%`e?#uvpL@JL{YK2amp4M@b)K93+;`%M?&esb^V+O33p$?X6f`Pm v@qcjWImIQZQdF>+l}(`k7Q>H&ugjU%v^WK|m>kOl+QQ)J>gTe~DWM4f1MxPL literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_upward_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_upward_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3405c564298bca5416b9acd5fff931c391b6d6cf GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iBu^K|kP61P=k9VgIPkDMTzkCg z&r7#Azxl2S9JIL;(UA1b_j&W>^7HOKCVwOfWhOtL(`oU3X1UUw^_*r($@i4PnFJ+2 zAKk?$aE@Dq@q$e>^NtgK{!J6N0?fLsPoS3j3^P696W z(2M8Rv;3qm` zO^>uX_l}Z73%<5qtYp|9J1tdj5sMk4$^-|dm<(Nqvx#s2v3}XYwqO~vT=qBr28A#t zlM;s29C8KEL+yDRo literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_upward_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_arrow_upward_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..edd9b1ddfbfc08f9d374ec2ccc69dbedc56f352f GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D1)eUBAr*{oFFSG_3gBUTSibtz z(IdStCSK)U!T3{A!Dw^Hq@1|Snfy_^($do2*yyc~O*?yd>iWQz^WKM^t3LcZ=|iRG zk3A|r|7Kn86;|8-bWh=-C*kYF)Lr&5&Uo;X@5(!l#?P`3Sk9L-2rJ!heDlxx;Ahzb zN75B4Swsr!?^|9DpJK!4H0Oo8of?0G0Q-OSVg>6149q+qemj&kF#hAJU@}d}o}j7} RtqpW5gQu&X%Q~loCIA@?R-pg@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_remove_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_remove_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6a899e355656f6a482085aba219c38f07edaba00 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}t6;Bt(kP61PXB{~i7&urQe^0;0 pap>URG_wPI3=S9D_5#&p@y!m(pU8GEFA1og!PC{xWt~$(69BPc7-Rqd literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d28b711846cd3bdd1df434db6a969125a25a3df4 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PU?JWtgtJB>h^JYD@<);T3K0RVYT7<&K! literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a84106b01fd4402e5d15b08c496a75b76e811999 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xf3?%cF6p=fS?83{ F1OO~S9V-9; literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0fdced8fce76a0f9a527388935adecebf63d0dae GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc~YJ(jv*C{ s$r5`OFVdQ&MBb@07vc`*Z=?k literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_downward_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_downward_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..fafe4fb90a74f6085a3fbc27c23ccd384c594fc0 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawo_V@BhEy=VJ$E$maDV{Y!(4?D zv2ra9Y_mR~zHUR+L?sjIt7;>1?_ zZr&;H^iFyTJh^#4?`%oXrrYx-3urv|Q9HV{yG(`Y)0_QU^p-8ys;e`L=aglsfcn>F z1NI5O9PJ+YC`@%|VD?DV*LZ$LA)RR@ACrv3D^}JC%pRoz&lQ4XMQ+FxF|6c!B;&NI z(dk^{l1tSY+~*RP7&R1IthAeR*mDkZ_xnSPD(4;o(NXiq3_{NjJUU&R@$sqUmLH#F hqG}#!0NtL&yt6BGq=1(;0kOH#P3d|zPv%O!()9GO;#K7=d^NY# zTf|pZbFTM_GP$*v0~Tex_3(6>v$b@Mi{a&oLP!0duiUJx+BLIp%D*;?_wPMAU(I>m z*f(X>OFv!9_h+W9lE+cc7^3s=mQ>$8;(Tagl zG48;O;!S6CBYA(QsO2?Yo#d??`6&FGyYQX`j2@axrwBC{#?4`7KNeXilF4*@vRZ)+ zh_X38Ijz{{WU&qB`HxF}%J_ehDNC)jn)JM;Aog3YY9-%OR)3>8rhk|Yx=mntKG*aQ zXA^IHlZs`?1O?4=Tzw6G3X$iewKE(GPMgnjIUni7ETnQW(_!9~f;b?1lFIp)4jXKp zF3n;6vY>JaS5+dTdUL|*eSfN%9JS`iU70L*SJbwcl`F)Pzr*dRhQOVT&*g5iS_HhD qB*`hj$SM-x042Wc_Xc{Pj=@bE13$ zt9O;PdTQR!%ZYwTU*0x#h^THma%{c+2M^5^L0+0mkMv4Elz4ID*eRz?g)u6^$K5v- z%uz9RS3fCZ?)l`0r_ynMA%&t2q~ObWADe^j#RfOOsY$zc}hM;KHlfMuUq=pU7A zaG7*Yvhl!e$xA%Xr${ubTw-~#)8h03rMEfNm-^ONOmNum*?()P-G`O{N8Xo?Ro{5s zSsTmmRIabzopr0I`LC!~g&Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_remove_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_remove_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a54db3d4729c1c87a4cfdadf31364b63661c62 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawv^-rLLo)8YJ;%t)z`${M!*6q5 sEjg!4=MD$~B^fGGxFn5II6%yEIwr?|v))XspA6!8y85}Sb4q9e0HCoNg#Z8m literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..52cad9d2b1f544a6dad106a72ed1a2073e3907ee GIT binary patch literal 94 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJdE%Zfjv*C{ o$qS?;SbP3EE@BQfx+pD!pr{Hp6wuwp00i_>zopr0KcyoNdN!< literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3cb10924a0912d9f64d338b9769da053bc051da6 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0R?HmZtAK52P4Ng8YIR z9G=}s19Id&T^vIy7?T^C0uTIeOgX2~{@-4rW`SaRO?zLF8zVzTLHf)E76O$Z{hqFV JF6*2UngE2qAnO1C literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d64c22e9edfdcf9babea9681c44e2dee53a6d2f6 GIT binary patch literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc^5i{T978G? xlN*`>5BzUTIj7P7-(I3-fns}2dtZ?oBSS_(`pg9u0+k>GJYD@<);T3K0RZru9Krwq literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_downward_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_downward_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..43bfcd50ab0ab66d16196016e5064a1a6c821e0d GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7!07Dh;uuoF`1btP%H~7?mWSR) zUtL(a+u&>Jvt=za6I%X%&oQXJ>H2wE@j1)qbBfQ!)^6?pv^fxqRwlyX8yyyQ<8iMOl;brOl6rDvRPIeUM_zR#aJ56quZqwt}y&aUw@(24W? zAN;9ddj4G4!hZgNpC4O()TljquB>P;&-wGG$BFaqPIY!dpFVe92;Bz_lCz96f2+A` TWb8Nx3{?hCS3j3^P6`FmWhg5*L!DA7xySoE|Li ze!%whEe5N;#=pL~GM|EGFJQL&mMO61Z~37;Vhw%54M|Mw47^PY8E?V`Z#-XY=E!!T zm`g!`h2f6j>xOT2k`4+S3{~f}zOyzlthg`EvHc9wfzA3rY1`*Ve={WpG4g!nlM z@txI)`@n(L{CI^Ax}Wzs>`2UF{_~q_A!EXWOWX7Xq!`>D0|nE5@gF!bwK86zr=Ic8 zZ=;9m2X@ChJg8Q_e(W#Pq3w5mGdZ5vuP^lHH(OJEyvmR7ye$9sd3<;;&GD~x;)DC< z0)KvM9o&$wAn}ctG%znEZ7!bhFxWwFQwegTe~ HDWM4f|8$z? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_upward_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_upward_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..fca5022c7415c7e6fd08636abf3285eb4dfa2869 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z$oMC;uuoF`1bs1&O-?Tt`9X8 zzOAVJ@uT|l#jqo5I}5}(i(8AQGc!M5J@?t1;&YbI=M*nKR{#9GDYH|Nor219Fty}) zu~S{072}iT!VVzHT{xmnr|}sxP*8>usHCorf$_=xgG>7vJ}p0*yULx1@yYc^QI;$d z_Op2?HvB1d;9`8Tp1Fxb;lKHUR~OtFellEe0TK)xj6jwXl*REu(S~uMqC5iwh>+q? zkY|+QP?^sRCU$W!KQCrbzmwI>JAt2};lr$~+rZ#r@O1Ta JS?83{1OVokc%c9Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_upward_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_upward_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8ac0552c7a37489e82306723c6c814da946ec028 GIT binary patch literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z^Liz;uuoF`1aaa-@^eSY=Pne zRV{WL7o_cTCEv(a#b^du?Ed-gTz5v_lm_$7*P^o5ZoL+D`+i;CWOe&LC+yug?c{}P z?9_hL_#F5-ui>*T*0_-XuLNBe)3hCiGM918VJ5=$Qg2Y~_#?SN z$nL!=kY?aes%K+pIx(NILE%$6g92D+JM*(YzZs1mhSsz``*WMY_+j?{z2YC0?LIRm zsKy+ff6-W;A?#4-A7yKhfK7LJ=W^xw%zTFy*UbIa@RNy!LqNfyfq@a3@jxG0R Ysd2aV@GU$l0}ML`Pgg&ebxsLQ0Maao1poj5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_remove_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_remove_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5d36049b573b83f549f5f8da3c496b8208abfb03 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgOgvp2Ln;{Go;MU^VBk3H@Mks~ wbI)GC|A7-2fwCa*VB^zGJQ4;82f#cK!G3(^zJQ4R)`vkHPgg&ebxsLQ0A)KH{Qv*} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b9222f087b52bdd2f0ebc6c8b15a6d803fe98cb7 GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc@}xXn978G? slNIE9ngS2}m*=s&Fv;0Wf^{(i!|S!?C(o_f;{?*{>FVdQ&MBb@04P@)9RL6T literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 5e53a389..a05da725 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -40,5 +40,7 @@ 20dp 50dp + 30dp + 5dp 400dp \ No newline at end of file