diff --git a/app/build.gradle b/app/build.gradle index b94791c..eb53af2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.stock.pignon" minSdkVersion 17 targetSdkVersion 36 - versionCode 6 - versionName "0.5.1" + versionCode 7 + versionName "0.5.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/assets/images/FD.jpg b/app/src/main/assets/images/FD.jpg deleted file mode 100644 index 468b5ee..0000000 Binary files a/app/src/main/assets/images/FD.jpg and /dev/null differ diff --git a/app/src/main/assets/images/axe_pedalier.jpg b/app/src/main/assets/images/axe_pedalier.jpg new file mode 100644 index 0000000..b9691ef Binary files /dev/null and b/app/src/main/assets/images/axe_pedalier.jpg differ diff --git a/app/src/main/assets/images/axeRapide.jpg b/app/src/main/assets/images/axe_rapide.jpg similarity index 100% rename from app/src/main/assets/images/axeRapide.jpg rename to app/src/main/assets/images/axe_rapide.jpg diff --git a/app/src/main/assets/images/axeRoue.jpg b/app/src/main/assets/images/axe_roue.jpg similarity index 100% rename from app/src/main/assets/images/axeRoue.jpg rename to app/src/main/assets/images/axe_roue.jpg diff --git a/app/src/main/assets/images/boitierPedalier.jpg b/app/src/main/assets/images/boitier_cartouche.jpg similarity index 100% rename from app/src/main/assets/images/boitierPedalier.jpg rename to app/src/main/assets/images/boitier_cartouche.jpg diff --git a/app/src/main/assets/images/boitier_hollowtech.jpg b/app/src/main/assets/images/boitier_hollowtech.jpg new file mode 100644 index 0000000..4ce0e71 Binary files /dev/null and b/app/src/main/assets/images/boitier_hollowtech.jpg differ diff --git a/app/src/main/assets/images/chambre_air.jpg b/app/src/main/assets/images/chambre_air.jpg new file mode 100644 index 0000000..0fd95d0 Binary files /dev/null and b/app/src/main/assets/images/chambre_air.jpg differ diff --git a/app/src/main/assets/images/collierSelle.jpg b/app/src/main/assets/images/collier_selle.jpg similarity index 100% rename from app/src/main/assets/images/collierSelle.jpg rename to app/src/main/assets/images/collier_selle.jpg diff --git a/app/src/main/assets/images/RD.jpg b/app/src/main/assets/images/derailleur_arriere.jpg similarity index 100% rename from app/src/main/assets/images/RD.jpg rename to app/src/main/assets/images/derailleur_arriere.jpg diff --git a/app/src/main/assets/images/derailleur_avant_tiragebas.jpg b/app/src/main/assets/images/derailleur_avant_tiragebas.jpg new file mode 100644 index 0000000..c0a4741 Binary files /dev/null and b/app/src/main/assets/images/derailleur_avant_tiragebas.jpg differ diff --git a/app/src/main/assets/images/derailleur_avant_tiragehaut.jpg b/app/src/main/assets/images/derailleur_avant_tiragehaut.jpg new file mode 100644 index 0000000..9b786c6 Binary files /dev/null and b/app/src/main/assets/images/derailleur_avant_tiragehaut.jpg differ diff --git a/app/src/main/assets/images/etrierDisque.jpg b/app/src/main/assets/images/etrier_cable.jpg similarity index 100% rename from app/src/main/assets/images/etrierDisque.jpg rename to app/src/main/assets/images/etrier_cable.jpg diff --git a/app/src/main/assets/images/etrier_cantilever.jpg b/app/src/main/assets/images/etrier_cantilever.jpg new file mode 100644 index 0000000..4591757 Binary files /dev/null and b/app/src/main/assets/images/etrier_cantilever.jpg differ diff --git a/app/src/main/assets/images/etrier_hydraulique.jpg b/app/src/main/assets/images/etrier_hydraulique.jpg new file mode 100644 index 0000000..9bbd723 Binary files /dev/null and b/app/src/main/assets/images/etrier_hydraulique.jpg differ diff --git a/app/src/main/assets/images/etrier_mafac_caliper.jpg b/app/src/main/assets/images/etrier_mafac_caliper.jpg new file mode 100644 index 0000000..869b219 Binary files /dev/null and b/app/src/main/assets/images/etrier_mafac_caliper.jpg differ diff --git a/app/src/main/assets/images/etrierPatin.jpg b/app/src/main/assets/images/etrier_vbrake.jpg similarity index 100% rename from app/src/main/assets/images/etrierPatin.jpg rename to app/src/main/assets/images/etrier_vbrake.jpg diff --git a/app/src/main/assets/images/fond_jante.jpg b/app/src/main/assets/images/fond_jante.jpg new file mode 100644 index 0000000..2d6100e Binary files /dev/null and b/app/src/main/assets/images/fond_jante.jpg differ diff --git a/app/src/main/assets/images/fourche_suspendue.jpg b/app/src/main/assets/images/fourche_suspendue.jpg new file mode 100644 index 0000000..aabf1dd Binary files /dev/null and b/app/src/main/assets/images/fourche_suspendue.jpg differ diff --git a/app/src/main/assets/images/frein_pontcentral.jpg b/app/src/main/assets/images/frein_pontcentral.jpg new file mode 100644 index 0000000..0224179 Binary files /dev/null and b/app/src/main/assets/images/frein_pontcentral.jpg differ diff --git a/app/src/main/assets/images/gardeBoue.jpg b/app/src/main/assets/images/garde_boue.jpg similarity index 100% rename from app/src/main/assets/images/gardeBoue.jpg rename to app/src/main/assets/images/garde_boue.jpg diff --git a/app/src/main/assets/images/jante.jpg b/app/src/main/assets/images/jante.jpg new file mode 100644 index 0000000..eda35de Binary files /dev/null and b/app/src/main/assets/images/jante.jpg differ diff --git a/app/src/main/assets/images/jeuDirection.jpg b/app/src/main/assets/images/jeu_direction.jpg similarity index 100% rename from app/src/main/assets/images/jeuDirection.jpg rename to app/src/main/assets/images/jeu_direction.jpg diff --git a/app/src/main/assets/images/manette_cadre.jpg b/app/src/main/assets/images/manette_cadre.jpg new file mode 100644 index 0000000..671d27b Binary files /dev/null and b/app/src/main/assets/images/manette_cadre.jpg differ diff --git a/app/src/main/assets/images/manivelleDroite.jpg b/app/src/main/assets/images/manivelle_droite.jpg similarity index 100% rename from app/src/main/assets/images/manivelleDroite.jpg rename to app/src/main/assets/images/manivelle_droite.jpg diff --git a/app/src/main/assets/images/manivelleGauche.jpg b/app/src/main/assets/images/manivelle_gauche.jpg similarity index 100% rename from app/src/main/assets/images/manivelleGauche.jpg rename to app/src/main/assets/images/manivelle_gauche.jpg diff --git a/app/src/main/assets/images/moyeuArriere.jpg b/app/src/main/assets/images/moyeu_arriere_cassette.jpg similarity index 100% rename from app/src/main/assets/images/moyeuArriere.jpg rename to app/src/main/assets/images/moyeu_arriere_cassette.jpg diff --git a/app/src/main/assets/images/moyeu_arriere_rouelibre.jpg b/app/src/main/assets/images/moyeu_arriere_rouelibre.jpg new file mode 100644 index 0000000..40ca983 Binary files /dev/null and b/app/src/main/assets/images/moyeu_arriere_rouelibre.jpg differ diff --git a/app/src/main/assets/images/moyeuAvant.jpg b/app/src/main/assets/images/moyeu_avant.jpg similarity index 100% rename from app/src/main/assets/images/moyeuAvant.jpg rename to app/src/main/assets/images/moyeu_avant.jpg diff --git a/app/src/main/assets/images/moyeu_retropedalage.jpg b/app/src/main/assets/images/moyeu_retropedalage.jpg new file mode 100644 index 0000000..17d9d6a Binary files /dev/null and b/app/src/main/assets/images/moyeu_retropedalage.jpg differ diff --git a/app/src/main/assets/images/panier.jpg b/app/src/main/assets/images/panier.jpg new file mode 100644 index 0000000..95289f8 Binary files /dev/null and b/app/src/main/assets/images/panier.jpg differ diff --git a/app/src/main/assets/images/pedalierComplet.jpg b/app/src/main/assets/images/pedalier_complet.jpg similarity index 100% rename from app/src/main/assets/images/pedalierComplet.jpg rename to app/src/main/assets/images/pedalier_complet.jpg diff --git a/app/src/main/assets/images/plateau_4.jpg b/app/src/main/assets/images/plateau_4.jpg new file mode 100644 index 0000000..13ec378 Binary files /dev/null and b/app/src/main/assets/images/plateau_4.jpg differ diff --git a/app/src/main/assets/images/plateau.jpg b/app/src/main/assets/images/plateau_5.jpg similarity index 100% rename from app/src/main/assets/images/plateau.jpg rename to app/src/main/assets/images/plateau_5.jpg diff --git a/app/src/main/assets/images/pneu.jpg b/app/src/main/assets/images/pneu.jpg deleted file mode 100644 index 5b71fa1..0000000 Binary files a/app/src/main/assets/images/pneu.jpg and /dev/null differ diff --git a/app/src/main/assets/images/pneu_26.jpg b/app/src/main/assets/images/pneu_26.jpg new file mode 100644 index 0000000..b87fd35 Binary files /dev/null and b/app/src/main/assets/images/pneu_26.jpg differ diff --git a/app/src/main/assets/images/pneu_large.jpg b/app/src/main/assets/images/pneu_large.jpg new file mode 100644 index 0000000..9aece25 Binary files /dev/null and b/app/src/main/assets/images/pneu_large.jpg differ diff --git a/app/src/main/assets/images/pneu_petit.jpg b/app/src/main/assets/images/pneu_petit.jpg new file mode 100644 index 0000000..a852e07 Binary files /dev/null and b/app/src/main/assets/images/pneu_petit.jpg differ diff --git a/app/src/main/assets/images/pneu_route.jpg b/app/src/main/assets/images/pneu_route.jpg new file mode 100644 index 0000000..d776fc5 Binary files /dev/null and b/app/src/main/assets/images/pneu_route.jpg differ diff --git a/app/src/main/assets/images/poignee.jpg b/app/src/main/assets/images/poignee.jpg new file mode 100644 index 0000000..11f5835 Binary files /dev/null and b/app/src/main/assets/images/poignee.jpg differ diff --git a/app/src/main/assets/images/poigneeCombo.jpg b/app/src/main/assets/images/poignee_combo.jpg similarity index 100% rename from app/src/main/assets/images/poigneeCombo.jpg rename to app/src/main/assets/images/poignee_combo.jpg diff --git a/app/src/main/assets/images/poigneefrein.jpg b/app/src/main/assets/images/poignee_frein.jpg similarity index 100% rename from app/src/main/assets/images/poigneefrein.jpg rename to app/src/main/assets/images/poignee_frein.jpg diff --git a/app/src/main/assets/images/poigneeGachette.jpg b/app/src/main/assets/images/poignee_gachette.jpg similarity index 100% rename from app/src/main/assets/images/poigneeGachette.jpg rename to app/src/main/assets/images/poignee_gachette.jpg diff --git a/app/src/main/assets/images/poigneeTournante.jpg b/app/src/main/assets/images/poignee_tournante.jpg similarity index 100% rename from app/src/main/assets/images/poigneeTournante.jpg rename to app/src/main/assets/images/poignee_tournante.jpg diff --git a/app/src/main/assets/images/poignees.jpg b/app/src/main/assets/images/poignees.jpg deleted file mode 100644 index dedc8bb..0000000 Binary files a/app/src/main/assets/images/poignees.jpg and /dev/null differ diff --git a/app/src/main/assets/images/pompe.jpg b/app/src/main/assets/images/pompe.jpg new file mode 100644 index 0000000..45130ea Binary files /dev/null and b/app/src/main/assets/images/pompe.jpg differ diff --git a/app/src/main/assets/images/porteBagage.jpg b/app/src/main/assets/images/porte_bagage.jpg similarity index 100% rename from app/src/main/assets/images/porteBagage.jpg rename to app/src/main/assets/images/porte_bagage.jpg diff --git a/app/src/main/assets/images/portebidon.jpg b/app/src/main/assets/images/porte_bidon.jpg similarity index 100% rename from app/src/main/assets/images/portebidon.jpg rename to app/src/main/assets/images/porte_bidon.jpg diff --git a/app/src/main/assets/images/potenceHeadset.jpg b/app/src/main/assets/images/potence_headset.jpg similarity index 100% rename from app/src/main/assets/images/potenceHeadset.jpg rename to app/src/main/assets/images/potence_headset.jpg diff --git a/app/src/main/assets/images/potence_headset_reglable.jpg b/app/src/main/assets/images/potence_headset_reglable.jpg new file mode 100644 index 0000000..54c7f44 Binary files /dev/null and b/app/src/main/assets/images/potence_headset_reglable.jpg differ diff --git a/app/src/main/assets/images/potencePlongeur.jpg b/app/src/main/assets/images/potence_plongeur.jpg similarity index 100% rename from app/src/main/assets/images/potencePlongeur.jpg rename to app/src/main/assets/images/potence_plongeur.jpg diff --git a/app/src/main/assets/images/potence_plongeur_reglable.jpg b/app/src/main/assets/images/potence_plongeur_reglable.jpg new file mode 100644 index 0000000..3a517de Binary files /dev/null and b/app/src/main/assets/images/potence_plongeur_reglable.jpg differ diff --git a/app/src/main/assets/images/retroviseur.jpg b/app/src/main/assets/images/retroviseur.jpg new file mode 100644 index 0000000..af72867 Binary files /dev/null and b/app/src/main/assets/images/retroviseur.jpg differ diff --git a/app/src/main/assets/images/rouearriere.jpg b/app/src/main/assets/images/roue_arriere.jpg similarity index 100% rename from app/src/main/assets/images/rouearriere.jpg rename to app/src/main/assets/images/roue_arriere.jpg diff --git a/app/src/main/assets/images/roueavant.jpg b/app/src/main/assets/images/roue_avant.jpg similarity index 100% rename from app/src/main/assets/images/roueavant.jpg rename to app/src/main/assets/images/roue_avant.jpg diff --git a/app/src/main/assets/images/roueLibre.jpg b/app/src/main/assets/images/roue_libre.jpg similarity index 100% rename from app/src/main/assets/images/roueLibre.jpg rename to app/src/main/assets/images/roue_libre.jpg diff --git a/app/src/main/assets/images/roulement_direction.jpg b/app/src/main/assets/images/roulement_direction.jpg new file mode 100644 index 0000000..5654170 Binary files /dev/null and b/app/src/main/assets/images/roulement_direction.jpg differ diff --git a/app/src/main/assets/images/roulement_pedalier.jpg b/app/src/main/assets/images/roulement_pedalier.jpg new file mode 100644 index 0000000..0a0a196 Binary files /dev/null and b/app/src/main/assets/images/roulement_pedalier.jpg differ diff --git a/app/src/main/assets/images/tigePlongeur.jpg b/app/src/main/assets/images/tige_plongeur.jpg similarity index 100% rename from app/src/main/assets/images/tigePlongeur.jpg rename to app/src/main/assets/images/tige_plongeur.jpg diff --git a/app/src/main/assets/images/tigeSelle.jpg b/app/src/main/assets/images/tige_selle.jpg similarity index 100% rename from app/src/main/assets/images/tigeSelle.jpg rename to app/src/main/assets/images/tige_selle.jpg diff --git a/app/src/main/assets/images/velo.jpg b/app/src/main/assets/images/velo.jpg new file mode 100644 index 0000000..43de3a1 Binary files /dev/null and b/app/src/main/assets/images/velo.jpg differ diff --git a/app/src/main/assets/images/visseriefrein.jpg b/app/src/main/assets/images/visserie_frein.jpg similarity index 100% rename from app/src/main/assets/images/visseriefrein.jpg rename to app/src/main/assets/images/visserie_frein.jpg diff --git a/app/src/main/assets/images/visseriepedalier.jpg b/app/src/main/assets/images/visserie_pedalier.jpg similarity index 100% rename from app/src/main/assets/images/visseriepedalier.jpg rename to app/src/main/assets/images/visserie_pedalier.jpg diff --git a/app/src/main/assets/images/visserieroue.jpg b/app/src/main/assets/images/visserie_roue.jpg similarity index 100% rename from app/src/main/assets/images/visserieroue.jpg rename to app/src/main/assets/images/visserie_roue.jpg diff --git a/app/src/main/assets/images/visserietransmission.jpg b/app/src/main/assets/images/visserie_transmission.jpg similarity index 100% rename from app/src/main/assets/images/visserietransmission.jpg rename to app/src/main/assets/images/visserie_transmission.jpg diff --git a/app/src/main/assets/pieces.json b/app/src/main/assets/pieces.json index d8b4921..b7729d8 100644 --- a/app/src/main/assets/pieces.json +++ b/app/src/main/assets/pieces.json @@ -8,10 +8,11 @@ "bgColor": "#FF0000", "textColor": "#000000", "items": [ + {"name": "Vélo", "minPrice": 20, "maxPrice": 40, "image": "velo"}, {"name": "Cadre", "minPrice": 20, "maxPrice": 40, "image": "cadre"}, {"name": "Selle", "minPrice": 1, "maxPrice": 7, "image": "selle"}, - {"name": "Tige de selle", "minPrice": 1, "maxPrice": 10, "image": "tigeselle"}, - {"name": "Collier de selle", "minPrice": 1, "maxPrice": 4, "image": "collierselle"} + {"name": "Tige de selle", "minPrice": 1, "maxPrice": 10, "image": "tige_selle"}, + {"name": "Collier de selle", "minPrice": 1, "maxPrice": 4, "image": "collier_selle"} ] }, { @@ -20,10 +21,14 @@ "textColor": "#000000", "items": [ {"name": "Fourche", "minPrice": 10, "maxPrice": 20, "image": "fourche"}, - {"name": "Jeu de direction", "minPrice": 1, "maxPrice": 8, "image": "jeudirection"}, - {"name": "Potence headset", "minPrice": 2, "maxPrice": 8, "image": "potenceheadset"}, - {"name": "Potence plongeur", "minPrice": 2, "maxPrice": 8, "image": "potenceplongeur"}, - {"name": "Tige plongeur", "minPrice": 1, "maxPrice": 4, "image": "tigeplongeur"} + {"name": "Fourche suspendue", "minPrice": 10, "maxPrice": 20, "image": "fourche_suspendue"}, + {"name": "Roulement direction", "minPrice": 1, "maxPrice": 8, "image": "roulement_direction"}, + {"name": "Jeu de direction", "minPrice": 1, "maxPrice": 8, "image": "jeu_direction"}, + {"name": "Potence headset", "minPrice": 2, "maxPrice": 8, "image": "potence_headset"}, + {"name": "Potence headset réglable", "minPrice": 2, "maxPrice": 8, "image": "potence_headset_reglable"}, + {"name": "Potence plongeur", "minPrice": 2, "maxPrice": 8, "image": "potence_plongeur"}, + {"name": "Potence plongeur réglable", "minPrice": 2, "maxPrice": 8, "image": "potence_plongeur_reglable"}, + {"name": "Tige plongeur", "minPrice": 1, "maxPrice": 4, "image": "tige_plongeur"} ] }, { @@ -31,13 +36,14 @@ "bgColor": "#F16000", "textColor": "#000000", "items": [ - {"name": "Poignée combo", "minPrice": 2, "maxPrice": 8, "image": "poigneecombo"}, - {"name": "Poignée frein", "minPrice": 2, "maxPrice": 8, "image": "poigneefrein"}, - {"name": "Poignée gachette", "minPrice": 2, "maxPrice": 8, "image": "poigneegachette"}, - {"name": "Poignée tournante", "minPrice": 2, "maxPrice": 6, "image": "poigneetournante"}, + {"name": "Poignée combo", "minPrice": 2, "maxPrice": 8, "image": "poignee_combo"}, + {"name": "Poignée frein", "minPrice": 2, "maxPrice": 8, "image": "poignee_frein"}, + {"name": "Poignée gachette", "minPrice": 2, "maxPrice": 8, "image": "poignee_gachette"}, + {"name": "Poignée tournante", "minPrice": 2, "maxPrice": 6, "image": "poignee_tournante"}, + {"name": "Manette cadre", "minPrice": 2, "maxPrice": 6, "image": "manette_cadre"}, {"name": "Gaine", "minPrice": 0, "maxPrice": 2, "image": "gaine"}, {"name": "Câble", "minPrice": 0, "maxPrice": 1, "image": "cable"}, - {"name": "Poignée", "minPrice": 1, "maxPrice": 4, "image": "poignees"}, + {"name": "Poignée", "minPrice": 1, "maxPrice": 4, "image": "poignee"}, {"name": "Cintre", "minPrice": 5, "maxPrice": 10,"image": "cintre"} ] }, @@ -46,11 +52,15 @@ "bgColor": "#FF00FF", "textColor": "#000000", "items": [ - {"name": "Étrier patin", "minPrice": 2, "maxPrice": 8, "image": "etrierpatin"}, - {"name": "Étrier disque", "minPrice": 2, "maxPrice": 8, "image": "etrierdisque"}, + {"name": "Étrier V-brake", "minPrice": 2, "maxPrice": 8, "image": "etrier_vbrake"}, + {"name": "Étrier Cantilever", "minPrice": 2, "maxPrice": 8, "image": "etrier_cantilever"}, + {"name": "Étrier Caliper ou Mafac", "minPrice": 2, "maxPrice": 8, "image": "etrier_mafac_caliper"}, + {"name": "Étrier disque câble", "minPrice": 2, "maxPrice": 8, "image": "etrier_cable"}, + {"name": "Étrier disque hydraulique", "minPrice": 2, "maxPrice": 8, "image": "etrier_hydraulique"}, {"name": "Patins", "minPrice": 1, "maxPrice": 2, "image": "patins"}, {"name": "Disque", "minPrice": 1, "maxPrice": 5, "image": "disque"}, - {"name": "Visserie frein", "minPrice": 0, "maxPrice": 1, "image": "visseriefrein"} + {"name": "Pont central cantilever", "minPrice": 0, "maxPrice": 1, "image": "frein_pontcentral"}, + {"name": "Visserie frein", "minPrice": 0, "maxPrice": 1, "image": "visserie_frein"} ] }, { @@ -58,15 +68,23 @@ "bgColor": "#0000FF", "textColor": "#FFFFFF", "items": [ - {"name": "Roue avant", "minPrice": 20, "maxPrice": 40, "image": "roueavant"}, - {"name": "Roue arrière", "minPrice": 20, "maxPrice": 40, "image": "rouearriere"}, - {"name": "Axe rapide", "minPrice": 1, "maxPrice": 2, "image": "axerapide"}, - {"name": "Axe roue", "minPrice": 1, "maxPrice": 3, "image": "axeroue"}, + {"name": "Chambre à air", "minPrice": 20, "maxPrice": 40, "image": "chambre_air"}, + {"name": "Roue avant", "minPrice": 20, "maxPrice": 40, "image": "roue_avant"}, + {"name": "Roue arrière", "minPrice": 20, "maxPrice": 40, "image": "roue_arriere"}, + {"name": "Axe rapide", "minPrice": 1, "maxPrice": 2, "image": "axe_rapide"}, + {"name": "Axe roue", "minPrice": 1, "maxPrice": 3, "image": "axe_roue"}, {"name": "Rayon", "minPrice": 0, "maxPrice": 2, "image": "rayon"}, - {"name": "Moyeu avant", "minPrice": 2, "maxPrice": 8, "image": "moyeuavant"}, - {"name": "Moyeu arrière", "minPrice": 2, "maxPrice": 10, "image": "moyeuarriere"}, - {"name": "Pneu", "minPrice": 10, "maxPrice": 20, "image": "pneu"}, - {"name": "Visserie roue", "minPrice": 0, "maxPrice": 1, "image": "visserieroue"} + {"name": "Jante", "minPrice": 0, "maxPrice": 2, "image": "jante"}, + {"name": "Fond de jante", "minPrice": 0, "maxPrice": 2, "image": "fond_jante"}, + {"name": "Moyeu avant", "minPrice": 2, "maxPrice": 8, "image": "moyeu_avant"}, + {"name": "Moyeu arrière cassette", "minPrice": 2, "maxPrice": 10, "image": "moyeu_arriere_cassette"}, + {"name": "Moyeu arrière roue libre", "minPrice": 2, "maxPrice": 10, "image": "moyeu_arriere_rouelibre"}, + {"name": "Moyeu arrière rétropédalage", "minPrice": 2, "maxPrice": 10, "image": "moyeu_retropedalage"}, + {"name": "Pneu petite taille", "minPrice": 10, "maxPrice": 20, "image": "pneu_petit"}, + {"name": "Pneu 26\"", "minPrice": 10, "maxPrice": 20, "image": "pneu_26"}, + {"name": "Pneu 28\" route", "minPrice": 10, "maxPrice": 20, "image": "pneu_route"}, + {"name": "Pneu 28\" large", "minPrice": 10, "maxPrice": 20, "image": "pneu_large"}, + {"name": "Visserie roue", "minPrice": 0, "maxPrice": 1, "image": "visserie_roue"} ] }, { @@ -74,12 +92,13 @@ "bgColor": "#FFCC00", "textColor": "#000000", "items": [ - {"name": "Dérailleur avant", "minPrice": 2, "maxPrice": 10, "image": "fd"}, - {"name": "Dérailleur arrière", "minPrice": 4, "maxPrice": 12, "image": "rd"}, + {"name": "Dérailleur arrière", "minPrice": 2, "maxPrice": 10, "image": "derailleur_arriere"}, + {"name": "Dérailleur avant tirage bas", "minPrice": 4, "maxPrice": 12, "image": "derailleur_avant_tiragebas"}, + {"name": "Dérailleur avant tirage haut", "minPrice": 4, "maxPrice": 12, "image": "derailleur_avant_tiragebas"}, {"name": "Cassette", "minPrice": 2, "maxPrice": 6, "image": "cassette"}, - {"name": "Roue libre", "minPrice": 2, "maxPrice": 6, "image": "rouelibre"}, + {"name": "Roue libre", "minPrice": 2, "maxPrice": 6, "image": "roue_libre"}, {"name": "Chaîne", "minPrice": 2, "maxPrice": 6, "image": "chaine"}, - {"name": "Visserie transmission", "minPrice": 0, "maxPrice": 1, "image": "visserietransmission"} + {"name": "Visserie transmission", "minPrice": 0, "maxPrice": 1, "image": "visserie_transmission"} ] }, { @@ -87,13 +106,17 @@ "bgColor": "#00FFFF", "textColor": "#000000", "items": [ - {"name": "Boîtier pédalier", "minPrice": 4, "maxPrice": 12, "image": "boitierpedalier"}, - {"name": "Manivelle gauche", "minPrice": 4, "maxPrice": 12, "image": "manivellegauche"}, - {"name": "Manivelle droite", "minPrice": 4, "maxPrice": 12, "image": "manivelledroite"}, - {"name": "Pédalier complet", "minPrice": 6, "maxPrice": 15, "image": "pedaliercomplet"}, + {"name": "Axe pédalier carré ou clavette", "minPrice": 4, "maxPrice": 12, "image": "axe_pedalier"}, + {"name": "Roulement pédalier", "minPrice": 4, "maxPrice": 12, "image": "roulement_pedalier"}, + {"name": "Boîtier pédalier cartouche", "minPrice": 4, "maxPrice": 12, "image": "boitier_cartouche"}, + {"name": "Boîtier pédalier Hollowtech 2", "minPrice": 4, "maxPrice": 12, "image": "boitier_hollowtech"}, + {"name": "Manivelle gauche", "minPrice": 4, "maxPrice": 12, "image": "manivelle_gauche"}, + {"name": "Manivelle droite", "minPrice": 4, "maxPrice": 12, "image": "manivelle_droite"}, + {"name": "Pédalier complet", "minPrice": 6, "maxPrice": 15, "image": "pedalier_complet"}, {"name": "Pédales", "minPrice": 2, "maxPrice": 8, "image": "pedales"}, - {"name": "Plateau", "minPrice": 2, "maxPrice": 8, "image": "plateau"}, - {"name": "Visserie pédalier", "minPrice": 0, "maxPrice": 1, "image": "visseriepedalier"} + {"name": "Plateau 4 branches", "minPrice": 2, "maxPrice": 8, "image": "plateau_4"}, + {"name": "Plateau 5 branches", "minPrice": 2, "maxPrice": 8, "image": "plateau_5"}, + {"name": "Visserie pédalier", "minPrice": 0, "maxPrice": 1, "image": "visserie_pedalier"} ] }, { @@ -102,10 +125,13 @@ "textColor": "#000000", "items": [ {"name": "Béquille", "minPrice": 2, "maxPrice": 8, "image": "bequille"}, - {"name": "Garde boue", "minPrice": 2, "maxPrice": 8, "image": "gardeboue"}, + {"name": "Garde boue", "minPrice": 2, "maxPrice": 8, "image": "garde_boue"}, {"name": "Lampe", "minPrice": 1, "maxPrice": 5, "image": "lampe"}, - {"name": "Porte bagage", "minPrice": 2, "maxPrice": 10, "image": "portebagage"}, - {"name": "Porte bidon", "minPrice": 0, "maxPrice": 1, "image": "portebidon"} + {"name": "Porte bagage", "minPrice": 2, "maxPrice": 10, "image": "porte_bagage"}, + {"name": "Porte bidon", "minPrice": 0, "maxPrice": 1, "image": "porte_bidon"}, + {"name": "Pompe", "minPrice": 0, "maxPrice": 1, "image": "pompe"}, + {"name": "Panier", "minPrice": 0, "maxPrice": 1, "image": "panier"}, + {"name": "Rétroviseur", "minPrice": 0, "maxPrice": 1, "image": "retroviseur"} ] } ] diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4104c11..9e15e6b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -45,11 +45,20 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:padding="10dp"> - + android:orientation="vertical"> + + + + + android:minLines="2" + android:maxLines="2" + android:ellipsize="end" + android:gravity="center"/>