Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/res/layout/action_bar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
android:layout_height="match_parent"
android:background="@null"
android:src="@drawable/ic_logo_redu_back"
android:text="Up" />
android:text="@string/action_bar_up"
android:contentDescription="@string/action_bar_up"/>

<TextView
android:id="@+id/tv_title_action_bar"
Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/activity_environment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/action_bar"
app:title="Ambientes" />
app:title="@string/pref_category_environment_title" />

<FrameLayout
android:id="@+id/fragment_container"
Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/activity_home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:layout_height="wrap_content"
layout="@layout/action_bar"
app:showCaret="false"
app:title="Redu" />
app:title="@string/app_name"/>

<LinearLayout
android:layout_width="match_parent"
Expand Down
26 changes: 13 additions & 13 deletions code/res/layout/activity_lecture.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/action_bar"
app:title="Redu" />
app:title="@string/app_name" />

<FrameLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -54,7 +54,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/bg_gray"
android:text="Remover"
android:text="@string/button_remove"
android:textColor="@color/blue"
android:visibility="gone" />
</LinearLayout>
Expand Down Expand Up @@ -90,7 +90,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="Utilizaremos um aplicativo do seu dispositivo para a visualização desta Aula"
android:text="@string/tv_document_app_device_message"
android:textAppearance="?android:attr/textAppearanceMedium" />

<Button
Expand All @@ -101,7 +101,7 @@
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:background="@drawable/bg_gray"
android:text="Acessar Aula"
android:text="@string/button_access_class"
android:textColor="@color/blue" />
</LinearLayout>

Expand Down Expand Up @@ -130,7 +130,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="Utilizaremos um aplicativo do seu dispositivo para a visualização desta Aula"
android:text="@string/tv_document_app_device_message"
android:textAppearance="?android:attr/textAppearanceMedium" />

<Button
Expand All @@ -141,7 +141,7 @@
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:background="@drawable/bg_gray"
android:text="Acessar Aula"
android:text="@string/button_access_class"
android:textColor="@color/blue" />
</LinearLayout>

Expand All @@ -161,7 +161,7 @@
android:id="@+id/tvPage"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="Utilizaremos um aplicativo do seu dispositivo para a visualização desta Aula"
android:text="@string/tv_document_app_device_message"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>

Expand Down Expand Up @@ -190,7 +190,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="Utilizaremos um aplicativo do seu dispositivo para a visualização desta Aula"
android:text="@string/tv_document_app_device_message"
android:textAppearance="?android:attr/textAppearanceMedium" />

<Button
Expand All @@ -201,7 +201,7 @@
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:background="@drawable/bg_gray"
android:text="Acessar Aula"
android:text="@string/button_access_class"
android:textColor="@color/blue" />
</LinearLayout>

Expand Down Expand Up @@ -230,7 +230,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="Utilizaremos um aplicativo do seu dispositivo para a visualização desta Aula"
android:text="@string/tv_document_app_device_message"
android:textAppearance="?android:attr/textAppearanceMedium" />

<Button
Expand All @@ -241,7 +241,7 @@
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:background="@drawable/bg_gray"
android:text="Acessar Aula"
android:text="@string/button_access_class"
android:textColor="@color/blue" />
</LinearLayout>

Expand All @@ -256,7 +256,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/bg_bottom_gray"
android:text="Mural"
android:text="@string/button_wall"
android:textColor="@color/blue" />

<Button
Expand All @@ -265,7 +265,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/bg_bottom_green"
android:text="Finalizar Aula"
android:text="@string/button_end_class"
android:textColor="#fff"
android:visibility="gone" />

Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/activity_lecture_wall.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/action_bar"
app:title="Redu" />
app:title="@string/app_name" />

<FrameLayout
android:id="@+id/fragment_container"
Expand Down
5 changes: 3 additions & 2 deletions code/res/layout/activity_post_status.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/action_bar"
app:title="Ambientes" />
app:title="@string/pref_category_environment_title"
/>

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -36,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="7dip"
android:layout_weight="1"
android:text="Fulaninho pediu ajuda"
android:text="@string/tv_user_action_someone_asekd_help"
android:textColor="@color/gray_dark" />

<ImageView
Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/activity_space.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/action_bar"
app:title="Redu" />
app:title="@string/app_name" />

<!-- RadioGroup
android:id="@+id/rg"
Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/activity_status_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/action_bar"
app:title="Redu" />
app:title="@string/app_name" />

<ListView
android:id="@+id/list"
Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/activity_web_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/action_bar"
app:title="Redu" />
app:title="@string/app_name" />

