Merge branch 'master' of https://github.com/machbarschaft/machbarscha…

…ft-android

app/src/main/res/values-de/strings.xml

@@ -1,45 +1,18 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">MACHBARSCHAFT</string>
     <string name="app_name_noncapital">Machbarschaft</string>
-    <string name="confirm">Bestätigen</string>
     <string name="title_back">Zurück</string>
-    <string name="stepFor">für</string>
 
     <string name="login_action_login">Los gehts</string>
-    <string name="login_action_register">Registrieren</string>
     <string name="login_hint_phone_number">Handynummer eintragen</string>
-    <string name="login_in_progress">Anmeldung…</string>
     <string name="login_error_invalid_phone_number">Bitte geben Sie eine valide Telefonnummer ein</string>
-    <string name="login_error_number_not_exist">Es gibt kein Nutzer mit dieser Nummer</string>
-    <string name="login_error_generic">Anmelden fehlgeschlagen</string>
 
-    <string name="verify_phone_wait_for_code">Bestätigungscode eingeben</string>
-    <string name="verify_phone_code_hint">Bestätigungscode per SMS</string>
     <string name="verify_phone_title">Handynummer bestätigen</string>
     <string name="verify_phone_btn_send_code">Code erneut senden</string>
     <string name="verify_phone_button">Verifizieren</string>
-    <string name="verify_phone_error_invalid_code">Code ungültig</string>
 
-    <string name="verify_address_dialog_message">Wir arbeiten daran, dass du deine Adresse bald über Maps suchen kannst.</string>
-    <string name="verify_address_dialog_understood">Verstanden</string>
-    <string name="verify_success">Verification erfolgreich</string>
-    <string name="verify_sms_sent">SMS gesendet</string>
     <string name="verify_error_generic">Verifikation fehlgeschlagen</string>
-    <string name="verify_error_fill_all_fields">Bitte fülle alle Felder aus</string>
     <string name="verify_error_sms_send_failed">SMS konnte nicht gesendet werden</string>
-    <string name="verify_error_no_agb">Bitte akzeptiere unsere AGB</string>
-    <string name="verify_error_verify">Bitte verifiziere dich</string>
-
-    <string name="register_title">Anmeldung vervollständigen</string>
-    <string name="register_subtitle_first">1. Basisinformationen</string>
-    <string name="register_subtitle_second">Identität verifizieren</string>
-    <string name="register_hint_name">Vorname</string>
-    <string name="register_hint_surname">Nachname</string>
-    <string name="register_hint_address">Anschrift</string>
-    <string name="register_hint_phone">Handynummer</string>
-    <string name="register_check_agb">AGB/Datenschutz</string>
-    <string name="register_button_send">Absenden</string>
-    <string name="register_button_back">Zurück</string>
 
     <string name="intro_1_text">Melde dich als \nMachbar:in an</string>
     <string name="intro_2_text">Finde Personen in deinem Umkreis, denen du etwas Gutes tun kannst</string>
@@ -54,19 +27,15 @@
     <string name="order_urgency_tomorrow">Morgen</string>
     <string name="order_urgency_undefined">Irgendwann</string>
 
-    <string name="home_button_urgency">Dringlichkeit</string>
-    <string name="home_button_radius">In deiner Nähe</string>
     <string name="home_link_faq">FAQ</string>
     <string name="home_link_contact">Kontakt</string>
     <string name="home_link_bug_report">Problem melden</string>
-    <string name="home_faq_description">Wir arbeiten an einer Lösung, damit du unsere FAQ\'s hier bald sehen kannst.</string>
     <string name="home_feedback_description">Wenn du ein Problem mit unserem Service hast, schreib uns einfach eine Mail. Wir kümmern uns dann so schnell es geht um dein Anliegen.</string>
     <string name="home_feedback_write_mail">Email schreiben</string>
     <string name="home_feedback_later">Später</string>
     <string name="home_feedback_subject">Problem mit der Android App</string>
     <string name="home_feedback_body1">Liebes Machbarschaft-Team,\n\nbei der Android App ist mir ein Problem aufgefallen. Die Technischen Informationen sind wie folgt:</string>
     <string name="home_feedback_body2" tools:ignore="TypographyEllipsis">Mein Problem ist ...</string>
-    <string name="home_dialog_understood">Verstanden</string>
     <string name="home_tab_distance">Distanz</string>
     <string name="home_tab_urgency">Dringlichkeit</string>
     <plurals name="home_order_count">
@@ -78,12 +47,6 @@
     <string name="home_order_extra_prescription">Rezept abhohlen</string>
     <string name="home_order_extra_car">Auto erforderlich</string>
 
-    <string name="order_detail_title">Der Auftrag</string>
-    <string name="order_detail_label_needs">benötigt</string>
-    <string name="order_detail_label_urgency">Dringlichkeit</string>
-    <string name="order_detail_label_address">Adresse</string>
-    <string name="order_detail_accept_order">Auftrag annehmen</string>
-
     <string name="order_accept_title">Schritt #1</string>
     <string name="order_accept_text">Bitte ruf %1$s an, um die Details des Auftrags zu besprechen.</string>
     <string name="call_now">Jetzt anrufen</string>
@@ -92,12 +55,7 @@
     <string name="order_carry_out_text">Sag uns bescheid, wenn Du unterwegs bist.</string>
     <string name="start_to_execute_now">Ich gehe jetzt los</string>
     <string name="start_to_execute_later">Ich gehe später los</string>
-    <string name="start_to_execute_failed">Ich konnte niemanden erreichen</string>
 
-    <string name="order_en_route_title">Schritt #3</string>
-    <string name="order_en_route_text">Auftrag erledigen</string>
-    <string name="target_address">Ziel-Adresse:</string>
-    <string name="calculate_route">Route berechnen</string>
     <string name="order_done">Auftrag erledigt</string>
     <string name="thank_you_text">Vielen Dank!\nDu bist toll!</string>
     <string name="back_to_home">zum Home Screen</string>
@@ -111,7 +69,6 @@
     <string name="order_first_text">Ein Hinweis, bevor Du den ersten Auftrag anschaust:
         Über Machbarschaft suchen echte Menschen Deine echte Hilfe. Mit dieser Vertrauenserklärung verpflichtest du Dich freiwillig zum vertraulichen Umgang mit den persönlichen Informationen,
         den Kontaktdaten und den Gesuchen der Hilfesuchenden. Bist du damit einverstanden?</string>
-    <string name="order_first_decline_btn">Ablehnen</string>
     <string name="order_first_accept_btn">Bestätigen</string>
     <string name="medical_warnings_not_checked">Du musst alle Hinweise bestätigen!</string>
     <string name="button_cancel">Abbrechen</string>

app/src/main/res/values/dimens.xml

@@ -15,13 +15,6 @@
     <dimen name="order_list_item_height">64dp</dimen>
     <dimen name="home_controls_elevation">4dp</dimen>
 
-    <dimen name="text_size_list_item">@dimen/text_size_default</dimen>
-    <dimen name="text_size_list_item_small">@dimen/text_size_default</dimen>
-
-    <dimen name="circular_map_diameter">320dp</dimen>
-
-    <dimen name="text_size_medium">16sp</dimen>
-
     <dimen name="space_between_content_areas">8dp</dimen>
 
     <dimen name="order_content_size">300dp</dimen>

app/src/main/res/values/strings.xml

@@ -1,43 +1,16 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">MACHBARSCHAFT</string>
     <string name="app_name_noncapital">Machbarschaft</string>
-    <string name="confirm">Confirm</string>
     <string name="title_back">Back</string>
-    <string name="stepFor">for</string>
 
     <string name="login_action_login">Start now</string>
-    <string name="login_action_register">Register</string>
     <string name="login_hint_phone_number">Enter phone number</string>
-    <string name="login_in_progress">Login…</string>
     <string name="login_error_invalid_phone_number">Please enter a valid phone number</string>
-    <string name="login_error_number_not_exist">There is no user with this number</string>
-    <string name="login_error_generic">Login failed</string>
-    <string name="verify_phone_wait_for_code">Enter confirmation code</string>
-    <string name="verify_phone_code_hint">Confirmation code per sms</string>
     <string name="verify_phone_title">Confirm phone number</string>
     <string name="verify_phone_btn_send_code">Resend code</string>
     <string name="verify_phone_button">Verify</string>
