Skip to content

likorn / Lavina

Go to a project
Commit 4aa0ba42 by Paktalin
Options

Orders icon + logo changed

parent 47f551ef
Inline Side-by-side
Showing with 53 additions and 60 deletions
app/src/main/java/com/example/paktalin/lavina/MainActivity.java
...@@ -92,7 +92,7 @@ public class MainActivity extends AppCompatActivity ...@@ -92,7 +92,7 @@ public class MainActivity extends AppCompatActivity
} }
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); DrawerLayout drawer = findViewById(R.id.drawer_layout);
drawer.closeDrawer(GravityCompat.START); drawer.closeDrawer(GravityCompat.START);
return true; return true;
} }
......
app/src/main/res/layout/activity_login.xml
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -10,52 +10,59 @@ ...@@ -10,52 +10,59 @@
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.example.paktalin.lavina.LoginActivity"> tools:context="com.example.paktalin.lavina.LoginActivity">
<!-- Login progress -->
<ProgressBar <ProgressBar
android:id="@+id/login_progress" android:id="@+id/login_progress"
style="?android:attr/progressBarStyleLarge" style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_centerInParent="true"
android:visibility="gone"/> android:visibility="gone"/>
<ScrollView <ScrollView
android:id="@+id/login_form" android:id="@+id/login_form"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:layout_centerVertical="true">
</ScrollView>
<RelativeLayout <RelativeLayout
android:id="@+id/email_login_form" android:id="@+id/email_login_form"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/image_logo" android:id="@+id/image_logo"
android:layout_width="200dp" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="100dp"
android:background="@drawable/logo" android:layout_centerHorizontal="true"
android:layout_centerHorizontal="true" /> android:layout_margin="30dp"
android:background="@drawable/logo" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_marginTop="12dp"
android:id="@+id/email_layout" android:id="@+id/email_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/image_logo"> android:layout_below="@+id/image_logo"
android:layout_marginTop="12dp">
<AutoCompleteTextView <AutoCompleteTextView
android:id="@+id/email" android:id="@+id/email"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/prompt_email" android:layout_marginEnd="30dp"
android:inputType="textEmailAddress"
android:layout_marginStart="30dp"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:layout_marginRight="30dp" android:layout_marginRight="30dp"
android:layout_marginEnd="30dp" android:layout_marginStart="30dp"
android:hint="@string/prompt_email"
android:inputType="textEmailAddress"
android:maxLines="1" android:maxLines="1"
android:singleLine="true"/> android:singleLine="true" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
...@@ -64,10 +71,10 @@ ...@@ -64,10 +71,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/email_layout" android:layout_below="@+id/email_layout"
android:layout_marginStart="30dp" android:layout_marginEnd="30dp"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:layout_marginRight="30dp" android:layout_marginRight="30dp"
android:layout_marginEnd="30dp"> android:layout_marginStart="30dp">
<EditText <EditText
android:id="@+id/password" android:id="@+id/password"
...@@ -79,7 +86,7 @@ ...@@ -79,7 +86,7 @@
android:imeOptions="actionUnspecified" android:imeOptions="actionUnspecified"
android:inputType="textPassword" android:inputType="textPassword"
android:maxLines="1" android:maxLines="1"
android:singleLine="true"/> android:singleLine="true" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
...@@ -88,28 +95,27 @@ ...@@ -88,28 +95,27 @@
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginTop="16dp"
android:text="@string/action_sign_in"
android:textStyle="bold"
android:layout_centerHorizontal="true"
android:layout_below="@+id/password_layout" android:layout_below="@+id/password_layout"
android:layout_centerHorizontal="true"
android:layout_marginTop="26dp"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:text="@string/action_sign_in"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="20sp"/> android:textSize="20sp"
android:textStyle="bold" />
<Button <Button
android:id="@+id/register_button" android:id="@+id/register_button"
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_below="@+id/sign_in_button"
android:text="@string/action_register"
android:textStyle="bold"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="16dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:text="@string/action_register"
android:textColor="@color/colorPrimaryDark" android:textColor="@color/colorPrimaryDark"
android:layout_below="@+id/sign_in_button"/> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
</ScrollView> </RelativeLayout>
</LinearLayout>
app/src/main/res/layout/app_bar_main.xml
...@@ -28,9 +28,7 @@ ...@@ -28,9 +28,7 @@
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:backgroundTint="@color/colorPrimary"
app:srcCompat="@drawable/wine_button" /> app:srcCompat="@drawable/wine_icon"
<!--android:background="@color/colorPrimaryDark"--> android:layout_margin="@dimen/fab_margin" />
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/wine_button" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
app/src/main/res/layout/nav_header_main.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
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="@color/colorPrimaryDark" android:background="@color/colorPrimary"
android:gravity="bottom" android:padding="30dp"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark"> android:theme="@style/ThemeOverlay.AppCompat.Dark">
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="100dp" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="100dp"
android:paddingTop="@dimen/nav_header_vertical_spacing" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginTop="40dp"
app:srcCompat="@drawable/logo" /> app:srcCompat="@drawable/logo" />
<TextView </RelativeLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="@string/app_name"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/slogan" />
</LinearLayout>
app/src/main/res/menu/activity_main_drawer.xml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<item <item
android:id="@+id/wine" android:id="@+id/wine"
android:icon="@drawable/wine_icon" android:icon="@drawable/wine_icon"
android:title="Select wine" /> android:title="Order wine" />
<item <item
android:id="@+id/collection" android:id="@+id/collection"
android:icon="@drawable/favorites_icon" android:icon="@drawable/favorites_icon"
...@@ -19,7 +19,11 @@ ...@@ -19,7 +19,11 @@
<item <item
android:id="@+id/community" android:id="@+id/community"
android:icon="@drawable/community_icon" android:icon="@drawable/community_icon"
android:title="Your friends choice" /> android:title="Friends choice" />
<item
android:id="@+id/orders"
android:icon="@drawable/orders_icon"
android:title="Orders" />
</group> </group>
<item android:title="Account"> <item android:title="Account">
......
app/src/main/res/values/dimens.xml
<resources> <resources>
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_horizontal_margin">22dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="nav_header_vertical_spacing">8dp</dimen> <dimen name="nav_header_vertical_spacing">8dp</dimen>
<dimen name="nav_header_height">176dp</dimen> <dimen name="nav_header_height">176dp</dimen>
......
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