<FrameLayout
android:layout_width="match_parent"
Expand Down
10 changes: 5 additions & 5 deletions code/res/layout/confirm_inserted_file_or_lecture.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:text="Cancelar"
android:text="@string/button_cancel"
android:textColor="@color/blue"
android:background="@drawable/bg_gray"
android:layout_margin="7dp" />
Expand All @@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_gravity="right"
android:layout_height="wrap_content"
android:text="Adicionar"
android:text="@string/button_add"
android:textColor="@color/blue"
android:background="@drawable/bg_gray"
android:layout_margin="7dp"/>
Expand Down Expand Up @@ -62,7 +62,7 @@
android:layout_height="wrap_content"
android:padding="10dp"
android:gravity="center"
android:text="Aula 2 (Vídeo)"
android:text="@string/tv_image_name_class_2"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#999"
android:textSize="10sp" />
Expand All @@ -86,15 +86,15 @@
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_gravity="left"
android:text="Título"
android:text="@string/tv_title"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#999"
android:textSize="12sp" />

<EditText
android:id="@+id/etTitleLecture"
android:layout_height="wrap_content"
android:hint="Digite aqui o nome da aula..."
android:hint="@string/hint_type_name_class"
android:inputType="text"
android:textSize="12sp"
android:layout_weight="1"
Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/environment_lecture_row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
android:padding="10dp"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:text="Java Modularizado"
android:text="@string/tv_modularised_java"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#36ACD5"
android:textSize="14sp" />
Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/environment_module_row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
android:gravity="top"
android:layout_marginLeft="32dp"
android:padding="10dp"
android:text="Módulo Modularização"
android:text="@string/tv_modularised_java"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#36ACD5"
android:textSize="16sp" />
Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/fragment_courses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Este Ambiente está vazio, não há Cursos"
android:text="@string/tv_this_environment_empty_no_courses"
android:textColor="@color/gray_dark"
android:visibility="gone" />

Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/fragment_listview.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="7dip"
android:text="Novos Status"
android:text="@string/tv_new_status"
android:textColor="@color/gray_dark" />

<View
Expand Down
4 changes: 2 additions & 2 deletions code/res/layout/fragment_mophology.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:layout_gravity="center"
android:layout_margin="12dp"
android:background="@drawable/bg_gray"
android:text="Novo Módulo"
android:text="@string/button_new_module"
android:textColor="@color/blue"
android:visibility="gone" />

Expand Down Expand Up @@ -48,7 +48,7 @@
android:layout_gravity="center"
android:gravity="center"
android:padding="15dp"
android:text="Esta Disciplina está vazia, será necessário adicionar o um Novo Módulo antes."
android:text="@string/tv_this_discipline_empty_no_modules"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/gray_light"
android:visibility="gone" />
Expand Down
4 changes: 2 additions & 2 deletions code/res/layout/fragment_support_material.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
android:layout_alignParentLeft="true"
android:drawableLeft="@drawable/ic_file"
android:gravity="center_vertical"
android:text="Índice"
android:text="@string/tv_index"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#CCC"
android:textSize="20dp" />
Expand Down Expand Up @@ -75,7 +75,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="15dp"
android:text="Esta pasta está vazia."
android:text="@string/tv_empty_folder"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/gray_light"
android:visibility="gone" />
Expand Down
2 changes: 1 addition & 1 deletion code/res/layout/insert_file_or_lecture.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:padding="10dp"
android:gravity="center"
android:text="O que você deseja adicionar?"
android:text="@string/tv_what_you_want_add"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#999"
android:textSize="12sp" />
Expand Down
16 changes: 8 additions & 8 deletions code/res/layout/login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,27 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Login ou email"
android:text="@string/tv_login_or_email"
android:textSize="12sp"
android:textColor="@color/gray_dark"
android:layout_marginTop="25dp"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Seu login ou email cadastrado"
android:text="@string/tv_login_or_email_already_registered"
android:textSize="12sp"
android:textColor="@color/gray_dark"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Senha"
android:text="@string/tv_password"
android:layout_marginTop="15dp"
android:textColor="@color/gray_dark"
android:textSize="12sp"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Sua senha"
android:text="@string/hint_your_password"
android:textSize="12sp"
android:textColor="@color/gray_dark"/>
<FrameLayout
Expand All @@ -75,7 +75,7 @@
android:layout_height="wrap_content"
android:layout_gravity="left"
android:textSize="12sp"
android:text="Mostrar Senha"
android:text="@string/tv_show_password"
android:textColor="@color/gray_dark" />

<TextView
Expand All @@ -86,7 +86,7 @@
android:textSize="12sp"
android:clickable="true"
android:background="@null"
android:text="Esqueceu?"/>
android:text="@string/tv_forgot_password"/>
</FrameLayout>
</LinearLayout>
</LinearLayout>
Expand All @@ -102,7 +102,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/blue"
android:text="Cadastrar-se"
android:text="@string/button_register"
android:background="@drawable/bt_bottom_gray" />

<Button
Expand All @@ -111,7 +111,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="#fff"
android:text="Cadastrar-se"
android:text="@string/button_register"
android:background="@drawable/bt_bottom_green" />
</LinearLayout>
</LinearLayout>
Loading