Skip to content

Commit 58fc698

Browse files
milovanderlindenmilovanderlinden
committed
Upgrading texts and layout
1 parent 5185aae commit 58fc698

15 files changed

Lines changed: 198 additions & 98 deletions

File tree

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "org.open311.android"
99
minSdkVersion 16
1010
targetSdkVersion 24
11-
versionCode 3
12-
versionName "1.2-alpha"
11+
versionCode 4
12+
versionName "1.3-alpha"
1313
multiDexEnabled true
1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1515
}

‎app/src/main/java/org/open311/android/MainActivity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ protected void onPreExecute() {
244244
MainActivity.this);
245245

246246
progressDialog.setMessage(getString(R.string.contactingServer) + " " + getCurrentCity().getCityName());
247+
MainActivity.this.setTitle(getString(R.string.app_name) + " " + getCurrentCity().getTitle());
247248
progressDialog.setCancelable(false);
248249
progressDialog.show();
249250

‎app/src/main/java/org/open311/android/models/Attachment.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package org.open311.android.models;
2+
3+
import android.net.Uri;
4+
import android.webkit.MimeTypeMap;
5+
6+
import java.io.Serializable;
7+
8+
/**
9+
* Created by miblon on 11/23/16.
10+
*/
11+
12+
public class Attachment implements Serializable {
13+
14+
public Uri getUri() {
15+
return uri;
16+
}
17+
18+
public Attachment setUri(Uri uri) {
19+
this.uri = uri;
20+
return this;
21+
}
22+
23+
private Uri uri;
24+
25+
26+
}

‎app/src/main/res/drawable-anydpi/ic_pause.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
9+
</vector>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:shape="oval">
5+
<stroke android:width="2.5dp" android:color="@color/colorPrimary" />
6+
<size android:width="80dp" android:height="80dp"/>
7+
</shape>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:shape="oval">
5+
<stroke android:width="2.5dp" android:color="@color/colorAccent" />
6+
<size android:width="80dp" android:height="80dp"/>
7+
</shape>

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

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:id="@+id/fragment_record"
5+
android:orientation="vertical"
6+
android:layout_width="fill_parent"
7+
android:layout_height="fill_parent">
8+
9+
<android.support.design.widget.FloatingActionButton
10+
android:id="@+id/btnRecord"
11+
android:layout_width="wrap_content"
12+
android:layout_height="wrap_content"
13+
android:layout_marginBottom="10dp"
14+
android:layout_alignParentBottom="true"
15+
android:layout_centerHorizontal="true" />
16+
17+
<Chronometer
18+
android:layout_width="wrap_content"
19+
android:layout_height="wrap_content"
20+
android:id="@+id/chronometer"
21+
android:textSize="60sp"
22+
android:fontFamily="sans-serif-light"
23+
android:layout_alignBottom="@+id/recordProgressBar"
24+
android:layout_centerHorizontal="true"
25+
android:layout_marginBottom="64dp"
26+
android:visibility="visible" />
27+
28+
<ProgressBar
29+
style="?android:attr/progressBarStyleHorizontal"
30+
android:id="@+id/recordProgressBar"
31+
android:layout_width="200dp"
32+
android:layout_height="200dp"
33+
android:progressDrawable="@drawable/record_progress_bar"
34+
android:background="@drawable/record_progress_bar_background"
35+
android:indeterminate="false"
36+
android:max="100"
37+
android:progress="0"
38+
android:layout_marginTop="27dp"
39+
android:layout_alignParentTop="true"
40+
android:layout_centerHorizontal="true" />
41+
42+
<Button
43+
android:layout_width="wrap_content"
44+
android:layout_height="wrap_content"
45+
android:id="@+id/btnPause"
46+
android:drawableLeft="@drawable/ic_pause"
47+
android:text="@string/pause"
48+
android:textAllCaps="true"
49+
android:fontFamily="sans-serif-condensed"
50+
android:layout_alignParentLeft="true"
51+
android:layout_alignParentStart="true"
52+
android:layout_alignParentBottom="true"
53+
android:layout_marginBottom="10dp"
54+
android:layout_marginLeft="10dp"
55+
android:layout_marginStart="10dp"/>
56+
57+
<TextView
58+
android:layout_width="wrap_content"
59+
android:layout_height="wrap_content"
60+
android:id="@+id/recording_status_text"
61+
android:text="@string/record_dialog"
62+
android:textStyle="bold"
63+
android:textSize="17sp"
64+
android:textColor="#000000"
65+
android:fontFamily="sans-serif-condensed"
66+
android:layout_above="@+id/btnRecord"
67+
android:layout_centerHorizontal="true"
68+
android:layout_marginBottom="60dp" />
69+
70+
</RelativeLayout>

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

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,52 +14,32 @@
1414
android:padding="16dp"
1515
android:layout_width="match_parent"
1616
android:layout_height="wrap_content">
17-
1817
<TextView
1918
style="@style/AppTheme.PolicyTitle"
20-
android:text="@string/privacyPolicy" />
21-
22-
<TextView
23-
style="@style/AppTheme.PolicyText"
24-
android:text="@string/privacyPar1" />
19+
android:text="@string/policy_intro_title" />
2520

