diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 1bec35e..d4733bb 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,8 +1,18 @@ + + + + + + diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e195a7..61ba494 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 28 defaultConfig { - applicationId "me.gilo.wc_app" + applicationId "me.gilo.wc" minSdkVersion 15 targetSdkVersion 28 versionCode 1 @@ -45,6 +45,12 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support:design:28.0.0' + + implementation 'io.github.inflationx:calligraphy3:3.0.0' + implementation 'io.github.inflationx:viewpump:1.0.0' + + implementation 'com.squareup.picasso:picasso:2.5.2' + testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/app/src/androidTest/java/me/gilo/wc_app/ExampleInstrumentedTest.kt b/app/src/androidTest/java/me/gilo/wc/ExampleInstrumentedTest.kt similarity index 96% rename from app/src/androidTest/java/me/gilo/wc_app/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/me/gilo/wc/ExampleInstrumentedTest.kt index 3c02a45..307a0c7 100644 --- a/app/src/androidTest/java/me/gilo/wc_app/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/me/gilo/wc/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package me.gilo.wc_app +package me.gilo.wc import android.support.test.InstrumentationRegistry import android.support.test.runner.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d01fa86..493c66a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,20 +1,31 @@ + package="me.gilo.wc"> + android:name=".WcApp" + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/AppTheme"> + android:name=".ui.MenuActivity" + android:label="@string/title_activity_menu" + android:theme="@style/AppTheme.NoActionBar"> + + + + diff --git a/app/src/main/assets/fonts/GT-America-Bold.otf b/app/src/main/assets/fonts/GT-America-Bold.otf new file mode 100644 index 0000000..8b10063 Binary files /dev/null and b/app/src/main/assets/fonts/GT-America-Bold.otf differ diff --git a/app/src/main/assets/fonts/GT-America-Medium.otf b/app/src/main/assets/fonts/GT-America-Medium.otf new file mode 100644 index 0000000..6d2ccd1 Binary files /dev/null and b/app/src/main/assets/fonts/GT-America-Medium.otf differ diff --git a/app/src/main/assets/fonts/GT-America-Regular.otf b/app/src/main/assets/fonts/GT-America-Regular.otf new file mode 100644 index 0000000..c29def9 Binary files /dev/null and b/app/src/main/assets/fonts/GT-America-Regular.otf differ diff --git a/app/src/main/java/me/gilo/wc/MainActivity.kt b/app/src/main/java/me/gilo/wc/MainActivity.kt new file mode 100644 index 0000000..de86b89 --- /dev/null +++ b/app/src/main/java/me/gilo/wc/MainActivity.kt @@ -0,0 +1,56 @@ +package me.gilo.wc + +import android.content.Intent +import android.support.v7.app.AppCompatActivity +import android.os.Bundle +import kotlinx.android.synthetic.main.activity_main.* +import me.gilo.wc.ui.MenuActivity +import me.gilo.woodroid.Woocommerce +import me.gilo.woodroid.models.Coupon +import me.gilo.woodroid.models.Product +import java.util.ArrayList +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class MainActivity : AppCompatActivity() { + + val TAG = "MainActivity"; + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + startActivity(Intent(baseContext, MenuActivity::class.java)); + finish() + + } + +// private fun coupons() { +// val woocommerce = Woocommerce.Builder() +// .setSiteUrl("http://157.230.131.179") +// .setApiVersion("2") +// .setConsumerKey("ck_26c61abd7eeff238d87dc56585bf26cb2d1a1ec3") +// .setConsumerSecret("cs_062e8e3a7ae0ce08fdebc0c39f8f834d5e87598e") +// .build() +// +// tvText.append("\n") +// tvText.append("\n") +// tvText.append("Products") +// tvText.append("\n") +// tvText.append("\n") +// +// woocommerce.Coupon().coupons().enqueue(object : Callback> { +// override fun onResponse(call: Call>, response: Response>) { +// val coupons = response.body() +// for (coupon in coupons!!) { +// tvText.append(coupon.description + "\n") +// } +// } +// +// override fun onFailure(call: Call>, t: Throwable) { +// +// } +// }) +// } +} diff --git a/app/src/main/java/me/gilo/wc/WcApp.java b/app/src/main/java/me/gilo/wc/WcApp.java new file mode 100644 index 0000000..da53faf --- /dev/null +++ b/app/src/main/java/me/gilo/wc/WcApp.java @@ -0,0 +1,24 @@ +package me.gilo.wc; + +import android.app.Application; +import io.github.inflationx.calligraphy3.CalligraphyConfig; +import io.github.inflationx.calligraphy3.CalligraphyInterceptor; +import io.github.inflationx.viewpump.ViewPump; + +public class WcApp extends Application { + + @Override + public void onCreate() { + super.onCreate(); + + ViewPump.init(ViewPump.builder() + .addInterceptor(new CalligraphyInterceptor( + new CalligraphyConfig.Builder() + .setDefaultFontPath("fonts/GT-America-Regular.otf") + .setFontAttrId(R.attr.fontPath) + .build())) + .build()); + + + } +} diff --git a/app/src/main/java/me/gilo/wc/adapter/MenuAdapter.java b/app/src/main/java/me/gilo/wc/adapter/MenuAdapter.java new file mode 100644 index 0000000..34349db --- /dev/null +++ b/app/src/main/java/me/gilo/wc/adapter/MenuAdapter.java @@ -0,0 +1,36 @@ +package me.gilo.wc.adapter; + +import android.app.Activity; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.ViewGroup; +import me.gilo.wc.R; +import me.gilo.wc.adapter.viewholder.MenuViewHolder; + +import java.util.HashMap; +import java.util.List; + +public class MenuAdapter extends RecyclerView.Adapter { + private List titles; + + public MenuAdapter( List titles) { + this.titles = titles; + } + + @Override + public MenuViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + return new MenuViewHolder(parent.getContext(), LayoutInflater.from(parent.getContext()).inflate(R.layout.single_menu_item, parent, false)); + } + + @Override + public void onBindViewHolder(MenuViewHolder holder, int position) { + holder.renderView(titles.get(position)); + } + + + @Override + public int getItemCount() { + return titles.size() == 0 ? 0 : titles.size(); + } +} diff --git a/app/src/main/java/me/gilo/wc/adapter/ProductAdapter.java b/app/src/main/java/me/gilo/wc/adapter/ProductAdapter.java new file mode 100644 index 0000000..e2567a9 --- /dev/null +++ b/app/src/main/java/me/gilo/wc/adapter/ProductAdapter.java @@ -0,0 +1,35 @@ +package me.gilo.wc.adapter; + +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.ViewGroup; +import me.gilo.wc.R; +import me.gilo.wc.adapter.viewholder.MenuViewHolder; +import me.gilo.wc.adapter.viewholder.ProductViewHolder; +import me.gilo.woodroid.models.Product; + +import java.util.List; + +public class ProductAdapter extends RecyclerView.Adapter { + private List products; + + public ProductAdapter(List products) { + this.products = products; + } + + @Override + public ProductViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + return new ProductViewHolder(parent.getContext(), LayoutInflater.from(parent.getContext()).inflate(R.layout.single_product_item, parent, false)); + } + + @Override + public void onBindViewHolder(ProductViewHolder holder, int position) { + holder.renderView(products.get(position)); + } + + + @Override + public int getItemCount() { + return products.size() == 0 ? 0 : products.size(); + } +} diff --git a/app/src/main/java/me/gilo/wc/adapter/viewholder/MenuViewHolder.java b/app/src/main/java/me/gilo/wc/adapter/viewholder/MenuViewHolder.java new file mode 100644 index 0000000..0562eae --- /dev/null +++ b/app/src/main/java/me/gilo/wc/adapter/viewholder/MenuViewHolder.java @@ -0,0 +1,49 @@ +package me.gilo.wc.adapter.viewholder; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; +import me.gilo.wc.R; +import me.gilo.wc.ui.CouponActivity; +import me.gilo.wc.ui.ShopActivity; + +public class MenuViewHolder extends RecyclerView.ViewHolder { + + View itemView; + Context context; + + public MenuViewHolder(Context context, View itemView) { + super(itemView); + + this.itemView = itemView; + this.context = context; + } + + public void renderView(String title) { + TextView tvTitle = itemView.findViewById(R.id.tvTitle); + tvTitle.setText(title); + + tvTitle.setOnClickListener(view -> startActivity(title)); + } + + private void startActivity(String title) { + Intent intent; + + switch (title){ + case "Products": + intent = new Intent(context, ShopActivity.class); + context.startActivity(intent); + break; + case "Coupons": + intent = new Intent(context, CouponActivity.class); + context.startActivity(intent); + break; + } + } + + +} \ No newline at end of file diff --git a/app/src/main/java/me/gilo/wc/adapter/viewholder/ProductViewHolder.kt b/app/src/main/java/me/gilo/wc/adapter/viewholder/ProductViewHolder.kt new file mode 100644 index 0000000..f7b12df --- /dev/null +++ b/app/src/main/java/me/gilo/wc/adapter/viewholder/ProductViewHolder.kt @@ -0,0 +1,35 @@ +package me.gilo.wc.adapter.viewholder + +import android.content.Context +import android.content.Intent +import android.support.v7.widget.RecyclerView +import android.text.Html +import android.view.View +import android.widget.ImageView +import android.widget.TextView +import com.squareup.picasso.Picasso +import me.gilo.wc.R +import me.gilo.wc.ui.CouponActivity +import me.gilo.wc.ui.ShopActivity +import me.gilo.woodroid.models.Product + +class ProductViewHolder(val context: Context, itemView: View) : + RecyclerView.ViewHolder(itemView) { + + fun renderView(product: Product) { + val ivImage = itemView.findViewById(R.id.ivImage) + val tvTitle = itemView.findViewById(R.id.tvTitle) + val tvDescription = itemView.findViewById(R.id.tvDescription) + val tvCallToAction = itemView.findViewById(R.id.tvCallToAction) + + tvTitle.text = product.name + tvDescription.text = Html.fromHtml(product.description) + tvCallToAction.text = Html.fromHtml(product.price_html) + + if (product.images != null && product.images.isNotEmpty()){ + Picasso.with(context).load(product.images[0].src).into(ivImage) + } + } + + +} \ No newline at end of file diff --git a/app/src/main/java/me/gilo/wc/ui/BaseActivity.kt b/app/src/main/java/me/gilo/wc/ui/BaseActivity.kt new file mode 100644 index 0000000..89cbc6e --- /dev/null +++ b/app/src/main/java/me/gilo/wc/ui/BaseActivity.kt @@ -0,0 +1,23 @@ +package me.gilo.wc.ui + +import android.app.Activity +import android.content.Context +import android.os.Bundle +import android.support.design.widget.Snackbar +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import io.github.inflationx.viewpump.ViewPumpContextWrapper +import me.gilo.wc.R + +import kotlinx.android.synthetic.main.activity_menu.* +import kotlinx.android.synthetic.main.content_menu.* +import me.gilo.wc.adapter.MenuAdapter +import java.util.ArrayList + +open class BaseActivity : AppCompatActivity() { + + override fun attachBaseContext(newBase: Context) { + super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase)) + } +} diff --git a/app/src/main/java/me/gilo/wc/ui/CouponActivity.kt b/app/src/main/java/me/gilo/wc/ui/CouponActivity.kt new file mode 100644 index 0000000..963bbcd --- /dev/null +++ b/app/src/main/java/me/gilo/wc/ui/CouponActivity.kt @@ -0,0 +1,21 @@ +package me.gilo.wc.ui + +import android.os.Bundle +import android.support.design.widget.Snackbar +import android.support.v7.app.AppCompatActivity; +import me.gilo.wc.R + +import kotlinx.android.synthetic.main.activity_coupon.* + +class CouponActivity : BaseActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_coupon) + setSupportActionBar(toolbar) + + title = "Coupon" + + } + +} diff --git a/app/src/main/java/me/gilo/wc/ui/MenuActivity.kt b/app/src/main/java/me/gilo/wc/ui/MenuActivity.kt new file mode 100644 index 0000000..66a2219 --- /dev/null +++ b/app/src/main/java/me/gilo/wc/ui/MenuActivity.kt @@ -0,0 +1,38 @@ +package me.gilo.wc.ui + +import android.app.Activity +import android.os.Bundle +import android.support.design.widget.Snackbar +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import me.gilo.wc.R + +import kotlinx.android.synthetic.main.activity_menu.* +import kotlinx.android.synthetic.main.content_menu.* +import me.gilo.wc.adapter.MenuAdapter +import java.util.ArrayList + +class MenuActivity : BaseActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_menu) + setSupportActionBar(toolbar) + + title = "Menu" + + val layoutManager = LinearLayoutManager(baseContext, LinearLayoutManager.VERTICAL, false) + rvMenu.layoutManager = layoutManager + rvMenu.isNestedScrollingEnabled = false + + var titles = ArrayList() + titles.add("Products") + titles.add("Coupons") + + var adapter = MenuAdapter(titles) + rvMenu.adapter = adapter + + } + +} diff --git a/app/src/main/java/me/gilo/wc/ui/ShopActivity.kt b/app/src/main/java/me/gilo/wc/ui/ShopActivity.kt new file mode 100644 index 0000000..e0f8370 --- /dev/null +++ b/app/src/main/java/me/gilo/wc/ui/ShopActivity.kt @@ -0,0 +1,75 @@ +package me.gilo.wc.ui + +import android.os.Bundle +import android.support.design.widget.Snackbar +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.GridLayoutManager +import android.support.v7.widget.LinearLayoutManager +import kotlinx.android.synthetic.main.activity_main.* +import me.gilo.wc.R + +import kotlinx.android.synthetic.main.activity_shop.* +import kotlinx.android.synthetic.main.content_menu.* +import kotlinx.android.synthetic.main.content_shop.* +import me.gilo.wc.adapter.MenuAdapter +import me.gilo.wc.adapter.ProductAdapter +import me.gilo.woodroid.Woocommerce +import me.gilo.woodroid.models.Product +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import java.util.ArrayList + +class ShopActivity : BaseActivity() { + + lateinit var adapter : ProductAdapter + lateinit var products: ArrayList + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_shop) + setSupportActionBar(toolbar) + + title = "Shop" + + val layoutManager = GridLayoutManager(baseContext, 2) + rvShop.layoutManager = layoutManager + rvShop.isNestedScrollingEnabled = false + + products = ArrayList() + + adapter = ProductAdapter(products) + rvShop.adapter = adapter + + products() + + } + + //Not best practise, but works for purposes of demo + private fun products() { + val woocommerce = Woocommerce.Builder() + .setSiteUrl("http://157.230.131.179") + .setApiVersion("2") + .setConsumerKey("ck_26c61abd7eeff238d87dc56585bf26cb2d1a1ec3") + .setConsumerSecret("cs_062e8e3a7ae0ce08fdebc0c39f8f834d5e87598e") + .build() + + woocommerce.products.enqueue(object : Callback> { + override fun onResponse(call: Call>, response: Response>) { + val productsResponse = response.body() + for (product in productsResponse!!) { + products.add(product) + } + + adapter.notifyDataSetChanged() + } + + override fun onFailure(call: Call>, t: Throwable) { + + } + }) + + + } + +} diff --git a/app/src/main/java/me/gilo/wc_app/MainActivity.kt b/app/src/main/java/me/gilo/wc_app/MainActivity.kt deleted file mode 100644 index 75e54b1..0000000 --- a/app/src/main/java/me/gilo/wc_app/MainActivity.kt +++ /dev/null @@ -1,71 +0,0 @@ -package me.gilo.wc_app - -import android.arch.lifecycle.Observer -import android.support.v7.app.AppCompatActivity -import android.os.Bundle -import android.util.Log -import kotlinx.android.synthetic.main.activity_main.* -import me.gilo.woodroid.Woocommerce -import me.gilo.woodroid.Woocommerce.Builder -import me.gilo.woodroid.callback.Status -import me.gilo.woodroid.models.Coupon -import me.gilo.woodroid.models.Product -import java.util.ArrayList -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response - -class MainActivity : AppCompatActivity() { - - val TAG = "MainActivity"; - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - val woocommerce = Woocommerce.Builder() - .setSiteUrl("http://157.230.131.179") - .setApiVersion("2") - .setConsumerKey("ck_26c61abd7eeff238d87dc56585bf26cb2d1a1ec3") - .setConsumerSecret("cs_062e8e3a7ae0ce08fdebc0c39f8f834d5e87598e") - .build() - -// tvText.append("\n") -// tvText.append("\n") -// tvText.append("Products") -// tvText.append("\n") -// tvText.append("\n") -// -// woocommerce.products.enqueue(object : Callback> { -// override fun onResponse(call: Call>, response: Response>) { -// val products = response.body() -// for (product in products!!) { -// tvText.append(product.title + "\n") -// } -// } -// -// override fun onFailure(call: Call>, t: Throwable) { -// -// } -// }) -// -// tvText.append("\n") -// tvText.append("\n") -// tvText.append("Coupons") -// tvText.append("\n") -// tvText.append("\n") - - woocommerce.Coupon().coupons().enqueue(object : Callback> { - override fun onResponse(call: Call>, response: Response>) { - val coupons = response.body() - for (coupon in coupons!!) { - tvText.append(coupon.description + "\n") - } - } - - override fun onFailure(call: Call>, t: Throwable) { - - } - }) - } -} diff --git a/app/src/main/java/me/gilo/wc_app/ui/ShopActivity.kt b/app/src/main/java/me/gilo/wc_app/ui/ShopActivity.kt deleted file mode 100644 index 6c8a803..0000000 --- a/app/src/main/java/me/gilo/wc_app/ui/ShopActivity.kt +++ /dev/null @@ -1,23 +0,0 @@ -package me.gilo.wc_app.ui - -import android.os.Bundle -import android.support.design.widget.Snackbar -import android.support.v7.app.AppCompatActivity; -import me.gilo.wc_app.R - -import kotlinx.android.synthetic.main.activity_shop.* - -class ShopActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_shop) - setSupportActionBar(toolbar) - - fab.setOnClickListener { view -> - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show() - } - } - -} diff --git a/app/src/main/res/drawable/rect_white.xml b/app/src/main/res/drawable/rect_white.xml new file mode 100644 index 0000000..a9fae12 --- /dev/null +++ b/app/src/main/res/drawable/rect_white.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_coupon.xml b/app/src/main/res/layout/activity_coupon.xml new file mode 100644 index 0000000..6216bec --- /dev/null +++ b/app/src/main/res/layout/activity_coupon.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml new file mode 100644 index 0000000..1dfe5c4 --- /dev/null +++ b/app/src/main/res/layout/activity_menu.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml index bfbb155..7f1157a 100644 --- a/app/src/main/res/layout/activity_shop.xml +++ b/app/src/main/res/layout/activity_shop.xml @@ -23,12 +23,4 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/content_coupon.xml b/app/src/main/res/layout/content_coupon.xml new file mode 100644 index 0000000..9ebc236 --- /dev/null +++ b/app/src/main/res/layout/content_coupon.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_menu.xml b/app/src/main/res/layout/content_menu.xml new file mode 100644 index 0000000..3f7bc58 --- /dev/null +++ b/app/src/main/res/layout/content_menu.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_shop.xml b/app/src/main/res/layout/content_shop.xml index e121533..629dc2a 100644 --- a/app/src/main/res/layout/content_shop.xml +++ b/app/src/main/res/layout/content_shop.xml @@ -9,9 +9,12 @@ tools:showIn="@layout/activity_shop" tools:context=".ui.ShopActivity"> - + \ No newline at end of file diff --git a/app/src/main/res/layout/single_menu_item.xml b/app/src/main/res/layout/single_menu_item.xml new file mode 100644 index 0000000..ac1a7ef --- /dev/null +++ b/app/src/main/res/layout/single_menu_item.xml @@ -0,0 +1,28 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/single_product_item.xml b/app/src/main/res/layout/single_product_item.xml new file mode 100644 index 0000000..9c85f93 --- /dev/null +++ b/app/src/main/res/layout/single_product_item.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 69b2233..824eea8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,16 @@ - #008577 - #00574B - #D81B60 + #3781ee + #2e6dca + #3681ee + + #e9ebf0 + + #ffffff + #2a2f35 + #2a2f35 + #474d59 + #5e6573 + #949aa6 + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 59a0b0c..184ee9b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,3 +1,3 @@ - 16dp + 16dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7c30b86..2e3feb6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,12 @@ - wc-app - ShopActivity + wc-app + ShopActivity + CouponActivity + MenuActivity + + + fonts/GT-America-Bold.otf + fonts/GT-America-Medium.otf + fonts/GT-America-Regular.otf + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 16dbab3..e38303a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,17 +1,20 @@ - - - - + + + +