Commit a671a4a5 authored by Lucas Braz Cunha's avatar Lucas Braz Cunha

Issue AGILE#153: [WIP] Developing schedules actvity layout

Signed-off-by: Lucas Braz Cunha's avatarLucas B. Cunha <lbc16@inf.ufpr.br>
parent f921c6fa
......@@ -9,14 +9,12 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.view.menu.MenuBuilder;
import android.support.v7.widget.ActionMenuView;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Gravity;
import android.view.Menu;
import android.view.MenuItem;
......@@ -33,7 +31,6 @@ import com.prolificinteractive.materialcalendarview.MaterialCalendarView;
import com.prolificinteractive.materialcalendarview.OnDateSelectedListener;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
......@@ -105,7 +102,7 @@ public class SchedulingActivity extends AppCompatActivity implements SchedulingV
}
});
ll_fields = (LinearLayout) findViewById(R.id.ll_scheduling_fields);
ll_fields = (LinearLayout) findViewById(R.id.ll_schedules_fields);
//pb_scheduling.setVisibility(View.VISIBLE);
//ll_fields.setVisibility(View.INVISIBLE);
......
......@@ -14,126 +14,124 @@
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:text="Acompanhar agendamentos"
android:text="@string/check_schedules"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="14sp"
android:textStyle="normal|bold"
android:typeface="normal" />
<android.support.v4.widget.NestedScrollView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/tv_homeact_welcome"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="@color/colorWhite">
<TextView
android:id="@+id/tv_schedules_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="15dp"
android:gravity="left"
android:text="Buscar Agendamentos"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
android:textStyle="bold"
android:typeface="normal" />
<LinearLayout
android:id="@+id/ll_scheduling_fields"
android:id="@+id/ll_schedules_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:layout_below="@id/tv_schedules_title"
android:orientation="vertical">
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="15dp"
android:gravity="center"
android:text="@string/schedules_description"
android:layout_marginStart="14dp"
android:layout_gravity="start"
android:text="@string/scheduling_sector"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
android:textStyle="normal"
android:typeface="normal" />
android:textSize="14sp"
android:textStyle="normal|bold"
android:layout_below="@id/tv_schedules_title"
android:typeface="normal"/>
<Spinner
android:id="@+id/spnr_scheduling_sector"
android:layout_marginEnd="35dp"
android:layout_marginStart="14dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/ll_accountact_state_container"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_gravity="start"
android:text="@string/scheduling_type"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="14sp"
android:textStyle="normal|bold"
android:typeface="normal"/>
<Spinner
android:id="@+id/spnr_scheduling_type"
android:layout_marginEnd="35dp"
android:layout_marginStart="14dp">
<ImageView
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_gravity="center"
android:contentDescription="@string/highlight_date_schedules_accessibility"
android:src="@drawable/date_highlight"/>
<TextView
android:id="@+id/tv_account_state"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:gravity="center_vertical|center_horizontal|start"
android:layout_marginStart="14dp"
android:layout_marginEnd="35dp"
android:text="@string/schedules_date"
android:textColor="@color/colorBlack"
android:textSize="16sp"/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_scheduling_calendar"
android:layout_marginStart="14dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:layout_marginEnd="54dp"
android:layout_marginStart="54dp"
android:layout_marginTop="21dp"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_scheduling_calendar_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/colorGreen">
<TextView
android:id="@+id/tv_calendar_year_scheduling"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:textSize="16sp"
android:textColor="@color/colorGray" />
<TextView
android:id="@+id/tv_calendar_day_month_scheduling"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:textColor="@color/colorWhite"
android:textSize="32sp"
android:textStyle="bold" />
</LinearLayout>
<com.prolificinteractive.materialcalendarview.MaterialCalendarView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/mcv_scheduling_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:mcv_showOtherDates="all"
app:mcv_selectionColor="@color/colorGreen"
app:mcv_calendarMode="month"
app:mcv_monthLabels="@array/months_pt"
app:mcv_weekDayLabels="@array/days_pt"/>
</LinearLayout>
android:layout_marginStart="14dp"
android:layout_gravity="start"
android:text="@string/scheduling_location"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="14sp"
android:textStyle="normal|bold"
android:typeface="normal"/>
<Spinner
android:id="@+id/spnr_scheduling_location"
android:layout_marginEnd="35dp"
android:layout_marginStart="14dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_schedules_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ll_schedules_fields"
android:layout_marginTop="10dp"
android:layout_marginStart="15dp"
android:gravity="left"
android:orientation="horizontal">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:background="@drawable/green_button_shape"
android:text="Buscar" />
<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:background="@android:color/transparent"
android:textColor="@color/colorRed"
android:text="Limpar Campos" />
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</RelativeLayout>
<ProgressBar
android:id="@+id/pb_scheduling"
......@@ -142,8 +140,7 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:indeterminate="true"
android:indeterminateTint="@color/colorGreen"
android:indeterminateTintMode="src_atop"
android:visibility="invisible" />
</RelativeLayout>
\ No newline at end of file
......@@ -28,7 +28,7 @@
android:background="@color/colorWhite">
<LinearLayout
android:id="@+id/ll_scheduling_fields"
android:id="@+id/ll_schedules_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
......
......@@ -148,5 +148,4 @@
<string name="highlight_date_scheduling_accessibility">Círculo ao redor de uma data demonstra que ela está disponível para agendamento</string>
<string name="highlight_date_schedules_accessibility">Círculo verde ao redor de uma data demonstra que existe um agendamento nessa data</string>
<string name="schedules_date">Atendimentos marcados</string>
<string name="schedules_description">Através do calendário abaixo, você poderá acompanhar seus atendimentos futuros. Ao clicar na data do atendimento, mais informações, como horário e local irão aparecer. Clique no botão para atualizar os agendamentos</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