Commit dc7dd098 authored by Bruno Freitas Tissei's avatar Bruno Freitas Tissei

Merge with Issue_144

Signed-off-by: Bruno Freitas Tissei's avatarBruno Freitas Tissei <bft15@inf.ufpr.br>
parents af25cd5f c22009a4
......@@ -319,9 +319,6 @@ public class SignupActivity extends AppCompatActivity implements SignupView {
btn_signup.setEnabled(true);
}
}
}
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_marginTop="75dp"
android:layout_marginTop="65dp"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -19,11 +19,60 @@
android:layout_marginTop="12dp"
android:textStyle="normal|bold" />
<LinearLayout
<RelativeLayout
android:layout_marginTop="12dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorWhite">
</LinearLayout>
<TextView
android:id="@+id/tv_homeact_presentation"
android:layout_width="310dp"
android:layout_height="wrap_content"
android:text="@string/schedules_screen_presentation"
android:typeface="normal"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textAlignment="center"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"/>
<TextView
android:layout_width="310dp"
android:layout_height="wrap_content"
android:text="@string/schedules_more_information"
android:typeface="normal"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textAlignment="center"
android:layout_marginTop="15dp"
android:layout_centerHorizontal="true"
android:layout_below="@id/tv_homeact_presentation"/>
<Button
android:text="@string/schedule"
android:width="290dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:id="@+id/btn_homeact_schedule" />
<Button
android:text="@string/check_schedules"
android:width="290dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/btn_homeact_schedule"
android:layout_centerHorizontal="true"
android:id="@+id/btn_homeact_check" />
<Button
android:text="@string/schedules_history"
android:width="290dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/btn_homeact_check"
android:layout_centerHorizontal="true"
android:id="@+id/button" />
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
......@@ -4,7 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/agendador_toolbar"
android:layout_width="match_parent"
android:layout_height="75dp"
android:layout_height="65dp"
android:background="@color/colorWhite"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
......@@ -17,8 +17,8 @@
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_drawer_hamburger"
android:id="@+id/img_toolbar_hamburger"
android:layout_centerVertical="true"
......@@ -30,8 +30,8 @@
android:gravity="center">
<ImageView
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/img_loginact_logo"
android:id="@+id/imageView"
android:layout_centerInParent="true"
......@@ -40,8 +40,9 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:gravity="center">
<android.support.v7.widget.ActionMenuView
android:id="@+id/agendador_toolbar_menu"
......
......@@ -59,4 +59,6 @@
<string name="empty_email">E-mail vázio</string>
<string name="password_weak">Senha fraca</string>
<string name="password_doesnt_match">Senhas diferem</string>
<string name="schedules_screen_presentation">Nesta página, você poderá efetuar um agendamento, acompanhar seus atendimentos futuros e verificar seus atendimentos já realizados ou cancelados.</string>
<string name="schedules_more_information">Para mais informações sobre como usar o Sistema Agendador de Serviços Públicos visite o Manual de Utilização ou a Seção de Perguntar Frequentes.</string>
</resources>
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 to comment