Skip to content

Commit

Permalink
Melhorias lembretes
Browse files Browse the repository at this point in the history
  • Loading branch information
@brunozrk
brunozrk committed May 4, 2014
1 parent f5ceb1e commit dbdc944
Show file tree
Hide file tree
Showing 20 changed files with 291 additions and 125 deletions.
Binary file modified ContComb/bin/classes/com/br/econocomb/R$id.class
View file
Binary file not shown.
Binary file modified ContComb/bin/classes/com/br/econocomb/R$layout.class
View file
Binary file not shown.
Binary file modified ContComb/bin/classes/com/br/econocomb/R$menu.class
View file
Binary file not shown.
Binary file modified ContComb/bin/classes/com/br/econocomb/R$string.class
View file
Binary file not shown.
Binary file modified ContComb/bin/classes/com/br/econocomb/R$style.class
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ContComb/gen/android/support/v7/appcompat/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ public static final class layout {
public static final int abc_popup_menu_item_layout = 0x7f030014;
public static final int abc_search_dropdown_item_icons_2line = 0x7f030015;
public static final int abc_search_view = 0x7f030016;
public static final int support_simple_spinner_dropdown_item = 0x7f030024;
public static final int support_simple_spinner_dropdown_item = 0x7f030025;
}
public static final class string {
public static final int abc_action_bar_home_description = 0x7f0a0001;
Expand Down
187 changes: 97 additions & 90 deletions ContComb/gen/com/br/econocomb/R.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,12 +1018,13 @@ public static final class id {
public static final int action_menu_divider=0x7f050016;
public static final int action_menu_presenter=0x7f050017;
public static final int action_mode_close_button=0x7f050024;
public static final int action_settings=0x7f05005b;
public static final int action_settings=0x7f05005e;
public static final int activity_chooser_view_content=0x7f050025;
public static final int always=0x7f05000b;
public static final int beginning=0x7f050011;
public static final int btnCalc=0x7f050040;
public static final int btnDatePicker=0x7f050048;
public static final int btnDatePicker=0x7f050049;
public static final int chNotifica=0x7f05004d;
public static final int checkbox=0x7f05002d;
public static final int collapseActionView=0x7f05000d;
public static final int content_frame=0x7f05003d;
Expand All @@ -1034,33 +1035,34 @@ public static final class id {
public static final int dropdown=0x7f05000f;
public static final int edit_query=0x7f050030;
public static final int end=0x7f050013;
public static final int etDesc=0x7f05004b;
public static final int etDesc=0x7f05004c;
public static final int etEtanol=0x7f05003e;
public static final int etFiltro=0x7f050058;
public static final int etFiltro=0x7f05005b;
public static final int etGasolina=0x7f05003f;
public static final int etLitros=0x7f050045;
public static final int etMarca=0x7f050049;
public static final int etMensagem=0x7f05004a;
public static final int etObs=0x7f050046;
public static final int etOdometro=0x7f050044;
public static final int etLitros=0x7f050046;
public static final int etMarca=0x7f05004a;
public static final int etMensagem=0x7f05004b;
public static final int etObs=0x7f050047;
public static final int etOdometro=0x7f050045;
public static final int expand_activities_button=0x7f050026;
public static final int expanded_menu=0x7f05002c;
public static final int home=0x7f050014;
public static final int homeAsUp=0x7f050005;
public static final int icon=0x7f05002a;
public static final int ifRoom=0x7f05000a;
public static final int imArrow=0x7f050050;
public static final int imArrow=0x7f050052;
public static final int image=0x7f050027;
public static final int left_drawer=0x7f050041;
public static final int listMode=0x7f050001;
public static final int listViewAbastecimentos=0x7f050055;
public static final int listViewCarros=0x7f050059;
public static final int listViewLembretes=0x7f05005a;
public static final int listViewAbastecimentos=0x7f050058;
public static final int listViewCarros=0x7f05005c;
public static final int listViewLembretes=0x7f05005d;
public static final int list_item=0x7f050029;
public static final int menu_envia=0x7f05005e;
public static final int menu_grava=0x7f05005d;
public static final int menu_novo=0x7f05005c;
public static final int menu_envia=0x7f050061;
public static final int menu_grava=0x7f050060;
public static final int menu_novo=0x7f05005f;
public static final int middle=0x7f050012;
public static final int naoMostraNovamente=0x7f050042;
public static final int never=0x7f050009;
public static final int none=0x7f050010;
public static final int normal=0x7f050000;
Expand All @@ -1081,24 +1083,25 @@ public static final class id {
public static final int showCustom=0x7f050007;
public static final int showHome=0x7f050004;
public static final int showTitle=0x7f050006;
public static final int spCarros=0x7f050043;
public static final int spDatas=0x7f050054;
public static final int spCarros=0x7f050044;
public static final int spDatas=0x7f050057;
public static final int split_action_bar=0x7f05001e;
public static final int stupid_android=0x7f050051;
public static final int stupid_android=0x7f050053;
public static final int submit_area=0x7f050039;
public static final int tabMode=0x7f050002;
public static final int text1=0x7f050042;
public static final int text1=0x7f050043;
public static final int title=0x7f05002b;
public static final int top_action_bar=0x7f050020;
public static final int tvAbastecimentos=0x7f050056;
public static final int tvData=0x7f050047;
public static final int tvDesc=0x7f050053;
public static final int tvLitros=0x7f05004d;
public static final int tvMarca=0x7f050052;
public static final int tvMedia=0x7f05004e;
public static final int tvMediaTotal=0x7f050057;
public static final int tvObs=0x7f05004f;
public static final int tvOdometro=0x7f05004c;
public static final int tvAbastecimentos=0x7f050059;
public static final int tvCarro=0x7f050056;
public static final int tvData=0x7f050048;
public static final int tvDesc=0x7f050055;
public static final int tvLitros=0x7f05004f;
public static final int tvMarca=0x7f050054;
public static final int tvMedia=0x7f050050;
public static final int tvMediaTotal=0x7f05005a;
public static final int tvObs=0x7f050051;
public static final int tvOdometro=0x7f05004e;
public static final int up=0x7f050021;
public static final int useLogo=0x7f050003;
public static final int withText=0x7f05000c;
Expand Down Expand Up @@ -1154,25 +1157,26 @@ public static final class layout {
public static final int abc_search_view=0x7f030016;
public static final int activity_main=0x7f030017;
public static final int ajuda=0x7f030018;
public static final int drawer_listview_item=0x7f030019;
public static final int form_abastecimento=0x7f03001a;
public static final int form_carro=0x7f03001b;
public static final int form_contato=0x7f03001c;
public static final int form_lembrete=0x7f03001d;
public static final int item_list_abastecimento=0x7f03001e;
public static final int item_list_carro=0x7f03001f;
public static final int item_list_lembrete=0x7f030020;
public static final int listagem_abastecimentos=0x7f030021;
public static final int listagem_carros=0x7f030022;
public static final int listagem_lembretes=0x7f030023;
public static final int support_simple_spinner_dropdown_item=0x7f030024;
public static final int dialog_checkbox=0x7f030019;
public static final int drawer_listview_item=0x7f03001a;
public static final int form_abastecimento=0x7f03001b;
public static final int form_carro=0x7f03001c;
public static final int form_contato=0x7f03001d;
public static final int form_lembrete=0x7f03001e;
public static final int item_list_abastecimento=0x7f03001f;
public static final int item_list_carro=0x7f030020;
public static final int item_list_lembrete=0x7f030021;
public static final int listagem_abastecimentos=0x7f030022;
public static final int listagem_carros=0x7f030023;
public static final int listagem_lembretes=0x7f030024;
public static final int support_simple_spinner_dropdown_item=0x7f030025;
}
public static final class menu {
public static final int main=0x7f0d0000;
public static final int main_menu=0x7f0d0001;
}
public static final class string {
public static final int abastecimento=0x7f0a0023;
public static final int abastecimento=0x7f0a0025;
/** Content description for the action bar "home" affordance. [CHAR LIMIT=NONE]
*/
public static final int abc_action_bar_home_description=0x7f0a0001;
Expand Down Expand Up @@ -1219,68 +1223,71 @@ public static final class string {
public static final int ajuda_campo_obrigatorio=0x7f0a001e;
public static final int ajuda_editar=0x7f0a001c;
public static final int ajuda_excluir=0x7f0a001d;
public static final int ajuda_lembrete=0x7f0a0021;
public static final int ajuda_menu=0x7f0a0020;
public static final int app_name=0x7f0a000d;
public static final int aviso_abastecimentos_do_carro=0x7f0a004a;
public static final int aviso_abastecimentos_do_carro=0x7f0a004d;
public static final int bem_vindo=0x7f0a0013;
public static final int cabec_data=0x7f0a0033;
public static final int cabec_desc=0x7f0a003b;
public static final int cabec_litros=0x7f0a0035;
public static final int cabec_media=0x7f0a0036;
public static final int cabec_obs=0x7f0a0037;
public static final int cabec_odometro=0x7f0a0034;
public static final int campo_nao_pode_ser_zero=0x7f0a0048;
public static final int campo_obrigatorio=0x7f0a0047;
public static final int campo_obrigatorio_titulo=0x7f0a003f;
public static final int carro=0x7f0a0024;
public static final int confirma_exclusao=0x7f0a0049;
public static final int cabec_data=0x7f0a0035;
public static final int cabec_desc=0x7f0a003d;
public static final int cabec_litros=0x7f0a0037;
public static final int cabec_marca=0x7f0a003e;
public static final int cabec_media=0x7f0a0038;
public static final int cabec_obs=0x7f0a0039;
public static final int cabec_odometro=0x7f0a0036;
public static final int campo_nao_pode_ser_zero=0x7f0a004b;
public static final int campo_obrigatorio=0x7f0a004a;
public static final int campo_obrigatorio_titulo=0x7f0a0042;
public static final int carro=0x7f0a0026;
public static final int confirma_exclusao=0x7f0a004c;
public static final int confirmacao=0x7f0a0011;
public static final int contato=0x7f0a003d;
public static final int data=0x7f0a0028;
public static final int deixa_uma_msg=0x7f0a003e;
public static final int desc=0x7f0a0022;
public static final int contato=0x7f0a0040;
public static final int data=0x7f0a002a;
public static final int deixa_uma_msg=0x7f0a0041;
public static final int desc=0x7f0a0023;
public static final int dicas=0x7f0a001b;
public static final int drawer_close=0x7f0a0051;
public static final int drawer_open=0x7f0a0050;
public static final int erro=0x7f0a004c;
public static final int erro_carregar_registro=0x7f0a004e;
public static final int erro_gravar_registro=0x7f0a004f;
public static final int erro_listar=0x7f0a004d;
public static final int etanol=0x7f0a0042;
public static final int etanol_ou_gasolina_titulo=0x7f0a0041;
public static final int filtro=0x7f0a003c;
public static final int gasolina=0x7f0a0043;
public static final int drawer_close=0x7f0a0054;
public static final int drawer_open=0x7f0a0053;
public static final int erro=0x7f0a004f;
public static final int erro_carregar_registro=0x7f0a0051;
public static final int erro_gravar_registro=0x7f0a0052;
public static final int erro_listar=0x7f0a0050;
public static final int etanol=0x7f0a0045;
public static final int etanol_ou_gasolina_titulo=0x7f0a0044;
public static final int filtro=0x7f0a003f;
public static final int gasolina=0x7f0a0046;
public static final int introducao=0x7f0a0014;
public static final int lembrete=0x7f0a0021;
public static final int list_data=0x7f0a002a;
public static final int list_litros=0x7f0a002c;
public static final int list_media=0x7f0a002d;
public static final int list_nome=0x7f0a002f;
public static final int list_obs=0x7f0a002e;
public static final int list_odometro=0x7f0a002b;
public static final int listagem_abastecimentos=0x7f0a0030;
public static final int listagem_carros=0x7f0a0031;
public static final int listagem_lembretes=0x7f0a0032;
public static final int litros=0x7f0a0026;
public static final int marca=0x7f0a0029;
public static final int lembrete=0x7f0a0022;
public static final int list_data=0x7f0a002c;
public static final int list_litros=0x7f0a002e;
public static final int list_media=0x7f0a002f;
public static final int list_nome=0x7f0a0031;
public static final int list_obs=0x7f0a0030;
public static final int list_odometro=0x7f0a002d;
public static final int listagem_abastecimentos=0x7f0a0032;
public static final int listagem_carros=0x7f0a0033;
public static final int listagem_lembretes=0x7f0a0034;
public static final int litros=0x7f0a0028;
public static final int marca=0x7f0a002b;
public static final int nao=0x7f0a0010;
public static final int nao_ha_carro_cadastrado=0x7f0a004b;
public static final int nao_ha_carro_cadastrado=0x7f0a004e;
public static final int nota=0x7f0a0016;
public static final int notificar=0x7f0a0024;
public static final int o_que_compensa=0x7f0a0015;
public static final int obs=0x7f0a0027;
public static final int odometro=0x7f0a0025;
public static final int obs=0x7f0a0029;
public static final int odometro=0x7f0a0027;
public static final int ou=0x7f0a0018;
public static final int resumo=0x7f0a0038;
public static final int resumo_abastecimentos=0x7f0a0039;
public static final int resumo_media_total=0x7f0a003a;
public static final int resumo=0x7f0a003a;
public static final int resumo_abastecimentos=0x7f0a003b;
public static final int resumo_media_total=0x7f0a003c;
public static final int rs_etanol=0x7f0a0017;
public static final int rs_gasolina=0x7f0a0019;
public static final int selecione_provedor=0x7f0a0012;
public static final int sim=0x7f0a000f;
public static final int sucesso_cadastro=0x7f0a0044;
public static final int sucesso_edicao=0x7f0a0045;
public static final int sucesso_exclusao=0x7f0a0046;
public static final int valor_invalido_titulo=0x7f0a0040;
public static final int sucesso_cadastro=0x7f0a0047;
public static final int sucesso_edicao=0x7f0a0048;
public static final int sucesso_exclusao=0x7f0a0049;
public static final int valor_invalido_titulo=0x7f0a0043;
}
public static final class style {
/**
Expand Down
8 changes: 7 additions & 1 deletion ContComb/res/layout/ajuda.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,15 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginLeft="20dp"
android:text="@string/ajuda_menu" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginLeft="20dp"
android:text="@string/ajuda_lembrete" />
</LinearLayout>
</LinearLayout>
</FrameLayout>
Expand Down
16 changes: 16 additions & 0 deletions ContComb/res/layout/dialog_checkbox.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >

<CheckBox
android:id="@+id/naoMostraNovamente"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:checked="false"
android:text="Não mostrar novamente." />

</LinearLayout>
9 changes: 7 additions & 2 deletions ContComb/res/layout/form_lembrete.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
android:background="@drawable/rounded_spinner" >
</Spinner>


<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -37,7 +36,13 @@
android:layout_height="wrap_content"
android:background="@drawable/rounded_edittext"
android:inputType="textMultiLine"
android:lines="3" />
android:lines="6" />

<CheckBox
android:id="@+id/chNotifica"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/notificar" />

<TextView
android:layout_width="wrap_content"
Expand Down
11 changes: 10 additions & 1 deletion ContComb/res/layout/item_list_lembrete.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,16 @@
android:id="@+id/tvDesc"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="73"
android:layout_weight="27"
android:gravity="center"
android:paddingBottom="10dp"
android:paddingTop="10dp" />

<TextView
android:id="@+id/tvCarro"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="27"
android:gravity="center"
android:paddingBottom="10dp"
android:paddingTop="10dp" />
Expand Down
14 changes: 11 additions & 3 deletions ContComb/res/layout/listagem_lembretes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,18 @@
<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="74"
android:layout_weight="27"
android:gravity="center"
android:text="@string/cabec_odometro" />
<TextView
android:text="@string/cabec_desc" />

<TextView
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="27"
android:gravity="center"
android:text="@string/cabec_marca" />

<TextView
android:layout_width="15dp"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand Down
Loading

0 comments on commit dbdc944

Please sign in to comment.