diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96f4ba7..31ca162 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,9 +21,6 @@
-
diff --git a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java b/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java
index 84bbfb8..89de796 100644
--- a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java
@@ -81,13 +81,13 @@ public class LoginActivity extends BaseActivity {
private void initRegisterTextView(){
Spannable wordtoSpan = new SpannableString(notHaveAnAccountText + " " + registerText);
- wordtoSpan.setSpan(new ForegroundColorSpan(Color.RED), 16, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ wordtoSpan.setSpan(new ForegroundColorSpan(Color.RED), 23, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
registerTextView.setText(wordtoSpan);
}
private void initForgotPasswordTextView(){
Spannable wordtoSpan = new SpannableString(forgotPasswordHintText + " " + resetPasswordText);
- wordtoSpan.setSpan(new ForegroundColorSpan(Color.RED), 20, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ wordtoSpan.setSpan(new ForegroundColorSpan(Color.RED), 35, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
forgotPasswordTextView.setText(wordtoSpan);
}
diff --git a/app/src/main/java/ch/pizzalink/android/activity/WelcomeActivity.java b/app/src/main/java/ch/pizzalink/android/activity/WelcomeActivity.java
deleted file mode 100644
index 8b7710e..0000000
--- a/app/src/main/java/ch/pizzalink/android/activity/WelcomeActivity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ch.pizzalink.android.activity;
-
-import android.os.Bundle;
-
-import butterknife.ButterKnife;
-import ch.pizzalink.android.R;
-
-public class WelcomeActivity extends BaseActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_welcome);
- ButterKnife.bind(this);
- }
-}
diff --git a/app/src/main/res/drawable-hdpi/pizzalink_logo.png b/app/src/main/res/drawable-hdpi/pizzalink_logo.png
new file mode 100644
index 0000000..e604f75
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/pizzalink_logo.png differ
diff --git a/app/src/main/res/drawable-mdpi/pizzalink_logo.png b/app/src/main/res/drawable-mdpi/pizzalink_logo.png
new file mode 100644
index 0000000..1738aa3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/pizzalink_logo.png differ
diff --git a/app/src/main/res/drawable-xhdpi/pizzalink_logo.png b/app/src/main/res/drawable-xhdpi/pizzalink_logo.png
new file mode 100644
index 0000000..4931b3a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/pizzalink_logo.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/pizzalink_logo.png b/app/src/main/res/drawable-xxhdpi/pizzalink_logo.png
new file mode 100644
index 0000000..301db47
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/pizzalink_logo.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/pizzalink_logo.png b/app/src/main/res/drawable-xxxhdpi/pizzalink_logo.png
new file mode 100644
index 0000000..c090611
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/pizzalink_logo.png differ
diff --git a/app/src/main/res/drawable/pizzalink_logo.png b/app/src/main/res/drawable/pizzalink_logo.png
deleted file mode 100644
index d4d796d..0000000
Binary files a/app/src/main/res/drawable/pizzalink_logo.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 8165eb2..868ac17 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -25,10 +25,11 @@
+ android:layout_above="@+id/loginLayout"
+ android:layout_alignParentTop="true">
+ android:layout_centerInParent="true"
+ android:layout_above="@+id/loginBottomLayout">
+
+
+
+
@@ -87,6 +99,7 @@
android:layout_height="wrap_content"
android:text="@string/register_text"
android:layout_gravity="center_horizontal"
+ android:gravity="center_horizontal"
android:textColor="@color/black"
android:paddingBottom="24dp"
android:paddingLeft="24dp"
@@ -94,6 +107,7 @@
android:paddingRight="24dp"
android:paddingEnd="24dp" />
+
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 19dfbbf..551a5b7 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -15,7 +15,7 @@
android:scaleType="fitXY"
android:layout_centerInParent="true"
android:text="Hello World!"
- android:layout_margin="24dp"
+ android:layout_margin="64dp"
android:src="@drawable/pizzalink_logo"/>
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
deleted file mode 100644
index 8e8e36c..0000000
--- a/app/src/main/res/layout/activity_welcome.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/layout/layout_pizzalink_toolbar.xml b/app/src/main/res/layout/layout_pizzalink_toolbar.xml
index 5c1026c..7b49be2 100644
--- a/app/src/main/res/layout/layout_pizzalink_toolbar.xml
+++ b/app/src/main/res/layout/layout_pizzalink_toolbar.xml
@@ -54,6 +54,15 @@
fontPath="fonts/AvenirNextLTProDemi.otf"
android:visibility="gone"/>
+
+
Einloggen
EINLOGGEN
Sie haben kein Konto?
- REGISTRIEREN
+ \nREGISTRIEREN
Haben Sie Ihr Passwort vergessen?
- PASSWORT ZURÜCKSETZEN
+ \nPASSWORT ZURÜCKSETZEN