diff options
Diffstat (limited to 'app')
35 files changed, 148 insertions, 142 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java index c269c872..dbdd008a 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java @@ -6,8 +6,8 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; +import androidx.appcompat.widget.AppCompatTextView; import androidx.fragment.app.Fragment; import butterknife.BindView; @@ -25,10 +25,10 @@ public class AboutFragment extends Fragment { private Unbinder unbinder; @BindView(R.id.version) - TextView versionTextView; + AppCompatTextView versionTextView; @BindView(R.id.terms_of_service) - TextView termsOfService; + AppCompatTextView termsOfService; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java index b065486a..f8053f5e 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java @@ -486,7 +486,7 @@ public class EipFragment extends Fragment implements Observer { View layout = inflater.inflate(R.layout.custom_toast, activity.findViewById(R.id.custom_toast_container)); - TextView text = layout.findViewById(R.id.text); + AppCompatTextView text = layout.findViewById(R.id.text); text.setText(message); Vibrator v = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE); diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java index 18000171..db5057cc 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java @@ -11,7 +11,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; -import androidx.fragment.app.Fragment; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -27,7 +26,9 @@ import android.widget.Filterable; import android.widget.ImageView; import android.widget.ListView; import android.widget.SearchView; -import android.widget.TextView; + +import androidx.appcompat.widget.AppCompatTextView; +import androidx.fragment.app.Fragment; import java.util.Collections; import java.util.List; @@ -77,10 +78,10 @@ public class ExcludeAppsFragment extends Fragment implements AdapterView.OnItemC static class AppViewHolder { public ApplicationInfo mInfo; public View rootView; - public TextView appName; + public AppCompatTextView appName; public ImageView appIcon; - //public TextView appSize; - //public TextView disabled; + //public AppCompatTextView appSize; + //public AppCompatTextView disabled; public CompoundButton checkBox; static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView, ViewGroup parent) { diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java index d788b9e6..a5a5e555 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/LogFragment.java @@ -19,8 +19,6 @@ import android.os.Handler; import android.os.Handler.Callback; import android.os.Message; import android.preference.PreferenceManager; -import androidx.annotation.Nullable; -import androidx.fragment.app.ListFragment; import android.text.SpannableString; import android.text.format.DateFormat; import android.view.LayoutInflater; @@ -37,9 +35,12 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.RadioGroup; import android.widget.SeekBar; -import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatTextView; +import androidx.fragment.app.ListFragment; + import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Date; @@ -55,8 +56,8 @@ import de.blinkt.openvpn.core.Preferences; import de.blinkt.openvpn.core.VpnStatus; import de.blinkt.openvpn.core.VpnStatus.LogListener; import de.blinkt.openvpn.core.VpnStatus.StateListener; -import se.leap.bitmaskclient.base.models.Constants; import se.leap.bitmaskclient.R; +import se.leap.bitmaskclient.base.models.Constants; import static de.blinkt.openvpn.core.OpenVPNService.humanReadableByteCount; @@ -70,9 +71,9 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. private SeekBar mLogLevelSlider; private LinearLayout mOptionsLayout; private RadioGroup mTimeRadioGroup; - private TextView mUpStatus; - private TextView mDownStatus; - private TextView mConnectStatus; + private AppCompatTextView mUpStatus; + private AppCompatTextView mDownStatus; + private AppCompatTextView mConnectStatus; private boolean mShowOptionsLayout; private CheckBox mClearLogCheckBox; @@ -219,11 +220,11 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. @Override public View getView(int position, View convertView, ViewGroup parent) { - TextView v; + AppCompatTextView v; if (convertView == null) - v = new TextView(getActivity()); + v = new AppCompatTextView(getActivity()); else - v = (TextView) convertView; + v = (AppCompatTextView) convertView; LogItem le = currentLevelEntries.get(position); String msg = le.getString(getActivity()); @@ -380,7 +381,7 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. private LogWindowListAdapter ladapter; - private TextView mSpeedView; + private AppCompatTextView mSpeedView; @Override @@ -474,7 +475,7 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. int position, long id) { ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE); - ClipData clip = ClipData.newPlainText("Log Entry", ((TextView) view).getText()); + ClipData clip = ClipData.newPlainText("Log Entry", ((AppCompatTextView) view).getText()); clipboard.setPrimaryClip(clip); Toast.makeText(getActivity(), R.string.copied_entry, Toast.LENGTH_SHORT).show(); return true; diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java index 1f4d0b17..020a48a4 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java @@ -27,6 +27,7 @@ import android.os.Bundle; import android.os.Handler; import androidx.annotation.NonNull; import androidx.annotation.StringRes; +import androidx.appcompat.widget.AppCompatTextView; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; @@ -380,7 +381,7 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen } private void initShowExperimentalHint() { - TextView textView = drawerLayout.findViewById(R.id.show_experimental_features); + AppCompatTextView textView = drawerLayout.findViewById(R.id.show_experimental_features); textView.setText(showExperimentalFeatures(getContext()) ? R.string.hide_experimental : R.string.show_experimental); textView.setOnClickListener(v -> { boolean shown = showExperimentalFeatures(getContext()); @@ -388,12 +389,12 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen tethering.setVisibility(GONE); firewall.setVisibility(GONE); experimentalFeatureFooter.setVisibility(GONE); - ((TextView) v).setText(R.string.show_experimental); + ((AppCompatTextView) v).setText(R.string.show_experimental); } else { tethering.setVisibility(VISIBLE); firewall.setVisibility(VISIBLE); experimentalFeatureFooter.setVisibility(VISIBLE); - ((TextView) v).setText(R.string.hide_experimental); + ((AppCompatTextView) v).setText(R.string.hide_experimental); } PreferenceHelper.setShowExperimentalFeatures(getContext(), !shown); }); diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/IconCheckboxEntry.java b/app/src/main/java/se/leap/bitmaskclient/base/views/IconCheckboxEntry.java index 977056f7..0957712b 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/views/IconCheckboxEntry.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/views/IconCheckboxEntry.java @@ -7,10 +7,10 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; -import android.widget.TextView; import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatTextView; import androidx.core.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; @@ -23,7 +23,7 @@ import se.leap.bitmaskclient.base.fragments.TetheringDialog; public class IconCheckboxEntry extends LinearLayout { @BindView(android.R.id.text1) - TextView textView; + AppCompatTextView textView; @BindView(R.id.material_icon) AppCompatImageView iconView; diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java b/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java index b6d72ab6..a499cdd1 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java @@ -24,6 +24,7 @@ import androidx.annotation.DrawableRes; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatTextView; import androidx.appcompat.widget.SwitchCompat; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -36,8 +37,8 @@ import se.leap.bitmaskclient.R; public class IconSwitchEntry extends LinearLayout { - private TextView textView; - private TextView subtitleView; + private AppCompatTextView textView; + private AppCompatTextView subtitleView; private AppCompatImageView iconView; private SwitchCompat switchView; private CompoundButton.OnCheckedChangeListener checkedChangeListener; diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java b/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java index 6b9bd760..2d9525ed 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java @@ -4,25 +4,26 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.TextView; + +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.widget.AppCompatTextView; import se.leap.bitmaskclient.R; public class IconTextEntry extends LinearLayout { - private TextView textView; + private AppCompatTextView textView; private ImageView iconView; - private TextView subtitleView; + private AppCompatTextView subtitleView; public IconTextEntry(Context context) { super(context); diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderRenderer.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderRenderer.java index 339199e0..8aba4941 100644 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderRenderer.java +++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderRenderer.java @@ -4,7 +4,8 @@ import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; + +import androidx.appcompat.widget.AppCompatTextView; import com.pedrogomez.renderers.Renderer; @@ -20,9 +21,9 @@ public class ProviderRenderer extends Renderer<Provider> { private final Context context; @BindView(R.id.provider_name) - TextView name; + AppCompatTextView name; @BindView(R.id.provider_domain) - TextView domain; + AppCompatTextView domain; public ProviderRenderer(Context context) { this.context = context; diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AbstractProviderDetailActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AbstractProviderDetailActivity.java index ba84ed9a..66999580 100644 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AbstractProviderDetailActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AbstractProviderDetailActivity.java @@ -62,7 +62,7 @@ public abstract class AbstractProviderDetailActivity extends ConfigWizardBaseAct optionsList.toArray(new String[optionsList.size()]) )); options.setOnItemClickListener((parent, view, position, id) -> { - String text = ((TextView) view).getText().toString(); + String text = ((AppCompatTextView) view).getText().toString(); Intent intent; if (text.equals(getString(R.string.login_to_profile))) { Log.d(TAG, "login selected"); diff --git a/app/src/main/res/font/sofiapro_regular.otf b/app/src/main/res/font/sofiapro_regular.otf Binary files differnew file mode 100644 index 00000000..66d25156 --- /dev/null +++ b/app/src/main/res/font/sofiapro_regular.otf diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml index 704a7319..e018c8fc 100644 --- a/app/src/main/res/layout-xlarge/f_about.xml +++ b/app/src/main/res/layout-xlarge/f_about.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/version" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="12sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/terms_of_service" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -31,7 +31,7 @@ android:paddingBottom="12dp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -42,14 +42,14 @@ android:layout_width="match_parent" android:layout_height="12sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" android:autoLink="all" android:text="@string/repository_url_text" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="18sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="12sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -82,7 +82,7 @@ android:layout_width="match_parent" android:layout_height="18sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -92,7 +92,7 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="24sp" @@ -106,7 +106,7 @@ android:src="@drawable/openvpnLogo" /> --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -116,14 +116,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="24sp" android:text="@string/lzo" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -133,14 +133,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="24sp" android:text="@string/openssl" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -149,14 +149,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/okhttp" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -166,14 +166,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/mbetTLS" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -184,14 +184,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/asio" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -201,14 +201,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/openvpn3" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -218,14 +218,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_library" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -235,14 +235,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_dispatcher" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -252,14 +252,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_transports" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" diff --git a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml index 7d679ae3..b39540a6 100644 --- a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml @@ -15,7 +15,7 @@ tools:src="@drawable/ic_add_circle_outline_grey600_24dp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -34,7 +34,7 @@ android:layout_above="@+id/subtitle" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout-xlarge/v_provider_list_item.xml b/app/src/main/res/layout-xlarge/v_provider_list_item.xml index ec1e1242..eea55be2 100644 --- a/app/src/main/res/layout-xlarge/v_provider_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_provider_list_item.xml @@ -10,7 +10,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" > - <TextView android:id="@+id/provider_domain" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="?android:attr/listPreferredItemPaddingStart" @@ -21,7 +21,7 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> - <TextView android:id="@+id/provider_name" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="?android:attr/listPreferredItemPaddingStart" diff --git a/app/src/main/res/layout-xlarge/v_single_list_item.xml b/app/src/main/res/layout-xlarge/v_single_list_item.xml index ad3de093..6a318ff5 100644 --- a/app/src/main/res/layout-xlarge/v_single_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_single_list_item.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout-xlarge/v_switch_list_item.xml b/app/src/main/res/layout-xlarge/v_switch_list_item.xml index 02e52d6d..f4c3e892 100644 --- a/app/src/main/res/layout-xlarge/v_switch_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_switch_list_item.xml @@ -27,7 +27,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -41,7 +41,7 @@ android:textAppearance="?android:attr/textAppearanceListItem" tools:text=".,m.,msdflksdjflksjdflkjsdflksdlsdflkj lskjdf lkjsdf lkjsdf fsdls" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout-xlarge/v_vpn_status.xml b/app/src/main/res/layout-xlarge/v_vpn_status.xml index 3b464b62..ce8e6928 100644 --- a/app/src/main/res/layout-xlarge/v_vpn_status.xml +++ b/app/src/main/res/layout-xlarge/v_vpn_status.xml @@ -13,20 +13,20 @@ android:layout_height="wrap_content"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/uploaded_data" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView style="@style/logWindowStatusText" android:id="@+id/speedUp" tools:text="4 Mbit/s 6.7 GB"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/downloaded_data" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView style="@style/logWindowStatusText" android:id="@+id/speedDown" tools:text="2 Mbit/s 4.7 GB"/> @@ -38,11 +38,11 @@ android:layout_height="wrap_content"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/vpn_status" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/speedStatus" tools:text="Connected to a very long ipv4 and 3483489348238824829482384928" diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml index d8d846f9..f1556875 100644 --- a/app/src/main/res/layout/allowed_application_layout.xml +++ b/app/src/main/res/layout/allowed_application_layout.xml @@ -26,7 +26,7 @@ tools:background="@drawable/icon" android:contentDescription="@null" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView tools:text="@string/app" android:id="@+id/app_name" android:layout_width="0dip" @@ -45,14 +45,14 @@ android:layout_rowSpan="1" android:visibility="visible" /> -<!-- <TextView +<!-- <androidx.appcompat.widget.AppCompatTextView android:id="@+id/app_size" android:layout_width="0dip" android:layout_gravity="fill_horizontal|top" android:textAppearance="?android:attr/textAppearanceSmall" android:textAlignment="viewStart" /> --> - <!-- <TextView + <!-- <androidx.appcompat.widget.AppCompatTextView android:id="@+id/app_disabled" android:layout_marginStart="8dip" android:layout_gravity="top" diff --git a/app/src/main/res/layout/allowed_vpn_apps.xml b/app/src/main/res/layout/allowed_vpn_apps.xml index c1711d56..f76b5f4f 100644 --- a/app/src/main/res/layout/allowed_vpn_apps.xml +++ b/app/src/main/res/layout/allowed_vpn_apps.xml @@ -10,7 +10,7 @@ tools:ignore="RtlCompat" android:layout_height="match_parent"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" diff --git a/app/src/main/res/layout/custom_toast.xml b/app/src/main/res/layout/custom_toast.xml index 70a9df8c..c267fb86 100644 --- a/app/src/main/res/layout/custom_toast.xml +++ b/app/src/main/res/layout/custom_toast.xml @@ -13,7 +13,7 @@ android:layout_marginRight="8dp" android:layout_gravity="center" /> - <TextView android:id="@+id/text" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/text" android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml index 3af36086..d6b6ea80 100644 --- a/app/src/main/res/layout/donation_reminder_dialog.xml +++ b/app/src/main/res/layout/donation_reminder_dialog.xml @@ -11,7 +11,7 @@ android:gravity="center" android:orientation="vertical"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/tvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -24,7 +24,7 @@ android:textSize="28sp" android:textStyle="bold" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/tvMessage" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml index ec7369ef..b10cc555 100644 --- a/app/src/main/res/layout/f_about.xml +++ b/app/src/main/res/layout/f_about.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/version" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/terms_of_service" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -31,7 +31,7 @@ android:paddingBottom="12dp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -41,7 +41,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -52,13 +52,13 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" android:text="@string/repository_url_text" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -68,7 +68,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -78,7 +78,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -88,7 +88,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_others" /> @@ -97,7 +97,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/openvpn" @@ -110,7 +110,7 @@ android:src="@drawable/openvpnLogo" /> --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/opevpn_copyright" /> @@ -119,13 +119,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/lzo" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/lzo_copyright" /> @@ -134,13 +134,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/openssl" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_openssl" /> @@ -149,13 +149,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/okhttp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_okhttp" /> @@ -164,13 +164,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/mbetTLS" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="web" @@ -180,13 +180,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/asio" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_asio" /> @@ -195,13 +195,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/openvpn3" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_openvpn3" /> @@ -210,13 +210,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_library" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_shapeshifter_library" /> @@ -225,13 +225,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_dispatcher" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_shapeshifter_dispatcher" /> @@ -240,13 +240,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_transports" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_shapeshifter_transports" /> @@ -255,13 +255,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/circleImageView" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_circleImageView" /> diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml index 97479ec3..65179857 100644 --- a/app/src/main/res/layout/f_drawer_main.xml +++ b/app/src/main/res/layout/f_drawer_main.xml @@ -108,7 +108,7 @@ android:visibility="gone" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/show_experimental_features" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/f_log.xml b/app/src/main/res/layout/f_log.xml index 47a80e50..ac77abd5 100644 --- a/app/src/main/res/layout/f_log.xml +++ b/app/src/main/res/layout/f_log.xml @@ -21,7 +21,7 @@ <include layout="@layout/f_log_sliders"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/speed_waiting" android:singleLine="true" android:id="@+id/speed" diff --git a/app/src/main/res/layout/f_log_sliders.xml b/app/src/main/res/layout/f_log_sliders.xml index 4196e243..ea444b3d 100644 --- a/app/src/main/res/layout/f_log_sliders.xml +++ b/app/src/main/res/layout/f_log_sliders.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/log_verbosity_level"/> @@ -29,7 +29,7 @@ tools:max="5" android:indeterminate="false"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/timestamps"/> diff --git a/app/src/main/res/layout/v_custom_notification.xml b/app/src/main/res/layout/v_custom_notification.xml index e97fcbe2..e3996dcc 100644 --- a/app/src/main/res/layout/v_custom_notification.xml +++ b/app/src/main/res/layout/v_custom_notification.xml @@ -28,7 +28,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -36,7 +36,7 @@ tools:text="Bitmask - Amsterdam" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/message" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_icon_select_text_list_item.xml b/app/src/main/res/layout/v_icon_select_text_list_item.xml index f38bac6e..801a372a 100644 --- a/app/src/main/res/layout/v_icon_select_text_list_item.xml +++ b/app/src/main/res/layout/v_icon_select_text_list_item.xml @@ -15,7 +15,7 @@ tools:src="@drawable/ic_bluetooth" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_icon_text_list_item.xml b/app/src/main/res/layout/v_icon_text_list_item.xml index 0b2d5b11..06b70a2e 100644 --- a/app/src/main/res/layout/v_icon_text_list_item.xml +++ b/app/src/main/res/layout/v_icon_text_list_item.xml @@ -14,7 +14,7 @@ android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" tools:src="@drawable/ic_add_circle_outline_grey600_24dp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -33,7 +33,7 @@ android:layout_above="@+id/subtitle" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_log_item.xml b/app/src/main/res/layout/v_log_item.xml index 713c3b1f..5f809523 100644 --- a/app/src/main/res/layout/v_log_item.xml +++ b/app/src/main/res/layout/v_log_item.xml @@ -4,7 +4,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" > - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml index 1f0e135b..b4f41793 100644 --- a/app/src/main/res/layout/v_provider_list_item.xml +++ b/app/src/main/res/layout/v_provider_list_item.xml @@ -10,7 +10,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" > - <TextView android:id="@+id/provider_domain" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="?android:attr/listPreferredItemPaddingStart" @@ -21,7 +21,7 @@ android:textAppearance="?android:attr/textAppearanceListItem" /> - <TextView android:id="@+id/provider_name" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="?android:attr/listPreferredItemPaddingStart" diff --git a/app/src/main/res/layout/v_single_list_item.xml b/app/src/main/res/layout/v_single_list_item.xml index 652cb693..7b35bf7f 100644 --- a/app/src/main/res/layout/v_single_list_item.xml +++ b/app/src/main/res/layout/v_single_list_item.xml @@ -1,4 +1,4 @@ -<TextView xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml index 1686a99d..5bd4de1b 100644 --- a/app/src/main/res/layout/v_switch_list_item.xml +++ b/app/src/main/res/layout/v_switch_list_item.xml @@ -27,7 +27,7 @@ android:minHeight="?android:attr/listPreferredItemHeightSmall" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -41,7 +41,7 @@ android:textAppearance="?android:attr/textAppearanceListItemSmall" tools:text=".,m.,msdflksdjflksjdflkjsdflksdlsdflkj lskjdf lkjsdf lkjsdf fsdls" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_vpn_status.xml b/app/src/main/res/layout/v_vpn_status.xml index 3b464b62..ce8e6928 100644 --- a/app/src/main/res/layout/v_vpn_status.xml +++ b/app/src/main/res/layout/v_vpn_status.xml @@ -13,20 +13,20 @@ android:layout_height="wrap_content"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/uploaded_data" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView style="@style/logWindowStatusText" android:id="@+id/speedUp" tools:text="4 Mbit/s 6.7 GB"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/downloaded_data" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView style="@style/logWindowStatusText" android:id="@+id/speedDown" tools:text="2 Mbit/s 4.7 GB"/> @@ -38,11 +38,11 @@ android:layout_height="wrap_content"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/vpn_status" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/speedStatus" tools:text="Connected to a very long ipv4 and 3483489348238824829482384928" diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml index 0a426ced..233eec9d 100644 --- a/app/src/main/res/values-v21/themes.xml +++ b/app/src/main/res/values-v21/themes.xml @@ -3,7 +3,7 @@ <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> - + <item name="android:fontFamily">@font/sofiapro_regular</item> <item name="textColorError">@color/colorError</item> <!-- progressBar color --> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index ab489fc6..e54feaff 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -3,9 +3,9 @@ <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + <item name="android:fontFamily">@font/sofiapro_regular</item> <item name="textColorError">@color/colorError</item> - <!-- progressBar color --> <item name="colorAccent">@color/colorPrimary</item> |