From bd5b432e61d9d71240ced2e2484a12cade363319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mustafa=20ic=CC=A7men?= Date: Sat, 18 Apr 2020 19:02:45 +0300 Subject: [PATCH] theme --- .../ch/pizzacucia/android/activity/MainActivity.java | 12 ++++++------ .../java/ch/pizzacucia/android/api/ApiConstants.java | 2 +- .../res/drawable/background_product_cart_price.xml | 2 +- .../res/drawable/ic_bottom_nav_item_cart_gray.xml | 2 +- .../res/drawable/selector_bottom_navigation_item.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_splash.xml | 11 ++++++++--- app/src/main/res/layout/layout_pizzalink_toolbar.xml | 10 +++++----- app/src/main/res/values/colors.xml | 3 ++- app/src/main/res/values/styles.xml | 6 +++--- 10 files changed, 29 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/ch/pizzacucia/android/activity/MainActivity.java b/app/src/main/java/ch/pizzacucia/android/activity/MainActivity.java index ef50c72..772fa99 100644 --- a/app/src/main/java/ch/pizzacucia/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzacucia/android/activity/MainActivity.java @@ -67,7 +67,7 @@ public class MainActivity extends BaseActivity { @BindDrawable(R.drawable.ic_bottom_nav_item_cart_yellow) Drawable yellowCartDrawable; @BindColor(R.color.yellow) int yellowColor; - @BindColor(R.color.venus) int grayColor; + @BindColor(R.color.white) int whiteColor; private FragmentManager fragmentManager; private String currentFragmentName = ""; @@ -153,7 +153,7 @@ public class MainActivity extends BaseActivity { private void initBadgeView(){ badge = new QBadgeView(this) .setBadgeBackgroundColor(yellowColor) - .setBadgeTextColor(grayColor) + .setBadgeTextColor(whiteColor) .setBadgeGravity(Gravity.TOP | Gravity.END); } */ @@ -195,7 +195,7 @@ public class MainActivity extends BaseActivity { openProductsScreen(getDefaultCategory()); shoppingCartImageView.setImageDrawable(grayCartDrawable); - shoppingCartTextView.setTextColor(grayColor); + shoppingCartTextView.setTextColor(whiteColor); if(!SessionHelper.isCustomerLoggedIn()) { cartTotalRelativeLayout.setVisibility(View.GONE); @@ -247,7 +247,7 @@ public class MainActivity extends BaseActivity { cartTotalRelativeLayout.setVisibility(View.GONE); shoppingCartImageView.setImageDrawable(grayCartDrawable); - shoppingCartTextView.setTextColor(grayColor); + shoppingCartTextView.setTextColor(whiteColor); return true; @@ -265,7 +265,7 @@ public class MainActivity extends BaseActivity { cartTotalRelativeLayout.setVisibility(View.GONE); shoppingCartImageView.setImageDrawable(grayCartDrawable); - shoppingCartTextView.setTextColor(grayColor); + shoppingCartTextView.setTextColor(whiteColor); return true; @@ -279,7 +279,7 @@ public class MainActivity extends BaseActivity { cartTotalRelativeLayout.setVisibility(View.GONE); shoppingCartImageView.setImageDrawable(grayCartDrawable); - shoppingCartTextView.setTextColor(grayColor); + shoppingCartTextView.setTextColor(whiteColor); return true; } diff --git a/app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java b/app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java index a6e1609..e6444ba 100644 --- a/app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java +++ b/app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java @@ -3,7 +3,7 @@ package ch.pizzacucia.android.api; public class ApiConstants { public static final int API_READ_TIMEOUT = 30; public static final int API_CONNECT_TIMEOUT = 10; - public static final String API_PATH = "http://pizza-leu.ch/"; + public static final String API_PATH = "http://pizzamaxx.ch/"; //public static final String API_PATH = "http://pizzaleu.ddns.net/"; public static final String APP_TYPE_ID_ANDROID = "2"; public static final int APP_ERROR_CODE_AUTHORIZATION = 1; diff --git a/app/src/main/res/drawable/background_product_cart_price.xml b/app/src/main/res/drawable/background_product_cart_price.xml index 2861fdb..adfa39f 100644 --- a/app/src/main/res/drawable/background_product_cart_price.xml +++ b/app/src/main/res/drawable/background_product_cart_price.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml b/app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml index 4644566..8fb4f91 100644 --- a/app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml +++ b/app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/selector_bottom_navigation_item.xml b/app/src/main/res/drawable/selector_bottom_navigation_item.xml index c340d6d..3a1c81e 100644 --- a/app/src/main/res/drawable/selector_bottom_navigation_item.xml +++ b/app/src/main/res/drawable/selector_bottom_navigation_item.xml @@ -6,5 +6,5 @@ android:color="@color/yellow" android:state_checked="true" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5160848..4f7746f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -181,7 +181,7 @@ android:layout_height="wrap_content" android:text="@string/bottom_nav_menu_item_cart" android:textSize="10sp" - android:textColor="@color/venus"/> + android:textColor="@color/white"/> diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index edf56df..a68e35e 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -22,8 +22,13 @@ android:layout_gravity="center_horizontal" android:src="@drawable/pizzacucina_splash_logo" android:adjustViewBounds="true" - android:layout_margin="16dp" - android:scaleType="fitXY" /> + android:layout_marginTop="16dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:scaleType="fitXY" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent"/> @@ -72,7 +72,7 @@ android:layout_alignParentEnd="true" android:padding="12dp" android:layout_centerVertical="true" - android:tint="@color/yellow" + android:tint="@color/white" android:src="@drawable/pizzacucina_logo" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ecd538c..5a96e37 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -16,7 +16,7 @@ #f15d51 #ffffff #4C4B4A - #000000 + #2c2c2c #000000 #EBECEC #33ffffff @@ -50,6 +50,7 @@ #ABB6C2 #FAC30A + #BBD686 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 49c27f0..91fe581 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -62,14 +62,14 @@ @@ -77,7 +77,7 @@