2621
<TextView
2722
style="@style/AppTheme.PolicyText"
28-
android:text="@string/privacyPar2" />
23+
android:text="@string/policy_intro_text" />
2924

3025
<TextView
31-
style="@style/AppTheme.PolicyText"
32-
android:text="@string/privacyPar3" />
26+
style="@style/AppTheme.PolicyTitle"
27+
android:text="@string/policy_privacy_title" />
3328

3429
<TextView
3530
style="@style/AppTheme.PolicyText"
36-
/>
31+
android:text="@string/policy_privacy_text" />
3732

3833
<TextView
3934
style="@style/AppTheme.PolicyTitle"
40-
android:text="@string/questionsAndFeedback" />
35+
android:text="@string/policy_faq_title" />
4136

4237
<TextView
4338
style="@style/AppTheme.PolicyText"
44-
android:text="@string/questionsPar1" />
39+
android:text="@string/policy_faq_text" />
4540
<TextView
4641
style="@style/AppTheme.PolicyText"
4742
/>
48-
49-
<TextView
50-
style="@style/AppTheme.PolicyTitle"
51-
android:text="@string/contactTitle" />
52-
53-
<TextView
54-
style="@style/AppTheme.ContactText"
55-
android:text="@string/contactAuthority" />
56-
<TextView
57-
style="@style/AppTheme.ContactText"
58-
android:text="@string/contactPhone" />
59-
<TextView
60-
style="@style/AppTheme.ContactText"
61-
android:text="@string/contactEmail" />
62-
6343
</LinearLayout>
6444

6545
</ScrollView>

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

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,20 @@
6464
android:layout_height="1px"
6565
android:background="#000" />
6666

67-
<android.support.design.widget.TextInputLayout
68-
android:id="@+id/input_layout_description"
67+
<android.support.design.widget.TextInputEditText
68+
android:id="@+id/report_description_textbox"
6969
android:layout_width="match_parent"
7070
android:layout_height="wrap_content"
71-
android:layout_weight="1">
72-
73-
<android.support.design.widget.TextInputEditText
74-
android:id="@+id/report_description_textbox"
75-
android:layout_width="match_parent"
76-
android:layout_height="wrap_content"
77-
android:cursorVisible="true"
78-
android:ems="5"
79-
android:gravity="top"
80-
android:hint="@string/report_hint_description"
81-
android:inputType="textMultiLine|textCapSentences"
82-
android:minHeight="200dp" />
83-
</android.support.design.widget.TextInputLayout>
71+
android:layout_marginLeft="16dp"
72+
android:layout_marginRight="16dp"
73+
android:layout_marginTop="16dp"
74+
android:background="@android:color/transparent"
75+
android:cursorVisible="true"
76+
android:ems="5"
77+
android:gravity="top"
78+
android:hint="@string/report_hint_description"
79+
android:inputType="textMultiLine|textCapSentences"
80+
android:minHeight="200dp" />
8481

8582
<android.support.v7.widget.LinearLayoutCompat
8683
android:id="@+id/report_attributes"

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,21 @@
4242
android:layout_height="wrap_content"
4343
android:orientation="vertical"
4444
android:padding="16dp">
45-
4645
<TextView
4746
style="@style/AppTheme.PolicyTitle"
48-
android:text="@string/app_name" />
47+
android:text="@string/policy_intro_title" />
4948

5049
<TextView
5150
style="@style/AppTheme.PolicyText"
52-
android:text="@string/introText1" />
51+
android:text="@string/policy_intro_text" />
5352

5453
<TextView
55-
style="@style/AppTheme.PolicyText"
56-
android:text="@string/introText2" />
54+
style="@style/AppTheme.PolicyTitle"
55+
android:text="@string/no_reports_title" />
5756

57+
<TextView
58+
style="@style/AppTheme.PolicyText"
59+
android:text="@string/no_reports_text" />
5860
</LinearLayout>
5961
</FrameLayout>
6062

0 commit comments

Comments
 (0)