volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

theme

Browse Source
This commit is contained in:
mustafa içmen
2020-04-18 19:02:45 +03:00
parent ff732ec2b1
commit bd5b432e61
10 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/ch/pizzacucia/android/activity/MainActivity.java
View File

@@ -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;
}

2
app/src/main/java/ch/pizzacucia/android/api/ApiConstants.java
View File

@@ -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;

2
app/src/main/res/drawable/background_product_cart_price.xml
View File

@@ -2,7 +2,7 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/yellow"/>
<solid android:color="@color/green"/>
<corners
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp" />

2
app/src/main/res/drawable/ic_bottom_nav_item_cart_gray.xml
View File

@@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="196.095"
android:viewportWidth="196.095" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#7F797C" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
<path android:fillColor="#FFFFFF" android:pathData="M155.16,78.07l-24.13,-48.27c2.44,-2.63 3.97,-6.13 3.97,-9.99c0,-8.12 -6.57,-14.7 -14.68,-14.7c-8.12,0 -14.69,6.57 -14.69,14.7c0,7.94 6.31,14.37 14.19,14.64l21.82,43.62H54.49l21.81,-43.62c7.87,-0.27 14.19,-6.7 14.19,-14.64c0,-8.12 -6.58,-14.7 -14.69,-14.7c-8.11,0 -14.7,6.57 -14.7,14.7c0,3.87 1.54,7.36 3.98,9.99l-24.14,48.27H0l42.49,112.92h111.11l42.5,-112.92H155.16zM78.09,147.41v-25.77h39.94v25.77H78.09zM118.03,159.51v19.36H78.09v-19.36H118.03zM39.06,147.49l-9.72,-25.85h36.64v25.78H39.08L39.06,147.49L39.06,147.49zM78.09,109.53V90.17h39.94v19.36H78.09zM130.13,121.64h36.63l-9.71,25.84v-0.07h-26.9v-25.77H130.13zM130.13,109.53V90.17h48.48l-7.28,19.36H130.13zM65.98,90.17v19.36H24.78l-7.28,-19.36H65.98zM43.59,159.51h22.39v19.36H50.87L43.59,159.51zM130.13,178.88v-19.36h22.39l-7.29,19.36H130.13z"/>
</vector>

2
app/src/main/res/drawable/selector_bottom_navigation_item.xml
View File

@@ -6,5 +6,5 @@
android:color="@color/yellow"
android:state_checked="true" />
<item android:color="@color/venus" />
<item android:color="@color/white" />
</selector>

2
app/src/main/res/layout/activity_main.xml
View File

@@ -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"/>
</LinearLayout>

11
app/src/main/res/layout/activity_splash.xml
View File

@@ -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"/>
<RelativeLayout
android:id="@+id/choosePostCodeLayout"
@@ -64,7 +69,7 @@
<Button
android:id="@+id/choosePostCodeButton"
android:background="@drawable/background_button_pizzapp_gray"
android:textColor="@color/yellow"
android:textColor="@color/white"
android:textSize="12sp"
android:textAllCaps="false"
android:layout_width="match_parent"

10
app/src/main/res/layout/layout_pizzalink_toolbar.xml
View File

@@ -32,7 +32,7 @@
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_hamburger_menu"
android:tint="@color/yellow"
android:tint="@color/white"
android:visibility="gone"/>
<ImageView
@@ -42,7 +42,7 @@
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_cancel"
android:tint="@color/yellow"
android:tint="@color/white"
android:visibility="gone"/>
<ImageView
@@ -52,7 +52,7 @@
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_back"
android:tint="@color/yellow"
android:tint="@color/white"
android:visibility="gone"/>
<TextView
@@ -61,7 +61,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textSize="18sp"
android:textColor="@color/yellow"
android:textColor="@color/white"
fontPath="fonts/Quicksand-Bold.ttf"
android:visibility="gone"/>
@@ -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" />
</RelativeLayout>

3
app/src/main/res/values/colors.xml
View File

@@ -16,7 +16,7 @@
<color name="bottom_menu_selected_item">#f15d51</color>
<color name="bottom_menu_unselected_item">#ffffff</color>
<color name="navigation_drawer_background">#4C4B4A</color>
<color name="main_black">#000000</color><!--#232b2b-->
<color name="main_black">#2c2c2c</color><!--#232b2b-->
<color name="black">#000000</color>
<color name="row_product_ingredients_background">#EBECEC</color>
<color name="transparent_white">#33ffffff</color>
@@ -50,6 +50,7 @@
<color name="heater">#ABB6C2</color>
<color name="yellow">#FAC30A</color>
<color name="green">#BBD686</color>
</resources>

6
app/src/main/res/values/styles.xml
View File

@@ -62,14 +62,14 @@
<style name="PizzappButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:textColor">@color/yellow</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="PizzappGrayButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:textColor">@color/yellow</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
@@ -77,7 +77,7 @@
<style name="PizzappGrayButton" parent="PizzappButtonWithoutMargin">
<item name="android:background">@drawable/background_button_pizzapp_gray</item>
<item name="android:textColor">@color/yellow</item>
<item name="android:textColor">@color/white</item>
<item name="android:layout_marginLeft">24dp</item>
<item name="android:layout_marginStart">24dp</item>
<item name="android:layout_marginRight">24dp</item>