diff --git a/app/src/main/java/com/yaros/sweetshopviki/common/Extension.kt b/app/src/main/java/com/yaros/sweetshopviki/common/Extension.kt index 3680474..18db4b4 100644 --- a/app/src/main/java/com/yaros/sweetshopviki/common/Extension.kt +++ b/app/src/main/java/com/yaros/sweetshopviki/common/Extension.kt @@ -20,7 +20,7 @@ fun Float.formatPrice(): String { fun ImageView.loadImage(url: String?) { Picasso.get() - .load("https://my-json-server.typicode.com/YarikHumster/SweetShopViki/$url") + .load("https://static.1000.menu/img/content-v2/05/f0/6402/chizkeik-iz-smetani_1579155436_15_max.jpg") .placeholder(R.drawable.loading) .error(R.drawable.error) .into(this) diff --git a/app/src/main/java/com/yaros/sweetshopviki/data/retrofit/DAOInterface.kt b/app/src/main/java/com/yaros/sweetshopviki/data/retrofit/DAOInterface.kt index f88ba3b..61eb182 100644 --- a/app/src/main/java/com/yaros/sweetshopviki/data/retrofit/DAOInterface.kt +++ b/app/src/main/java/com/yaros/sweetshopviki/data/retrofit/DAOInterface.kt @@ -11,11 +11,11 @@ interface DAOInterface { suspend fun getCategories(): Response> - @GET("categories/{categoryId}/products") - suspend fun getProducts(@Path("categoryId") categoryId: Int): Response> + @GET("products/{id}") + suspend fun getProducts(@Path("id") id: Int): Response> - @GET("JsonSearch") + @GET("search") suspend fun getSearch(): Response> } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_basket.xml b/app/src/main/res/layout/fragment_basket.xml index 2247041..3d41f16 100644 --- a/app/src/main/res/layout/fragment_basket.xml +++ b/app/src/main/res/layout/fragment_basket.xml @@ -127,7 +127,7 @@ android:layout_weight="1" android:gravity="center" android:textAllCaps="false" - android:textColor="@color/primary" + android:textColor="@color/black" android:textSize="16sp" android:textStyle="bold" tools:text="150,00 ₺" /> diff --git a/app/src/main/res/layout/fragment_payment.xml b/app/src/main/res/layout/fragment_payment.xml index b8e4014..b7901e2 100644 --- a/app/src/main/res/layout/fragment_payment.xml +++ b/app/src/main/res/layout/fragment_payment.xml @@ -122,6 +122,7 @@ android:layout_marginLeft="10dp" android:layout_marginTop="5dp" android:layout_marginRight="10dp" + android:textColor="@color/black" android:layout_marginBottom="5dp" android:layout_weight="1" android:background="@drawable/custom_edittext" @@ -196,6 +197,7 @@ android:layout_marginRight="10dp" android:layout_marginBottom="5dp" android:layout_weight="1" + android:textColor="@color/black" android:background="@drawable/custom_edittext" android:gravity="left" android:hint="@string/order_address"