Commit 1636a9a4 authored by Lucas Braz Cunha's avatar Lucas Braz Cunha
Browse files

ISSUE AGILE#153: Initial layout [WIP]


Signed-off-by: Lucas Braz Cunha's avatarLucas B. Cunha <lbc16@inf.ufpr.br>
parent 0a3d5a3e
......@@ -31,7 +31,7 @@ dependencies {
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
compile 'com.android.support.test.espresso:espresso-core:2.2.2'
compile 'com.android.support.constraint:constraint-layout:1.0.1'
compile 'com.prolificinteractive:material-calendarview:1.4.3'
testCompile 'junit:junit:4.12'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
}
......@@ -23,15 +23,16 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".LoginActivity"></activity>
<activity android:name=".HomeActivity"></activity>
<activity android:name=".CepActivity"></activity>
<activity android:name=".CepNotFoundActivity"></activity>
<activity android:name=".SignupActivity"></activity>
<activity android:name=".AccountActivity"></activity>
<activity android:name=".ForgotPasswordActivity"></activity>
<activity android:name=".TermActivity"></activity>
<activity android:name=".SchedulingActivity"></activity>
<activity android:name=".LoginActivity" />
<activity android:name=".HomeActivity" />
<activity android:name=".CepActivity" />
<activity android:name=".CepNotFoundActivity" />
<activity android:name=".SignupActivity" />
<activity android:name=".AccountActivity" />
<activity android:name=".ForgotPasswordActivity" />
<activity android:name=".TermActivity" />
<activity android:name=".SchedulingActivity" />
<activity android:name=".SchedulesActivity"></activity>
</application>
</manifest>
\ No newline at end of file
......@@ -203,9 +203,14 @@ public class HomeActivity extends AppCompatActivity implements HomeView,
return true;
case R.id.nav_schedule:
intent = new Intent(this, TermActivity.class);
item.setChecked(false);
startActivity(intent);
return true;
case R.id.nav_check_schedules:
intent = new Intent(this, SchedulesActivity.class);
startActivity(intent);
return true;
default:
}
return false;
}
......
package br.ufpr.c3sl.agendador.agendador;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class SchedulesActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_schedules);
}
}
......@@ -244,6 +244,10 @@ public class SchedulingActivity extends AppCompatActivity implements SchedulingV
intent = new Intent(this, TermActivity.class);
item.setChecked(false);
startActivity(intent);
case R.id.nav_check_schedules:
intent = new Intent(this, SchedulesActivity.class);
startActivity(intent);
return true;
default:
}
return false;
......
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:openDrawer="start">
<include
layout="@layout/appbar_schedules"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<android.support.design.widget.NavigationView
android:id="@+id/home_navigation_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="start"
android:fitsSystemWindows="true"
app:headerLayout="@layout/nav_drawer_header"
app:menu="@menu/activity_home_drawer" />
</android.support.v4.widget.DrawerLayout>
......@@ -18,7 +18,7 @@
<include layout="@layout/content_home" />
<android.support.design.widget.FloatingActionButton
<!--<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="56dp"
android:layout_height="56dp"
......@@ -26,6 +26,6 @@
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
app:srcCompat="@drawable/ic_action_search"
app:backgroundTint="@color/colorGreen" />
app:backgroundTint="@color/colorGreen" />-->
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/toolbar"/>
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_schedules" />
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="59dp"
android:background="@color/colorGray"
android:orientation="vertical">
<TextView
android:id="@+id/tv_homeact_welcome"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:text="Acompanhar agendamentos"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="14sp"
android:textStyle="normal|bold"
android:typeface="normal" />
<android.support.v4.widget.NestedScrollView
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">
<LinearLayout
android:id="@+id/ll_scheduling_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
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:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
android:textStyle="normal"
android:typeface="normal" />
<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"
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_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>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<ProgressBar
android:id="@+id/pb_scheduling"
android:layout_width="80dp"
android:layout_height="80dp"
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
......@@ -129,7 +129,7 @@
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_gravity="center"
android:contentDescription="@string/highlight_date_accessibility"
android:contentDescription="@string/highlight_date_scheduling_accessibility"
android:src="@drawable/date_highlight"/>
<TextView
......
......@@ -145,5 +145,8 @@
<item>Dom</item>
</string-array>
<string name="scheduling_date">Datas disponíveis</string>
<string name="highlight_date_accessibility">Círculo ao redor de uma data demonstra que ela está disponível para agendamento</string>
<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