Still improving resources

This commit is contained in:
Sylvain Berfini 2018-10-25 11:09:58 +02:00
parent 6cd78120e3
commit 47e7bc2293
51 changed files with 117 additions and 79 deletions

View file

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View file

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

View file

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View file

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 397 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 468 B

View file

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View file

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View file

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 538 B

View file

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View file

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

View file

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -5,6 +5,6 @@
<item android:state_enabled="false"
android:drawable="@drawable/resizable_assistant_button_disabled" />
<item
android:drawable="@drawable/resizable_assistant_button" />
android:drawable="@drawable/resizable_assistant_button_default" />
</selector>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/chat_group_informations_disabled" />
<item
android:drawable="@drawable/chat_group_informations_default" />
</selector>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true"
android:drawable="@drawable/valid" />
android:drawable="@drawable/valid_default" />
<item android:state_enabled="false"
android:drawable="@drawable/valid_disabled" />
</selector>

View file

@ -3,6 +3,6 @@
<item android:state_enabled="false"
android:drawable="@drawable/contact_add_disabled" />
<item
android:drawable="@drawable/contact_add" />
android:drawable="@drawable/contact_add_default" />
</selector>

View file

@ -3,5 +3,5 @@
<item android:state_enabled="false"
android:drawable="@drawable/delete_disabled" />
<item
android:drawable="@drawable/delete" />
android:drawable="@drawable/delete_default" />
</selector>

View file

@ -3,5 +3,5 @@
<item android:state_enabled="false"
android:drawable="@drawable/edit_list_disabled" />
<item
android:drawable="@drawable/edit_list" />
android:drawable="@drawable/edit_list_default" />
</selector>

View file

@ -3,5 +3,5 @@
<item android:state_enabled="false"
android:drawable="@drawable/menu_disabled" />
<item
android:drawable="@drawable/menu" />
android:drawable="@drawable/menu_default" />
</selector>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true"
<item android:state_selected="true"
android:drawable="@drawable/micro_selected" />
<item
android:drawable="@drawable/micro_default" />

7
res/drawable/options.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@drawable/options_selected" />
<item
android:drawable="@drawable/options_default" />
</selector>

View file

@ -3,5 +3,5 @@
<item android:state_enabled="false"
android:drawable="@drawable/options_add_call_disabled" />
<item
android:drawable="@drawable/options_add_call" />
android:drawable="@drawable/options_add_call_default" />
</selector>

View file

@ -3,5 +3,5 @@
<item android:state_enabled="false"
android:drawable="@drawable/options_start_conference_disabled" />
<item
android:drawable="@drawable/options_start_conference" />
android:drawable="@drawable/options_start_conference_default" />
</selector>

View file

@ -3,5 +3,5 @@
<item android:state_enabled="false"
android:drawable="@drawable/options_transfer_call_disabled" />
<item
android:drawable="@drawable/options_transfer_call" />
android:drawable="@drawable/options_transfer_call_default" />
</selector>

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/resizable_assistant_button_disabled" />
<item android:state_pressed="true"
android:drawable="@drawable/resizable_assistant_button_over" />
<item
android:drawable="@drawable/resizable_assistant_button_default" />
</selector>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@drawable/route_bluetooth_selected" />
<item
android:drawable="@drawable/route_bluetooth_default" />
</selector>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@drawable/route_earpiece_selected" />
<item
android:drawable="@drawable/route_earpiece_default" />
</selector>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@drawable/route_speaker_selected" />
<item
android:drawable="@drawable/route_speaker_default" />
</selector>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true"
<item android:state_selected="true"
android:drawable="@drawable/speaker_selected" />
<item
android:drawable="@drawable/speaker_default" />

7
res/drawable/valid.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/valid_disabled" />
<item
android:drawable="@drawable/valid_default" />
</selector>

View file

@ -116,7 +116,7 @@
<ImageView
android:id="@+id/micro"
android:src="@drawable/micro_default"
android:src="@drawable/micro"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro"
android:layout_width="match_parent"
@ -126,7 +126,7 @@
<ImageView
android:id="@+id/speaker"
android:src="@drawable/speaker_default"
android:src="@drawable/speaker"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker"
android:layout_width="match_parent"

View file

@ -82,7 +82,7 @@
<ImageView
android:id="@+id/add_contact"
android:src="@drawable/contact_add_button"
android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_add_contact"
android:layout_width="match_parent"

View file

@ -116,7 +116,7 @@
<ImageView
android:id="@+id/micro"
android:src="@drawable/micro_default"
android:src="@drawable/micro"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro"
android:layout_width="match_parent"
@ -126,7 +126,7 @@
<ImageView
android:id="@+id/speaker"
android:src="@drawable/speaker_default"
android:src="@drawable/speaker"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker"
android:layout_width="match_parent"

View file

@ -79,7 +79,7 @@
<ImageView
android:id="@+id/add_contact"
android:src="@drawable/contact_add_button"
android:src="@drawable/contact_add"
android:contentDescription="@string/content_description_add_contact"
android:background="@drawable/toolbar_button"
android:layout_width="match_parent"

View file

@ -79,7 +79,7 @@
<ImageView
android:id="@+id/add_contact"
android:src="@drawable/contact_add_button"
android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_add_contact"
android:layout_width="match_parent"

View file

@ -40,7 +40,7 @@
android:id="@+id/clearSearchField"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/clean_field_default"
android:src="@drawable/clean_field"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:paddingLeft="5dp"

View file

@ -199,7 +199,7 @@
<ImageView
android:id="@+id/video"
android:src="@drawable/camera_button"
android:src="@drawable/camera"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_switch_video"
android:padding="20dp"
@ -219,7 +219,7 @@
<ImageView
android:id="@+id/micro"
android:src="@drawable/micro_default"
android:src="@drawable/micro"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro"
android:padding="10dp"
@ -229,7 +229,7 @@
<ImageView
android:id="@+id/speaker"
android:src="@drawable/speaker_default"
android:src="@drawable/speaker"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker"
android:padding="15dp"
@ -250,7 +250,7 @@
<ImageView
android:id="@+id/options"
android:src="@drawable/options_default"
android:src="@drawable/options"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_call_options"
android:padding="15dp"
@ -350,7 +350,7 @@
<ImageView
android:id="@+id/add_call"
android:src="@drawable/options_add_call_button"
android:src="@drawable/options_add_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_add_call"
android:padding="15dp"
@ -393,7 +393,7 @@
<ImageView
android:id="@+id/transfer"
android:src="@drawable/options_transfer_call_button"
android:src="@drawable/options_transfer_call"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_transfer"
android:padding="15dp"
@ -435,7 +435,7 @@
<ImageView
android:id="@+id/conference"
android:src="@drawable/options_start_conference_button"
android:src="@drawable/options_start_conference"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_conference"
android:visibility="invisible"

View file

@ -102,7 +102,7 @@
<ImageView
android:id="@+id/micro"
android:src="@drawable/micro_default"
android:src="@drawable/micro"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro"
android:layout_width="match_parent"
@ -112,7 +112,7 @@
<ImageView
android:id="@+id/speaker"
android:src="@drawable/speaker_default"
android:src="@drawable/speaker"
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker"
android:layout_width="match_parent"

View file

@ -86,7 +86,7 @@
<ImageView
android:id="@+id/edit"
android:src="@drawable/edit_list_button"
android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp"

View file

@ -54,7 +54,7 @@
<ImageView
android:id="@+id/edit"
android:src="@drawable/edit_list_button"
android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp"

View file

@ -76,7 +76,7 @@
<ImageView
android:id="@+id/edit"
android:src="@drawable/edit_list_button"
android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp"

View file

@ -123,7 +123,7 @@
<ImageView
android:id="@+id/edit"
android:src="@drawable/edit_list_button"
android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp"

View file

@ -76,7 +76,7 @@
<ImageView
android:id="@+id/add_contact"
android:src="@drawable/contact_add_button"
android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_add_contact"
android:layout_width="match_parent"

View file

@ -45,7 +45,7 @@
<ImageView
android:id="@+id/delete"
android:src="@drawable/delete_button"
android:src="@drawable/delete"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_delete_selection"
android:layout_width="0dp"

View file

@ -65,7 +65,7 @@
<ImageView
android:id="@+id/edit"
android:src="@drawable/edit_list_button"
android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp"

View file

@ -13,7 +13,7 @@
<ImageView
android:id="@+id/side_menu_button"
android:src="@drawable/menu_burger"
android:src="@drawable/menu"
android:contentDescription="@string/content_description_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

View file

