Reworked resources & colors + started dark mode

This commit is contained in:
Sylvain Berfini 2019-03-04 17:37:44 +01:00
parent 0275b282a6
commit 80cddbfb6c
197 changed files with 1087 additions and 939 deletions

View file

@ -67,7 +67,7 @@
android:label="@string/app_name"
android:launchMode="singleTask"
android:noHistory="true"
android:theme="@style/NoTitle"
android:theme="@style/LinphoneStyleLight"
android:windowSoftInputMode="adjustPan|stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -125,7 +125,7 @@
<activity
android:name=".LinphoneActivity"
android:launchMode="singleTask"
android:theme="@style/NoTitle">
android:theme="@style/LinphoneStyleLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@ -134,7 +134,7 @@
android:name=".call.CallIncomingActivity"
android:launchMode="singleTop"
android:noHistory="true"
android:theme="@style/NoTitle">
android:theme="@style/LinphoneStyleLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@ -143,7 +143,7 @@
android:name=".call.CallOutgoingActivity"
android:launchMode="singleTop"
android:noHistory="true"
android:theme="@style/NoTitle">
android:theme="@style/LinphoneStyleLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@ -152,7 +152,7 @@
android:name=".call.CallActivity"
android:launchMode="singleTop"
android:noHistory="true"
android:theme="@style/FullScreen">
android:theme="@style/LinphoneStyleLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@ -168,7 +168,7 @@
<activity
android:name=".assistant.AssistantActivity"
android:screenOrientation="behind"
android:theme="@style/NoTitle">
android:theme="@style/LinphoneStyleLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@ -176,7 +176,7 @@
<activity
android:name=".purchase.InAppPurchaseActivity"
android:screenOrientation="nosensor"
android:theme="@style/NoTitle">
android:theme="@style/LinphoneStyleLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@ -184,7 +184,7 @@
<activity
android:name=".assistant.RemoteProvisioningLoginActivity"
android:screenOrientation="nosensor"
android:theme="@style/NoTitle">
android:theme="@style/LinphoneStyleLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@ -192,7 +192,7 @@
<activity
android:name=".assistant.RemoteProvisioningActivity"
android:screenOrientation="nosensor"
android:theme="@style/NoTitle">
android:theme="@style/LinphoneStyleLight">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>

View file

@ -19,7 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import android.Manifest;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.AlarmManager;
import android.app.AlertDialog;
@ -80,8 +79,9 @@ import org.linphone.mediastream.Version;
import org.linphone.settings.LinphonePreferences;
import org.linphone.settings.LinphonePreferences.AccountBuilder;
import org.linphone.utils.LinphoneUtils;
import org.linphone.utils.ThemableActivity;
public class AssistantActivity extends Activity
public class AssistantActivity extends ThemableActivity
implements OnClickListener,
ActivityCompat.OnRequestPermissionsResultCallback,
AccountCreatorListener {
@ -673,7 +673,7 @@ public class AssistantActivity extends Activity
WindowManager.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.MATCH_PARENT);
mProgress.getWindow().setBackgroundDrawable(d);
mProgress.setContentView(R.layout.progress_dialog);
mProgress.setContentView(R.layout.wait_layout);
mProgress.show();
}
}
@ -690,7 +690,7 @@ public class AssistantActivity extends Activity
WindowManager.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.MATCH_PARENT);
mProgress.getWindow().setBackgroundDrawable(d);
mProgress.setContentView(R.layout.progress_dialog);
mProgress.setContentView(R.layout.wait_layout);
mProgress.show();
}

View file

