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

login and register

Browse Source
This commit is contained in:
mustafa içmen
2017-10-01 23:51:59 +03:00
parent dca2c7a71c
commit 9f9274acf5
23 changed files with 411 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/drawable/ic_back.xml Normal file
View File

@@ -0,0 +1,4 @@
<vector android:height="20dp" android:viewportHeight="240.823"
android:viewportWidth="240.823" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffff" android:pathData="M57.63,129.01L165.93,237.27c4.75,4.74 12.45,4.74 17.22,0c4.75,-4.74 4.75,-12.44 0,-17.18l-99.71,-99.67l99.69,-99.67c4.75,-4.74 4.75,-12.44 0,-17.19c-4.75,-4.74 -12.46,-4.74 -17.22,0L57.62,111.82C52.94,116.51 52.94,124.33 57.63,129.01z"/>
</vector>

BIN
app/src/main/res/drawable/pizzalink_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

75
app/src/main/res/layout/activity_login.xml
View File

@@ -7,8 +7,81 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
tools:context="ch.pizzalink.android.activity.LoginActivity">
tools:context="ch.pizzalink.android.activity.LoginActivity"
android:focusable="true"
android:focusableInTouchMode="true">
<ch.pizzalink.android.view.PizzalinkToolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/activity_title_login"
android:background="@color/white"
app:titleTextColor="@color/black" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/loginLayout">
<ImageView
android:layout_width="180dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:text="Hello World!"
android:src="@drawable/pizzalink_logo"/>
</RelativeLayout>
<LinearLayout
android:id="@+id/loginLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerInParent="true">
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/emailPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/email"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/passwordPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/password"/>
<android.support.v4.widget.Space
android:layout_width="match_parent"
android:layout_height="24dp" />
<Button
android:id="@+id/loginButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="@string/button_login"
style="@style/PizzalinkButton" />
<TextView
android:id="@+id/registerTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/register_text"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"
android:padding="24dp" />
</LinearLayout>
</RelativeLayout>

23
app/src/main/res/layout/activity_register.xml
View File

@@ -7,7 +7,9 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white"
tools:context="ch.pizzalink.android.activity.RegisterActivity">
tools:context="ch.pizzalink.android.activity.RegisterActivity"
android:focusable="true"
android:focusableInTouchMode="true">
<ch.pizzalink.android.view.PizzalinkToolbar
android:id="@+id/registerToolbar"
@@ -15,6 +17,7 @@
android:layout_height="wrap_content"
app:title="@string/activity_title_register"
android:background="@color/white"
app:showBackIcon="true"
app:titleTextColor="@color/black" />
<ScrollView
@@ -94,6 +97,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/postcode"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/zonePizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/zone"/>
<ch.pizzalink.android.view.PizzalinkEditText
android:id="@+id/countryPizzalinkEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint="@string/county"/>
<android.support.v4.widget.Space
android:layout_width="match_parent"
@@ -103,14 +118,14 @@
</ScrollView>
<ch.pizzalink.android.view.PizzalinkButton
<Button
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
app:isEnabled="false"
app:text="@string/activity_title_register"
style="@style/PizzalinkButton"
android:text="@string/button_register"
android:layout_alignParentBottom="true" />
</RelativeLayout>

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

@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="ch.pizzalink.android.activity.SplashActivity"
android:background="@color/black">
android:background="@color/white">
<ImageView
android:layout_width="match_parent"
@@ -15,7 +15,7 @@
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:text="Hello World!"
android:layout_margin="48dp"
android:layout_margin="24dp"
android:src="@drawable/pizzalink_logo"/>
</RelativeLayout>

12
app/src/main/res/layout/layout_pizzalink_button.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
@@ -10,11 +10,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:layout_marginRight="24dp"
android:layout_marginEnd="24dp"
android:textColor="@color/white"
android:background="@drawable/background_button_enabled"/>
</RelativeLayout>
</LinearLayout>

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

@@ -30,6 +30,15 @@
android:src="@drawable/ic_hamburger_menu"
android:visibility="gone"/>
<ImageView
android:id="@+id/backIcon"
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:padding="20dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_back"
android:visibility="gone"/>
<TextView
android:id="@+id/toolbarTitleTextView"
android:layout_width="wrap_content"

169
app/src/main/res/layout/row_pizza.xml
View File