@ -541,50 +541,42 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
} else {
if (video.isEnabled()) {
if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
video.setImageResource(R.drawable.camera_selected);
video.setSelected(true);
videoProgress.setVisibility(View.INVISIBLE);
} else {
video.setImageResource(R.drawable.camera_button);
video.setSelected(false);
}
} else {
video.setImageResource(R.drawable.camera_button);
video.setSelected(false);
}
}
if (getPackageManager().checkPermission(Manifest.permission.CAMERA, getPackageName()) != PackageManager.PERMISSION_GRANTED) {
video.setImageResource(R.drawable.camera_button);
video.setSelected(false);
}
if (isSpeakerEnabled) {
speaker.setImageResource(R.drawable.speaker_selected);
} else {
speaker.setImageResource(R.drawable.speaker_default);
}
speaker.setSelected(isSpeakerEnabled);
if (getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName()) != PackageManager.PERMISSION_GRANTED) {
isMicMuted = true;
}
if (isMicMuted) {
micro.setImageResource(R.drawable.micro_selected);
} else {
micro.setImageResource(R.drawable.micro_default);
}
micro.setSelected(isMicMuted);
try {
routeSpeaker.setImageResource(R.drawable.route_speaker);
routeSpeaker.setSelected(false);
if (BluetoothManager.getInstance().isUsingBluetoothAudioRoute()) {
isSpeakerEnabled = false; // We need this if isSpeakerEnabled wasn't set correctly
routeEarpiece.setImageResource(R.drawable.route_earpiece);
routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
routeEarpiece.setSelected(false);
routeBluetooth.setSelected(true);
return;
} else {
routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);
routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeEarpiece.setSelected(true);
routeBluetooth.setSelected(false);
}
if (isSpeakerEnabled) {
routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
routeEarpiece.setImageResource(R.drawable.route_earpiece);
routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeSpeaker.setSelected(true);
routeEarpiece.setSelected(false);
routeBluetooth.setSelected(false);
}
} catch (NullPointerException npe) {
Log.e("Bluetooth: Audio routes menu disabled on tablets for now (4)");
@ -690,24 +682,24 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
} else if (id == R.id.route_bluetooth) {
if (BluetoothManager.getInstance().routeAudioToBluetooth()) {
isSpeakerEnabled = false;
routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
routeSpeaker.setImageResource(R.drawable.route_speaker);
routeEarpiece.setImageResource(R.drawable.route_earpiece);
routeBluetooth.setSelected(true);
routeSpeaker.setSelected(false);
routeEarpiece.setSelected(false);
}
hideOrDisplayAudioRoutes();
} else if (id == R.id.route_earpiece) {
LinphoneManager.getInstance().routeAudioToReceiver();
isSpeakerEnabled = false;
routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeSpeaker.setImageResource(R.drawable.route_speaker);
routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);
routeBluetooth.setSelected(false);
routeSpeaker.setSelected(false);
routeEarpiece.setSelected(true);
hideOrDisplayAudioRoutes();
} else if (id == R.id.route_speaker) {
LinphoneManager.getInstance().routeAudioToSpeaker();
isSpeakerEnabled = true;
routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
routeEarpiece.setImageResource(R.drawable.route_earpiece);
routeBluetooth.setSelected(false);
routeSpeaker.setSelected(true);
routeEarpiece.setSelected(false);
hideOrDisplayAudioRoutes();
} else if (id == R.id.call_pause) {
Call call = (Call) v.getTag();
@ -883,11 +875,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
Core lc = LinphoneManager.getLc();
isMicMuted = !isMicMuted;
lc.enableMic(!isMicMuted);
if (isMicMuted) {
micro.setImageResource(R.drawable.micro_selected);
} else {
micro.setImageResource(R.drawable.micro_default);
}
micro.setSelected(isMicMuted);
}
protected void toggleSpeaker() {
@ -898,14 +886,13 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
else
LinphoneManager.getInstance().enableProximitySensing(!isSpeakerEnabled);
}
speaker.setSelected(isSpeakerEnabled);
if (isSpeakerEnabled) {
LinphoneManager.getInstance().routeAudioToSpeaker();
speaker.setImageResource(R.drawable.speaker_selected);
LinphoneManager.getInstance().enableSpeaker(isSpeakerEnabled);
} else {
Log.d("Toggle speaker off, routing back to earpiece");
LinphoneManager.getInstance().routeAudioToReceiver();
speaker.setImageResource(R.drawable.speaker_default);
}
}
@ -987,7 +974,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
conference.setVisibility(View.INVISIBLE);
displayVideoCall(false);
numpad.setVisibility(View.GONE);
options.setImageResource(R.drawable.options_default);
options.setSelected(false);
}
}, SECONDS_BEFORE_HIDING_CONTROLS);
}
@ -1037,7 +1024,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private void hideOrDisplayCallOptions() {
//Hide options
if (addCall.getVisibility() == View.VISIBLE) {
options.setImageResource(R.drawable.options_default);
options.setSelected(false);
if (isTransferAllowed) {
transfer.setVisibility(View.INVISIBLE);
}
@ -1049,7 +1036,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
}
addCall.setVisibility(View.VISIBLE);
conference.setVisibility(View.VISIBLE);
options.setImageResource(R.drawable.options_selected);
options.setSelected(true);
transfer.setEnabled(LinphoneManager.getLc().getCurrentCall() != null);
}
}
@ -1363,7 +1350,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
onCallStateChanged.setOnClickListener(this);
if (call.getState() == State.Paused || call.getState() == State.PausedByRemote || call.getState() == State.Pausing) {
onCallStateChanged.setImageResource(R.drawable.pause);
onCallStateChanged.setSelected(false);
isCallPaused = true;
isInConference = false;
} else if (call.getState() == State.OutgoingInit || call.getState() == State.OutgoingProgress || call.getState() == State.OutgoingRinging) {

View file

@ -209,7 +209,7 @@ public class DialerFragment extends Fragment {
mCall.setImageResource(R.drawable.call_audio_start);
}
mAddContact.setEnabled(false);
mAddContact.setImageResource(R.drawable.contact_add_button);
mAddContact.setImageResource(R.drawable.contact_add);
mAddContact.setOnClickListener(addContactListener);
enableDisableAddContact();
}