Commit 29537765 by Paktalin

Customized menu top

parent 74e5677d
...@@ -3,6 +3,7 @@ package com.example.paktalin.lavina; ...@@ -3,6 +3,7 @@ package com.example.paktalin.lavina;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
...@@ -186,6 +187,8 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< ...@@ -186,6 +187,8 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
showProgress(true); showProgress(true);
mAuthTask = new UserLoginTask(email, password); mAuthTask = new UserLoginTask(email, password);
mAuthTask.execute((Void) null); mAuthTask.execute((Void) null);
Intent intent = new Intent(LoginActivity.this, MainActivity.class);
startActivity(intent);
} }
} }
private boolean isEmailValid(String email) { private boolean isEmailValid(String email) {
......
...@@ -27,7 +27,10 @@ ...@@ -27,7 +27,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
app:backgroundTint="@color/colorPrimary"
app:srcCompat="@drawable/wine_button" />
<!--android:background="@color/colorPrimaryDark"-->
android:layout_margin="@dimen/fab_margin" android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" /> app:srcCompat="@drawable/wine_button" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height" android:layout_height="@dimen/nav_header_height"
android:background="@drawable/side_nav_bar" android:background="@color/colorPrimaryDark"
android:gravity="bottom" android:gravity="bottom"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
...@@ -14,22 +14,22 @@ ...@@ -14,22 +14,22 @@
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="wrap_content" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="100dp"
android:paddingTop="@dimen/nav_header_vertical_spacing" android:paddingTop="@dimen/nav_header_vertical_spacing"
app:srcCompat="@mipmap/ic_launcher_round" /> app:srcCompat="@drawable/logo" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing" android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="Android Studio" android:text="@string/app_name"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="android.studio@android.com" /> android:text="@string/slogan" />
</LinearLayout> </LinearLayout>
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<!-- Strings related to login --> <!-- Strings related to login -->
<string name="prompt_email">Email</string> <string name="prompt_email">Email</string>
<string name="slogan">Your digital cellar</string>
<string name="prompt_password">Password (optional)</string> <string name="prompt_password">Password (optional)</string>
<string name="action_sign_in">Sign in</string> <string name="action_sign_in">Sign in</string>
<string name="action_register">Register</string> <string name="action_register">Register</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment