Skip to content

Commit df9be41

Browse files
milovanderlindenmilovanderlinden
committed
Setting up Audio upload related to #36 
1 parent 6a23c3a commit df9be41

9 files changed

Lines changed: 189 additions & 115 deletions

File tree

‎app/src/main/java/org/open311/android/fragments/ReportFragment.java‎

Lines changed: 155 additions & 85 deletions
Large diffs are not rendered by default.

‎app/src/main/res/drawable-v21/fab_label_background.xml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,24 @@
66
<shape android:shape="rectangle">
77
<solid android:color="#99000000" />
88
<padding
9+
android:bottom="4dp"
910
android:left="8dp"
10-
android:top="4dp"
1111
android:right="8dp"
12-
android:bottom="4dp" />
12+
android:top="4dp" />
1313
<corners android:radius="2dp" />
1414
</shape>
1515
</item>
1616

1717
<item>
1818
<selector>
19-
2019
<item android:state_pressed="true">
2120
<shape>
2221
<solid android:color="#A6000000" />
2322
<padding
23+
android:bottom="4dp"
2424
android:left="8dp"
25-
android:top="4dp"
2625
android:right="8dp"
27-
android:bottom="4dp" />
26+
android:top="4dp" />
2827
<corners android:radius="2dp" />
2928
</shape>
3029
</item>
@@ -33,16 +32,14 @@
3332
<shape android:shape="rectangle">
3433
<solid android:color="#99000000" />
3534
<padding
35+
android:bottom="4dp"
3636
android:left="8dp"
37-
android:top="4dp"
3837
android:right="8dp"
39-
android:bottom="4dp" />
38+
android:top="4dp" />
4039
<corners android:radius="2dp" />
4140
</shape>
4241
</item>
43-
4442
</selector>
4543
</item>
46-
4744
</ripple>
4845

‎app/src/main/res/drawable/fab_label_background.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
43
<item android:state_pressed="true">
54
<shape>
65
<solid android:color="#A6000000" />
7-
<padding android:left="8dp" android:top="4dp" android:right="8dp" android:bottom="4dp" />
6+
<padding android:bottom="4dp" android:left="8dp" android:right="8dp" android:top="4dp" />
87
<corners android:radius="2dp" />
98
</shape>
109
</item>
1110

1211
<item>
1312
<shape>
1413
<solid android:color="#99000000" />
15-
<padding android:left="8dp" android:top="4dp" android:right="8dp" android:bottom="4dp" />
14+
<padding android:bottom="4dp" android:left="8dp" android:right="8dp" android:top="4dp" />
1615
<corners android:radius="2dp" />
1716
</shape>
1817
</item>
19-
2018
</selector>

‎app/src/main/res/layout/fragment_report.xml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,6 @@
77
android:focusableInTouchMode="true"
88
tools:context=".fragments.ReportFragment">
99

10-
<android.support.design.widget.FloatingActionButton
11-
android:id="@+id/report_submit"
12-
android:layout_width="wrap_content"
13-
android:layout_height="match_parent"
14-
android:layout_gravity="end|bottom"
15-
android:layout_marginBottom="10dp"
16-
android:layout_marginEnd="10dp"
17-
android:layout_marginRight="10dp"
18-
android:src="@drawable/ic_done"
19-
app:backgroundTint="@color/colorPrimary" />
20-
2110
<ScrollView
2211
android:layout_width="match_parent"
2312
android:layout_height="match_parent">
@@ -295,4 +284,14 @@
295284
</android.support.v7.widget.LinearLayoutCompat>
296285
</ScrollView>
297286

287+
<android.support.design.widget.FloatingActionButton
288+
android:id="@+id/report_submit"
289+
android:layout_width="wrap_content"
290+
android:layout_height="match_parent"
291+
android:layout_gravity="end|bottom"
292+
android:layout_marginBottom="10dp"
293+
android:layout_marginEnd="10dp"
294+
android:layout_marginRight="10dp"
295+
android:src="@drawable/ic_done"
296+
app:backgroundTint="@color/colorPrimary" />
298297
</android.support.design.widget.CoordinatorLayout>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<string name="supports_media">Unterstützt Medien</string>
2222
<string name="dialog_loading_services">Lade Service Information</string>
2323
<string name="dialog_posting_service">Hinweis wird übertragen</string>
24-
<string name="choose_media_source">Quelle für Foto</string>
24+
<string name="choose_media_source">Bildquelle auswählen</string>
2525
<string name="camera">Kamera</string>
2626
<string name="gallery">Galerie</string>
2727
<string name="location">Ort</string>
@@ -127,4 +127,6 @@
127127
<string name="house_number">Hausnummer</string>
128128
<string name="edit_address">Adresse</string>
129129
<string name="report_hint_sound">Ton hinzufügen</string>
130+
<string name="choose_audio_source">Audioquelle auswählen</string>
131+
<string name="recorder">Mikrofon</string>
130132
</resources>

‎app/src/main/res/values-fi/strings.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<string name="supports_media">Tukee media</string>
2323
<string name="dialog_loading_services">Haetaan palvelun tietoja</string>
2424
<string name="dialog_posting_service">Lähetetään palautetta</string>
25-
<string name="choose_media_source">Valitse kuva</string>
25+
<string name="choose_media_source">Valitse kuvalähde</string>
2626
<string name="camera">Kamera</string>
2727
<string name="gallery">Galleria</string>
2828
<string name="location">Sijainti</string>
@@ -127,4 +127,6 @@
127127
<string name="house_number">Talonumero</string>
128128
<string name="edit_address">Osoite</string>
129129
<string name="report_hint_sound">Lisää ääni</string>
130+
<string name="choose_audio_source">Valitse äänilähde</string>
131+
<string name="recorder">Mikrofoni</string>
130132
</resources>

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<string name="supports_media">Supports Média</string>
2323
<string name="dialog_loading_services">Chargement service information</string>
2424
<string name="dialog_posting_service">Transmission demande</string>
25-
<string name="choose_media_source">Choisir source photo</string>
25+
<string name="choose_media_source">Sélectionner une source d\'image</string>
2626
<string name="camera">Caméra</string>
2727
<string name="gallery">Gallery</string>
2828
<string name="location">Emplacement</string>
@@ -127,4 +127,6 @@
127127
<string name="house_number">Numéro</string>
128128
<string name="edit_address">Adresse</string>
129129
<string name="report_hint_sound">Ajouter du son</string>
130+
<string name="choose_audio_source">Sélectionner une source audio</string>
131+
<string name="recorder">Microphone</string>
130132
</resources>

‎app/src/main/res/values-nl/strings.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<string name="error_403">Onvoldoende rechten</string>
7777
<string name="dialog_posting_service">Melding wordt verzonden</string>
7878
<string name="dialog_loading_services">Informatie wordt opgehaald</string>
79-
<string name="choose_media_source">Selecteer de bron</string>
79+
<string name="choose_media_source">Selecteer afbeeldingbron</string>
8080
<string name="button_accept_error">Annuleren</string>
8181
<string name="btn_sign_up">Aanmelden</string>
8282
<string name="api_key">API Sleutel</string>
@@ -126,5 +126,7 @@
126126
<string name="house_number">Huisnummer</string>
127127
<string name="street">Straat</string>
128128
<string name="edit_address">Adres</string>
129-
<string name="report_hint_sound">Voeg geluid toe</string>
129+
<string name="report_hint_sound">Voeg audio toe</string>
130+
<string name="choose_audio_source">Selecteer audiobron</string>
131+
<string name="recorder">Microfoon</string>
130132
</resources>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<string name="supports_media">Supports Media</string>
3939
<string name="dialog_loading_services">Loading service information</string>
4040
<string name="dialog_posting_service">Posting service request</string>
41-
<string name="choose_media_source">Select Source</string>
41+
<string name="choose_media_source">Select Image Source</string>
4242
<string name="camera">Camera</string>
4343
<string name="gallery">Gallery</string>
4444
<string name="location">Location</string>
@@ -126,4 +126,6 @@
126126
<string name="house_number">Housenumber</string>
127127
<string name="edit_address">Address</string>
128128
<string name="report_hint_sound">Add sound</string>
129+
<string name="recorder">Microphone</string>
130+
<string name="choose_audio_source">Select Audio Source</string>
129131
</resources>

0 commit comments

Comments
 (0)