From 080f1697e97e13461ec6df4d31c8924d01257a1b Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 9 Apr 2019 01:47:48 +0300 Subject: MERGE --- .../colorcapture/controls/ToggleImageButton.java | 122 +++++++++++++++++++++ .../twine/colorcapture/mvvm/BindingAdapters.java | 9 ++ .../twine/colorcapture/mvvm/BindingConverters.java | 17 +++ .../colorcapture/views/home/HomeFragment.java | 39 ++++--- .../views/loading/LoadingFragmentVM.java | 4 +- .../colorcapture/views/main/MainActivity.java | 11 +- .../colorcapture/views/main/MainActivityVM.java | 25 +++++ .../app/src/main/res/drawable-hdpi/logo.png | Bin 0 -> 14712 bytes .../app/src/main/res/drawable-hdpi/more_normal.png | Bin 0 -> 2778 bytes .../src/main/res/drawable-hdpi/more_selected.png | Bin 0 -> 6366 bytes .../app/src/main/res/drawable-hdpi/my_colors.png | Bin 0 -> 3888 bytes .../app/src/main/res/drawable-hdpi/selected.png | Bin 0 -> 8549 bytes .../app/src/main/res/drawable-hdpi/twine_logo.png | Bin 0 -> 11261 bytes .../main/res/drawable-hdpi/twinesnap_normal.png | Bin 0 -> 3585 bytes .../main/res/drawable-hdpi/twinesnap_selected.png | Bin 0 -> 7914 bytes .../app/src/main/res/drawable-mdpi/logo.png | Bin 0 -> 9261 bytes .../app/src/main/res/drawable-mdpi/more_normal.png | Bin 0 -> 1658 bytes .../src/main/res/drawable-mdpi/more_selected.png | Bin 0 -> 3457 bytes .../app/src/main/res/drawable-mdpi/my_colors.png | Bin 0 -> 2340 bytes .../app/src/main/res/drawable-mdpi/selected.png | Bin 0 -> 4651 bytes .../app/src/main/res/drawable-mdpi/twine_logo.png | Bin 0 -> 7143 bytes .../main/res/drawable-mdpi/twinesnap_normal.png | Bin 0 -> 2208 bytes .../main/res/drawable-mdpi/twinesnap_selected.png | Bin 0 -> 4338 bytes .../app/src/main/res/drawable-xhdpi/logo.png | Bin 0 -> 21247 bytes .../src/main/res/drawable-xhdpi/more_normal.png | Bin 0 -> 3755 bytes .../src/main/res/drawable-xhdpi/more_selected.png | Bin 0 -> 9912 bytes .../app/src/main/res/drawable-xhdpi/my_colors.png | Bin 0 -> 5574 bytes .../app/src/main/res/drawable-xhdpi/selected.png | Bin 0 -> 12524 bytes .../app/src/main/res/drawable-xhdpi/twine_logo.png | Bin 0 -> 16023 bytes .../main/res/drawable-xhdpi/twinesnap_normal.png | Bin 0 -> 4973 bytes .../main/res/drawable-xhdpi/twinesnap_selected.png | Bin 0 -> 12333 bytes .../app/src/main/res/drawable-xxhdpi/logo.png | Bin 0 -> 35163 bytes .../src/main/res/drawable-xxhdpi/more_normal.png | Bin 0 -> 6055 bytes .../src/main/res/drawable-xxhdpi/more_selected.png | Bin 0 -> 19207 bytes .../app/src/main/res/drawable-xxhdpi/my_colors.png | Bin 0 -> 8326 bytes .../app/src/main/res/drawable-xxhdpi/selected.png | Bin 0 -> 23601 bytes .../src/main/res/drawable-xxhdpi/twine_logo.png | Bin 0 -> 26389 bytes .../main/res/drawable-xxhdpi/twinesnap_normal.png | Bin 0 -> 7911 bytes .../res/drawable-xxhdpi/twinesnap_selected.png | Bin 0 -> 23276 bytes .../app/src/main/res/drawable-xxxhdpi/logo.png | Bin 0 -> 51829 bytes .../src/main/res/drawable-xxxhdpi/more_normal.png | Bin 0 -> 8485 bytes .../main/res/drawable-xxxhdpi/more_selected.png | Bin 0 -> 31105 bytes .../src/main/res/drawable-xxxhdpi/my_colors.png | Bin 0 -> 11825 bytes .../app/src/main/res/drawable-xxxhdpi/selected.png | Bin 0 -> 37818 bytes .../src/main/res/drawable-xxxhdpi/twine_logo.png | Bin 0 -> 38186 bytes .../main/res/drawable-xxxhdpi/twinesnap_normal.png | Bin 0 -> 10943 bytes .../res/drawable-xxxhdpi/twinesnap_selected.png | Bin 0 -> 37678 bytes .../src/main/res/drawable/background_gradient.xml | 8 ++ .../app/src/main/res/drawable/border.xml | 8 ++ .../app/src/main/res/drawable/border_shadow.xml | 19 ++++ .../app/src/main/res/layout/activity_main.xml | 40 ++++--- .../app/src/main/res/layout/fragment_capture.xml | 26 +++-- .../app/src/main/res/layout/fragment_loading.xml | 50 ++++----- .../app/src/main/res/values/colors.xml | 2 + .../app/src/main/res/values/strings.xml | 2 + .../app/src/main/res/values/styles.xml | 6 + Software/Android_Studio/settings.jar | Bin 0 -> 5837 bytes 57 files changed, 319 insertions(+), 69 deletions(-) create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/ToggleImageButton.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingAdapters.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingConverters.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/my_colors.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twine_logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/my_colors.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twine_logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/my_colors.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twine_logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/my_colors.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twine_logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/my_colors.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twine_logo.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_normal.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_selected.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable/background_gradient.xml create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border.xml create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border_shadow.xml create mode 100644 Software/Android_Studio/settings.jar (limited to 'Software/Android_Studio') diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/ToggleImageButton.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/ToggleImageButton.java new file mode 100644 index 000000000..466b6de7e --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/ToggleImageButton.java @@ -0,0 +1,122 @@ +package com.twine.colorcapture.controls; + +import android.content.Context; +import android.content.res.TypedArray; +import android.databinding.BindingAdapter; +import android.databinding.BindingMethod; +import android.databinding.InverseBindingAdapter; +import android.databinding.InverseBindingListener; +import android.databinding.InverseBindingMethod; +import android.databinding.InverseBindingMethods; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; +import android.widget.Checkable; + +import com.twine.colorcapture.R; + +public class ToggleImageButton extends android.support.v7.widget.AppCompatImageButton implements Checkable +{ + private OnCheckedChangeListener onCheckedChangeListener; + private Drawable normalImage; + private Drawable checkedImage; + + public ToggleImageButton(Context context) + { + super(context); + } + + public ToggleImageButton(Context context, AttributeSet attrs) + { + super(context, attrs); + setAttributes(attrs); + } + + public ToggleImageButton(Context context, AttributeSet attrs, int defStyle) + { + super(context, attrs, defStyle); + setAttributes(attrs); + } + + private void setAttributes(AttributeSet attrs) + { + TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.ToggleImageButton); + + normalImage = getContext().getDrawable(a.getResourceId(R.styleable.ToggleImageButton_normalImage, 0)); + checkedImage = getContext().getDrawable(a.getResourceId(R.styleable.ToggleImageButton_checkedImage, 0)); + + setChecked(a.getBoolean(R.styleable.ToggleImageButton_android_checked, false)); + a.recycle(); + } + + @Override + public boolean isChecked() + { + return isSelected(); + } + + @Override + public void setChecked(boolean checked) + { + setSelected(checked); + + if (checked) + { + setImageDrawable(checkedImage); + } + else + { + setImageDrawable(normalImage); + } + + if (onCheckedChangeListener != null) + { + onCheckedChangeListener.onCheckedChanged(this, checked); + } + } + + @Override + public void toggle() + { + setChecked(!isChecked()); + } + + @Override + public boolean performClick() + { + toggle(); + return super.performClick(); + } + + public OnCheckedChangeListener getOnCheckedChangeListener() + { + return onCheckedChangeListener; + } + + public void setOnCheckedChangeListener(OnCheckedChangeListener onCheckedChangeListener) + { + this.onCheckedChangeListener = onCheckedChangeListener; + } + + public static interface OnCheckedChangeListener + { + public void onCheckedChanged(ToggleImageButton buttonView, boolean isChecked); + } + + @BindingAdapter(value = "cccAttrChanged") + public static void createCheckedBinding(ToggleImageButton btn, InverseBindingListener listener) + { + btn.setOnCheckedChangeListener((e, r) -> listener.onChange()); + } + + @BindingAdapter("ccc") + public static void setChecked(ToggleImageButton view, boolean value) + { + view.setChecked(value); + } + + @InverseBindingAdapter(attribute = "ccc") + public static boolean getChecked(ToggleImageButton view) + { + return view.isChecked(); + } +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingAdapters.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingAdapters.java new file mode 100644 index 000000000..41bfb052b --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingAdapters.java @@ -0,0 +1,9 @@ +package com.twine.colorcapture.mvvm; + +import android.databinding.BindingConversion; +import android.databinding.InverseBindingMethod; + +public class BindingAdapters +{ + +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingConverters.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingConverters.java new file mode 100644 index 000000000..929d1ee0e --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/BindingConverters.java @@ -0,0 +1,17 @@ +package com.twine.colorcapture.mvvm; + +import android.databinding.BindingConversion; +import android.databinding.InverseBindingMethod; + +public class BindingConverters +{ +// @BindingConversion +// public static boolean toInt(Boolean value) { +// return value; +// } +// +// @InverseBindingMethod() +// public static int toObject(int number) { +// return number; +// } +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/home/HomeFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/home/HomeFragment.java index 76bdfe20f..4dc05b81d 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/home/HomeFragment.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/home/HomeFragment.java @@ -1,4 +1,5 @@ package com.twine.colorcapture.views.home; + import android.Manifest; import android.content.pm.PackageManager; import android.os.Build; @@ -15,37 +16,39 @@ import com.twine.colorcapture.mvvm.FragmentBase; public class HomeFragment extends FragmentBase implements IHomeFragment { private IAction1 cameraAccessAction; - + public HomeFragment() { // Required empty public constructor } - + @Override protected int getLayoutId() { return R.layout.fragment_home; } - + @Override protected void inject() { App.getComponent().inject(this); } - + @Override public String getTitle() { return "Home"; } - + @Override public void requestCameraAccess(IAction1 action) { cameraAccessAction = action; - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - if (ContextCompat.checkSelfPermission(this.getActivity(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) + { + if (ContextCompat.checkSelfPermission(this.getActivity(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) + { ActivityCompat.requestPermissions(this.getActivity(), new String[]{Manifest.permission.CAMERA}, 1); @@ -56,17 +59,23 @@ public class HomeFragment extends FragmentBase 0 - && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + && grantResults[0] == PackageManager.PERMISSION_GRANTED) + { cameraAccessAction.invoke(true); - } else { + } + else + { cameraAccessAction.invoke(false); } } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingFragmentVM.java index ecce7a74e..39a93450e 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingFragmentVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/loading/LoadingFragmentVM.java @@ -31,7 +31,7 @@ public class LoadingFragmentVM extends ViewModelBase { super.onViewAttached(view); - new CountDownTimer(2000,50) + new CountDownTimer(5000,50) { @Override @@ -44,7 +44,7 @@ public class LoadingFragmentVM extends ViewModelBase public void onFinish() { loadingProgress.set(2000); - navigationProvider.navigateTo(NavigationView.Home, false); + navigationProvider.navigateTo(NavigationView.Capture, false); } }.start(); } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java index 74e3d5707..5ff99751f 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java @@ -8,6 +8,8 @@ import android.support.v4.widget.DrawerLayout; import android.util.Log; import android.view.Gravity; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.Animation.AnimationListener; @@ -18,6 +20,7 @@ import android.widget.LinearLayout; import com.twine.colorcapture.App; import com.twine.colorcapture.R; +import com.twine.colorcapture.controls.ToggleImageButton; import com.twine.colorcapture.core.IAction; import com.twine.colorcapture.core.Task; import com.twine.colorcapture.databinding.ActivityMainBinding; @@ -42,7 +45,7 @@ public class MainActivity extends ActivityBase { private INavigationProvider navigationProvider; + + public DependencyProperty isMoreToggled; + public DependencyProperty isCaptureToggled; + public DependencyProperty isMyColorsToggled; @Inject public MainActivityVM(Bus eventBus, INotificationProvider notificationProvider, INavigationProvider navigationProvider) { this.navigationProvider = navigationProvider; + isMoreToggled = new DependencyProperty(false,this::onMoreToggled); + isCaptureToggled = new DependencyProperty(true,this::onCaptureToggled); + isMyColorsToggled = new DependencyProperty(false,this::onMyColorsToggled); + } + + private void onMyColorsToggled(DependencyProperty booleanDependencyProperty, Boolean value) + { + isMoreToggled.set(false); + isCaptureToggled.set(false); + } + + private void onCaptureToggled(DependencyProperty booleanDependencyProperty, Boolean value) + { + isMoreToggled.set(false); + isMyColorsToggled.set(false); + } + + private void onMoreToggled(DependencyProperty booleanDependencyProperty, Boolean value) + { + isCaptureToggled.set(false); + isMyColorsToggled.set(false); } } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo.png new file mode 100644 index 000000000..d603442d6 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_normal.png new file mode 100644 index 000000000..8f8c4e153 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_selected.png new file mode 100644 index 000000000..28b678a74 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/more_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/my_colors.png new file mode 100644 index 000000000..64433b097 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/my_colors.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/selected.png new file mode 100644 index 000000000..59b34c80f Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twine_logo.png new file mode 100644 index 000000000..bad8273ba Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twine_logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_normal.png new file mode 100644 index 000000000..79705e9ca Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_selected.png new file mode 100644 index 000000000..3ca5bf9b7 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/twinesnap_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo.png new file mode 100644 index 000000000..d9dc2cf15 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_normal.png new file mode 100644 index 000000000..6c8ce0b9a Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_selected.png new file mode 100644 index 000000000..179384dd0 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/more_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/my_colors.png new file mode 100644 index 000000000..c38fbefc1 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/my_colors.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/selected.png new file mode 100644 index 000000000..0a5041bb9 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twine_logo.png new file mode 100644 index 000000000..0c56ba31b Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twine_logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_normal.png new file mode 100644 index 000000000..3999dfb84 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_selected.png new file mode 100644 index 000000000..6bd9f3638 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/twinesnap_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo.png new file mode 100644 index 000000000..f6b3bf9be Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_normal.png new file mode 100644 index 000000000..a540c41be Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_selected.png new file mode 100644 index 000000000..60494cce8 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/more_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/my_colors.png new file mode 100644 index 000000000..2eae175fd Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/my_colors.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/selected.png new file mode 100644 index 000000000..e1aa19889 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twine_logo.png new file mode 100644 index 000000000..9009dd34a Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twine_logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_normal.png new file mode 100644 index 000000000..bf6509ea2 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_selected.png new file mode 100644 index 000000000..f71ff6ea5 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/twinesnap_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo.png new file mode 100644 index 000000000..fe384b6dd Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_normal.png new file mode 100644 index 000000000..edbed5b5e Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_selected.png new file mode 100644 index 000000000..263622f94 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/more_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/my_colors.png new file mode 100644 index 000000000..1570ddb97 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/my_colors.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/selected.png new file mode 100644 index 000000000..6c4d944f2 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twine_logo.png new file mode 100644 index 000000000..ce0f15c34 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twine_logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_normal.png new file mode 100644 index 000000000..6b098152f Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_selected.png new file mode 100644 index 000000000..94e490595 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/twinesnap_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo.png new file mode 100644 index 000000000..b173a3c86 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_normal.png new file mode 100644 index 000000000..1f009161c Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_selected.png new file mode 100644 index 000000000..80b2611cf Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/more_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/my_colors.png new file mode 100644 index 000000000..b816454ed Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/my_colors.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/selected.png new file mode 100644 index 000000000..705b88dfe Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twine_logo.png new file mode 100644 index 000000000..d9ff791bc Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twine_logo.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_normal.png new file mode 100644 index 000000000..f48411cb9 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_normal.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_selected.png new file mode 100644 index 000000000..3741bdb4a Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/twinesnap_selected.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/background_gradient.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/background_gradient.xml new file mode 100644 index 000000000..9a95bd708 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/background_gradient.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border.xml new file mode 100644 index 000000000..2f0177da9 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border_shadow.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border_shadow.xml new file mode 100644 index 000000000..cf3d424af --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/border_shadow.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml index 1d7d77ad4..e650b8328 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml @@ -21,60 +21,64 @@ + android:visibility="visible"> - - -