@ -18,7 +18,6 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
@ -39,8 +38,9 @@ import org.linphone.core.Core;
import org.linphone.core.CoreListenerStub;
import org.linphone.core.tools.Log;
import org.linphone.settings.LinphonePreferences;
import org.linphone.utils.ThemableActivity;
public class RemoteProvisioningActivity extends Activity {
public class RemoteProvisioningActivity extends ThemableActivity {
private final Handler mHandler = new Handler();
private String mConfigUriParam = null;
private ProgressBar mSpinner;

View file

@ -31,10 +31,11 @@ import org.linphone.core.ConfiguringState;
import org.linphone.core.Core;
import org.linphone.core.CoreListenerStub;
import org.linphone.settings.LinphonePreferences;
import org.linphone.utils.ThemableActivity;
import org.linphone.xmlrpc.XmlRpcHelper;
import org.linphone.xmlrpc.XmlRpcListenerBase;
public class RemoteProvisioningLoginActivity extends Activity implements OnClickListener {
public class RemoteProvisioningLoginActivity extends ThemableActivity implements OnClickListener {
private EditText mLogin, mPassword, mDomain;
private Button mConnect;
private CoreListenerStub mListener;

View file

@ -684,8 +684,7 @@ public class CallActivity extends LinphoneGenericActivity
!LinphoneManager.getLc().soundResourcesLocked()
&& currentCall != null
&& currentCall.getCurrentParams().getRecordFile() != null);
mRecordCall.setImageResource(
mIsRecording ? R.drawable.options_rec_selected : R.drawable.options_rec_default);
mRecordCall.setSelected(mIsRecording);
mRecording.setEnabled(mIsRecording);
mRecording.setVisibility(mIsRecording ? View.VISIBLE : View.GONE);
@ -823,8 +822,7 @@ public class CallActivity extends LinphoneGenericActivity
if (enable && !mIsRecording) {
call.startRecording();
Log.d("start call mRecording");
mRecordCall.setImageResource(R.drawable.options_rec_selected);
mRecordCall.setSelected(true);
mRecording.setVisibility(View.VISIBLE);
mRecording.setEnabled(true);
@ -833,8 +831,7 @@ public class CallActivity extends LinphoneGenericActivity
} else if (!enable && mIsRecording) {
call.stopRecording();
Log.d("stop call mRecording");
mRecordCall.setImageResource(R.drawable.options_rec_default);
mRecordCall.setSelected(false);
mRecording.setVisibility(View.GONE);
mRecording.setEnabled(false);

View file

@ -216,20 +216,12 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
if (id == R.id.micro) {
mIsMicMuted = !mIsMicMuted;
if (mIsMicMuted) {
mMicro.setImageResource(R.drawable.micro_selected);
} else {
mMicro.setImageResource(R.drawable.micro_default);
}
mMicro.setSelected(mIsMicMuted);
LinphoneManager.getLc().enableMic(!mIsMicMuted);
}
if (id == R.id.speaker) {
mIsSpeakerEnabled = !mIsSpeakerEnabled;
if (mIsSpeakerEnabled) {
mSpeaker.setImageResource(R.drawable.route_speaker_selected);
} else {
mSpeaker.setImageResource(R.drawable.route_speaker_default);
}
mSpeaker.setSelected(mIsSpeakerEnabled);
LinphoneManager.getInstance().enableSpeaker(mIsSpeakerEnabled);
}
if (id == R.id.outgoing_hang_up) {

View file

@ -260,8 +260,7 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
holder.fileTransferAction, mContext, R.style.font15);
holder.fileTransferAction.setBackgroundResource(
R.drawable.resizable_confirm_delete_button);
ContactAvatar.setAvatarMask(
holder.avatarLayout, R.drawable.avatar_chat_mask_outgoing);
ContactAvatar.setAvatarMask(holder.avatarLayout, R.drawable.avatar_mask);
} else {
for (LinphoneContact c : mParticipants) {
if (c != null && c.hasAddress(remoteSender.asStringUriOnly())) {
@ -287,11 +286,12 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
}
holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font9);
Compatibility.setTextAppearance(
holder.contactName, mContext, R.style.contact_organization_font);
Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font8);
holder.fileTransferAction.setBackgroundResource(
R.drawable.resizable_assistant_button);
ContactAvatar.setAvatarMask(holder.avatarLayout, R.drawable.avatar_chat_mask);
ContactAvatar.setAvatarMask(holder.avatarLayout, R.drawable.avatar_mask);
}
if (contact == null) {

View file

@ -151,11 +151,12 @@ public class ImdnOldFragment extends Fragment {
ContactAvatar.setAvatarMask(mBubble.avatarLayout, R.drawable.avatar_chat_mask_outgoing);
} else {
mBubble.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
Compatibility.setTextAppearance(mBubble.contactName, getActivity(), R.style.font9);
Compatibility.setTextAppearance(
mBubble.contactName, getActivity(), R.style.contact_organization_font);
Compatibility.setTextAppearance(
mBubble.fileTransferAction, getActivity(), R.style.font8);
mBubble.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
ContactAvatar.setAvatarMask(mBubble.avatarLayout, R.drawable.avatar_chat_mask);
ContactAvatar.setAvatarMask(mBubble.avatarLayout, R.drawable.avatar_mask);
}
return view;

View file

@ -120,7 +120,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
WindowManager.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.MATCH_PARENT);
mProgress.getWindow().setBackgroundDrawable(d);
mProgress.setContentView(R.layout.progress_dialog);
mProgress.setContentView(R.layout.wait_layout);
mProgress.show();
}

View file

@ -1431,6 +1431,17 @@ public class LinphonePreferences {
getConfig().setBool("app", "android_power_saver_dialog", b);
}
public boolean isDarkModeEnabled() {
return /*AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
&& */ getConfig().getBool("app", "dark_mode", false);
}
public void enableDarkMode(boolean enable) {
/*AppCompatDelegate.setDefaultNightMode(
enable ? AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);*/
getConfig().setBool("app", "dark_mode", enable);
}
public static class AccountBuilder {
private final Core lc;
private String tempUsername;

View file

@ -1689,6 +1689,8 @@ public class SettingsFragment extends PreferencesListFragment {
}
private void initAdvancedSettings() {
((CheckBoxPreference) findPreference(getString(R.string.pref_dark_mode_key)))
.setChecked(mPrefs.isDarkModeEnabled());
((CheckBoxPreference) findPreference(getString(R.string.pref_friendlist_subscribe_key)))
.setChecked(mPrefs.isFriendlistsubscriptionEnabled());
((CheckBoxPreference) findPreference(getString(R.string.pref_debug_key)))
@ -1710,6 +1712,23 @@ public class SettingsFragment extends PreferencesListFragment {
}
private void setAdvancedPreferencesListener() {
findPreference(getString(R.string.pref_dark_mode_key))
.setOnPreferenceChangeListener(
new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(
Preference preference, Object newValue) {
boolean value = (Boolean) newValue;
mPrefs.enableDarkMode(value);
if (value) {
LinphoneActivity.instance().setTheme(R.style.LinphoneStyleDark);
} else {
LinphoneActivity.instance()
.setTheme(R.style.LinphoneStyleLight);
}
return true;
}
});
findPreference(getString(R.string.pref_friendlist_subscribe_key))
.setOnPreferenceChangeListener(

View file

@ -19,13 +19,12 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import android.app.Activity;
import android.os.Bundle;
import org.linphone.LinphoneLauncherActivity;
import org.linphone.LinphoneManager;
import org.linphone.LinphoneService;
public class LinphoneGenericActivity extends Activity {
public class LinphoneGenericActivity extends ThemableActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {

View file

@ -0,0 +1,37 @@
package org.linphone.utils;
/*
ThemableActivity.java
Copyright (C) 2019 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import org.linphone.R;
import org.linphone.settings.LinphonePreferences;
public class ThemableActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
if (LinphonePreferences.instance().isDarkModeEnabled()) {
setTheme(R.style.LinphoneStyleDark);
}
super.onCreate(savedInstanceState);
}
}

View file

@ -36,6 +36,7 @@ public class EraseButton extends ImageView
public EraseButton(Context context, AttributeSet attrs) {
super(context, attrs);
setEnabled(false);
setOnClickListener(this);
setOnLongClickListener(this);
}
@ -50,6 +51,7 @@ public class EraseButton extends ImageView
mAddress.getEditableText().delete(lBegin - 1, lBegin);
}
}
setEnabled(mAddress.getText().length() > 0);
}
public boolean onLongClick(View v) {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 675 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

View file

@ -1,10 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/backspace_over" />
<item android:state_enabled="false"
android:drawable="@drawable/backspace_disabled" />
<item
android:drawable="@drawable/backspace_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/backspace_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/backspace_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/backspace_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,6 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/camera_selected" android:state_selected="true" />
<item android:drawable="@drawable/camera_disabled" android:state_enabled="false" />
<item android:drawable="@drawable/camera_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/camera_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/camera_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/camera_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

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

View file

@ -1,7 +1,15 @@
<?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" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/chat_group_informations_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/chat_group_informations_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/chat_group_informations_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,15 @@
<?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/next" />
<item android:state_enabled="false"
android:drawable="@drawable/next_disabled" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/next"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/next"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/next"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,15 @@
<?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/chat_group_informations" />
<item android:state_enabled="false"
android:drawable="@drawable/chat_group_informations_disabled" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/chat_group_informations_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/chat_group_informations_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/chat_group_informations_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,15 @@
<?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/contact_add_disabled" />
<item
android:drawable="@drawable/contact_add_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/contact_add_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/contact_add_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/contact_add_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,15 @@
<?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/contacts_all_selected" />
<item
android:drawable="@drawable/contacts_all_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/contacts_all_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/contacts_all_default"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/contacts_all_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,15 @@
<?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/contacts_sip_selected" />
<item
android:drawable="@drawable/contacts_sip_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/contacts_sip_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/contacts_sip_default"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/contacts_sip_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/delete_disabled" android:state_enabled="false" />
<item android:drawable="@drawable/delete_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/delete_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/delete_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/delete_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,15 @@
<?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/edit_list_disabled" />
<item
android:drawable="@drawable/edit_list_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/edit_list_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/edit_list_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/edit_list_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="line">
<stroke android:width="1dp" android:color="@color/colorE"/>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="line">
<stroke android:width="1dp" android:color="?attr/dividerColor"/>
<size android:height="1dp" android:width="50dp" />
</shape>

View file

@ -4,7 +4,6 @@
android:drawable="@color/colorA" />
<item android:state_selected="true"
android:drawable="@color/colorC" />
<item
android:drawable="@color/colorC" />
</selector>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
<solid android:color="@color/colorC"/>
<solid android:color="?attr/primaryTextColor"/>
<size android:width="35dp" android:height="35dp"/>
</shape>

View file

@ -1,8 +1,15 @@
<?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/history_all_selected" />
<item
android:drawable="@drawable/history_all_default"/>
<item android:state_pressed="true">
<bitmap android:src="@drawable/history_all_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/history_all_default"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/history_all_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,15 @@
<?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/history_missed_selected" />
<item
android:drawable="@drawable/history_missed_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/history_missed_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/history_missed_default"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/history_missed_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

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

View file

@ -1,5 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/micro_selected" android:state_selected="true" />
<item android:drawable="@drawable/micro_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/micro_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/micro_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item android:state_selected="true">
<bitmap android:src="@drawable/micro_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item>
<bitmap android:src="@drawable/micro_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_8_over" />
<item
android:drawable="@drawable/numpad_8" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_8"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_8"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_5_over" />
<item
android:drawable="@drawable/numpad_5" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_5"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_5"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_4_over" />
<item
android:drawable="@drawable/numpad_4" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_4"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_4"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_9_over" />
<item
android:drawable="@drawable/numpad_9" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_9"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_9"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_1_over" />
<item
android:drawable="@drawable/numpad_1" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_1"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_1"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_7_over" />
<item
android:drawable="@drawable/numpad_7" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_7"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_7"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_hash_over" />
<item
android:drawable="@drawable/numpad_hash" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_hash"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_hash"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_6_over" />
<item
android:drawable="@drawable/numpad_6" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_6"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_6"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_star_over" />
<item
android:drawable="@drawable/numpad_star" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_star"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_star"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_3_over" />
<item
android:drawable="@drawable/numpad_3" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_3"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_3"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_2_over" />
<item
android:drawable="@drawable/numpad_2" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_2"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_2"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/numpad_0_over" />
<item
android:drawable="@drawable/numpad_0" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/numpad_0"
android:tint="?attr/accentColor"/>
</item>
<item>
<bitmap android:src="@drawable/numpad_0"
android:tint="?attr/drawableDarkModeTintColor"/>
</item>
</selector>

View file

@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/options_selected" android:state_selected="true" />
<item android:drawable="@drawable/options_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/options_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/options_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/options_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,15 @@
<?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/options_add_call_disabled" />
<item
android:drawable="@drawable/options_add_call_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/options_add_call_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/options_add_call_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/options_add_call_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<bitmap android:src="@drawable/options_rec_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/options_rec_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item android:state_selected="true">
<bitmap android:src="@drawable/options_rec_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item>
<bitmap android:src="@drawable/options_rec_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,15 @@
<?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/options_start_conference_disabled" />
<item
android:drawable="@drawable/options_start_conference_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/options_start_conference_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/options_start_conference_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/options_start_conference_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,15 @@
<?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/options_transfer_call_disabled" />
<item
android:drawable="@drawable/options_transfer_call_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/options_transfer_call_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/options_transfer_call_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/options_transfer_call_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,15 @@
<?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" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/route_bluetooth_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/route_bluetooth_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/route_bluetooth_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,15 @@
<?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" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/route_earpiece_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/route_earpiece_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/route_earpiece_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,15 @@
<?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" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/route_speaker_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/route_speaker_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/route_speaker_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/routes_selected" android:state_selected="true" />
<item android:drawable="@drawable/routes_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/routes_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/routes_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item>
<bitmap android:src="@drawable/routes_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -1,7 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/route_speaker_selected"
android:state_selected="true" />
<item
android:drawable="@drawable/route_speaker_default" />
<item android:state_pressed="true">
<bitmap android:src="@drawable/route_speaker_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/route_speaker_default"
android:tint="?attr/drawableTintDisabledColor"/>
</item>
<item android:state_selected="true">
<bitmap android:src="@drawable/route_speaker_default"
android:tint="?attr/drawableTintOverColor"/>
</item>
<item>
<bitmap android:src="@drawable/route_speaker_default"
android:tint="?attr/drawableTintColor"/>
</item>
</selector>

View file

@ -3,7 +3,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="30dp">
android:padding="30dp"
android:background="?attr/backgroundColor">
<TextView
android:id="@+id/question"

View file

@ -55,7 +55,7 @@
<TextView
android:id="@+id/current_contact_name"
style="@style/font5"
style="@style/big_contact_name_font"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -189,7 +189,7 @@
android:background="@drawable/round_orange_button_background"
android:contentDescription="@string/content_description_record_call"
android:padding="8dp"
android:src="@drawable/recording"
android:src="@drawable/options_rec"
android:visibility="gone" />
</RelativeLayout>
@ -248,7 +248,7 @@
<TextView
android:id="@+id/missed_chats"
style="@style/font18"
style="@style/unread_count_font"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
@ -388,7 +388,7 @@
android:background="@drawable/button_background"
android:contentDescription="@string/content_description_record_call"
android:padding="15dp"
android:src="@drawable/options_rec_default"
android:src="@drawable/options_rec"
android:visibility="gone" />
<ImageView

View file

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorH">
android:background="?attr/backgroundColor">
<RelativeLayout
android:id="@+id/dialer"
@ -11,7 +11,7 @@
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp"
android:background="@color/colorH"
android:background="?attr/backgroundColor"
android:visibility="gone"/>
<RelativeLayout
@ -20,7 +20,7 @@
android:layout_height="60dp"
android:layout_alignParentTop="true"
android:layout_marginBottom="10dp"
android:background="@color/colorF">
android:background="?attr/lighToolbarBackgroundColor">
<org.linphone.views.EraseButton
android:id="@+id/erase"
@ -35,12 +35,11 @@
<org.linphone.views.AddressText
android:id="@+id/address"
style="@style/font5"
style="@style/numpad_composed_number_font"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/erase"
android:background="@color/colorF"
android:ellipsize="start"
android:hint="@string/address_bar_hint"
android:inputType="textEmailAddress"

View file

@ -18,7 +18,7 @@
android:src="@drawable/splashscreen" />
<TextView
style="@style/font21"
style="@style/splash_screen_app_name_font"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -27,12 +27,11 @@
android:visibility="gone" />
<TextView
style="@style/splash_screen_subtitle_font"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/app_description"
android:textColor="@color/colorA"
android:textSize="28sp" />
android:text="@string/app_description" />
</LinearLayout>
@ -40,6 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:indeterminateTint="@color/colorA"
android:layout_marginBottom="20dp" />
<View

View file

@ -25,7 +25,7 @@
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@color/colorF"
android:background="?attr/lighToolbarBackgroundColor"
android:orientation="horizontal"
android:visibility="gone">
@ -41,7 +41,7 @@
<TextView
android:id="@+id/top_bar_title"
style="@style/font1"
style="@style/toolbar_title_font"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.6"
@ -103,12 +103,12 @@
android:layout_width="5dp"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:background="@color/colorA"
android:background="?attr/accentColor"
android:visibility="gone" />
<TextView
android:id="@+id/missed_calls"
style="@style/font18"
style="@style/unread_count_font"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@ -141,7 +141,7 @@
android:layout_width="5dp"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:background="@color/colorA"
android:background="?attr/accentColor"
android:visibility="gone" />
</RelativeLayout>
@ -165,7 +165,7 @@
android:layout_width="5dp"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:background="@color/colorA" />
android:background="?attr/accentColor" />
</RelativeLayout>
@ -189,12 +189,12 @@
android:layout_width="5dp"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:background="@color/colorA"
android:background="?attr/accentColor"
android:visibility="gone" />
<TextView
android:id="@+id/missed_chats"
style="@style/font18"
style="@style/unread_count_font"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@ -232,7 +232,7 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:background="@color/colorA"
android:background="?attr/accentColor"
android:gravity="bottom">
<ImageView
@ -246,7 +246,7 @@
<TextView
android:id="@+id/quit"
style="@style/font14"
style="@style/quit_button_font"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
@ -259,7 +259,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/side_menu_quit"
android:background="@color/colorH"
android:orientation="vertical">
<include layout="@layout/side_menu_main_account" />
@ -268,7 +267,6 @@
android:id="@+id/accounts_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorH"
android:cacheColorHint="@color/transparent"
android:choiceMode="singleChoice"
android:divider="@android:color/transparent"
@ -278,17 +276,10 @@
android:id="@+id/item_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorH"
android:choiceMode="singleChoice"
android:divider="@color/colorE"
android:divider="?attr/dividerColor"
android:dividerHeight="1dp"
android:footerDividersEnabled="true"
android:listSelector="@color/colorH" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/colorE" />
android:footerDividersEnabled="true" />
</LinearLayout>

View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/backgroundColor">
<LinearLayout
android:layout_width="match_parent"
@ -133,7 +134,7 @@
<TextView
android:id="@+id/sip_uri"
style="@style/font9"
style="@style/contact_organization_font"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible" />
@ -328,6 +329,8 @@
android:layout_height="wrap_content"
android:layout_column="1"
android:checked="false"
android:button="@drawable/checkbox"
android:textColor="?attr/primaryTextColor"
android:text="@string/use_username_instead_or_phone_number"
android:visibility="visible" />
</TableRow>
@ -344,10 +347,13 @@
android:layout_height="wrap_content"
android:layout_column="1"
android:checked="false"
android:button="@drawable/checkbox"
android:textColor="?attr/primaryTextColor"
android:text="@string/use_email_for_validation"
android:visibility="visible" />
</TableRow>
</TableLayout>
<Button
@ -377,4 +383,5 @@
android:visibility="gone" />
</LinearLayout>
</ScrollView>

View file

@ -3,7 +3,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="30dp">
android:padding="30dp"
android:background="?attr/backgroundColor">
<TextView
android:id="@+id/question"

View file

@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="?attr/backgroundColor"
android:padding="30dp">
<TextView
@ -212,6 +213,8 @@
android:id="@+id/use_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:button="@drawable/checkbox"
android:textColor="?attr/primaryTextColor"
android:text="@string/login_with_username"
android:visibility="visible" />
</TableRow>

View file

@ -197,6 +197,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:textColor="?attr/primaryTextColor"
android:text="@string/pref_transport_udp" />
<RadioButton
@ -204,6 +205,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:textColor="?attr/primaryTextColor"
android:text="@string/pref_transport_tcp" />
<RadioButton
@ -211,12 +213,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:textColor="?attr/primaryTextColor"
android:checked="true"
android:text="@string/pref_transport_tls" />
</RadioGroup>
</LinearLayout>
</TableRow>
</TableLayout>
<Button
@ -233,4 +238,5 @@
android:textColor="@drawable/assistant_button_text_color" />
</LinearLayout>
</ScrollView>

Some files were not shown because too many files have changed in this diff Show more