Still cleaning resources

This commit is contained in:
Sylvain Berfini 2018-10-25 10:37:33 +02:00
parent 28d0308427
commit 6cd78120e3
16 changed files with 17 additions and 16 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

View file

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View file

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View file

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

View file

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/pause_disabled" />
<item android:state_selected="true"
android:drawable="@drawable/pause_over_selected" />
<item android:state_pressed="true" <item android:state_pressed="true"
android:drawable="@drawable/pause_small_over_selected" /> android:drawable="@drawable/pause_over_selected" />
<item <item
android:drawable="@drawable/pause_small_default" /> android:drawable="@drawable/pause_default" />
</selector> </selector>

View file

@ -127,7 +127,7 @@
<ImageView <ImageView
android:id="@+id/pause" android:id="@+id/pause"
android:src="@drawable/pause_big_default" android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause" android:contentDescription="@string/content_description_pause"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"

View file

@ -135,7 +135,7 @@
<ImageView <ImageView
android:id="@+id/pause" android:id="@+id/pause"
android:src="@drawable/pause_big_default" android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause" android:contentDescription="@string/content_description_pause"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"

View file

@ -123,7 +123,7 @@
<ImageView <ImageView
android:id="@+id/pause" android:id="@+id/pause"
android:src="@drawable/pause_big_default" android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause" android:contentDescription="@string/content_description_pause"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"

View file

@ -4,7 +4,6 @@
android:alpha="0.5" android:alpha="0.5"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_margin="2dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp"> android:padding="5dp">
@ -37,7 +36,7 @@
<ImageView <ImageView
android:id="@+id/call_pause" android:id="@+id/call_pause"
android:src="@drawable/pause_small_over_selected" android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause" android:contentDescription="@string/content_description_pause"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"

View file

@ -38,7 +38,7 @@
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:padding="10dp" android:padding="10dp"
android:src="@drawable/pause_big_default"/> android:src="@drawable/pause"/>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"

View file

@ -29,7 +29,7 @@
<ImageView <ImageView
android:id="@+id/conference_pause" android:id="@+id/conference_pause"
android:src="@drawable/pause_small_over_selected" android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause" android:contentDescription="@string/content_description_pause"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"

View file

@ -728,10 +728,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private void enabledPauseButton(boolean enabled) { private void enabledPauseButton(boolean enabled) {
if (enabled) { if (enabled) {
pause.setEnabled(true); pause.setEnabled(true);
pause.setImageResource(R.drawable.pause_big_default);
} else { } else {
pause.setEnabled(false); pause.setEnabled(false);
pause.setImageResource(R.drawable.pause_big_disabled);
} }
} }
@ -918,14 +916,14 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) { if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
isVideoCallPaused = true; isVideoCallPaused = true;
} }
pause.setImageResource(R.drawable.pause_big_over_selected); pause.setSelected(true);
} else if (call != null) { } else if (call != null) {
if (call.getState() == State.Paused) { if (call.getState() == State.Paused) {
lc.resumeCall(call); lc.resumeCall(call);
if (isVideoCallPaused) { if (isVideoCallPaused) {
isVideoCallPaused = false; isVideoCallPaused = false;
} }
pause.setImageResource(R.drawable.pause_big_default); pause.setSelected(false);
} }
} }
} }
@ -1496,10 +1494,10 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
conferenceStatus = findViewById(R.id.conference_pause); conferenceStatus = findViewById(R.id.conference_pause);
if (conferenceStatus != null) { if (conferenceStatus != null) {
if (lc.isInConference()) { if (lc.isInConference()) {
conferenceStatus.setImageResource(R.drawable.pause_big_over_selected); conferenceStatus.setSelected(true);
lc.leaveConference(); lc.leaveConference();
} else { } else {
conferenceStatus.setImageResource(R.drawable.pause_big_default); conferenceStatus.setSelected(false);
lc.enterConference(); lc.enterConference();
} }
} }

View file

@ -200,7 +200,7 @@ public class DialerFragment extends Fragment {
mCall.resetClickListener(); mCall.resetClickListener();
} }
mAddContact.setEnabled(true); mAddContact.setEnabled(true);
mAddContact.setImageResource(R.drawable.call_alt_back); mAddContact.setImageResource(R.drawable.call_back);
mAddContact.setOnClickListener(cancelListener); mAddContact.setOnClickListener(cancelListener);
} else { } else {
if (LinphoneManager.getLc().getVideoActivationPolicy().getAutomaticallyInitiate()) { if (LinphoneManager.getLc().getVideoActivationPolicy().getAutomaticallyInitiate()) {