From 5afe57ab868ee9e2e27f5b26b9b14de3519c0402 Mon Sep 17 00:00:00 2001 From: cyberta Date: Fri, 2 Dec 2022 02:08:55 +0100 Subject: rearranging assets, split them into normal and custom flavor --- .../EipFragment.java | 654 --------------------- .../leap/bitmaskclient/base/views/MainButton.java | 57 -- app/src/normal/res/drawable-hdpi/bg_connected.png | Bin 0 -> 190405 bytes app/src/normal/res/drawable-hdpi/bg_connecting.png | Bin 0 -> 236571 bytes .../normal/res/drawable-hdpi/bg_disconnected.png | Bin 0 -> 143331 bytes .../res/drawable-hdpi/ic_splash_background.png | Bin 39702 -> 0 bytes .../normal/res/drawable-hdpi/state_connected.png | Bin 0 -> 81235 bytes .../normal/res/drawable-hdpi/state_connecting.png | Bin 0 -> 80386 bytes .../res/drawable-hdpi/state_disconnected.png | Bin 0 -> 73514 bytes app/src/normal/res/drawable-xhdpi/bg_connected.png | Bin 0 -> 319429 bytes .../normal/res/drawable-xhdpi/bg_connecting.png | Bin 0 -> 400307 bytes .../normal/res/drawable-xhdpi/bg_disconnected.png | Bin 0 -> 220676 bytes .../res/drawable-xhdpi/ic_splash_background.png | Bin 64868 -> 0 bytes .../normal/res/drawable-xhdpi/state_connected.png | Bin 0 -> 121655 bytes .../normal/res/drawable-xhdpi/state_connecting.png | Bin 0 -> 122701 bytes .../res/drawable-xhdpi/state_disconnected.png | Bin 0 -> 116193 bytes .../normal/res/drawable-xxhdpi/bg_connected.png | Bin 0 -> 701727 bytes .../normal/res/drawable-xxhdpi/bg_connecting.png | Bin 0 -> 828368 bytes .../normal/res/drawable-xxhdpi/bg_disconnected.png | Bin 0 -> 446155 bytes .../normal/res/drawable-xxhdpi/state_connected.png | Bin 0 -> 220730 bytes .../res/drawable-xxhdpi/state_connecting.png | Bin 0 -> 226345 bytes .../res/drawable-xxhdpi/state_disconnected.png | Bin 0 -> 222370 bytes .../normal/res/drawable-xxxhdpi/bg_connected.png | Bin 0 -> 1228810 bytes .../normal/res/drawable-xxxhdpi/bg_connecting.png | Bin 0 -> 1489207 bytes .../res/drawable-xxxhdpi/bg_disconnected.png | Bin 0 -> 745847 bytes .../res/drawable-xxxhdpi/ic_splash_background.png | Bin 131879 -> 0 bytes .../res/drawable-xxxhdpi/state_connected.png | Bin 0 -> 324196 bytes .../res/drawable-xxxhdpi/state_connecting.png | Bin 0 -> 334967 bytes .../res/drawable-xxxhdpi/state_disconnected.png | Bin 0 -> 362086 bytes app/src/normal/res/drawable/bg_connected.png | Bin 0 -> 90299 bytes app/src/normal/res/drawable/bg_connecting.png | Bin 0 -> 112042 bytes app/src/normal/res/drawable/bg_disconnected.png | Bin 0 -> 143331 bytes .../normal/res/drawable/ic_splash_background.xml | 4 + app/src/normal/res/drawable/state_connected.png | Bin 0 -> 47593 bytes app/src/normal/res/drawable/state_connecting.png | Bin 0 -> 47055 bytes app/src/normal/res/drawable/state_disconnected.png | Bin 0 -> 40172 bytes app/src/normal/res/layout-port/f_eip.xml | 154 ----- app/src/normal/res/layout-xlarge-port/f_eip.xml | 162 ----- app/src/normal/res/layout-xlarge/f_eip.xml | 155 ----- app/src/normal/res/layout/f_eip.xml | 164 ------ app/src/normal/res/layout/v_location_button.xml | 104 ---- app/src/normal/res/layout/v_main_button.xml | 142 ----- 42 files changed, 4 insertions(+), 1592 deletions(-) delete mode 100644 app/src/normal/java/se.leap.bitmaskclient.base.fragments/EipFragment.java delete mode 100644 app/src/normal/java/se/leap/bitmaskclient/base/views/MainButton.java create mode 100644 app/src/normal/res/drawable-hdpi/bg_connected.png create mode 100644 app/src/normal/res/drawable-hdpi/bg_connecting.png create mode 100644 app/src/normal/res/drawable-hdpi/bg_disconnected.png delete mode 100644 app/src/normal/res/drawable-hdpi/ic_splash_background.png create mode 100644 app/src/normal/res/drawable-hdpi/state_connected.png create mode 100644 app/src/normal/res/drawable-hdpi/state_connecting.png create mode 100644 app/src/normal/res/drawable-hdpi/state_disconnected.png create mode 100644 app/src/normal/res/drawable-xhdpi/bg_connected.png create mode 100644 app/src/normal/res/drawable-xhdpi/bg_connecting.png create mode 100644 app/src/normal/res/drawable-xhdpi/bg_disconnected.png delete mode 100644 app/src/normal/res/drawable-xhdpi/ic_splash_background.png create mode 100644 app/src/normal/res/drawable-xhdpi/state_connected.png create mode 100644 app/src/normal/res/drawable-xhdpi/state_connecting.png create mode 100644 app/src/normal/res/drawable-xhdpi/state_disconnected.png create mode 100644 app/src/normal/res/drawable-xxhdpi/bg_connected.png create mode 100644 app/src/normal/res/drawable-xxhdpi/bg_connecting.png create mode 100644 app/src/normal/res/drawable-xxhdpi/bg_disconnected.png create mode 100644 app/src/normal/res/drawable-xxhdpi/state_connected.png create mode 100644 app/src/normal/res/drawable-xxhdpi/state_connecting.png create mode 100644 app/src/normal/res/drawable-xxhdpi/state_disconnected.png create mode 100644 app/src/normal/res/drawable-xxxhdpi/bg_connected.png create mode 100644 app/src/normal/res/drawable-xxxhdpi/bg_connecting.png create mode 100644 app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png delete mode 100644 app/src/normal/res/drawable-xxxhdpi/ic_splash_background.png create mode 100644 app/src/normal/res/drawable-xxxhdpi/state_connected.png create mode 100644 app/src/normal/res/drawable-xxxhdpi/state_connecting.png create mode 100644 app/src/normal/res/drawable-xxxhdpi/state_disconnected.png create mode 100644 app/src/normal/res/drawable/bg_connected.png create mode 100644 app/src/normal/res/drawable/bg_connecting.png create mode 100644 app/src/normal/res/drawable/bg_disconnected.png create mode 100644 app/src/normal/res/drawable/ic_splash_background.xml create mode 100644 app/src/normal/res/drawable/state_connected.png create mode 100644 app/src/normal/res/drawable/state_connecting.png create mode 100644 app/src/normal/res/drawable/state_disconnected.png delete mode 100644 app/src/normal/res/layout-port/f_eip.xml delete mode 100644 app/src/normal/res/layout-xlarge-port/f_eip.xml delete mode 100644 app/src/normal/res/layout-xlarge/f_eip.xml delete mode 100644 app/src/normal/res/layout/f_eip.xml delete mode 100644 app/src/normal/res/layout/v_location_button.xml delete mode 100644 app/src/normal/res/layout/v_main_button.xml (limited to 'app/src/normal') diff --git a/app/src/normal/java/se.leap.bitmaskclient.base.fragments/EipFragment.java b/app/src/normal/java/se.leap.bitmaskclient.base.fragments/EipFragment.java deleted file mode 100644 index 0210077c..00000000 --- a/app/src/normal/java/se.leap.bitmaskclient.base.fragments/EipFragment.java +++ /dev/null @@ -1,654 +0,0 @@ -/** - * Copyright (c) 2018 LEAP Encryption Access Project and contributers - * - * 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 3 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, see . - */ -package se.leap.bitmaskclient.base.fragments; - -import static de.blinkt.openvpn.core.ConnectionStatus.LEVEL_NONETWORK; -import static se.leap.bitmaskclient.R.string.vpn_certificate_user_message; -import static se.leap.bitmaskclient.base.models.Constants.ASK_TO_CANCEL_VPN; -import static se.leap.bitmaskclient.base.models.Constants.EIP_ACTION_START; -import static se.leap.bitmaskclient.base.models.Constants.EIP_EARLY_ROUTES; -import static se.leap.bitmaskclient.base.models.Constants.EIP_RESTART_ON_BOOT; -import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_KEY; -import static se.leap.bitmaskclient.base.models.Constants.REQUEST_CODE_CONFIGURE_LEAP; -import static se.leap.bitmaskclient.base.models.Constants.REQUEST_CODE_LOG_IN; -import static se.leap.bitmaskclient.base.models.Constants.REQUEST_CODE_SWITCH_PROVIDER; -import static se.leap.bitmaskclient.base.models.Constants.SHARED_PREFERENCES; -import static se.leap.bitmaskclient.base.utils.ConfigHelper.isDefaultBitmask; -import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getPreferredCity; -import static se.leap.bitmaskclient.eip.EipSetupObserver.reconnectingWithDifferentGateway; -import static se.leap.bitmaskclient.eip.GatewaysManager.Load.UNKNOWN; -import static se.leap.bitmaskclient.providersetup.ProviderAPI.DOWNLOAD_GEOIP_JSON; -import static se.leap.bitmaskclient.providersetup.ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE; -import static se.leap.bitmaskclient.providersetup.ProviderAPI.USER_MESSAGE; - -import android.app.Activity; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; -import android.content.SharedPreferences; -import android.os.Bundle; -import android.os.IBinder; -import android.text.Spannable; -import android.text.SpannableString; -import android.text.TextUtils; -import android.text.style.RelativeSizeSpan; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.ColorRes; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.appcompat.widget.AppCompatTextView; -import androidx.core.content.ContextCompat; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentTransaction; - -import java.util.Observable; -import java.util.Observer; -import java.util.concurrent.atomic.AtomicBoolean; - -import de.blinkt.openvpn.core.ConnectionStatus; -import de.blinkt.openvpn.core.IOpenVPNServiceInternal; -import de.blinkt.openvpn.core.OpenVPNService; -import de.blinkt.openvpn.core.VpnStatus; -import de.blinkt.openvpn.core.connection.Connection; -import se.leap.bitmaskclient.R; -import se.leap.bitmaskclient.base.FragmentManagerEnhanced; -import se.leap.bitmaskclient.base.MainActivity; -import se.leap.bitmaskclient.base.models.Provider; -import se.leap.bitmaskclient.base.models.ProviderObservable; -import se.leap.bitmaskclient.base.utils.PreferenceHelper; -import se.leap.bitmaskclient.base.views.LocationButton; -import se.leap.bitmaskclient.base.views.MainButton; -import se.leap.bitmaskclient.databinding.FEipBinding; -import se.leap.bitmaskclient.eip.EipCommand; -import se.leap.bitmaskclient.eip.EipStatus; -import se.leap.bitmaskclient.eip.GatewaysManager; -import se.leap.bitmaskclient.providersetup.ProviderAPICommand; -import se.leap.bitmaskclient.providersetup.ProviderListActivity; -import se.leap.bitmaskclient.providersetup.activities.CustomProviderSetupActivity; -import se.leap.bitmaskclient.providersetup.activities.LoginActivity; -import se.leap.bitmaskclient.providersetup.models.LeapSRPSession; -import se.leap.bitmaskclient.tor.TorServiceCommand; -import se.leap.bitmaskclient.tor.TorStatusObservable; - -public class EipFragment extends Fragment implements Observer { - - public final static String TAG = EipFragment.class.getSimpleName(); - - - private SharedPreferences preferences; - private Provider provider; - - AppCompatImageView background; - AppCompatImageView stateView; - MainButton mainButton; - LocationButton locationButton; - AppCompatTextView mainDescription; - AppCompatTextView subDescription; - - private EipStatus eipStatus; - private ProviderObservable providerObservable; - private TorStatusObservable torStatusObservable; - - private GatewaysManager gatewaysManager; - - //---saved Instance ------- - private final String KEY_SHOW_PENDING_START_CANCELLATION = "KEY_SHOW_PENDING_START_CANCELLATION"; - private final String KEY_SHOW_ASK_TO_STOP_EIP = "KEY_SHOW_ASK_TO_STOP_EIP"; - private boolean showPendingStartCancellation = false; - private boolean showAskToStopEip = false; - //------------------------ - AlertDialog alertDialog; - - private IOpenVPNServiceInternal mService; - // We use this service connection to detect if openvpn is running without network - private EipFragmentServiceConnection openVpnConnection; - - @Override - public void onAttach(Context context) { - super.onAttach(context); - Bundle arguments = getArguments(); - Activity activity = getActivity(); - if (activity != null) { - if (arguments != null) { - provider = arguments.getParcelable(PROVIDER_KEY); - if (provider == null) { - handleNoProvider(activity); - } else { - Log.d(TAG, provider.getName() + " configured as provider"); - } - } else { - handleNoProvider(activity); - } - } - } - - private void handleNoProvider(Activity activity) { - if (isDefaultBitmask()) { - activity.startActivityForResult(new Intent(activity, ProviderListActivity.class), REQUEST_CODE_SWITCH_PROVIDER); - } else { - Log.e(TAG, "no provider given - try to reconfigure custom provider"); - startActivityForResult(new Intent(activity, CustomProviderSetupActivity.class), REQUEST_CODE_CONFIGURE_LEAP); - - } - - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - openVpnConnection = new EipFragmentServiceConnection(); - eipStatus = EipStatus.getInstance(); - providerObservable = ProviderObservable.getInstance(); - torStatusObservable = TorStatusObservable.getInstance(); - Activity activity = getActivity(); - if (activity != null) { - preferences = getActivity().getSharedPreferences(SHARED_PREFERENCES, Context.MODE_PRIVATE); - } else { - Log.e(TAG, "activity is null in onCreate - no preferences set!"); - } - - gatewaysManager = new GatewaysManager(getContext()); - - - } - - @Override - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - FEipBinding binding = FEipBinding.inflate(LayoutInflater.from(getContext()), container, false); - background = binding.background; - mainButton = binding.mainButton; - locationButton = binding.gatewayLocationButton; - locationButton.setTextColor(R.color.black800); - mainDescription = binding.mainDescription; - subDescription = binding.subDescription; - stateView = binding.stateView; - - eipStatus.addObserver(this); - torStatusObservable.addObserver(this); - providerObservable.addObserver(this); - - try { - Bundle arguments = getArguments(); - if (arguments != null && arguments.containsKey(ASK_TO_CANCEL_VPN) && arguments.getBoolean(ASK_TO_CANCEL_VPN)) { - arguments.remove(ASK_TO_CANCEL_VPN); - setArguments(arguments); - askToStopEIP(); - } - } catch (IllegalStateException e) { - // probably setArguments failed because the fragments state is already saved - e.printStackTrace(); - } - - restoreFromSavedInstance(savedInstanceState); - locationButton.setOnClickListener(v -> { - FragmentManagerEnhanced fragmentManager = new FragmentManagerEnhanced(getActivity().getSupportFragmentManager()); - Fragment fragment = new GatewaySelectionFragment(); - fragmentManager.replace(R.id.main_container, fragment, MainActivity.TAG); - }); - - mainButton.setOnClickListener(v -> { - handleIcon(); - }); - return binding.getRoot(); - } - - @Override - public void onStart() { - super.onStart(); - if (DonationReminderDialog.isCallable(getContext())) { - showDonationReminderDialog(); - } - } - - @Override - public void onResume() { - super.onResume(); - if (!eipStatus.isDisconnected()) { - openVpnConnection.bindService(); - } - handleNewState(); - } - - @Override - public void onPause() { - super.onPause(); - openVpnConnection.unbindService(); - } - - @Override - public void onSaveInstanceState(@NonNull Bundle outState) { - super.onSaveInstanceState(outState); - if (showAskToStopEip) { - outState.putBoolean(KEY_SHOW_ASK_TO_STOP_EIP, true); - alertDialog.dismiss(); - } else if (showPendingStartCancellation) { - outState.putBoolean(KEY_SHOW_PENDING_START_CANCELLATION, true); - alertDialog.dismiss(); - } - } - - private void restoreFromSavedInstance(Bundle savedInstanceState) { - if (savedInstanceState != null && savedInstanceState.containsKey(KEY_SHOW_PENDING_START_CANCELLATION)) { - showPendingStartCancellation = true; - askPendingStartCancellation(); - } else if (savedInstanceState != null && savedInstanceState.containsKey(KEY_SHOW_ASK_TO_STOP_EIP)) { - showAskToStopEip = true; - askToStopEIP(); - } - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - Activity activity = getActivity(); - if (activity != null) { - ((MainActivity) activity).setDefaultActivityBarColor(); - } - eipStatus.deleteObserver(this); - providerObservable.deleteObserver(this); - torStatusObservable.deleteObserver(this); - background = null; - mainButton = null; - locationButton = null; - mainDescription = null; - subDescription = null; - stateView = null; - } - - private void saveStatus(boolean restartOnBoot) { - preferences.edit().putBoolean(EIP_RESTART_ON_BOOT, restartOnBoot).apply(); - } - - void handleIcon() { - if (isOpenVpnRunningWithoutNetwork() || eipStatus.isConnected() || eipStatus.isConnecting() || eipStatus.isUpdatingVpnCert()) - handleSwitchOff(); - else - handleSwitchOn(); - } - - private void handleSwitchOn() { - Context context = getContext(); - if (context == null) { - Log.e(TAG, "context is null when switch turning on"); - return; - } - - if (canStartEIP()) { - startEipFromScratch(); - } else if (canLogInToStartEIP()) { - askUserToLogIn(getString(vpn_certificate_user_message)); - } else { - // provider has no VpnCertificate but user is logged in - updateInvalidVpnCertificate(); - } - } - - private boolean canStartEIP() { - boolean certificateExists = provider.hasVpnCertificate(); - boolean isAllowedAnon = provider.allowsAnonymous(); - return (isAllowedAnon || certificateExists) && !eipStatus.isConnected() && !eipStatus.isConnecting(); - } - - private boolean canLogInToStartEIP() { - boolean isAllowedRegistered = provider.allowsRegistered(); - boolean isLoggedIn = LeapSRPSession.loggedIn(); - return isAllowedRegistered && !isLoggedIn && !eipStatus.isConnecting() && !eipStatus.isConnected(); - } - - private void handleSwitchOff() { - if (isOpenVpnRunningWithoutNetwork() || eipStatus.isConnecting() || eipStatus.isUpdatingVpnCert()) { - askPendingStartCancellation(); - } else if (eipStatus.isConnected()) { - askToStopEIP(); - } - } - - private void setMainButtonEnabled(boolean enabled) { - locationButton.setEnabled(enabled); - mainButton.setEnabled(enabled); - } - - public void startEipFromScratch() { - saveStatus(true); - Context context = getContext(); - if (context == null) { - Log.e(TAG, "context is null when trying to start VPN"); - return; - } - if (!provider.getGeoipUrl().isDefault() && provider.shouldUpdateGeoIpJson()) { - Bundle bundle = new Bundle(); - bundle.putBoolean(EIP_ACTION_START, true); - bundle.putBoolean(EIP_EARLY_ROUTES, false); - ProviderAPICommand.execute(context, DOWNLOAD_GEOIP_JSON, bundle, provider); - } else { - EipCommand.startVPN(context, false); - } - EipStatus.getInstance().updateState("UI_CONNECTING", "", 0, ConnectionStatus.LEVEL_START); - } - - protected void stopEipIfPossible() { - Context context = getContext(); - if (context == null) { - Log.e(TAG, "context is null when trying to stop EIP"); - return; - } - EipCommand.stopVPN(context); - } - - private void askPendingStartCancellation() { - Activity activity = getActivity(); - if (activity == null) { - Log.e(TAG, "activity is null when asking to cancel"); - return; - } - - try { - AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getActivity()); - showPendingStartCancellation = true; - alertDialog = alertBuilder.setTitle(activity.getString(R.string.eip_cancel_connect_title)) - .setMessage(activity.getString(R.string.eip_cancel_connect_text)) - .setPositiveButton((android.R.string.yes), (dialog, which) -> { - Context context = getContext(); - if (context != null && eipStatus.isUpdatingVpnCert() && - TorStatusObservable.isRunning()) { - TorServiceCommand.stopTorServiceAsync(context.getApplicationContext()); - } - stopEipIfPossible(); - }) - .setNegativeButton(activity.getString(android.R.string.no), (dialog, which) -> { - }).setOnDismissListener(dialog -> showPendingStartCancellation = false).show(); - } catch (IllegalStateException e) { - e.printStackTrace(); - } - - } - - protected void askToStopEIP() { - Activity activity = getActivity(); - if (activity == null) { - Log.e(TAG, "activity is null when asking to stop EIP"); - return; - } - try { - AlertDialog.Builder alertBuilder = new AlertDialog.Builder(activity); - showAskToStopEip = true; - alertDialog = alertBuilder.setTitle(activity.getString(R.string.eip_cancel_connect_title)) - .setMessage(activity.getString(R.string.eip_warning_browser_inconsistency)) - .setPositiveButton((android.R.string.yes), (dialog, which) -> stopEipIfPossible()) - .setNegativeButton(activity.getString(android.R.string.no), (dialog, which) -> { - }).setOnDismissListener(dialog -> showAskToStopEip = false).show(); - } catch (IllegalStateException e) { - e.printStackTrace(); - } - - } - - @Override - public void update(Observable observable, Object data) { - if (observable instanceof EipStatus) { - eipStatus = (EipStatus) observable; - handleNewStateOnMain(); - - if (eipStatus.isConnecting()) { - openVpnConnection.bindService(); - } - if ("NOPROCESS".equals(EipStatus.getInstance().getState())) { - //assure that the Service is shutdown completely if openvpn was stopped - openVpnConnection.unbindService(); - } - } else if (observable instanceof ProviderObservable) { - provider = ((ProviderObservable) observable).getCurrentProvider(); - } else if (observable instanceof TorStatusObservable && EipStatus.getInstance().isUpdatingVpnCert()) { - handleNewStateOnMain(); - } - } - - private void handleNewStateOnMain() { - Activity activity = getActivity(); - if (activity != null) { - activity.runOnUiThread(this::handleNewState); - } else { - Log.e("EipFragment", "activity is null"); - } - } - - private void setActivityBarColor(@ColorRes int primaryColor, @ColorRes int secondaryColor) { - Activity activity = getActivity(); - if (activity == null) { - return; - } - ((MainActivity) getActivity()).setActivityBarColor(primaryColor, secondaryColor, R.color.actionbar_dark_color); - } - - private void handleNewState() { - Activity activity = getActivity(); - if (activity == null) { - Log.e(TAG, "activity is null while trying to handle new state"); - return; - } - - Log.d(TAG, "eip fragment eipStatus state: " + eipStatus.getState() + " - level: " + eipStatus.getLevel() + " - is reconnecting: " + eipStatus.isReconnecting()); - if (eipStatus.isUpdatingVpnCert()) { - setMainButtonEnabled(true); - String city = getPreferredCity(getContext()); - String locationName = VpnStatus.getCurrentlyConnectingVpnName() != null ? - VpnStatus.getCurrentlyConnectingVpnName() : - city == null ? getString(R.string.gateway_selection_recommended_location) : city; - locationButton.setText(locationName); - locationButton.setLocationLoad(UNKNOWN); - locationButton.showBridgeIndicator(false); - locationButton.showRecommendedIndicator(false); - mainDescription.setText(R.string.eip_status_connecting); - String torStatus = TorStatusObservable.getStringForCurrentStatus(getContext()); - if (!TextUtils.isEmpty(torStatus)) { - Spannable spannable = new SpannableString(torStatus); - spannable.setSpan(new RelativeSizeSpan(0.75f), 0, spannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - subDescription.setText(TextUtils.concat(getString(R.string.updating_certificate_message) + "\n", spannable)); - } else { - subDescription.setText(getString(R.string.updating_certificate_message)); - } - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_connecting)); - stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.yellow_mask)); - mainButton.updateState(false, true, false); - setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent); - } else if (eipStatus.isConnecting()) { - setMainButtonEnabled(true); - String city = getPreferredCity(getContext()); - String locationName = VpnStatus.getCurrentlyConnectingVpnName() != null ? - VpnStatus.getCurrentlyConnectingVpnName() : - city == null ? getString(R.string.gateway_selection_recommended_location) : city; - locationButton.setText(locationName); - locationButton.setLocationLoad(UNKNOWN); - locationButton.showBridgeIndicator(false); - locationButton.showRecommendedIndicator(false); - mainDescription.setText(R.string.eip_status_connecting); - subDescription.setText(null); - background.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.bg_connecting)); - stateView.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.yellow_mask)); - mainButton.updateState(false, true, false); - setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent); - } else if (eipStatus.isConnected()) { - setMainButtonEnabled(true); - mainButton.updateState(true, false, false); - Connection.TransportType transportType = PreferenceHelper.getUseBridges(getContext()) ? Connection.TransportType.OBFS4 : Connection.TransportType.OPENVPN; - locationButton.setLocationLoad(PreferenceHelper.useObfuscationPinning(getContext()) ? GatewaysManager.Load.UNKNOWN : gatewaysManager.getLoadForLocation(VpnStatus.getLastConnectedVpnName(), transportType)); - locationButton.setText(VpnStatus.getLastConnectedVpnName()); - locationButton.showBridgeIndicator(VpnStatus.isUsingBridges()); - locationButton.showRecommendedIndicator(getPreferredCity(getContext()) == null); - mainDescription.setText(R.string.eip_status_secured); - subDescription.setText(null); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_connected)); - stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.green_mask)); - setActivityBarColor(R.color.bg_running_top, R.color.bg_running_top_light_transparent); - } else if(isOpenVpnRunningWithoutNetwork()) { - Log.d(TAG, "eip fragment eipStatus - isOpenVpnRunningWithoutNetwork"); - setMainButtonEnabled(true); - mainButton.updateState(true, false, true); - locationButton.setText(VpnStatus.getCurrentlyConnectingVpnName()); - locationButton.showBridgeIndicator(VpnStatus.isUsingBridges()); - locationButton.showBridgeIndicator(VpnStatus.isUsingBridges()); - locationButton.showRecommendedIndicator(getPreferredCity(getContext())== null); - mainDescription.setText(R.string.eip_state_connected); - subDescription.setText(R.string.eip_state_no_network); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_connecting)); - stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.yellow_mask)); - setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent); - } else if (eipStatus.isDisconnected() && reconnectingWithDifferentGateway()) { - locationButton.setText(VpnStatus.getCurrentlyConnectingVpnName()); - locationButton.setLocationLoad(UNKNOWN); - locationButton.showBridgeIndicator(false); - locationButton.showRecommendedIndicator(false); - mainDescription.setText(R.string.eip_status_connecting); - subDescription.setText(R.string.reconnecting); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_connecting)); - stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.yellow_mask)); - setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent); - - } else if (eipStatus.isDisconnecting()) { - setMainButtonEnabled(false); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_disconnected)); - stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.red_mask)); - mainButton.updateState(false, false, false); - mainDescription.setText(R.string.eip_status_unsecured); - setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent); - } else if (eipStatus.isBlocking()) { - setMainButtonEnabled(true); - mainButton.updateState(true, false, true); - locationButton.setText(getString(R.string.no_location)); - locationButton.setLocationLoad(UNKNOWN); - locationButton.showBridgeIndicator(false); - locationButton.showRecommendedIndicator(false); - mainDescription.setText(R.string.eip_state_connected); - subDescription.setText(getString(R.string.eip_state_blocking, getString(R.string.app_name))); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_disconnected)); - stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.red_mask)); - setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent); - } else { - locationButton.setText(getContext().getString(R.string.vpn_button_turn_on)); - setMainButtonEnabled(true); - mainButton.updateState(false, false, false); - locationButton.setLocationLoad(UNKNOWN); - locationButton.showBridgeIndicator(false); - String city = getPreferredCity(getContext()); - locationButton.setText(city == null ? getString(R.string.gateway_selection_recommended_location) : city); - locationButton.showRecommendedIndicator(false); - mainDescription.setText(R.string.eip_status_unsecured); - subDescription.setText(null); - background.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.bg_disconnected)); - stateView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.red_mask)); - setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent); - } - } - - private boolean isOpenVpnRunningWithoutNetwork() { - boolean isRunning = false; - try { - isRunning = eipStatus.getLevel() == LEVEL_NONETWORK && - mService.isVpnRunning(); - } catch (Exception e) { - //eat me - e.printStackTrace(); - } - - return isRunning; - } - - private void updateInvalidVpnCertificate() { - eipStatus.setUpdatingVpnCert(true); - ProviderAPICommand.execute(getContext(), UPDATE_INVALID_VPN_CERTIFICATE, provider); - } - - private void askUserToLogIn(String userMessage) { - Intent intent = new Intent(getContext(), LoginActivity.class); - intent.putExtra(PROVIDER_KEY, provider); - - if(userMessage != null) { - intent.putExtra(USER_MESSAGE, userMessage); - } - - Activity activity = getActivity(); - if (activity != null) { - activity.startActivityForResult(intent, REQUEST_CODE_LOG_IN); - } - } - - private class EipFragmentServiceConnection implements ServiceConnection { - private final AtomicBoolean bind = new AtomicBoolean(false); - - void bindService() { - Activity activity = getActivity(); - if (activity == null) { - Log.e(TAG, "activity is null when binding OpenVpn"); - return; - } - if (!bind.get()) { - activity.runOnUiThread(() -> { - Intent intent = new Intent(activity, OpenVPNService.class); - intent.setAction(OpenVPNService.START_SERVICE); - - activity.bindService(intent, EipFragmentServiceConnection.this, Context.BIND_AUTO_CREATE); - bind.set(true); - }); - } - } - - void unbindService() { - Activity activity = getActivity(); - if (activity == null) { - return; - } - if (bind.get()) { - activity.runOnUiThread(() -> { - activity.unbindService(EipFragmentServiceConnection.this); - bind.set(false); - }); - } - } - - @Override - public void onServiceConnected(ComponentName className, - IBinder service) { - mService = IOpenVPNServiceInternal.Stub.asInterface(service); - handleNewState(); - } - - @Override - public void onServiceDisconnected(ComponentName arg0) { - mService = null; - } - } - - public void showDonationReminderDialog() { - try { - FragmentTransaction fragmentTransaction = new FragmentManagerEnhanced( - getActivity().getSupportFragmentManager()).removePreviousFragment( - DonationReminderDialog.TAG); - DialogFragment newFragment = new DonationReminderDialog(); - newFragment.setCancelable(false); - newFragment.show(fragmentTransaction, DonationReminderDialog.TAG); - } catch (IllegalStateException | NullPointerException e) { - e.printStackTrace(); - } - } -} diff --git a/app/src/normal/java/se/leap/bitmaskclient/base/views/MainButton.java b/app/src/normal/java/se/leap/bitmaskclient/base/views/MainButton.java deleted file mode 100644 index 715063b5..00000000 --- a/app/src/normal/java/se/leap/bitmaskclient/base/views/MainButton.java +++ /dev/null @@ -1,57 +0,0 @@ -package se.leap.bitmaskclient.base.views; - -import android.annotation.TargetApi; -import android.content.Context; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.widget.RelativeLayout; - -import androidx.appcompat.widget.AppCompatImageView; -import androidx.core.content.ContextCompat; - -import se.leap.bitmaskclient.R; -import se.leap.bitmaskclient.databinding.VMainButtonBinding; - -public class MainButton extends RelativeLayout { - - private static final String TAG = MainButton.class.getSimpleName(); - - AppCompatImageView button; - - public MainButton(Context context) { - super(context); - initLayout(context); - } - - public MainButton(Context context, AttributeSet attrs) { - super(context, attrs); - initLayout(context); - } - - public MainButton(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - initLayout(context); - } - - - @TargetApi(21) - public MainButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - initLayout(context); - } - - private void initLayout(Context context) { - VMainButtonBinding binding = VMainButtonBinding.inflate(LayoutInflater.from(context), this, true); - button = binding.button; - } - - public void updateState(boolean isOn, boolean isProcessing, boolean isError) { - if (isProcessing) { - button.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.button_circle_cancel)); - } else { - button.setImageDrawable( - ContextCompat.getDrawable(getContext(), - isOn ? R.drawable.button_circle_stop : R.drawable.button_circle_start)); - } - } -} diff --git a/app/src/normal/res/drawable-hdpi/bg_connected.png b/app/src/normal/res/drawable-hdpi/bg_connected.png new file mode 100644 index 00000000..0e98f705 Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_connected.png differ diff --git a/app/src/normal/res/drawable-hdpi/bg_connecting.png b/app/src/normal/res/drawable-hdpi/bg_connecting.png new file mode 100644 index 00000000..24632712 Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_connecting.png differ diff --git a/app/src/normal/res/drawable-hdpi/bg_disconnected.png b/app/src/normal/res/drawable-hdpi/bg_disconnected.png new file mode 100644 index 00000000..de96be57 Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_disconnected.png differ diff --git a/app/src/normal/res/drawable-hdpi/ic_splash_background.png b/app/src/normal/res/drawable-hdpi/ic_splash_background.png deleted file mode 100644 index 3e5f7871..00000000 Binary files a/app/src/normal/res/drawable-hdpi/ic_splash_background.png and /dev/null differ diff --git a/app/src/normal/res/drawable-hdpi/state_connected.png b/app/src/normal/res/drawable-hdpi/state_connected.png new file mode 100644 index 00000000..fccc060a Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/state_connected.png differ diff --git a/app/src/normal/res/drawable-hdpi/state_connecting.png b/app/src/normal/res/drawable-hdpi/state_connecting.png new file mode 100644 index 00000000..72e3ae45 Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/state_connecting.png differ diff --git a/app/src/normal/res/drawable-hdpi/state_disconnected.png b/app/src/normal/res/drawable-hdpi/state_disconnected.png new file mode 100644 index 00000000..d2ef7d99 Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/state_disconnected.png differ diff --git a/app/src/normal/res/drawable-xhdpi/bg_connected.png b/app/src/normal/res/drawable-xhdpi/bg_connected.png new file mode 100644 index 00000000..915dff95 Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_connected.png differ diff --git a/app/src/normal/res/drawable-xhdpi/bg_connecting.png b/app/src/normal/res/drawable-xhdpi/bg_connecting.png new file mode 100644 index 00000000..be4469df Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_connecting.png differ diff --git a/app/src/normal/res/drawable-xhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xhdpi/bg_disconnected.png new file mode 100644 index 00000000..433c776f Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_disconnected.png differ diff --git a/app/src/normal/res/drawable-xhdpi/ic_splash_background.png b/app/src/normal/res/drawable-xhdpi/ic_splash_background.png deleted file mode 100644 index c2135c04..00000000 Binary files a/app/src/normal/res/drawable-xhdpi/ic_splash_background.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xhdpi/state_connected.png b/app/src/normal/res/drawable-xhdpi/state_connected.png new file mode 100644 index 00000000..c852459d Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/state_connected.png differ diff --git a/app/src/normal/res/drawable-xhdpi/state_connecting.png b/app/src/normal/res/drawable-xhdpi/state_connecting.png new file mode 100644 index 00000000..d81190fe Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/state_connecting.png differ diff --git a/app/src/normal/res/drawable-xhdpi/state_disconnected.png b/app/src/normal/res/drawable-xhdpi/state_disconnected.png new file mode 100644 index 00000000..c0d57a03 Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/state_disconnected.png differ diff --git a/app/src/normal/res/drawable-xxhdpi/bg_connected.png b/app/src/normal/res/drawable-xxhdpi/bg_connected.png new file mode 100644 index 00000000..cd78d865 Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/bg_connected.png differ diff --git a/app/src/normal/res/drawable-xxhdpi/bg_connecting.png b/app/src/normal/res/drawable-xxhdpi/bg_connecting.png new file mode 100644 index 00000000..718e102f Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/bg_connecting.png differ diff --git a/app/src/normal/res/drawable-xxhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xxhdpi/bg_disconnected.png new file mode 100644 index 00000000..ffbcdb79 Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/bg_disconnected.png differ diff --git a/app/src/normal/res/drawable-xxhdpi/state_connected.png b/app/src/normal/res/drawable-xxhdpi/state_connected.png new file mode 100644 index 00000000..32286177 Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/state_connected.png differ diff --git a/app/src/normal/res/drawable-xxhdpi/state_connecting.png b/app/src/normal/res/drawable-xxhdpi/state_connecting.png new file mode 100644 index 00000000..75cf3782 Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/state_connecting.png differ diff --git a/app/src/normal/res/drawable-xxhdpi/state_disconnected.png b/app/src/normal/res/drawable-xxhdpi/state_disconnected.png new file mode 100644 index 00000000..ac560317 Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/state_disconnected.png differ diff --git a/app/src/normal/res/drawable-xxxhdpi/bg_connected.png b/app/src/normal/res/drawable-xxxhdpi/bg_connected.png new file mode 100644 index 00000000..3c9d97b4 Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/bg_connected.png differ diff --git a/app/src/normal/res/drawable-xxxhdpi/bg_connecting.png b/app/src/normal/res/drawable-xxxhdpi/bg_connecting.png new file mode 100644 index 00000000..bff2004c Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/bg_connecting.png differ diff --git a/app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png new file mode 100644 index 00000000..2503f135 Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png differ diff --git a/app/src/normal/res/drawable-xxxhdpi/ic_splash_background.png b/app/src/normal/res/drawable-xxxhdpi/ic_splash_background.png deleted file mode 100644 index 1b8046fa..00000000 Binary files a/app/src/normal/res/drawable-xxxhdpi/ic_splash_background.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xxxhdpi/state_connected.png b/app/src/normal/res/drawable-xxxhdpi/state_connected.png new file mode 100644 index 00000000..f5a5adaf Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/state_connected.png differ diff --git a/app/src/normal/res/drawable-xxxhdpi/state_connecting.png b/app/src/normal/res/drawable-xxxhdpi/state_connecting.png new file mode 100644 index 00000000..806dcbf4 Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/state_connecting.png differ diff --git a/app/src/normal/res/drawable-xxxhdpi/state_disconnected.png b/app/src/normal/res/drawable-xxxhdpi/state_disconnected.png new file mode 100644 index 00000000..9e216955 Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/state_disconnected.png differ diff --git a/app/src/normal/res/drawable/bg_connected.png b/app/src/normal/res/drawable/bg_connected.png new file mode 100644 index 00000000..6da7878d Binary files /dev/null and b/app/src/normal/res/drawable/bg_connected.png differ diff --git a/app/src/normal/res/drawable/bg_connecting.png b/app/src/normal/res/drawable/bg_connecting.png new file mode 100644 index 00000000..c371f3f0 Binary files /dev/null and b/app/src/normal/res/drawable/bg_connecting.png differ diff --git a/app/src/normal/res/drawable/bg_disconnected.png b/app/src/normal/res/drawable/bg_disconnected.png new file mode 100644 index 00000000..de96be57 Binary files /dev/null and b/app/src/normal/res/drawable/bg_disconnected.png differ diff --git a/app/src/normal/res/drawable/ic_splash_background.xml b/app/src/normal/res/drawable/ic_splash_background.xml new file mode 100644 index 00000000..aa2618c1 --- /dev/null +++ b/app/src/normal/res/drawable/ic_splash_background.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable/state_connected.png b/app/src/normal/res/drawable/state_connected.png new file mode 100644 index 00000000..e515f3f5 Binary files /dev/null and b/app/src/normal/res/drawable/state_connected.png differ diff --git a/app/src/normal/res/drawable/state_connecting.png b/app/src/normal/res/drawable/state_connecting.png new file mode 100644 index 00000000..98dd7978 Binary files /dev/null and b/app/src/normal/res/drawable/state_connecting.png differ diff --git a/app/src/normal/res/drawable/state_disconnected.png b/app/src/normal/res/drawable/state_disconnected.png new file mode 100644 index 00000000..a4bd4a78 Binary files /dev/null and b/app/src/normal/res/drawable/state_disconnected.png differ diff --git a/app/src/normal/res/layout-port/f_eip.xml b/app/src/normal/res/layout-port/f_eip.xml deleted file mode 100644 index eed5fde6..00000000 --- a/app/src/normal/res/layout-port/f_eip.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/normal/res/layout-xlarge-port/f_eip.xml b/app/src/normal/res/layout-xlarge-port/f_eip.xml deleted file mode 100644 index ae548c82..00000000 --- a/app/src/normal/res/layout-xlarge-port/f_eip.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/normal/res/layout-xlarge/f_eip.xml b/app/src/normal/res/layout-xlarge/f_eip.xml deleted file mode 100644 index a4d94394..00000000 --- a/app/src/normal/res/layout-xlarge/f_eip.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/normal/res/layout/f_eip.xml b/app/src/normal/res/layout/f_eip.xml deleted file mode 100644 index 9c921721..00000000 --- a/app/src/normal/res/layout/f_eip.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/normal/res/layout/v_location_button.xml b/app/src/normal/res/layout/v_location_button.xml deleted file mode 100644 index 8aaf4978..00000000 --- a/app/src/normal/res/layout/v_location_button.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/normal/res/layout/v_main_button.xml b/app/src/normal/res/layout/v_main_button.xml deleted file mode 100644 index e3f96693..00000000 --- a/app/src/normal/res/layout/v_main_button.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 9ec59148a926a5c8e5fecfbb64b6418d1dbb852d Mon Sep 17 00:00:00 2001 From: cyberta Date: Fri, 2 Dec 2022 15:37:59 +0100 Subject: implement transition animation between connected and disconnected state for RiseupVPn --- .../state_transition_connected_disconnected.png | Bin 0 -> 40172 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/src/normal/res/drawable/state_transition_connected_disconnected.png (limited to 'app/src/normal') diff --git a/app/src/normal/res/drawable/state_transition_connected_disconnected.png b/app/src/normal/res/drawable/state_transition_connected_disconnected.png new file mode 100644 index 00000000..a4bd4a78 Binary files /dev/null and b/app/src/normal/res/drawable/state_transition_connected_disconnected.png differ -- cgit v1.2.3 From 7bb9d4210d1411294bc2d8152d6d56a5e5f8e207 Mon Sep 17 00:00:00 2001 From: cyberta Date: Sun, 4 Dec 2022 04:08:12 +0100 Subject: replace vpn state background pngs for Bitmask with vector graphics --- app/src/normal/res/drawable-hdpi/bg_connected.png | Bin 190405 -> 0 bytes app/src/normal/res/drawable-hdpi/bg_connecting.png | Bin 236571 -> 0 bytes .../normal/res/drawable-hdpi/bg_disconnected.png | Bin 143331 -> 0 bytes app/src/normal/res/drawable-xhdpi/bg_connected.png | Bin 319429 -> 0 bytes .../normal/res/drawable-xhdpi/bg_connecting.png | Bin 400307 -> 0 bytes .../normal/res/drawable-xhdpi/bg_disconnected.png | Bin 220676 -> 0 bytes .../normal/res/drawable-xxhdpi/bg_connected.png | Bin 701727 -> 0 bytes .../normal/res/drawable-xxhdpi/bg_connecting.png | Bin 828368 -> 0 bytes .../normal/res/drawable-xxhdpi/bg_disconnected.png | Bin 446155 -> 0 bytes .../normal/res/drawable-xxxhdpi/bg_connected.png | Bin 1228810 -> 0 bytes .../normal/res/drawable-xxxhdpi/bg_connecting.png | Bin 1489207 -> 0 bytes .../res/drawable-xxxhdpi/bg_disconnected.png | Bin 745847 -> 0 bytes app/src/normal/res/drawable/bg_connected.png | Bin 90299 -> 0 bytes app/src/normal/res/drawable/bg_connected.xml | 14 +++++++ .../normal/res/drawable/bg_connected_effect.xml | 44 +++++++++++++++++++++ app/src/normal/res/drawable/bg_connecting.png | Bin 112042 -> 0 bytes app/src/normal/res/drawable/bg_connecting.xml | 13 ++++++ .../normal/res/drawable/bg_connecting_effect.xml | 44 +++++++++++++++++++++ app/src/normal/res/drawable/bg_disconnected.png | Bin 143331 -> 0 bytes app/src/normal/res/drawable/bg_disconnected.xml | 13 ++++++ .../normal/res/drawable/bg_disconnected_effect.xml | 33 ++++++++++++++++ 21 files changed, 161 insertions(+) delete mode 100644 app/src/normal/res/drawable-hdpi/bg_connected.png delete mode 100644 app/src/normal/res/drawable-hdpi/bg_connecting.png delete mode 100644 app/src/normal/res/drawable-hdpi/bg_disconnected.png delete mode 100644 app/src/normal/res/drawable-xhdpi/bg_connected.png delete mode 100644 app/src/normal/res/drawable-xhdpi/bg_connecting.png delete mode 100644 app/src/normal/res/drawable-xhdpi/bg_disconnected.png delete mode 100644 app/src/normal/res/drawable-xxhdpi/bg_connected.png delete mode 100644 app/src/normal/res/drawable-xxhdpi/bg_connecting.png delete mode 100644 app/src/normal/res/drawable-xxhdpi/bg_disconnected.png delete mode 100644 app/src/normal/res/drawable-xxxhdpi/bg_connected.png delete mode 100644 app/src/normal/res/drawable-xxxhdpi/bg_connecting.png delete mode 100644 app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png delete mode 100644 app/src/normal/res/drawable/bg_connected.png create mode 100644 app/src/normal/res/drawable/bg_connected.xml create mode 100644 app/src/normal/res/drawable/bg_connected_effect.xml delete mode 100644 app/src/normal/res/drawable/bg_connecting.png create mode 100644 app/src/normal/res/drawable/bg_connecting.xml create mode 100644 app/src/normal/res/drawable/bg_connecting_effect.xml delete mode 100644 app/src/normal/res/drawable/bg_disconnected.png create mode 100644 app/src/normal/res/drawable/bg_disconnected.xml create mode 100644 app/src/normal/res/drawable/bg_disconnected_effect.xml (limited to 'app/src/normal') diff --git a/app/src/normal/res/drawable-hdpi/bg_connected.png b/app/src/normal/res/drawable-hdpi/bg_connected.png deleted file mode 100644 index 0e98f705..00000000 Binary files a/app/src/normal/res/drawable-hdpi/bg_connected.png and /dev/null differ diff --git a/app/src/normal/res/drawable-hdpi/bg_connecting.png b/app/src/normal/res/drawable-hdpi/bg_connecting.png deleted file mode 100644 index 24632712..00000000 Binary files a/app/src/normal/res/drawable-hdpi/bg_connecting.png and /dev/null differ diff --git a/app/src/normal/res/drawable-hdpi/bg_disconnected.png b/app/src/normal/res/drawable-hdpi/bg_disconnected.png deleted file mode 100644 index de96be57..00000000 Binary files a/app/src/normal/res/drawable-hdpi/bg_disconnected.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xhdpi/bg_connected.png b/app/src/normal/res/drawable-xhdpi/bg_connected.png deleted file mode 100644 index 915dff95..00000000 Binary files a/app/src/normal/res/drawable-xhdpi/bg_connected.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xhdpi/bg_connecting.png b/app/src/normal/res/drawable-xhdpi/bg_connecting.png deleted file mode 100644 index be4469df..00000000 Binary files a/app/src/normal/res/drawable-xhdpi/bg_connecting.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xhdpi/bg_disconnected.png deleted file mode 100644 index 433c776f..00000000 Binary files a/app/src/normal/res/drawable-xhdpi/bg_disconnected.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xxhdpi/bg_connected.png b/app/src/normal/res/drawable-xxhdpi/bg_connected.png deleted file mode 100644 index cd78d865..00000000 Binary files a/app/src/normal/res/drawable-xxhdpi/bg_connected.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xxhdpi/bg_connecting.png b/app/src/normal/res/drawable-xxhdpi/bg_connecting.png deleted file mode 100644 index 718e102f..00000000 Binary files a/app/src/normal/res/drawable-xxhdpi/bg_connecting.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xxhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xxhdpi/bg_disconnected.png deleted file mode 100644 index ffbcdb79..00000000 Binary files a/app/src/normal/res/drawable-xxhdpi/bg_disconnected.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xxxhdpi/bg_connected.png b/app/src/normal/res/drawable-xxxhdpi/bg_connected.png deleted file mode 100644 index 3c9d97b4..00000000 Binary files a/app/src/normal/res/drawable-xxxhdpi/bg_connected.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xxxhdpi/bg_connecting.png b/app/src/normal/res/drawable-xxxhdpi/bg_connecting.png deleted file mode 100644 index bff2004c..00000000 Binary files a/app/src/normal/res/drawable-xxxhdpi/bg_connecting.png and /dev/null differ diff --git a/app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png deleted file mode 100644 index 2503f135..00000000 Binary files a/app/src/normal/res/drawable-xxxhdpi/bg_disconnected.png and /dev/null differ diff --git a/app/src/normal/res/drawable/bg_connected.png b/app/src/normal/res/drawable/bg_connected.png deleted file mode 100644 index 6da7878d..00000000 Binary files a/app/src/normal/res/drawable/bg_connected.png and /dev/null differ diff --git a/app/src/normal/res/drawable/bg_connected.xml b/app/src/normal/res/drawable/bg_connected.xml new file mode 100644 index 00000000..19dac103 --- /dev/null +++ b/app/src/normal/res/drawable/bg_connected.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable/bg_connected_effect.xml b/app/src/normal/res/drawable/bg_connected_effect.xml new file mode 100644 index 00000000..08ef8172 --- /dev/null +++ b/app/src/normal/res/drawable/bg_connected_effect.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/normal/res/drawable/bg_connecting.png b/app/src/normal/res/drawable/bg_connecting.png deleted file mode 100644 index c371f3f0..00000000 Binary files a/app/src/normal/res/drawable/bg_connecting.png and /dev/null differ diff --git a/app/src/normal/res/drawable/bg_connecting.xml b/app/src/normal/res/drawable/bg_connecting.xml new file mode 100644 index 00000000..8482d30e --- /dev/null +++ b/app/src/normal/res/drawable/bg_connecting.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable/bg_connecting_effect.xml b/app/src/normal/res/drawable/bg_connecting_effect.xml new file mode 100644 index 00000000..fd462a54 --- /dev/null +++ b/app/src/normal/res/drawable/bg_connecting_effect.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable/bg_disconnected.png b/app/src/normal/res/drawable/bg_disconnected.png deleted file mode 100644 index de96be57..00000000 Binary files a/app/src/normal/res/drawable/bg_disconnected.png and /dev/null differ diff --git a/app/src/normal/res/drawable/bg_disconnected.xml b/app/src/normal/res/drawable/bg_disconnected.xml new file mode 100644 index 00000000..a5729185 --- /dev/null +++ b/app/src/normal/res/drawable/bg_disconnected.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable/bg_disconnected_effect.xml b/app/src/normal/res/drawable/bg_disconnected_effect.xml new file mode 100644 index 00000000..bcc6064a --- /dev/null +++ b/app/src/normal/res/drawable/bg_disconnected_effect.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 8510b91343e234d559b39e8e5e14acc7a975506a Mon Sep 17 00:00:00 2001 From: cyberta Date: Mon, 5 Dec 2022 14:31:21 +0100 Subject: Bitmask splash screen for Android 12+ --- app/src/normal/res/drawable/splash_branding.xml | 3 +++ app/src/normal/res/drawable/splash_icon.xml | 14 ++++++++++++++ app/src/normal/res/values-v31/themes.xml | 8 ++++++++ 3 files changed, 25 insertions(+) create mode 100644 app/src/normal/res/drawable/splash_branding.xml create mode 100644 app/src/normal/res/drawable/splash_icon.xml create mode 100644 app/src/normal/res/values-v31/themes.xml (limited to 'app/src/normal') diff --git a/app/src/normal/res/drawable/splash_branding.xml b/app/src/normal/res/drawable/splash_branding.xml new file mode 100644 index 00000000..8c4ee21c --- /dev/null +++ b/app/src/normal/res/drawable/splash_branding.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable/splash_icon.xml b/app/src/normal/res/drawable/splash_icon.xml new file mode 100644 index 00000000..f882d322 --- /dev/null +++ b/app/src/normal/res/drawable/splash_icon.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/values-v31/themes.xml b/app/src/normal/res/values-v31/themes.xml new file mode 100644 index 00000000..7ea17424 --- /dev/null +++ b/app/src/normal/res/values-v31/themes.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file -- cgit v1.2.3 From ec380e8b8913835cc50448aa51b75b3925644957 Mon Sep 17 00:00:00 2001 From: cyberta Date: Tue, 6 Dec 2022 03:17:15 +0100 Subject: re-adding pngs as fallback for pre-API 24, appearantly Android 6's vector graphic rendering is really broken --- .../res/drawable-anydpi-v24/background_main.xml | 52 +++++++++++ .../res/drawable-anydpi-v24/bg_connected.xml | 14 +++ .../drawable-anydpi-v24/bg_connected_effect.xml | 44 +++++++++ .../res/drawable-anydpi-v24/bg_connecting.xml | 13 +++ .../drawable-anydpi-v24/bg_connecting_effect.xml | 44 +++++++++ .../res/drawable-anydpi-v24/bg_disconnected.xml | 13 +++ .../drawable-anydpi-v24/bg_disconnected_effect.xml | 33 +++++++ .../drawable-anydpi-v24/rotate_progress_image.xml | 103 +++++++++++++++++++++ .../normal/res/drawable-anydpi-v24/splash_icon.xml | 14 +++ app/src/normal/res/drawable-hdpi/bg_connected.png | Bin 0 -> 101464 bytes app/src/normal/res/drawable-hdpi/bg_connecting.png | Bin 0 -> 137369 bytes .../normal/res/drawable-hdpi/bg_disconnected.png | Bin 0 -> 59922 bytes .../res/drawable-hdpi/rotate_progress_image.png | Bin 0 -> 6427 bytes .../normal/res/drawable-xhdpi/background_main.png | Bin 0 -> 64868 bytes app/src/normal/res/drawable-xhdpi/bg_connected.png | Bin 0 -> 168784 bytes .../normal/res/drawable-xhdpi/bg_connecting.png | Bin 0 -> 230677 bytes .../normal/res/drawable-xhdpi/bg_disconnected.png | Bin 0 -> 79223 bytes .../res/drawable-xhdpi/rotate_progress_image.png | Bin 0 -> 9736 bytes .../res/drawable-xxhdpi/rotate_progress_image.png | Bin 0 -> 12752 bytes .../res/drawable-xxxhdpi/background_main.png | Bin 0 -> 131879 bytes app/src/normal/res/drawable/background_eip.xml | 52 ----------- app/src/normal/res/drawable/background_main.png | Bin 0 -> 39702 bytes app/src/normal/res/drawable/background_main.xml | 52 ----------- app/src/normal/res/drawable/bg_connected.png | Bin 0 -> 50250 bytes app/src/normal/res/drawable/bg_connected.xml | 14 --- .../normal/res/drawable/bg_connected_effect.xml | 44 --------- app/src/normal/res/drawable/bg_connecting.png | Bin 0 -> 68160 bytes app/src/normal/res/drawable/bg_connecting.xml | 13 --- .../normal/res/drawable/bg_connecting_effect.xml | 44 --------- app/src/normal/res/drawable/bg_disconnected.png | Bin 0 -> 59917 bytes app/src/normal/res/drawable/bg_disconnected.xml | 13 --- .../normal/res/drawable/bg_disconnected_effect.xml | 33 ------- .../normal/res/drawable/rotate_progress_image.png | Bin 0 -> 4945 bytes .../normal/res/drawable/rotate_progress_image.xml | 103 --------------------- app/src/normal/res/drawable/splash_icon.xml | 14 --- 35 files changed, 330 insertions(+), 382 deletions(-) create mode 100644 app/src/normal/res/drawable-anydpi-v24/background_main.xml create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_connected.xml create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_connected_effect.xml create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_connecting.xml create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_connecting_effect.xml create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_disconnected.xml create mode 100644 app/src/normal/res/drawable-anydpi-v24/bg_disconnected_effect.xml create mode 100644 app/src/normal/res/drawable-anydpi-v24/rotate_progress_image.xml create mode 100644 app/src/normal/res/drawable-anydpi-v24/splash_icon.xml create mode 100644 app/src/normal/res/drawable-hdpi/bg_connected.png create mode 100644 app/src/normal/res/drawable-hdpi/bg_connecting.png create mode 100644 app/src/normal/res/drawable-hdpi/bg_disconnected.png create mode 100644 app/src/normal/res/drawable-hdpi/rotate_progress_image.png create mode 100644 app/src/normal/res/drawable-xhdpi/background_main.png create mode 100644 app/src/normal/res/drawable-xhdpi/bg_connected.png create mode 100644 app/src/normal/res/drawable-xhdpi/bg_connecting.png create mode 100644 app/src/normal/res/drawable-xhdpi/bg_disconnected.png create mode 100644 app/src/normal/res/drawable-xhdpi/rotate_progress_image.png create mode 100644 app/src/normal/res/drawable-xxhdpi/rotate_progress_image.png create mode 100644 app/src/normal/res/drawable-xxxhdpi/background_main.png delete mode 100644 app/src/normal/res/drawable/background_eip.xml create mode 100644 app/src/normal/res/drawable/background_main.png delete mode 100644 app/src/normal/res/drawable/background_main.xml create mode 100644 app/src/normal/res/drawable/bg_connected.png delete mode 100644 app/src/normal/res/drawable/bg_connected.xml delete mode 100644 app/src/normal/res/drawable/bg_connected_effect.xml create mode 100644 app/src/normal/res/drawable/bg_connecting.png delete mode 100644 app/src/normal/res/drawable/bg_connecting.xml delete mode 100644 app/src/normal/res/drawable/bg_connecting_effect.xml create mode 100644 app/src/normal/res/drawable/bg_disconnected.png delete mode 100644 app/src/normal/res/drawable/bg_disconnected.xml delete mode 100644 app/src/normal/res/drawable/bg_disconnected_effect.xml create mode 100644 app/src/normal/res/drawable/rotate_progress_image.png delete mode 100644 app/src/normal/res/drawable/rotate_progress_image.xml delete mode 100644 app/src/normal/res/drawable/splash_icon.xml (limited to 'app/src/normal') diff --git a/app/src/normal/res/drawable-anydpi-v24/background_main.xml b/app/src/normal/res/drawable-anydpi-v24/background_main.xml new file mode 100644 index 00000000..4b60e9dc --- /dev/null +++ b/app/src/normal/res/drawable-anydpi-v24/background_main.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_connected.xml b/app/src/normal/res/drawable-anydpi-v24/bg_connected.xml new file mode 100644 index 00000000..19dac103 --- /dev/null +++ b/app/src/normal/res/drawable-anydpi-v24/bg_connected.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_connected_effect.xml b/app/src/normal/res/drawable-anydpi-v24/bg_connected_effect.xml new file mode 100644 index 00000000..08ef8172 --- /dev/null +++ b/app/src/normal/res/drawable-anydpi-v24/bg_connected_effect.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_connecting.xml b/app/src/normal/res/drawable-anydpi-v24/bg_connecting.xml new file mode 100644 index 00000000..8482d30e --- /dev/null +++ b/app/src/normal/res/drawable-anydpi-v24/bg_connecting.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_connecting_effect.xml b/app/src/normal/res/drawable-anydpi-v24/bg_connecting_effect.xml new file mode 100644 index 00000000..fd462a54 --- /dev/null +++ b/app/src/normal/res/drawable-anydpi-v24/bg_connecting_effect.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_disconnected.xml b/app/src/normal/res/drawable-anydpi-v24/bg_disconnected.xml new file mode 100644 index 00000000..a5729185 --- /dev/null +++ b/app/src/normal/res/drawable-anydpi-v24/bg_disconnected.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable-anydpi-v24/bg_disconnected_effect.xml b/app/src/normal/res/drawable-anydpi-v24/bg_disconnected_effect.xml new file mode 100644 index 00000000..bcc6064a --- /dev/null +++ b/app/src/normal/res/drawable-anydpi-v24/bg_disconnected_effect.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable-anydpi-v24/rotate_progress_image.xml b/app/src/normal/res/drawable-anydpi-v24/rotate_progress_image.xml new file mode 100644 index 00000000..44a35ba9 --- /dev/null +++ b/app/src/normal/res/drawable-anydpi-v24/rotate_progress_image.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml b/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml new file mode 100644 index 00000000..f882d322 --- /dev/null +++ b/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/normal/res/drawable-hdpi/bg_connected.png b/app/src/normal/res/drawable-hdpi/bg_connected.png new file mode 100644 index 00000000..7c64939a Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_connected.png differ diff --git a/app/src/normal/res/drawable-hdpi/bg_connecting.png b/app/src/normal/res/drawable-hdpi/bg_connecting.png new file mode 100644 index 00000000..49620c2c Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_connecting.png differ diff --git a/app/src/normal/res/drawable-hdpi/bg_disconnected.png b/app/src/normal/res/drawable-hdpi/bg_disconnected.png new file mode 100644 index 00000000..36a048d5 Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/bg_disconnected.png differ diff --git a/app/src/normal/res/drawable-hdpi/rotate_progress_image.png b/app/src/normal/res/drawable-hdpi/rotate_progress_image.png new file mode 100644 index 00000000..d7c85e02 Binary files /dev/null and b/app/src/normal/res/drawable-hdpi/rotate_progress_image.png differ diff --git a/app/src/normal/res/drawable-xhdpi/background_main.png b/app/src/normal/res/drawable-xhdpi/background_main.png new file mode 100644 index 00000000..c2135c04 Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/background_main.png differ diff --git a/app/src/normal/res/drawable-xhdpi/bg_connected.png b/app/src/normal/res/drawable-xhdpi/bg_connected.png new file mode 100644 index 00000000..ca129080 Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_connected.png differ diff --git a/app/src/normal/res/drawable-xhdpi/bg_connecting.png b/app/src/normal/res/drawable-xhdpi/bg_connecting.png new file mode 100644 index 00000000..294e4708 Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_connecting.png differ diff --git a/app/src/normal/res/drawable-xhdpi/bg_disconnected.png b/app/src/normal/res/drawable-xhdpi/bg_disconnected.png new file mode 100644 index 00000000..15bdb108 Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/bg_disconnected.png differ diff --git a/app/src/normal/res/drawable-xhdpi/rotate_progress_image.png b/app/src/normal/res/drawable-xhdpi/rotate_progress_image.png new file mode 100644 index 00000000..d6eb6b65 Binary files /dev/null and b/app/src/normal/res/drawable-xhdpi/rotate_progress_image.png differ diff --git a/app/src/normal/res/drawable-xxhdpi/rotate_progress_image.png b/app/src/normal/res/drawable-xxhdpi/rotate_progress_image.png new file mode 100644 index 00000000..893b074b Binary files /dev/null and b/app/src/normal/res/drawable-xxhdpi/rotate_progress_image.png differ diff --git a/app/src/normal/res/drawable-xxxhdpi/background_main.png b/app/src/normal/res/drawable-xxxhdpi/background_main.png new file mode 100644 index 00000000..1b8046fa Binary files /dev/null and b/app/src/normal/res/drawable-xxxhdpi/background_main.png differ diff --git a/app/src/normal/res/drawable/background_eip.xml b/app/src/normal/res/drawable/background_eip.xml deleted file mode 100644 index 9b20a8fd..00000000 --- a/app/src/normal/res/drawable/background_eip.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/normal/res/drawable/background_main.png b/app/src/normal/res/drawable/background_main.png new file mode 100644 index 00000000..3e5f7871 Binary files /dev/null and b/app/src/normal/res/drawable/background_main.png differ diff --git a/app/src/normal/res/drawable/background_main.xml b/app/src/normal/res/drawable/background_main.xml deleted file mode 100644 index 4b60e9dc..00000000 --- a/app/src/normal/res/drawable/background_main.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/normal/res/drawable/bg_connected.png b/app/src/normal/res/drawable/bg_connected.png new file mode 100644 index 00000000..9741dcba Binary files /dev/null and b/app/src/normal/res/drawable/bg_connected.png differ diff --git a/app/src/normal/res/drawable/bg_connected.xml b/app/src/normal/res/drawable/bg_connected.xml deleted file mode 100644 index 19dac103..00000000 --- a/app/src/normal/res/drawable/bg_connected.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/normal/res/drawable/bg_connected_effect.xml b/app/src/normal/res/drawable/bg_connected_effect.xml deleted file mode 100644 index 08ef8172..00000000 --- a/app/src/normal/res/drawable/bg_connected_effect.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/normal/res/drawable/bg_connecting.png b/app/src/normal/res/drawable/bg_connecting.png new file mode 100644 index 00000000..d85ddd4b Binary files /dev/null and b/app/src/normal/res/drawable/bg_connecting.png differ diff --git a/app/src/normal/res/drawable/bg_connecting.xml b/app/src/normal/res/drawable/bg_connecting.xml deleted file mode 100644 index 8482d30e..00000000 --- a/app/src/normal/res/drawable/bg_connecting.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/normal/res/drawable/bg_connecting_effect.xml b/app/src/normal/res/drawable/bg_connecting_effect.xml deleted file mode 100644 index fd462a54..00000000 --- a/app/src/normal/res/drawable/bg_connecting_effect.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/normal/res/drawable/bg_disconnected.png b/app/src/normal/res/drawable/bg_disconnected.png new file mode 100644 index 00000000..a22b7097 Binary files /dev/null and b/app/src/normal/res/drawable/bg_disconnected.png differ diff --git a/app/src/normal/res/drawable/bg_disconnected.xml b/app/src/normal/res/drawable/bg_disconnected.xml deleted file mode 100644 index a5729185..00000000 --- a/app/src/normal/res/drawable/bg_disconnected.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/normal/res/drawable/bg_disconnected_effect.xml b/app/src/normal/res/drawable/bg_disconnected_effect.xml deleted file mode 100644 index bcc6064a..00000000 --- a/app/src/normal/res/drawable/bg_disconnected_effect.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/normal/res/drawable/rotate_progress_image.png b/app/src/normal/res/drawable/rotate_progress_image.png new file mode 100644 index 00000000..fe7f3526 Binary files /dev/null and b/app/src/normal/res/drawable/rotate_progress_image.png differ diff --git a/app/src/normal/res/drawable/rotate_progress_image.xml b/app/src/normal/res/drawable/rotate_progress_image.xml deleted file mode 100644 index 44a35ba9..00000000 --- a/app/src/normal/res/drawable/rotate_progress_image.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/normal/res/drawable/splash_icon.xml b/app/src/normal/res/drawable/splash_icon.xml deleted file mode 100644 index f882d322..00000000 --- a/app/src/normal/res/drawable/splash_icon.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file -- cgit v1.2.3