-    <string name="verify_phone_error_invalid_code">Invalid code</string>
-    <string name="verify_address_dialog_message">We are working on this feature.</string>
-    <string name="verify_address_dialog_understood">Understood</string>
-    <string name="verify_success">Verification successful</string>
-    <string name="verify_sms_sent">SMS sent </string>
     <string name="verify_error_generic">Verification failed</string>
-    <string name="verify_error_fill_all_fields">Please fill all fields</string>
     <string name="verify_error_sms_send_failed">SMS couldn\'t be send</string>
-    <string name="verify_error_no_agb">Please accept our terms and conditions</string>
-    <string name="verify_error_verify">Please verify yourself</string>
-
-    <string name="register_title">Complete registration</string>
-    <string name="register_subtitle_first">1. Basic information</string>
-    <string name="register_subtitle_second">Verify identity</string>
-    <string name="register_hint_name">First name</string>
-    <string name="register_hint_surname">Surname</string>
-    <string name="register_hint_address">Address</string>
-    <string name="register_hint_phone">Phone number</string>
-    <string name="register_check_agb">Terms and conditions</string>
-    <string name="register_button_send">Submit</string>
-    <string name="register_button_back">Back</string>
 
     <string name="intro_1_text">Register as helper</string>
     <string name="intro_2_text">Find people in your area to whom you can do good</string>
@@ -52,19 +25,15 @@
     <string name="order_urgency_tomorrow">Tomorrow</string>
     <string name="order_urgency_undefined">Sometime</string>
 
-    <string name="home_button_urgency">Urgency</string>
-    <string name="home_button_radius">Near you</string>
     <string name="home_link_faq">FAQ</string>
     <string name="home_link_contact">Contact</string>
     <string name="home_link_bug_report">Report problem</string>
-    <string name="home_faq_description">We are working on a solution, so that you can see our FAQ here.</string>
     <string name="home_feedback_description">If you have a problem with our service, just send an email. We will take care of your request as soon as possible.</string>
     <string name="home_feedback_write_mail">Send email</string>
     <string name="home_feedback_later">Later</string>
     <string name="home_feedback_subject">Problem in the Android App</string>
     <string name="home_feedback_body1">Dear Machbarschaft team, I noticed a problem with the Android app. The technical information is as follows:</string>
     <string name="home_feedback_body2" tools:ignore="TypographyEllipsis">My problem is ...</string>
-    <string name="home_dialog_understood">Understood</string>
     <string name="home_tab_distance">Distance</string>
     <string name="home_tab_urgency">Urgency</string>
     <plurals name="home_order_count">
@@ -76,12 +45,6 @@
     <string name="home_order_extra_prescription">Get recipe</string>
     <string name="home_order_extra_car">Car needed</string>
 
-    <string name="order_detail_title">The order</string>
-    <string name="order_detail_label_needs">requires</string>
-    <string name="order_detail_label_urgency">Urgency</string>
-    <string name="order_detail_label_address">Address</string>
-    <string name="order_detail_accept_order">Accept order</string>
-
     <string name="order_accept_title">Step #1</string>
     <string name="order_accept_text">Please call %1$s to discuss the details of the order.</string>
     <string name="call_now">Call now</string>
@@ -90,12 +53,7 @@
     <string name="order_carry_out_text">Tell us, when you are on your way.</string>
     <string name="start_to_execute_now">Leaving now</string>
     <string name="start_to_execute_later">I will go later</string>
-    <string name="start_to_execute_failed">I could not reach anybody</string>
 
-    <string name="order_en_route_title">Step #3</string>
-    <string name="order_en_route_text">Execute order</string>
-    <string name="target_address">Target address:</string>
-    <string name="calculate_route">Navigate</string>
     <string name="order_done">Order completed</string>
     <string name="thank_you_text">Thank you!\nYou are great!</string>
     <string name="back_to_home">back to Home</string>
@@ -108,7 +66,6 @@
     <string name="order_first_text">One hint before you look at the first assignment: Via Machbarschaft real people are looking for your real help.
         With this declaration of trust you voluntarily commit yourself to the confidential handling of personal information,
         contact data and requests of people seeking help. Do you agree with this?</string>
-    <string name="order_first_decline_btn">Decline</string>
     <string name="order_first_accept_btn">Accept</string>
     <string name="medical_warnings_not_checked">You need to confirm all warnings!</string>
     <string name="button_cancel">Cancel</string>