Skip to content

Commit dbdc944

Browse files
committed
Melhorias lembretes
1 parent f5ceb1e commit dbdc944

File tree

20 files changed

+291
-125
lines changed

20 files changed

+291
-125
lines changed
107 Bytes
Binary file not shown.
39 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
106 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

ContComb/gen/android/support/v7/appcompat/R.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ public static final class layout {
334334
public static final int abc_popup_menu_item_layout = 0x7f030014;
335335
public static final int abc_search_dropdown_item_icons_2line = 0x7f030015;
336336
public static final int abc_search_view = 0x7f030016;
337-
public static final int support_simple_spinner_dropdown_item = 0x7f030024;
337+
public static final int support_simple_spinner_dropdown_item = 0x7f030025;
338338
}
339339
public static final class string {
340340
public static final int abc_action_bar_home_description = 0x7f0a0001;

ContComb/gen/com/br/econocomb/R.java

Lines changed: 97 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,12 +1018,13 @@ public static final class id {
10181018
public static final int action_menu_divider=0x7f050016;
10191019
public static final int action_menu_presenter=0x7f050017;
10201020
public static final int action_mode_close_button=0x7f050024;
1021-
public static final int action_settings=0x7f05005b;
1021+
public static final int action_settings=0x7f05005e;
10221022
public static final int activity_chooser_view_content=0x7f050025;
10231023
public static final int always=0x7f05000b;
10241024
public static final int beginning=0x7f050011;
10251025
public static final int btnCalc=0x7f050040;
1026-
public static final int btnDatePicker=0x7f050048;
1026+
public static final int btnDatePicker=0x7f050049;
1027+
public static final int chNotifica=0x7f05004d;
10271028
public static final int checkbox=0x7f05002d;
10281029
public static final int collapseActionView=0x7f05000d;
10291030
public static final int content_frame=0x7f05003d;
@@ -1034,33 +1035,34 @@ public static final class id {
10341035
public static final int dropdown=0x7f05000f;
10351036
public static final int edit_query=0x7f050030;
10361037
public static final int end=0x7f050013;
1037-
public static final int etDesc=0x7f05004b;
1038+
public static final int etDesc=0x7f05004c;
10381039
public static final int etEtanol=0x7f05003e;
1039-
public static final int etFiltro=0x7f050058;
1040+
public static final int etFiltro=0x7f05005b;
10401041
public static final int etGasolina=0x7f05003f;
1041-
public static final int etLitros=0x7f050045;
1042-
public static final int etMarca=0x7f050049;
1043-
public static final int etMensagem=0x7f05004a;
1044-
public static final int etObs=0x7f050046;
1045-
public static final int etOdometro=0x7f050044;
1042+
public static final int etLitros=0x7f050046;
1043+
public static final int etMarca=0x7f05004a;
1044+
public static final int etMensagem=0x7f05004b;
1045+
public static final int etObs=0x7f050047;
1046+
public static final int etOdometro=0x7f050045;
10461047
public static final int expand_activities_button=0x7f050026;
10471048
public static final int expanded_menu=0x7f05002c;
10481049
public static final int home=0x7f050014;
10491050
public static final int homeAsUp=0x7f050005;
10501051
public static final int icon=0x7f05002a;
10511052
public static final int ifRoom=0x7f05000a;
1052-
public static final int imArrow=0x7f050050;
1053+
public static final int imArrow=0x7f050052;
10531054
public static final int image=0x7f050027;
10541055
public static final int left_drawer=0x7f050041;
10551056
public static final int listMode=0x7f050001;
1056-
public static final int listViewAbastecimentos=0x7f050055;
1057-
public static final int listViewCarros=0x7f050059;
1058-
public static final int listViewLembretes=0x7f05005a;
1057+
public static final int listViewAbastecimentos=0x7f050058;
1058+
public static final int listViewCarros=0x7f05005c;
1059+
public static final int listViewLembretes=0x7f05005d;
10591060
public static final int list_item=0x7f050029;
1060-
public static final int menu_envia=0x7f05005e;
1061-
public static final int menu_grava=0x7f05005d;
1062-
public static final int menu_novo=0x7f05005c;
1061+
public static final int menu_envia=0x7f050061;
1062+
public static final int menu_grava=0x7f050060;
1063+
public static final int menu_novo=0x7f05005f;
10631064
public static final int middle=0x7f050012;
1065+
public static final int naoMostraNovamente=0x7f050042;
10641066
public static final int never=0x7f050009;
10651067
public static final int none=0x7f050010;
10661068
public static final int normal=0x7f050000;
@@ -1081,24 +1083,25 @@ public static final class id {
10811083
public static final int showCustom=0x7f050007;
10821084
public static final int showHome=0x7f050004;
10831085
public static final int showTitle=0x7f050006;
1084-
public static final int spCarros=0x7f050043;
1085-
public static final int spDatas=0x7f050054;
1086+
public static final int spCarros=0x7f050044;
1087+
public static final int spDatas=0x7f050057;
10861088
public static final int split_action_bar=0x7f05001e;
1087-
public static final int stupid_android=0x7f050051;
1089+
public static final int stupid_android=0x7f050053;
10881090
public static final int submit_area=0x7f050039;
10891091
public static final int tabMode=0x7f050002;
1090-
public static final int text1=0x7f050042;
1092+
public static final int text1=0x7f050043;
10911093
public static final int title=0x7f05002b;
10921094
public static final int top_action_bar=0x7f050020;
1093-
public static final int tvAbastecimentos=0x7f050056;
1094-
public static final int tvData=0x7f050047;
1095-
public static final int tvDesc=0x7f050053;
1096-
public static final int tvLitros=0x7f05004d;
1097-
public static final int tvMarca=0x7f050052;
1098-
public static final int tvMedia=0x7f05004e;
1099-
public static final int tvMediaTotal=0x7f050057;
1100-
public static final int tvObs=0x7f05004f;
1101-
public static final int tvOdometro=0x7f05004c;
1095+
public static final int tvAbastecimentos=0x7f050059;
1096+
public static final int tvCarro=0x7f050056;
1097+
public static final int tvData=0x7f050048;
1098+
public static final int tvDesc=0x7f050055;
1099+
public static final int tvLitros=0x7f05004f;
1100+
public static final int tvMarca=0x7f050054;
1101+
public static final int tvMedia=0x7f050050;
1102+
public static final int tvMediaTotal=0x7f05005a;
1103+
public static final int tvObs=0x7f050051;
1104+
public static final int tvOdometro=0x7f05004e;
11021105
public static final int up=0x7f050021;
11031106
public static final int useLogo=0x7f050003;
11041107
public static final int withText=0x7f05000c;
@@ -1154,25 +1157,26 @@ public static final class layout {
11541157
public static final int abc_search_view=0x7f030016;
11551158
public static final int activity_main=0x7f030017;
11561159
public static final int ajuda=0x7f030018;
1157-
public static final int drawer_listview_item=0x7f030019;
1158-
public static final int form_abastecimento=0x7f03001a;
1159-
public static final int form_carro=0x7f03001b;
1160-
public static final int form_contato=0x7f03001c;
1161-
public static final int form_lembrete=0x7f03001d;
1162-
public static final int item_list_abastecimento=0x7f03001e;
1163-
public static final int item_list_carro=0x7f03001f;
1164-
public static final int item_list_lembrete=0x7f030020;
1165-
public static final int listagem_abastecimentos=0x7f030021;
1166-
public static final int listagem_carros=0x7f030022;
1167-
public static final int listagem_lembretes=0x7f030023;
1168-
public static final int support_simple_spinner_dropdown_item=0x7f030024;
1160+
public static final int dialog_checkbox=0x7f030019;
1161+
public static final int drawer_listview_item=0x7f03001a;
1162+
public static final int form_abastecimento=0x7f03001b;
1163+
public static final int form_carro=0x7f03001c;
1164+
public static final int form_contato=0x7f03001d;
1165+
public static final int form_lembrete=0x7f03001e;
1166+
public static final int item_list_abastecimento=0x7f03001f;
1167+
public static final int item_list_carro=0x7f030020;
1168+
public static final int item_list_lembrete=0x7f030021;
1169+
public static final int listagem_abastecimentos=0x7f030022;
1170+
public static final int listagem_carros=0x7f030023;
1171+
public static final int listagem_lembretes=0x7f030024;
1172+
public static final int support_simple_spinner_dropdown_item=0x7f030025;
11691173
}
11701174
public static final class menu {
11711175
public static final int main=0x7f0d0000;
11721176
public static final int main_menu=0x7f0d0001;
11731177
}
11741178
public static final class string {
1175-
public static final int abastecimento=0x7f0a0023;
1179+
public static final int abastecimento=0x7f0a0025;
11761180
/** Content description for the action bar "home" affordance. [CHAR LIMIT=NONE]
11771181
*/
11781182
public static final int abc_action_bar_home_description=0x7f0a0001;
@@ -1219,68 +1223,71 @@ public static final class string {
12191223
public static final int ajuda_campo_obrigatorio=0x7f0a001e;
12201224
public static final int ajuda_editar=0x7f0a001c;
12211225
public static final int ajuda_excluir=0x7f0a001d;
1226+
public static final int ajuda_lembrete=0x7f0a0021;
12221227
public static final int ajuda_menu=0x7f0a0020;
12231228
public static final int app_name=0x7f0a000d;
1224-
public static final int aviso_abastecimentos_do_carro=0x7f0a004a;
1229+
public static final int aviso_abastecimentos_do_carro=0x7f0a004d;
12251230
public static final int bem_vindo=0x7f0a0013;
1226-
public static final int cabec_data=0x7f0a0033;
1227-
public static final int cabec_desc=0x7f0a003b;
1228-
public static final int cabec_litros=0x7f0a0035;
1229-
public static final int cabec_media=0x7f0a0036;
1230-
public static final int cabec_obs=0x7f0a0037;
1231-
public static final int cabec_odometro=0x7f0a0034;
1232-
public static final int campo_nao_pode_ser_zero=0x7f0a0048;
1233-
public static final int campo_obrigatorio=0x7f0a0047;
1234-
public static final int campo_obrigatorio_titulo=0x7f0a003f;
1235-
public static final int carro=0x7f0a0024;
1236-
public static final int confirma_exclusao=0x7f0a0049;
1231+
public static final int cabec_data=0x7f0a0035;
1232+
public static final int cabec_desc=0x7f0a003d;
1233+
public static final int cabec_litros=0x7f0a0037;
1234+
public static final int cabec_marca=0x7f0a003e;
1235+
public static final int cabec_media=0x7f0a0038;
1236+
public static final int cabec_obs=0x7f0a0039;
1237+
public static final int cabec_odometro=0x7f0a0036;
1238+
public static final int campo_nao_pode_ser_zero=0x7f0a004b;
1239+
public static final int campo_obrigatorio=0x7f0a004a;
1240+
public static final int campo_obrigatorio_titulo=0x7f0a0042;
1241+
public static final int carro=0x7f0a0026;
1242+
public static final int confirma_exclusao=0x7f0a004c;
12371243
public static final int confirmacao=0x7f0a0011;
1238-
public static final int contato=0x7f0a003d;
1239-
public static final int data=0x7f0a0028;
1240-
public static final int deixa_uma_msg=0x7f0a003e;
1241-
public static final int desc=0x7f0a0022;
1244+
public static final int contato=0x7f0a0040;
1245+
public static final int data=0x7f0a002a;
1246+
public static final int deixa_uma_msg=0x7f0a0041;
1247+
public static final int desc=0x7f0a0023;
12421248
public static final int dicas=0x7f0a001b;
1243-
public static final int drawer_close=0x7f0a0051;
1244-
public static final int drawer_open=0x7f0a0050;
1245-
public static final int erro=0x7f0a004c;
1246-
public static final int erro_carregar_registro=0x7f0a004e;
1247-
public static final int erro_gravar_registro=0x7f0a004f;
1248-
public static final int erro_listar=0x7f0a004d;
1249-
public static final int etanol=0x7f0a0042;
1250-
public static final int etanol_ou_gasolina_titulo=0x7f0a0041;
1251-
public static final int filtro=0x7f0a003c;
1252-
public static final int gasolina=0x7f0a0043;
1249+
public static final int drawer_close=0x7f0a0054;
1250+
public static final int drawer_open=0x7f0a0053;
1251+
public static final int erro=0x7f0a004f;
1252+
public static final int erro_carregar_registro=0x7f0a0051;
1253+
public static final int erro_gravar_registro=0x7f0a0052;
1254+
public static final int erro_listar=0x7f0a0050;
1255+
public static final int etanol=0x7f0a0045;
1256+
public static final int etanol_ou_gasolina_titulo=0x7f0a0044;
1257+
public static final int filtro=0x7f0a003f;
1258+
public static final int gasolina=0x7f0a0046;
12531259
public static final int introducao=0x7f0a0014;
1254-
public static final int lembrete=0x7f0a0021;
1255-
public static final int list_data=0x7f0a002a;
1256-
public static final int list_litros=0x7f0a002c;
1257-
public static final int list_media=0x7f0a002d;
1258-
public static final int list_nome=0x7f0a002f;
1259-
public static final int list_obs=0x7f0a002e;
1260-
public static final int list_odometro=0x7f0a002b;
1261-
public static final int listagem_abastecimentos=0x7f0a0030;
1262-
public static final int listagem_carros=0x7f0a0031;
1263-
public static final int listagem_lembretes=0x7f0a0032;
1264-
public static final int litros=0x7f0a0026;
1265-
public static final int marca=0x7f0a0029;
1260+
public static final int lembrete=0x7f0a0022;
1261+
public static final int list_data=0x7f0a002c;
1262+
public static final int list_litros=0x7f0a002e;
1263+
public static final int list_media=0x7f0a002f;
1264+
public static final int list_nome=0x7f0a0031;
1265+
public static final int list_obs=0x7f0a0030;
1266+
public static final int list_odometro=0x7f0a002d;
1267+
public static final int listagem_abastecimentos=0x7f0a0032;
1268+
public static final int listagem_carros=0x7f0a0033;
1269+
public static final int listagem_lembretes=0x7f0a0034;
1270+
public static final int litros=0x7f0a0028;
1271+
public static final int marca=0x7f0a002b;
12661272
public static final int nao=0x7f0a0010;
1267-
public static final int nao_ha_carro_cadastrado=0x7f0a004b;
1273+
public static final int nao_ha_carro_cadastrado=0x7f0a004e;
12681274
public static final int nota=0x7f0a0016;
1275+
public static final int notificar=0x7f0a0024;
12691276
public static final int o_que_compensa=0x7f0a0015;
1270-
public static final int obs=0x7f0a0027;
1271-
public static final int odometro=0x7f0a0025;
1277+
public static final int obs=0x7f0a0029;
1278+
public static final int odometro=0x7f0a0027;
12721279
public static final int ou=0x7f0a0018;
1273-
public static final int resumo=0x7f0a0038;
1274-
public static final int resumo_abastecimentos=0x7f0a0039;
1275-
public static final int resumo_media_total=0x7f0a003a;
1280+
public static final int resumo=0x7f0a003a;
1281+
public static final int resumo_abastecimentos=0x7f0a003b;
1282+
public static final int resumo_media_total=0x7f0a003c;
12761283
public static final int rs_etanol=0x7f0a0017;
12771284
public static final int rs_gasolina=0x7f0a0019;
12781285
public static final int selecione_provedor=0x7f0a0012;
12791286
public static final int sim=0x7f0a000f;
1280-
public static final int sucesso_cadastro=0x7f0a0044;
1281-
public static final int sucesso_edicao=0x7f0a0045;
1282-
public static final int sucesso_exclusao=0x7f0a0046;
1283-
public static final int valor_invalido_titulo=0x7f0a0040;
1287+
public static final int sucesso_cadastro=0x7f0a0047;
1288+
public static final int sucesso_edicao=0x7f0a0048;
1289+
public static final int sucesso_exclusao=0x7f0a0049;
1290+
public static final int valor_invalido_titulo=0x7f0a0043;
12841291
}
12851292
public static final class style {
12861293
/**

ContComb/res/layout/ajuda.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,15 @@
6767
<TextView
6868
android:layout_width="wrap_content"
6969
android:layout_height="wrap_content"
70-
android:layout_marginBottom="20dp"
7170
android:layout_marginLeft="20dp"
7271
android:text="@string/ajuda_menu" />
72+
73+
<TextView
74+
android:layout_width="wrap_content"
75+
android:layout_height="wrap_content"
76+
android:layout_marginBottom="20dp"
77+
android:layout_marginLeft="20dp"
78+
android:text="@string/ajuda_lembrete" />
7379
</LinearLayout>
7480
</LinearLayout>
7581
</FrameLayout>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="wrap_content"
5+
android:orientation="vertical" >
6+
7+
<CheckBox
8+
android:id="@+id/naoMostraNovamente"
9+
android:layout_width="match_parent"
10+
android:layout_height="wrap_content"
11+
android:layout_marginLeft="10dp"
12+
android:layout_marginTop="10dp"
13+
android:checked="false"
14+
android:text="Não mostrar novamente." />
15+
16+
</LinearLayout>

ContComb/res/layout/form_lembrete.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
android:background="@drawable/rounded_spinner" >
2626
</Spinner>
2727

28-
2928
<TextView
3029
android:layout_width="wrap_content"
3130
android:layout_height="wrap_content"
@@ -37,7 +36,13 @@
3736
android:layout_height="wrap_content"
3837
android:background="@drawable/rounded_edittext"
3938
android:inputType="textMultiLine"
40-
android:lines="3" />
39+
android:lines="6" />
40+
41+
<CheckBox
42+
android:id="@+id/chNotifica"
43+
android:layout_width="wrap_content"
44+
android:layout_height="wrap_content"
45+
android:text="@string/notificar" />
4146

4247
<TextView
4348
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)