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

bug fixes

Browse Source
This commit is contained in:
cimenmus
2018-08-23 20:14:59 +03:00
parent a69471f798
commit a6982624ba
15 changed files with 442 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable/angebot1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
app/src/main/res/drawable/angebot2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 114 KiB

BIN
app/src/main/res/drawable/pizzapp_splash_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

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

@@ -1,4 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="ch.pizzapp.android.activity.SplashActivity"
android:background="@color/white">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/background_wood"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_margin="8dp">
<ImageView
android:id="@+id/campaign1ImageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/angebot1"
android:adjustViewBounds="true"
android:layout_gravity="center_horizontal"
android:scaleType="fitXY" />
<ImageView
android:id="@+id/campaign2ImageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:src="@drawable/angebot2"/>
<ImageView
android:id="@+id/pizzappSplashLogoImageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="@drawable/pizzapp_splash_logo"
android:adjustViewBounds="true"
android:layout_marginTop="8dp"
android:scaleType="fitXY" />
<RelativeLayout
android:id="@+id/choosePostCodeLayout"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/background_button_add_cart">
<TextView
android:id="@+id/postCodeTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/choose_post_code"
android:layout_centerInParent="true"
android:textSize="12sp"
android:textColor="@color/white"/>
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_down_black"
android:tint="@color/white"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:layout_centerVertical="true"/>
</RelativeLayout>
<Button
android:id="@+id/choosePostCodeButton"
android:background="@drawable/background_button_pizzapp_gray"
android:textColor="@color/white"
android:textSize="12sp"
android:textAllCaps="false"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="8dp"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:text="@string/choose_post_code_button" />
</LinearLayout>
</RelativeLayout>
<!--
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -25,3 +132,4 @@
android:src="@drawable/splash_logo"/>
</RelativeLayout>
-->

27
app/src/main/res/layout/fragment_profile.xml
View File

@@ -187,6 +187,33 @@
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:background="@color/black"/>
<RelativeLayout
android:id="@+id/changePostCodeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/change_post_code"
fontPath="fonts/Quicksand-Bold.ttf"
android:layout_marginTop="4dp"
android:textColor="@color/black"
android:layout_centerVertical="true" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"

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

@@ -35,6 +35,8 @@
<string name="alert_update_app">Sie müssen die Pizzalink-Applikation aktualisieren, um sie zu verwenden.</string>
<string name="update_app">AKTUALISIEREN</string>
<string name="choose_store">Wählen Sie Postleitzahl</string>
<string name="choose_post_code">Ihre PLZ</string>
<string name="choose_post_code_button">GO!</string>
<!-- SplashActivity -->
<!-- LoginActivity-->
@@ -201,6 +203,7 @@
<string name="update_profile">Profil Aktualisieren</string>    
<string name="update_password">Passwort Aktualisieren</string>    
<string name="button_logout">Abmelden</string>    
<string name="change_post_code">Postleitzahl Ändern</string>    
<string name="alert_logout">Möchten Sie sich abmelden?</string>
<!-- ProfileFragment-->