@@ -44,183 +44,16 @@
android:gravity="center"
android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="12dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:layout_weight="1">
<ImageView
android:id="@+id/increasePizzaCountTextView"
android:layout_width="24dp"
android:layout_height="24dp"
android:paddingLeft="4dp"
android:paddingStart="4dp"
android:paddingRight="4dp"
android:paddingEnd="4dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_up_black" />
<TextView
android:id="@+id/pizzaCountTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:textStyle="bold"
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
<ImageView
android:id="@+id/deccreasePizzaCountTextView"
android:layout_width="24dp"
android:layout_height="24dp"
android:padding="4dp"
android:layout_margin="4dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_down_black"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:layout_weight="1">
<TextView
android:id="@+id/pizzaSize1NameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Klein"
android:textSize="10sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/pizzaSize1CheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
/>
<TextView
android:id="@+id/pizzaSize1LengthTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="26cm"
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:layout_weight="1">
<TextView
android:id="@+id/pizzaSize2NameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Normal"
android:textSize="10sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/pizzaSize2CheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
/>
<TextView
android:id="@+id/pizzaSize2LengthTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="32cm"
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:layout_weight="1">
<TextView
android:id="@+id/pizzaSize3NameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Gross"
android:textSize="10sp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
<android.support.v7.widget.AppCompatCheckBox
android:id="@+id/pizzaSize3CheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
/>
<TextView
android:id="@+id/pizzaSize3LengthTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="50cm"
android:textSize="12sp"
android:layout_marginTop="4dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/black"/>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/pizzaPriceTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:text="CHF 25.00"
android:padding="16dp"
android:textStyle="bold"
android:layout_gravity="center_horizontal" />
<Button
android:id="@+id/addPizzaToCartTextView"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_margin="12dp"
style="@style/AddCartButton"
android:text="Add to Cart"/>
</LinearLayout>
</android.support.v7.widget.CardView>

1
app/src/main/res/values/attrs.xml
View File

@@ -3,6 +3,7 @@
<declare-styleable name="PizzalinkToolbar">
<attr name="showHamburgerMenuIcon" format="boolean" />
<attr name="showBackIcon" format="boolean" />
<attr name="title" format="string" />
<attr name="toolbarBackgroundColor" format="reference" />
<attr name="toolbarTitleTextColor" format="reference" />

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

@@ -23,5 +23,6 @@
<color name="quartz">#DCDCDD</color>
<color name="venus">#7F797C</color>
<color name="background_splash">#F4F4F4</color>
</resources>

21
app/src/main/res/values/strings.xml
View File

@@ -44,8 +44,8 @@
<string name="fragment_title_item_beer_drinks">Beer</string>
<string name="fragment_title_dessert">Dessert</string>
<!-- LoginActivity-->
<string name="activity_title_login">Giriş Yap</string>
<!-- RegisterActivity-->
<string name="activity_title_register">Kayıt Ol</string>
<string name="firstname">Ad</string>
<string name="lastname">Soyad</string>
<string name="telephone">Telefon Numarası</string>
@@ -56,11 +56,20 @@
<string name="addres_line_2">Adres 2</string>
<string name="city">Şehir</string>
<string name="postcode">Posta Kodu</string>
<!-- LoginActivity-->
<string name="county">Ülke</string>
<string name="zone">Bölge</string>
<string name="alert_fill_all_fields">Lütfen istenen tüm bigileri doldurunuz.</string>
<string name="alert_valid_email">Lütfen geçerli bir mail adresi giriniz.</string>
<string name="alert_passwords_not_matched">Şifreler uyuşmuyor..</string>
<string name="button_register">KAYIT OL</string>
<!-- RegisterActivity-->
<!-- RegisterActivity-->
<string name="activity_title_register">Kayıt Ol</string>
<!-- RegisterActivity-->
<!-- LoginActivity-->
<string name="activity_title_login">Giriş Yap</string>
<string name="button_login">GİRİŞ YAP</string>
<string name="not_have_an_accaount">Hesabın yok mu?</string>
<string name="register_text">KAYIT OL</string>
<!-- LoginActivity-->
<string name="alert">Uyarı</string>
<string name="error_message">Bir hata oluştu.</string>

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

@@ -21,4 +21,15 @@
<item name="android:textAllCaps">false</item>
</style>
<style name="PizzalinkButton">
<item name="android:background">@drawable/background_button_enabled</item>
<item name="android:textColor">@color/red</item>
<item name="android:layout_marginLeft">24dp</item>
<item name="android:layout_marginStart">24dp</item>
<item name="android:layout_marginRight">24dp</item>
<item name="android:layout_marginEnd">24dp</item>
<item name="android:textSize">12sp</item>
<item name="android:textAllCaps">false</item>
</style>
</resources>