Skip to content

Commit b1f1e73

Browse files
committed
Fixes #110: Fix UI issues that came up when supporting API level 16
1 parent 313a698 commit b1f1e73

File tree

5 files changed

+43
-20
lines changed

5 files changed

+43
-20
lines changed

Examples/restcomm-messenger/.idea/inspectionProfiles/Project_Default.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/restcomm-messenger/.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/restcomm-messenger/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66

77
defaultConfig {
88
applicationId "com.telestax.restcomm_messenger"
9-
minSdkVersion 17
9+
minSdkVersion 16
1010
targetSdkVersion 22
1111
versionCode 1
1212
versionName "1.2.3"

Examples/restcomm-messenger/app/src/main/res/layout/activity_call.xml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,39 +24,36 @@
2424
android:text="Answer"
2525
android:id="@+id/button_answer"
2626
android:minWidth="100dp"
27-
android:layout_alignParentBottom="true"
28-
android:layout_alignParentEnd="true"
29-
android:layout_marginBottom="10dp"
30-
android:layout_marginRight="10dp" />
27+
android:layout_below="@+id/button_cancel"
28+
android:layout_alignLeft="@+id/button_cancel"
29+
android:layout_alignStart="@+id/button_cancel" />
3130

3231
<Button
3332
android:layout_width="wrap_content"
3433
android:layout_height="wrap_content"
3534
android:text="Decline"
3635
android:id="@+id/button_decline"
37-
android:layout_alignParentBottom="true"
38-
android:layout_alignParentLeft="true"
39-
android:layout_alignParentStart="true"
4036
android:minWidth="100dp"
41-
android:layout_marginLeft="10dp"
42-
android:layout_marginBottom="10dp" />
37+
android:layout_below="@+id/button_cancel"
38+
android:layout_alignLeft="@+id/button_hangup"
39+
android:layout_alignStart="@+id/button_hangup" />
4340

4441
<Button
4542
android:layout_width="wrap_content"
4643
android:layout_height="wrap_content"
4744
android:text="Cancel"
4845
android:id="@+id/button_cancel"
4946
android:minWidth="100dp"
50-
android:layout_marginRight="10dp"
5147
android:layout_alignTop="@+id/button_hangup"
52-
android:layout_alignStart="@+id/button_answer" />
48+
android:layout_alignParentRight="true"
49+
android:layout_alignParentEnd="true"
50+
android:layout_marginRight="10dp" />
5351

5452
<CheckBox
5553
android:layout_width="wrap_content"
5654
android:layout_height="wrap_content"
5755
android:text="Mute"
5856
android:id="@+id/checkbox_muted"
59-
android:layout_below="@+id/button_register"
6057
android:layout_alignParentLeft="true"
6158
android:layout_alignParentStart="true"
6259
android:layout_marginTop="17dp"

Examples/restcomm-messenger/app/src/main/res/layout/activity_main.xml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
android:text="Dial"
1212
android:id="@+id/button_dial"
1313
android:layout_below="@+id/text_uri"
14-
android:layout_alignEnd="@+id/button_send"
14+
android:layout_alignRight="@+id/text_uri"
15+
android:layout_alignEnd="@+id/text_uri"
16+
android:layout_alignParentLeft="true"
1517
android:layout_alignParentStart="true" />
1618
<!--
1719
<Button
@@ -31,8 +33,10 @@
3133
android:text="Register"
3234
android:id="@+id/button_register"
3335
android:layout_alignParentBottom="true"
34-
android:layout_alignParentStart="true"
35-
android:layout_alignParentEnd="true" />
36+
android:layout_alignRight="@+id/button_send"
37+
android:layout_alignEnd="@+id/button_send"
38+
android:layout_alignParentLeft="true"
39+
android:layout_alignParentStart="true" />
3640
<!--
3741
<Button
3842
android:layout_width="wrap_content"
@@ -71,7 +75,9 @@
7175
android:text="Send"
7276
android:id="@+id/button_send"
7377
android:layout_below="@+id/text_message"
78+
android:layout_alignParentRight="true"
7479
android:layout_alignParentEnd="true"
80+
android:layout_alignParentLeft="true"
7581
android:layout_alignParentStart="true" />
7682

7783
<EditText
@@ -83,7 +89,8 @@
8389
android:layout_alignParentStart="true"
8490
android:layout_toStartOf="@+id/button_send"
8591
android:layout_marginTop="10dp"
86-
android:layout_alignEnd="@+id/button_send" />
92+
android:layout_alignParentRight="true"
93+
android:layout_alignParentEnd="true" />
8794

8895
<EditText
8996
android:layout_width="wrap_content"
@@ -96,7 +103,8 @@
96103
android:layout_alignParentStart="true"
97104
android:layout_marginTop="25dp"
98105
android:layout_toStartOf="@+id/button_send"
99-
android:layout_alignParentEnd="true" />
106+
android:layout_alignRight="@+id/text_wall"
107+
android:layout_alignEnd="@+id/text_wall" />
100108

101109
<EditText
102110
android:layout_width="wrap_content"
@@ -111,8 +119,8 @@
111119
android:layout_alignParentLeft="true"
112120
android:layout_alignParentStart="true"
113121
android:layout_marginTop="20dp"
114-
android:layout_alignRight="@+id/button_send"
115-
android:layout_alignEnd="@+id/button_send" />
122+
android:layout_alignRight="@+id/button_dial"
123+
android:layout_alignEnd="@+id/button_dial" />
116124
<!--
117125
<CheckBox
118126
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)