From d66c5e376f12aff4cd69e09dbe629a5a069392cc Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sun, 12 May 2019 08:52:51 +0300 Subject: Implemented About screens on TCC. Implemented 2D and 3D card emulations on color capture module. --- .../colorcapture/dagger/ApplicationComponent.java | 9 ++ .../colorcapture/dagger/ViewModelsModule.java | 24 +++ .../navigation/NavigationFragment.java | 8 + .../colorcapture/views/about/AboutFragment.java | 30 ++++ .../colorcapture/views/about/AboutFragmentVM.java | 53 +++++++ .../colorcapture/views/about/IAboutFragment.java | 7 + .../colorcapture/views/card/CardFragment.java | 29 ++++ .../colorcapture/views/card/CardFragmentVM.java | 15 ++ .../colorcapture/views/card/ICardFragment.java | 8 + .../colorcapture/views/main/MainActivityVM.java | 20 ++- .../colorcapture/views/twine/ITwineFragment.java | 7 + .../colorcapture/views/twine/TwineFragment.java | 29 ++++ .../colorcapture/views/twine/TwineFragmentVM.java | 33 ++++ .../app/src/main/res/drawable-hdpi/icon.png | Bin 1868 -> 1725 bytes .../app/src/main/res/drawable-hdpi/logo_twine.png | Bin 0 -> 11312 bytes .../app/src/main/res/drawable-mdpi/icon.png | Bin 1260 -> 1161 bytes .../app/src/main/res/drawable-mdpi/logo_twine.png | Bin 0 -> 7146 bytes .../src/main/res/drawable-sw600dp-mdpi/icon.png | Bin 2545 -> 2248 bytes .../main/res/drawable-sw600dp-mdpi/logo_twine.png | Bin 0 -> 16333 bytes .../app/src/main/res/drawable-xhdpi/icon.png | Bin 2545 -> 2248 bytes .../app/src/main/res/drawable-xhdpi/logo_twine.png | Bin 0 -> 16333 bytes .../app/src/main/res/drawable-xxhdpi/icon.png | Bin 3805 -> 3606 bytes .../src/main/res/drawable-xxhdpi/logo_twine.png | Bin 0 -> 27186 bytes .../app/src/main/res/drawable-xxxhdpi/icon.png | Bin 5130 -> 4850 bytes .../src/main/res/drawable-xxxhdpi/logo_twine.png | Bin 0 -> 40297 bytes .../app/src/main/res/drawable/dark_gradient.xml | 8 + .../app/src/main/res/layout/activity_main.xml | 3 +- .../app/src/main/res/layout/dialog_error.xml | 1 + .../app/src/main/res/layout/dialog_progress.xml | 1 + .../app/src/main/res/layout/dialog_success.xml | 1 + .../app/src/main/res/layout/dialog_welcome.xml | 1 + .../app/src/main/res/layout/fragment_about.xml | 173 +++++++++++++++++++++ .../app/src/main/res/layout/fragment_card.xml | 50 ++++++ .../app/src/main/res/layout/fragment_twine.xml | 104 +++++++++++++ .../app/src/main/res/layout/side_menu.xml | 2 + .../app/src/main/res/values/colors.xml | 2 +- .../ColorCapture/app/src/main/res/values/sizes.xml | 4 +- .../app/src/main/res/values/strings.xml | 16 ++ 38 files changed, 633 insertions(+), 5 deletions(-) create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragment.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/IAboutFragment.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragment.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragmentVM.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/ICardFragment.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/ITwineFragment.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragment.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragmentVM.java create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo_twine.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo_twine.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/logo_twine.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo_twine.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo_twine.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo_twine.png create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/drawable/dark_gradient.xml create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_about.xml create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_card.xml create mode 100644 Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_twine.xml (limited to 'Software/Android_Studio') diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ApplicationComponent.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ApplicationComponent.java index 63852f2bc..fbb524754 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ApplicationComponent.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ApplicationComponent.java @@ -6,7 +6,9 @@ import com.twine.colorcapture.dialogs.processing.ProcessingDialog; import com.twine.colorcapture.dialogs.progress.ProgressDialog; import com.twine.colorcapture.dialogs.success.SuccessDialog; import com.twine.colorcapture.dialogs.welcome.WelcomeDialog; +import com.twine.colorcapture.views.about.AboutFragment; import com.twine.colorcapture.views.capture.CaptureFragment; +import com.twine.colorcapture.views.card.CardFragment; import com.twine.colorcapture.views.mycolors.MyColorsFragment; import com.twine.colorcapture.views.loading.LoadingActivity; import com.twine.colorcapture.views.main.MainActivity; @@ -15,6 +17,7 @@ import com.twine.colorcapture.views.rename.RenameFragment; import com.twine.colorcapture.views.result.ResultFragment; import com.twine.colorcapture.views.sendtoemail.SendToEmailFragment; import com.twine.colorcapture.views.sendtomachine.SendToMachineFragment; +import com.twine.colorcapture.views.twine.TwineFragment; import javax.inject.Singleton; @@ -57,4 +60,10 @@ public interface ApplicationComponent void inject(RenameFragment renameFragment); void inject(SendToEmailFragment sendToEmailFragment); + + void inject(AboutFragment aboutFragment); + + void inject(TwineFragment twineFragment); + + void inject(CardFragment cardFragment); } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ViewModelsModule.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ViewModelsModule.java index 8b43a5cec..0a161bd7b 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ViewModelsModule.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ViewModelsModule.java @@ -9,7 +9,9 @@ import com.twine.colorcapture.dialogs.success.SuccessDialogVM; import com.twine.colorcapture.dialogs.welcome.WelcomeDialogVM; import com.twine.colorcapture.navigation.INavigationProvider; import com.twine.colorcapture.notification.INotificationProvider; +import com.twine.colorcapture.views.about.AboutFragmentVM; import com.twine.colorcapture.views.capture.CaptureFragmentVM; +import com.twine.colorcapture.views.card.CardFragmentVM; import com.twine.colorcapture.views.loading.LoadingActivityVM; import com.twine.colorcapture.views.mycolors.MyColorsFragmentVM; import com.twine.colorcapture.views.main.MainActivityVM; @@ -18,6 +20,7 @@ import com.twine.colorcapture.views.rename.RenameFragmentVM; import com.twine.colorcapture.views.result.ResultFragmentVM; import com.twine.colorcapture.views.sendtoemail.SendToEmailFragmentVM; import com.twine.colorcapture.views.sendtomachine.SendToMachineFragmentVM; +import com.twine.colorcapture.views.twine.TwineFragmentVM; import com.twine.colorcapture.web.ITCCService; import javax.inject.Singleton; @@ -103,6 +106,27 @@ public class ViewModelsModule return new SendToMachineFragmentVM(notificationProvider, navigationProvider, tccService); } + @Provides + @Singleton + public AboutFragmentVM provideAboutFragmentVM() + { + return new AboutFragmentVM(); + } + + @Provides + @Singleton + public TwineFragmentVM provideTwineFragmentVM() + { + return new TwineFragmentVM(); + } + + @Provides + @Singleton + public CardFragmentVM provideCardFragmentVM(INavigationProvider navigationProvider) + { + return new CardFragmentVM(navigationProvider); + } + @Provides @Singleton public ProgressDialogVM provideProgressDialogVM() diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/NavigationFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/NavigationFragment.java index 0d54f2bf4..64b7ba9f9 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/NavigationFragment.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/NavigationFragment.java @@ -14,4 +14,12 @@ public enum NavigationFragment @PreventHistory @HideHeader SendToEmail, + @PreventHistory + About, + @PreventHistory + Twine, + @PreventHistory + Card, + @PreventHistory + CardOrder, } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragment.java new file mode 100644 index 000000000..bdd82b50e --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragment.java @@ -0,0 +1,30 @@ +package com.twine.colorcapture.views.about; + +import android.app.Fragment; + +import com.twine.colorcapture.App; +import com.twine.colorcapture.R; +import com.twine.colorcapture.databinding.FragmentAboutBinding; +import com.twine.colorcapture.mvvm.FragmentBase; + +public class AboutFragment extends FragmentBase implements IAboutFragment +{ + + @Override + protected int getLayoutId() + { + return R.layout.fragment_about; + } + + @Override + protected void inject() + { + App.getComponent().inject(this); + } + + @Override + public String getTitle() + { + return "About"; + } +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java new file mode 100644 index 000000000..d7e4a6704 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java @@ -0,0 +1,53 @@ +package com.twine.colorcapture.views.about; + +import android.content.Intent; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.net.Uri; + +import com.twine.colorcapture.App; +import com.twine.colorcapture.mvvm.DependencyProperty; +import com.twine.colorcapture.mvvm.RelayCommand; +import com.twine.colorcapture.mvvm.ViewModelBase; +import com.twine.colorcapture.navigation.TabState; +import com.twine.colorcapture.navigation.TabStateManager; + +public class AboutFragmentVM extends ViewModelBase +{ + public RelayCommand contactCommand; + public RelayCommand termsOfUseCommand; + public RelayCommand privacyPolicyCommand; + + public DependencyProperty version; + + public AboutFragmentVM() + { + contactCommand = new RelayCommand(() -> openBrowser("http://twine-s.com/contact/contact-us")); + termsOfUseCommand = new RelayCommand(() -> openBrowser("http://twine-s.com/privacy-policy")); + privacyPolicyCommand = new RelayCommand(() -> openBrowser("http://twine-s.com/privacy-policy")); + version = new DependencyProperty<>(""); + + try + { + PackageInfo pInfo = App.getContext().getPackageManager().getPackageInfo(App.getContext().getPackageName(), 0); + version.set(Integer.toString(pInfo.versionCode)); + } + catch (PackageManager.NameNotFoundException e) + { + e.printStackTrace(); + } + } + + private void openBrowser(String url) + { + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + App.getContext().startActivity(browserIntent); + } + + @Override + protected void onNavigatedTo() + { + super.onNavigatedTo(); + TabStateManager.getInstance().state.set(TabState.More); + } +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/IAboutFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/IAboutFragment.java new file mode 100644 index 000000000..2343421c3 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/IAboutFragment.java @@ -0,0 +1,7 @@ +package com.twine.colorcapture.views.about; + +import com.twine.colorcapture.mvvm.IView; + +public interface IAboutFragment extends IView +{ +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragment.java new file mode 100644 index 000000000..bdcac205d --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragment.java @@ -0,0 +1,29 @@ +package com.twine.colorcapture.views.card; + +import android.app.Fragment; + +import com.twine.colorcapture.App; +import com.twine.colorcapture.R; +import com.twine.colorcapture.databinding.FragmentCardBinding; +import com.twine.colorcapture.mvvm.FragmentBase; + +public class CardFragment extends FragmentBase implements ICardFragment +{ + @Override + protected int getLayoutId() + { + return R.layout.fragment_card; + } + + @Override + protected void inject() + { + App.getComponent().inject(this); + } + + @Override + public String getTitle() + { + return "Card"; + } +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragmentVM.java new file mode 100644 index 000000000..357a94e23 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragmentVM.java @@ -0,0 +1,15 @@ +package com.twine.colorcapture.views.card; + +import com.twine.colorcapture.mvvm.ViewModelBase; +import com.twine.colorcapture.navigation.INavigationProvider; + +import javax.inject.Inject; + +public class CardFragmentVM extends ViewModelBase +{ + @Inject + public CardFragmentVM(INavigationProvider navigationProvider) + { + + } +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/ICardFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/ICardFragment.java new file mode 100644 index 000000000..464bf4fab --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/ICardFragment.java @@ -0,0 +1,8 @@ +package com.twine.colorcapture.views.card; + +import com.twine.colorcapture.mvvm.IView; + +public interface ICardFragment extends IView +{ + +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java index c7c8eb7a1..72a088fa2 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java @@ -32,6 +32,8 @@ public class MainActivityVM extends ViewModelBase public RelayCommand moreCommand; public RelayCommand howToUseCommand; + public RelayCommand aboutCommand; + public RelayCommand aboutTwineCommand; @Inject public MainActivityVM(Bus eventBus, INotificationProvider notificationProvider, INavigationProvider navigationProvider) @@ -44,6 +46,8 @@ public class MainActivityVM extends ViewModelBase navigationProvider.addFragmentNavigationListener(this::onNavigation); howToUseCommand = new RelayCommand(this::handleHowToUseCommand); + aboutCommand = new RelayCommand(this::handleAboutCommand); + aboutTwineCommand = new RelayCommand(this::handleAboutTwineCommand); captureCommand = new RelayCommand(this::handleCaptureCommand); myColorsCommand = new RelayCommand(this::handleMyColorsCommand); @@ -81,7 +85,21 @@ public class MainActivityVM extends ViewModelBase private void handleHowToUseCommand() { view.closeMenu(); - notificationProvider.showDialog(new WelcomeDialog(), (vm) -> { }); + notificationProvider.showDialog(new WelcomeDialog(), (vm) -> + { + }); + } + + private void handleAboutCommand() + { + view.closeMenu(); + navigationProvider.navigateTo(NavigationFragment.About, true, false); + } + + private void handleAboutTwineCommand() + { + view.closeMenu(); + navigationProvider.navigateTo(NavigationFragment.Twine, true, false); } private void onNavigation(NavigationFragment navigationFragment) diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/ITwineFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/ITwineFragment.java new file mode 100644 index 000000000..f915eb8e3 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/ITwineFragment.java @@ -0,0 +1,7 @@ +package com.twine.colorcapture.views.twine; + +import com.twine.colorcapture.mvvm.IView; + +public interface ITwineFragment extends IView +{ +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragment.java new file mode 100644 index 000000000..5f2c722df --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragment.java @@ -0,0 +1,29 @@ +package com.twine.colorcapture.views.twine; + +import android.app.Fragment; + +import com.twine.colorcapture.App; +import com.twine.colorcapture.R; +import com.twine.colorcapture.databinding.FragmentTwineBinding; +import com.twine.colorcapture.mvvm.FragmentBase; + +public class TwineFragment extends FragmentBase implements ITwineFragment +{ + @Override + protected int getLayoutId() + { + return R.layout.fragment_twine; + } + + @Override + protected void inject() + { + App.getComponent().inject(this); + } + + @Override + public String getTitle() + { + return "Twine"; + } +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragmentVM.java new file mode 100644 index 000000000..2afe56b0d --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragmentVM.java @@ -0,0 +1,33 @@ +package com.twine.colorcapture.views.twine; + +import android.content.Intent; +import android.net.Uri; + +import com.twine.colorcapture.App; +import com.twine.colorcapture.mvvm.RelayCommand; +import com.twine.colorcapture.mvvm.ViewModelBase; +import com.twine.colorcapture.navigation.TabState; +import com.twine.colorcapture.navigation.TabStateManager; + +public class TwineFragmentVM extends ViewModelBase +{ + public RelayCommand contactCommand; + + public TwineFragmentVM() + { + contactCommand = new RelayCommand(() -> openBrowser("http://twine-s.com/contact/contact-us")); + } + + private void openBrowser(String url) + { + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + App.getContext().startActivity(browserIntent); + } + + @Override + protected void onNavigatedTo() + { + super.onNavigatedTo(); + TabStateManager.getInstance().state.set(TabState.More); + } +} diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/icon.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/icon.png index 5920654e4..35367194d 100644 Binary files a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/icon.png and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/icon.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo_twine.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo_twine.png new file mode 100644 index 000000000..363924f69 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-hdpi/logo_twine.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/icon.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/icon.png index f0889f9a3..27b1e5f35 100644 Binary files a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/icon.png and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/icon.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo_twine.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo_twine.png new file mode 100644 index 000000000..7df280515 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-mdpi/logo_twine.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon.png index 40e46cd1f..6bc4398b2 100644 Binary files a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon.png and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/logo_twine.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/logo_twine.png new file mode 100644 index 000000000..633caaad5 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/logo_twine.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/icon.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/icon.png index 40e46cd1f..6bc4398b2 100644 Binary files a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/icon.png and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/icon.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo_twine.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo_twine.png new file mode 100644 index 000000000..633caaad5 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xhdpi/logo_twine.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/icon.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/icon.png index 968ebf639..4247642f9 100644 Binary files a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/icon.png and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/icon.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo_twine.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo_twine.png new file mode 100644 index 000000000..011679c81 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxhdpi/logo_twine.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/icon.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/icon.png index 25650a2ff..3c0905522 100644 Binary files a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/icon.png and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/icon.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo_twine.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo_twine.png new file mode 100644 index 000000000..955e28e25 Binary files /dev/null and b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-xxxhdpi/logo_twine.png differ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/dark_gradient.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/dark_gradient.xml new file mode 100644 index 000000000..336cd7f4b --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable/dark_gradient.xml @@ -0,0 +1,8 @@ + + + + \ 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 9830c53db..cfe7878ff 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 @@ -28,7 +28,8 @@ diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml index 8e6bfb3fc..4c099af9f 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml @@ -18,6 +18,7 @@ android:layout_width="@dimen/dialog_width" android:layout_height="@dimen/dialog_height" android:layout_centerVertical="true" + android:elevation="10dp" android:layout_centerHorizontal="true" android:background="@drawable/border_primary_background"> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_welcome.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_welcome.xml index 44bc25f51..e9dc5d0b9 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_welcome.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_welcome.xml @@ -25,6 +25,7 @@ android:background="@drawable/welcome_dialog_border" android:foregroundGravity="center" android:layout_marginLeft="30dp" + android:layout_marginRight="30dp" android:layout_marginTop="50dp" android:layout_marginBottom="100dp" diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_about.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_about.xml new file mode 100644 index 000000000..923feca18 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_about.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +