From 905cf37dc3e5e7a3a3ffdd80b09cb4be3ccfc806 Mon Sep 17 00:00:00 2001 From: cyberta Date: Wed, 30 Nov 2022 16:01:52 +0100 Subject: add new drawables for riseupVPN --- app/src/custom/res/drawable-hdpi/bg_connected.png | Bin 0 -> 147673 bytes app/src/custom/res/drawable-hdpi/bg_connecting.png | Bin 0 -> 237385 bytes .../custom/res/drawable-hdpi/bg_disconnected.png | Bin 0 -> 123636 bytes app/src/custom/res/drawable-xhdpi/bg_connected.png | Bin 0 -> 228442 bytes .../custom/res/drawable-xhdpi/bg_connecting.png | Bin 0 -> 402134 bytes .../custom/res/drawable-xhdpi/bg_disconnected.png | Bin 0 -> 200573 bytes .../custom/res/drawable-xxhdpi/bg_connected.png | Bin 0 -> 460545 bytes .../custom/res/drawable-xxhdpi/bg_connecting.png | Bin 0 -> 831328 bytes .../custom/res/drawable-xxhdpi/bg_disconnected.png | Bin 0 -> 417997 bytes .../custom/res/drawable-xxxhdpi/bg_connected.png | Bin 0 -> 765207 bytes .../custom/res/drawable-xxxhdpi/bg_connecting.png | Bin 0 -> 1492820 bytes .../res/drawable-xxxhdpi/bg_disconnected.png | Bin 0 -> 683759 bytes app/src/custom/res/drawable/bg_connected.png | Bin 0 -> 77818 bytes app/src/custom/res/drawable/bg_connecting.png | Bin 0 -> 112675 bytes app/src/custom/res/drawable/bg_disconnected.png | Bin 0 -> 63491 bytes app/src/custom/res/drawable/state_connected.xml | 15 +++ app/src/custom/res/layout/v_location_button.xml | 104 +++++++++++++++ app/src/custom/res/layout/v_main_button.xml | 142 +++++++++++++++++++++ 18 files changed, 261 insertions(+) create mode 100644 app/src/custom/res/drawable-hdpi/bg_connected.png create mode 100644 app/src/custom/res/drawable-hdpi/bg_connecting.png create mode 100644 app/src/custom/res/drawable-hdpi/bg_disconnected.png create mode 100644 app/src/custom/res/drawable-xhdpi/bg_connected.png create mode 100644 app/src/custom/res/drawable-xhdpi/bg_connecting.png create mode 100644 app/src/custom/res/drawable-xhdpi/bg_disconnected.png create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connected.png create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connecting.png create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_disconnected.png create mode 100644 app/src/custom/res/drawable-xxxhdpi/bg_connected.png create mode 100644 app/src/custom/res/drawable-xxxhdpi/bg_connecting.png create mode 100644 app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png create mode 100644 app/src/custom/res/drawable/bg_connected.png create mode 100644 app/src/custom/res/drawable/bg_connecting.png create mode 100644 app/src/custom/res/drawable/bg_disconnected.png create mode 100644 app/src/custom/res/drawable/state_connected.xml create mode 100644 app/src/custom/res/layout/v_location_button.xml create mode 100644 app/src/custom/res/layout/v_main_button.xml (limited to 'app/src/custom') diff --git a/app/src/custom/res/drawable-hdpi/bg_connected.png b/app/src/custom/res/drawable-hdpi/bg_connected.png new file mode 100644 index 00000000..53648c23 Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_connected.png differ diff --git a/app/src/custom/res/drawable-hdpi/bg_connecting.png b/app/src/custom/res/drawable-hdpi/bg_connecting.png new file mode 100644 index 00000000..a62d308c Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_connecting.png differ diff --git a/app/src/custom/res/drawable-hdpi/bg_disconnected.png b/app/src/custom/res/drawable-hdpi/bg_disconnected.png new file mode 100644 index 00000000..c2e031df Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_disconnected.png differ diff --git a/app/src/custom/res/drawable-xhdpi/bg_connected.png b/app/src/custom/res/drawable-xhdpi/bg_connected.png new file mode 100644 index 00000000..4491692a Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_connected.png differ diff --git a/app/src/custom/res/drawable-xhdpi/bg_connecting.png b/app/src/custom/res/drawable-xhdpi/bg_connecting.png new file mode 100644 index 00000000..703a77c4 Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_connecting.png differ diff --git a/app/src/custom/res/drawable-xhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png new file mode 100644 index 00000000..4e05614e Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png differ diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxhdpi/bg_connected.png new file mode 100644 index 00000000..29bd3a05 Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_connected.png differ diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png new file mode 100644 index 00000000..9b91293c Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png differ diff --git a/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png new file mode 100644 index 00000000..c4a09aa7 Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png differ diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxxhdpi/bg_connected.png new file mode 100644 index 00000000..d1e95fb6 Binary files /dev/null and b/app/src/custom/res/drawable-xxxhdpi/bg_connected.png differ diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png new file mode 100644 index 00000000..e6d36eb0 Binary files /dev/null and b/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png differ diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png new file mode 100644 index 00000000..df597f2f Binary files /dev/null and b/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png differ diff --git a/app/src/custom/res/drawable/bg_connected.png b/app/src/custom/res/drawable/bg_connected.png new file mode 100644 index 00000000..a375181d Binary files /dev/null and b/app/src/custom/res/drawable/bg_connected.png differ diff --git a/app/src/custom/res/drawable/bg_connecting.png b/app/src/custom/res/drawable/bg_connecting.png new file mode 100644 index 00000000..eccf184b Binary files /dev/null and b/app/src/custom/res/drawable/bg_connecting.png differ diff --git a/app/src/custom/res/drawable/bg_disconnected.png b/app/src/custom/res/drawable/bg_disconnected.png new file mode 100644 index 00000000..cc3ead9a Binary files /dev/null and b/app/src/custom/res/drawable/bg_disconnected.png differ diff --git a/app/src/custom/res/drawable/state_connected.xml b/app/src/custom/res/drawable/state_connected.xml new file mode 100644 index 00000000..c9854d69 --- /dev/null +++ b/app/src/custom/res/drawable/state_connected.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/custom/res/layout/v_location_button.xml b/app/src/custom/res/layout/v_location_button.xml new file mode 100644 index 00000000..8aaf4978 --- /dev/null +++ b/app/src/custom/res/layout/v_location_button.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/layout/v_main_button.xml b/app/src/custom/res/layout/v_main_button.xml new file mode 100644 index 00000000..e3f96693 --- /dev/null +++ b/app/src/custom/res/layout/v_main_button.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 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 --- .../bitmaskclient/base/fragments/EipFragment.java | 686 --------------------- .../leap/bitmaskclient/base/views/MainButton.java | 124 ---- app/src/custom/res/animator/alpha2.xml | 10 + app/src/custom/res/animator/alpha3.xml | 4 + app/src/custom/res/drawable-ldpi/logo.png | Bin 8743 -> 0 bytes app/src/custom/res/drawable-mdpi/logo.png | Bin 6324 -> 0 bytes app/src/custom/res/drawable-xxxhdpi/logo.png | Bin 43251 -> 0 bytes app/src/custom/res/drawable/background_eip.xml | 11 - app/src/custom/res/drawable/crow.xml | 9 - app/src/custom/res/drawable/ravens.xml | 33 + app/src/custom/res/drawable/ravens1.xml | 16 - app/src/custom/res/drawable/ravens2.xml | 24 - app/src/custom/res/drawable/ravens3.xml | 33 - .../custom/res/drawable/rotate_progress_image.xml | 14 + app/src/custom/res/drawable/state_connecting.xml | 4 + app/src/custom/res/drawable/state_disconnected.xml | 9 + app/src/custom/res/layout-port/f_eip.xml | 113 ---- app/src/custom/res/layout-xlarge-port/f_eip.xml | 122 ---- app/src/custom/res/layout-xlarge/f_eip.xml | 127 ---- app/src/custom/res/layout/f_eip.xml | 146 ----- app/src/custom/res/layout/v_location_button.xml | 104 ---- app/src/custom/res/layout/v_main_button.xml | 142 ----- 22 files changed, 74 insertions(+), 1657 deletions(-) delete mode 100644 app/src/custom/java/se/leap/bitmaskclient/base/fragments/EipFragment.java delete mode 100644 app/src/custom/java/se/leap/bitmaskclient/base/views/MainButton.java create mode 100644 app/src/custom/res/animator/alpha2.xml create mode 100644 app/src/custom/res/animator/alpha3.xml delete mode 100644 app/src/custom/res/drawable-ldpi/logo.png delete mode 100644 app/src/custom/res/drawable-mdpi/logo.png delete mode 100644 app/src/custom/res/drawable-xxxhdpi/logo.png delete mode 100644 app/src/custom/res/drawable/background_eip.xml delete mode 100644 app/src/custom/res/drawable/crow.xml create mode 100644 app/src/custom/res/drawable/ravens.xml delete mode 100644 app/src/custom/res/drawable/ravens1.xml delete mode 100644 app/src/custom/res/drawable/ravens2.xml delete mode 100644 app/src/custom/res/drawable/ravens3.xml create mode 100644 app/src/custom/res/drawable/rotate_progress_image.xml create mode 100644 app/src/custom/res/drawable/state_connecting.xml create mode 100644 app/src/custom/res/drawable/state_disconnected.xml delete mode 100644 app/src/custom/res/layout-port/f_eip.xml delete mode 100644 app/src/custom/res/layout-xlarge-port/f_eip.xml delete mode 100644 app/src/custom/res/layout-xlarge/f_eip.xml delete mode 100644 app/src/custom/res/layout/f_eip.xml delete mode 100644 app/src/custom/res/layout/v_location_button.xml delete mode 100644 app/src/custom/res/layout/v_main_button.xml (limited to 'app/src/custom') diff --git a/app/src/custom/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/custom/java/se/leap/bitmaskclient/base/fragments/EipFragment.java deleted file mode 100644 index 2588f436..00000000 --- a/app/src/custom/java/se/leap/bitmaskclient/base/fragments/EipFragment.java +++ /dev/null @@ -1,686 +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.base.utils.ViewHelper.convertDimensionToPx; -import static se.leap.bitmaskclient.eip.EipSetupObserver.gatewayOrder; -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.graphics.ColorMatrix; -import android.graphics.ColorMatrixColorFilter; -import android.os.Bundle; -import android.os.IBinder; -import android.os.Vibrator; -import android.text.Spannable; -import android.text.SpannableString; -import android.text.TextUtils; -import android.text.style.RelativeSizeSpan; -import android.util.Log; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Toast; - -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.appcompat.widget.AppCompatTextView; -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 butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.OnClick; -import butterknife.Unbinder; -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.BuildConfig; -import se.leap.bitmaskclient.R; -import se.leap.bitmaskclient.base.FragmentManagerEnhanced; -import se.leap.bitmaskclient.base.MainActivity; -import se.leap.bitmaskclient.base.fragments.DonationReminderDialog; -import se.leap.bitmaskclient.base.fragments.GatewaySelectionFragment; -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.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; - - @BindView(R.id.background) - AppCompatImageView background; - - @BindView(R.id.main_button) - MainButton mainButton; - - @BindView(R.id.gateway_location_button) - LocationButton locationButton; - - @BindView(R.id.main_description) - AppCompatTextView mainDescription; - - @BindView(R.id.sub_description) - AppCompatTextView subDescription; - - private Unbinder unbinder; - 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) { - eipStatus.addObserver(this); - torStatusObservable.addObserver(this); - providerObservable.addObserver(this); - View view = inflater.inflate(R.layout.f_eip, container, false); - unbinder = ButterKnife.bind(this, view); - - 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); - }); - return view; - } - - @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(); - eipStatus.deleteObserver(this); - providerObservable.deleteObserver(this); - torStatusObservable.deleteObserver(this); - unbinder.unbind(); - } - - private void saveStatus(boolean restartOnBoot) { - preferences.edit().putBoolean(EIP_RESTART_ON_BOOT, restartOnBoot).apply(); - } - - @OnClick(R.id.main_button) - void onButtonClick() { - handleIcon(); - } - - 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 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); - showConnectionTransitionLayout(true); - locationButton.setText(getString(R.string.eip_status_start_pending)); - locationButton.setLocationLoad(UNKNOWN); - locationButton.showBridgeIndicator(false); - locationButton.showRecommendedIndicator(false); - mainDescription.setText(null); - 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)); - } - } else if (eipStatus.isConnecting()) { - setMainButtonEnabled(true); - showConnectionTransitionLayout(true); - locationButton.setText(getString(R.string.eip_status_start_pending)); - locationButton.setLocationLoad(UNKNOWN); - locationButton.showBridgeIndicator(false); - locationButton.showRecommendedIndicator(false); - mainDescription.setText(null); - subDescription.setText(null); - } 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_state_connected); - subDescription.setText(null); - colorBackground(); - } 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); - colorBackgroundALittle(); - mainDescription.setText(R.string.eip_state_connected); - subDescription.setText(R.string.eip_state_no_network); - } else if (eipStatus.isDisconnected() && reconnectingWithDifferentGateway()) { - showConnectionTransitionLayout(true); - // showRetryToast(activity); - locationButton.setText(getString(R.string.eip_status_start_pending)); - locationButton.setLocationLoad(UNKNOWN); - locationButton.showBridgeIndicator(false); - locationButton.showRecommendedIndicator(false); - mainDescription.setText(null); - subDescription.setText(R.string.reconnecting); - } else if (eipStatus.isDisconnecting()) { - setMainButtonEnabled(false); - showConnectionTransitionLayout(false); - mainDescription.setText(R.string.eip_state_insecure); - } else if (eipStatus.isBlocking()) { - setMainButtonEnabled(true); - mainButton.updateState(true, false, true); - colorBackgroundALittle(); - 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))); - } else { - locationButton.setText(activity.getString(R.string.vpn_button_turn_on)); - setMainButtonEnabled(true); - mainButton.updateState(false, false, false); - greyscaleBackground(); - 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_state_insecure); - subDescription.setText(R.string.connection_not_connected); - } - } - - private void showToast(Activity activity, String message, boolean vibrateLong) { - LayoutInflater inflater = getLayoutInflater(); - View layout = inflater.inflate(R.layout.custom_toast, - activity.findViewById(R.id.custom_toast_container)); - - AppCompatTextView text = layout.findViewById(R.id.text); - text.setText(message); - - Vibrator v = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE); - if (vibrateLong) { - v.vibrate(100); - v.vibrate(200); - } else { - v.vibrate(100); - } - - Toast toast = new Toast(activity.getApplicationContext()); - toast.setGravity(Gravity.BOTTOM, 0, convertDimensionToPx(this.getContext(), R.dimen.stdpadding)); - toast.setDuration(Toast.LENGTH_LONG); - toast.setView(layout); - toast.show(); - } - - private void showRetryToast(Activity activity) { - int nClosestGateway = gatewayOrder(); - String message = String.format("Server number " + nClosestGateway + " not reachable. Trying next gateway."); - showToast(activity, message, true ); - } - - private void showConnectionTransitionLayout(boolean isConnecting) { - mainButton.updateState(true, isConnecting, false); - if (isConnecting) { - colorBackgroundALittle(); - } else { - greyscaleBackground(); - } - } - - 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 greyscaleBackground() { - if (BuildConfig.use_color_filter) { - ColorMatrix matrix = new ColorMatrix(); - matrix.setSaturation(0); - ColorMatrixColorFilter cf = new ColorMatrixColorFilter(matrix); - background.setColorFilter(cf); - background.setImageAlpha(255); - } - } - - private void colorBackgroundALittle() { - if (BuildConfig.use_color_filter) { - background.setColorFilter(null); - background.setImageAlpha(144); - } - } - - private void colorBackground() { - if (BuildConfig.use_color_filter) { - background.setColorFilter(null); - background.setImageAlpha(210); - } - } - - 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/custom/java/se/leap/bitmaskclient/base/views/MainButton.java b/app/src/custom/java/se/leap/bitmaskclient/base/views/MainButton.java deleted file mode 100644 index c5ac4544..00000000 --- a/app/src/custom/java/se/leap/bitmaskclient/base/views/MainButton.java +++ /dev/null @@ -1,124 +0,0 @@ -package se.leap.bitmaskclient.base.views; - -import android.annotation.TargetApi; -import android.content.Context; -import android.graphics.PorterDuff; -import android.graphics.drawable.AnimationDrawable; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.view.animation.AlphaAnimation; -import android.view.animation.Animation; -import android.widget.RelativeLayout; - -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.appcompat.widget.AppCompatImageView; -import androidx.core.content.ContextCompat; - -import se.leap.bitmaskclient.R; - -public class MainButton extends RelativeLayout { - - private static final String TAG = MainButton.class.getSimpleName(); - - AppCompatImageView glow; - AppCompatImageView shadowLight; - AnimationDrawable glowAnimation; - - private boolean isOn = false; - private boolean isProcessing = false; - private boolean isError = true; - - - 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) { - LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - View rootview = inflater.inflate(R.layout.v_main_btn, this, true); - - glow = rootview.findViewById(R.id.vpn_btn_glow); - glowAnimation = (AnimationDrawable) glow.getBackground(); - shadowLight = rootview.findViewById(R.id.vpn_btn_shadow_light); - } - - - private void stopGlowAnimation() { - AlphaAnimation fadeOutAnimation = new AlphaAnimation(1.0f, 0.0f); - fadeOutAnimation.setDuration(300); - fadeOutAnimation.setAnimationListener(new Animation.AnimationListener() { - @Override - public void onAnimationStart(Animation animation) {} - - @Override - public void onAnimationEnd(Animation animation) { - glow.setVisibility(GONE); - glowAnimation.stop(); - } - - @Override - public void onAnimationRepeat(Animation animation) {} - }); - glow.startAnimation(fadeOutAnimation); - } - - private void startGlowAnimation() { - glow.setAlpha(1.0f); - glow.setVisibility(VISIBLE); - glowAnimation.start(); - } - - public void updateState(boolean isOn, boolean isProcessing, boolean isError) { - if (this.isOn != isOn) { - this.isOn = isOn; - shadowLight.setVisibility(isOn ? VISIBLE : GONE); - } - - if (this.isProcessing != isProcessing) { - if (!isProcessing) { - stopGlowAnimation(); - } else { - startGlowAnimation(); - } - this.isProcessing = isProcessing; - } - - if (this.isError != isError) { - @DrawableRes int drawableResource = isOn ? R.drawable.on_off_btn_start_2_enabled : R.drawable.on_off_btn_start_2_disabled; - if (!isError) { - setImageWithTint(shadowLight, drawableResource, R.color.colorMainBtnHighlight); - } else { - setImageWithTint(shadowLight, drawableResource, R.color.colorMainBtnError); - } - this.isError = isError; - } - } - - private void setImageWithTint(AppCompatImageView view, @DrawableRes int resourceId, @ColorRes int color) { - view.setImageDrawable(ContextCompat.getDrawable(getContext(), resourceId)); - view.setColorFilter(ContextCompat.getColor(getContext(), color), PorterDuff.Mode.SRC_ATOP); - } - - - -} diff --git a/app/src/custom/res/animator/alpha2.xml b/app/src/custom/res/animator/alpha2.xml new file mode 100644 index 00000000..bf997dea --- /dev/null +++ b/app/src/custom/res/animator/alpha2.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/custom/res/animator/alpha3.xml b/app/src/custom/res/animator/alpha3.xml new file mode 100644 index 00000000..d05f36c2 --- /dev/null +++ b/app/src/custom/res/animator/alpha3.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-ldpi/logo.png b/app/src/custom/res/drawable-ldpi/logo.png deleted file mode 100644 index 4e22d99f..00000000 Binary files a/app/src/custom/res/drawable-ldpi/logo.png and /dev/null differ diff --git a/app/src/custom/res/drawable-mdpi/logo.png b/app/src/custom/res/drawable-mdpi/logo.png deleted file mode 100644 index e53cb15c..00000000 Binary files a/app/src/custom/res/drawable-mdpi/logo.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xxxhdpi/logo.png b/app/src/custom/res/drawable-xxxhdpi/logo.png deleted file mode 100644 index 4297d90c..00000000 Binary files a/app/src/custom/res/drawable-xxxhdpi/logo.png and /dev/null differ diff --git a/app/src/custom/res/drawable/background_eip.xml b/app/src/custom/res/drawable/background_eip.xml deleted file mode 100644 index a2364794..00000000 --- a/app/src/custom/res/drawable/background_eip.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/crow.xml b/app/src/custom/res/drawable/crow.xml deleted file mode 100644 index 3d3660b8..00000000 --- a/app/src/custom/res/drawable/crow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/ravens.xml b/app/src/custom/res/drawable/ravens.xml new file mode 100644 index 00000000..f97a3532 --- /dev/null +++ b/app/src/custom/res/drawable/ravens.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/ravens1.xml b/app/src/custom/res/drawable/ravens1.xml deleted file mode 100644 index d38b0c19..00000000 --- a/app/src/custom/res/drawable/ravens1.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/ravens2.xml b/app/src/custom/res/drawable/ravens2.xml deleted file mode 100644 index 0a3cbb7e..00000000 --- a/app/src/custom/res/drawable/ravens2.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/ravens3.xml b/app/src/custom/res/drawable/ravens3.xml deleted file mode 100644 index f97a3532..00000000 --- a/app/src/custom/res/drawable/ravens3.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/rotate_progress_image.xml b/app/src/custom/res/drawable/rotate_progress_image.xml new file mode 100644 index 00000000..f84f9034 --- /dev/null +++ b/app/src/custom/res/drawable/rotate_progress_image.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/state_connecting.xml b/app/src/custom/res/drawable/state_connecting.xml new file mode 100644 index 00000000..3ef89983 --- /dev/null +++ b/app/src/custom/res/drawable/state_connecting.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/state_disconnected.xml b/app/src/custom/res/drawable/state_disconnected.xml new file mode 100644 index 00000000..3d3660b8 --- /dev/null +++ b/app/src/custom/res/drawable/state_disconnected.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/custom/res/layout-port/f_eip.xml b/app/src/custom/res/layout-port/f_eip.xml deleted file mode 100644 index cb99a700..00000000 --- a/app/src/custom/res/layout-port/f_eip.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/custom/res/layout-xlarge-port/f_eip.xml b/app/src/custom/res/layout-xlarge-port/f_eip.xml deleted file mode 100644 index 10b7a7e3..00000000 --- a/app/src/custom/res/layout-xlarge-port/f_eip.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/custom/res/layout-xlarge/f_eip.xml b/app/src/custom/res/layout-xlarge/f_eip.xml deleted file mode 100644 index e6b28c67..00000000 --- a/app/src/custom/res/layout-xlarge/f_eip.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/custom/res/layout/f_eip.xml b/app/src/custom/res/layout/f_eip.xml deleted file mode 100644 index 9a823b65..00000000 --- a/app/src/custom/res/layout/f_eip.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/custom/res/layout/v_location_button.xml b/app/src/custom/res/layout/v_location_button.xml deleted file mode 100644 index 8aaf4978..00000000 --- a/app/src/custom/res/layout/v_location_button.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/layout/v_main_button.xml b/app/src/custom/res/layout/v_main_button.xml deleted file mode 100644 index e3f96693..00000000 --- a/app/src/custom/res/layout/v_main_button.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 33bae6bada5aadc3ab3919fa04233d2d916e5721 Mon Sep 17 00:00:00 2001 From: cyberta Date: Fri, 2 Dec 2022 02:18:48 +0100 Subject: implement connecting animation for riseup --- app/src/custom/res/animator/alpha1.xml | 11 +++++++++++ app/src/custom/res/animator/alpha2.xml | 16 +++++++++------- app/src/custom/res/animator/alpha3.xml | 11 +++++++++-- app/src/custom/res/drawable/ravens.xml | 6 ++++++ app/src/custom/res/drawable/state_connecting.xml | 17 ++++++++++++++--- 5 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 app/src/custom/res/animator/alpha1.xml (limited to 'app/src/custom') diff --git a/app/src/custom/res/animator/alpha1.xml b/app/src/custom/res/animator/alpha1.xml new file mode 100644 index 00000000..94192a0b --- /dev/null +++ b/app/src/custom/res/animator/alpha1.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/custom/res/animator/alpha2.xml b/app/src/custom/res/animator/alpha2.xml index bf997dea..b66ef59c 100644 --- a/app/src/custom/res/animator/alpha2.xml +++ b/app/src/custom/res/animator/alpha2.xml @@ -1,10 +1,12 @@ - \ No newline at end of file + android:duration="1000" + android:propertyName="fillColor" + android:valueFrom="#00000000" + android:valueTo="#000000" + android:startOffset="1000" + android:valueType="colorType" + /> + + diff --git a/app/src/custom/res/animator/alpha3.xml b/app/src/custom/res/animator/alpha3.xml index d05f36c2..2a1e0ba4 100644 --- a/app/src/custom/res/animator/alpha3.xml +++ b/app/src/custom/res/animator/alpha3.xml @@ -1,4 +1,11 @@ - - \ No newline at end of file + + diff --git a/app/src/custom/res/drawable/ravens.xml b/app/src/custom/res/drawable/ravens.xml index f97a3532..788aef84 100644 --- a/app/src/custom/res/drawable/ravens.xml +++ b/app/src/custom/res/drawable/ravens.xml @@ -4,29 +4,35 @@ android:width="342dp" android:height="206dp"> diff --git a/app/src/custom/res/drawable/state_connecting.xml b/app/src/custom/res/drawable/state_connecting.xml index 3ef89983..267ba791 100644 --- a/app/src/custom/res/drawable/state_connecting.xml +++ b/app/src/custom/res/drawable/state_connecting.xml @@ -1,4 +1,15 @@ - - - \ No newline at end of file + + + + + + \ 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_connceted_disconnected.xml | 4 + app/src/custom/res/drawable/state_connected.xml | 30 +++++--- app/src/custom/res/drawable/state_disconnected.xml | 22 ++++-- .../state_transition_connected_disconnected.xml | 89 ++++++++++++++++++++++ 4 files changed, 129 insertions(+), 16 deletions(-) create mode 100644 app/src/custom/res/animator/state_transition_connceted_disconnected.xml create mode 100644 app/src/custom/res/drawable/state_transition_connected_disconnected.xml (limited to 'app/src/custom') diff --git a/app/src/custom/res/animator/state_transition_connceted_disconnected.xml b/app/src/custom/res/animator/state_transition_connceted_disconnected.xml new file mode 100644 index 00000000..751d2da5 --- /dev/null +++ b/app/src/custom/res/animator/state_transition_connceted_disconnected.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/state_connected.xml b/app/src/custom/res/drawable/state_connected.xml index c9854d69..e0a9005f 100644 --- a/app/src/custom/res/drawable/state_connected.xml +++ b/app/src/custom/res/drawable/state_connected.xml @@ -3,13 +3,25 @@ android:viewportHeight="220" android:width="166dp" android:height="220dp"> - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/state_disconnected.xml b/app/src/custom/res/drawable/state_disconnected.xml index 3d3660b8..7c49a537 100644 --- a/app/src/custom/res/drawable/state_disconnected.xml +++ b/app/src/custom/res/drawable/state_disconnected.xml @@ -1,9 +1,17 @@ - + android:viewportWidth="166" + android:viewportHeight="220" + android:width="166dp" + android:height="220dp"> + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/state_transition_connected_disconnected.xml b/app/src/custom/res/drawable/state_transition_connected_disconnected.xml new file mode 100644 index 00000000..0496e729 --- /dev/null +++ b/app/src/custom/res/drawable/state_transition_connected_disconnected.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 1709558fd2025a62931248b4c021f379172de70f Mon Sep 17 00:00:00 2001 From: cyberta Date: Fri, 2 Dec 2022 15:40:37 +0100 Subject: fix colors --- app/src/custom/res/values/custom-theme.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/src/custom') diff --git a/app/src/custom/res/values/custom-theme.xml b/app/src/custom/res/values/custom-theme.xml index a17b401c..b1a8d0cd 100644 --- a/app/src/custom/res/values/custom-theme.xml +++ b/app/src/custom/res/values/custom-theme.xml @@ -9,8 +9,11 @@ #ffffff #cccccc + + @color/black800_dark + @color/white - #ffffff + @color/black800_dark #58FFA9 -- cgit v1.2.3 From 620689f338ffcedb29558d80fda00006d65a6ef7 Mon Sep 17 00:00:00 2001 From: cyberta Date: Fri, 2 Dec 2022 20:43:15 +0100 Subject: fix location button icon color for RiseupVPN --- app/src/custom/res/values/custom-theme.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/custom') diff --git a/app/src/custom/res/values/custom-theme.xml b/app/src/custom/res/values/custom-theme.xml index b1a8d0cd..48d04322 100644 --- a/app/src/custom/res/values/custom-theme.xml +++ b/app/src/custom/res/values/custom-theme.xml @@ -19,6 +19,6 @@ #eF2222 - #ffffff - #22ffffff + @color/black800 + @color/black800_transparent -- cgit v1.2.3 From e8625b3fb29285d73033efb3aab96263528e270a Mon Sep 17 00:00:00 2001 From: cyberta Date: Sun, 4 Dec 2022 02:07:49 +0100 Subject: replace connected state background pngs for RiseupVPN with vector graphics --- app/src/custom/res/drawable-hdpi/bg_connected.png | Bin 147673 -> 0 bytes app/src/custom/res/drawable-hdpi/bg_connecting.png | Bin 237385 -> 0 bytes .../custom/res/drawable-hdpi/bg_disconnected.png | Bin 123636 -> 0 bytes app/src/custom/res/drawable-xhdpi/bg_connected.png | Bin 228442 -> 0 bytes .../custom/res/drawable-xhdpi/bg_connecting.png | Bin 402134 -> 0 bytes .../custom/res/drawable-xhdpi/bg_disconnected.png | Bin 200573 -> 0 bytes .../custom/res/drawable-xxhdpi/bg_connected.png | Bin 460545 -> 0 bytes .../custom/res/drawable-xxhdpi/bg_connecting.png | Bin 831328 -> 0 bytes .../custom/res/drawable-xxhdpi/bg_disconnected.png | Bin 417997 -> 0 bytes .../custom/res/drawable-xxxhdpi/bg_connected.png | Bin 765207 -> 0 bytes .../custom/res/drawable-xxxhdpi/bg_connecting.png | Bin 1492820 -> 0 bytes .../res/drawable-xxxhdpi/bg_disconnected.png | Bin 683759 -> 0 bytes app/src/custom/res/drawable/bg_connected.png | Bin 77818 -> 0 bytes app/src/custom/res/drawable/bg_connected.xml | 13 ++++++ .../custom/res/drawable/bg_connected_effect.xml | 25 ++++++++++++ app/src/custom/res/drawable/bg_connecting.png | Bin 112675 -> 0 bytes app/src/custom/res/drawable/bg_connecting.xml | 13 ++++++ .../custom/res/drawable/bg_connecting_effect.xml | 44 ++++++++++++++++++++ app/src/custom/res/drawable/bg_disconnected.png | Bin 63491 -> 0 bytes app/src/custom/res/drawable/bg_disconnected.xml | 15 +++++++ .../custom/res/drawable/bg_disconnected_effect.xml | 45 +++++++++++++++++++++ 21 files changed, 155 insertions(+) delete mode 100644 app/src/custom/res/drawable-hdpi/bg_connected.png delete mode 100644 app/src/custom/res/drawable-hdpi/bg_connecting.png delete mode 100644 app/src/custom/res/drawable-hdpi/bg_disconnected.png delete mode 100644 app/src/custom/res/drawable-xhdpi/bg_connected.png delete mode 100644 app/src/custom/res/drawable-xhdpi/bg_connecting.png delete mode 100644 app/src/custom/res/drawable-xhdpi/bg_disconnected.png delete mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connected.png delete mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connecting.png delete mode 100644 app/src/custom/res/drawable-xxhdpi/bg_disconnected.png delete mode 100644 app/src/custom/res/drawable-xxxhdpi/bg_connected.png delete mode 100644 app/src/custom/res/drawable-xxxhdpi/bg_connecting.png delete mode 100644 app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png delete mode 100644 app/src/custom/res/drawable/bg_connected.png create mode 100644 app/src/custom/res/drawable/bg_connected.xml create mode 100644 app/src/custom/res/drawable/bg_connected_effect.xml delete mode 100644 app/src/custom/res/drawable/bg_connecting.png create mode 100644 app/src/custom/res/drawable/bg_connecting.xml create mode 100644 app/src/custom/res/drawable/bg_connecting_effect.xml delete mode 100644 app/src/custom/res/drawable/bg_disconnected.png create mode 100644 app/src/custom/res/drawable/bg_disconnected.xml create mode 100644 app/src/custom/res/drawable/bg_disconnected_effect.xml (limited to 'app/src/custom') diff --git a/app/src/custom/res/drawable-hdpi/bg_connected.png b/app/src/custom/res/drawable-hdpi/bg_connected.png deleted file mode 100644 index 53648c23..00000000 Binary files a/app/src/custom/res/drawable-hdpi/bg_connected.png and /dev/null differ diff --git a/app/src/custom/res/drawable-hdpi/bg_connecting.png b/app/src/custom/res/drawable-hdpi/bg_connecting.png deleted file mode 100644 index a62d308c..00000000 Binary files a/app/src/custom/res/drawable-hdpi/bg_connecting.png and /dev/null differ diff --git a/app/src/custom/res/drawable-hdpi/bg_disconnected.png b/app/src/custom/res/drawable-hdpi/bg_disconnected.png deleted file mode 100644 index c2e031df..00000000 Binary files a/app/src/custom/res/drawable-hdpi/bg_disconnected.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xhdpi/bg_connected.png b/app/src/custom/res/drawable-xhdpi/bg_connected.png deleted file mode 100644 index 4491692a..00000000 Binary files a/app/src/custom/res/drawable-xhdpi/bg_connected.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xhdpi/bg_connecting.png b/app/src/custom/res/drawable-xhdpi/bg_connecting.png deleted file mode 100644 index 703a77c4..00000000 Binary files a/app/src/custom/res/drawable-xhdpi/bg_connecting.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png deleted file mode 100644 index 4e05614e..00000000 Binary files a/app/src/custom/res/drawable-xhdpi/bg_disconnected.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxhdpi/bg_connected.png deleted file mode 100644 index 29bd3a05..00000000 Binary files a/app/src/custom/res/drawable-xxhdpi/bg_connected.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png deleted file mode 100644 index 9b91293c..00000000 Binary files a/app/src/custom/res/drawable-xxhdpi/bg_connecting.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png deleted file mode 100644 index c4a09aa7..00000000 Binary files a/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxxhdpi/bg_connected.png deleted file mode 100644 index d1e95fb6..00000000 Binary files a/app/src/custom/res/drawable-xxxhdpi/bg_connected.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png deleted file mode 100644 index e6d36eb0..00000000 Binary files a/app/src/custom/res/drawable-xxxhdpi/bg_connecting.png and /dev/null differ diff --git a/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png deleted file mode 100644 index df597f2f..00000000 Binary files a/app/src/custom/res/drawable-xxxhdpi/bg_disconnected.png and /dev/null differ diff --git a/app/src/custom/res/drawable/bg_connected.png b/app/src/custom/res/drawable/bg_connected.png deleted file mode 100644 index a375181d..00000000 Binary files a/app/src/custom/res/drawable/bg_connected.png and /dev/null differ diff --git a/app/src/custom/res/drawable/bg_connected.xml b/app/src/custom/res/drawable/bg_connected.xml new file mode 100644 index 00000000..f851203d --- /dev/null +++ b/app/src/custom/res/drawable/bg_connected.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_connected_effect.xml b/app/src/custom/res/drawable/bg_connected_effect.xml new file mode 100644 index 00000000..75e79573 --- /dev/null +++ b/app/src/custom/res/drawable/bg_connected_effect.xml @@ -0,0 +1,25 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_connecting.png b/app/src/custom/res/drawable/bg_connecting.png deleted file mode 100644 index eccf184b..00000000 Binary files a/app/src/custom/res/drawable/bg_connecting.png and /dev/null differ diff --git a/app/src/custom/res/drawable/bg_connecting.xml b/app/src/custom/res/drawable/bg_connecting.xml new file mode 100644 index 00000000..8482d30e --- /dev/null +++ b/app/src/custom/res/drawable/bg_connecting.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_connecting_effect.xml b/app/src/custom/res/drawable/bg_connecting_effect.xml new file mode 100644 index 00000000..fd462a54 --- /dev/null +++ b/app/src/custom/res/drawable/bg_connecting_effect.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_disconnected.png b/app/src/custom/res/drawable/bg_disconnected.png deleted file mode 100644 index cc3ead9a..00000000 Binary files a/app/src/custom/res/drawable/bg_disconnected.png and /dev/null differ diff --git a/app/src/custom/res/drawable/bg_disconnected.xml b/app/src/custom/res/drawable/bg_disconnected.xml new file mode 100644 index 00000000..bfc3c1d1 --- /dev/null +++ b/app/src/custom/res/drawable/bg_disconnected.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_disconnected_effect.xml b/app/src/custom/res/drawable/bg_disconnected_effect.xml new file mode 100644 index 00000000..d19c2f7f --- /dev/null +++ b/app/src/custom/res/drawable/bg_disconnected_effect.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From e963546dd01627d1a7c9f38467733ae80cddaef3 Mon Sep 17 00:00:00 2001 From: cyberta Date: Sun, 4 Dec 2022 16:59:59 +0100 Subject: implement RiseupVPN splash screen for Android API 31+ --- app/src/custom/res/drawable/splash_branding.xml | 47 +++++++++++++++++++++++++ app/src/custom/res/drawable/splash_icon.xml | 17 +++++++++ app/src/custom/res/drawable/splash_page.xml | 10 ++++++ 3 files changed, 74 insertions(+) create mode 100644 app/src/custom/res/drawable/splash_branding.xml create mode 100644 app/src/custom/res/drawable/splash_icon.xml (limited to 'app/src/custom') diff --git a/app/src/custom/res/drawable/splash_branding.xml b/app/src/custom/res/drawable/splash_branding.xml new file mode 100644 index 00000000..8bbd83ca --- /dev/null +++ b/app/src/custom/res/drawable/splash_branding.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + diff --git a/app/src/custom/res/drawable/splash_icon.xml b/app/src/custom/res/drawable/splash_icon.xml new file mode 100644 index 00000000..e8335bc6 --- /dev/null +++ b/app/src/custom/res/drawable/splash_icon.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/splash_page.xml b/app/src/custom/res/drawable/splash_page.xml index 4c72dfe2..48a622ac 100644 --- a/app/src/custom/res/drawable/splash_page.xml +++ b/app/src/custom/res/drawable/splash_page.xml @@ -1,4 +1,14 @@ + -- cgit v1.2.3 From 1b981b7971e207e892a4f457d455f0856533540f Mon Sep 17 00:00:00 2001 From: cyberta Date: Mon, 5 Dec 2022 13:23:14 +0100 Subject: replace motd png with vector graphic --- app/src/custom/res/drawable/ic_motd.png | Bin 34639 -> 0 bytes app/src/custom/res/drawable/ic_motd.xml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) delete mode 100644 app/src/custom/res/drawable/ic_motd.png create mode 100644 app/src/custom/res/drawable/ic_motd.xml (limited to 'app/src/custom') diff --git a/app/src/custom/res/drawable/ic_motd.png b/app/src/custom/res/drawable/ic_motd.png deleted file mode 100644 index 5d2efea4..00000000 Binary files a/app/src/custom/res/drawable/ic_motd.png and /dev/null differ diff --git a/app/src/custom/res/drawable/ic_motd.xml b/app/src/custom/res/drawable/ic_motd.xml new file mode 100644 index 00000000..85c9e58a --- /dev/null +++ b/app/src/custom/res/drawable/ic_motd.xml @@ -0,0 +1,18 @@ + + + + + + + \ 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/bg_connected.xml | 13 +++ .../drawable-anydpi-v24/bg_connected_effect.xml | 25 ++++++ .../res/drawable-anydpi-v24/bg_connecting.xml | 13 +++ .../drawable-anydpi-v24/bg_connecting_effect.xml | 44 ++++++++++ .../res/drawable-anydpi-v24/bg_disconnected.xml | 15 ++++ .../drawable-anydpi-v24/bg_disconnected_effect.xml | 45 +++++++++++ app/src/custom/res/drawable-anydpi-v24/ic_motd.xml | 18 +++++ app/src/custom/res/drawable-anydpi-v24/ravens.xml | 39 +++++++++ .../drawable-anydpi-v24/rotate_progress_image.xml | 14 ++++ .../res/drawable-anydpi-v24/state_connected.xml | 27 +++++++ .../res/drawable-anydpi-v24/state_connecting.xml | 15 ++++ .../res/drawable-anydpi-v24/state_disconnected.xml | 17 ++++ .../state_transition_connected_disconnected.xml | 89 +++++++++++++++++++++ app/src/custom/res/drawable-hdpi/bg_connected.png | Bin 0 -> 61315 bytes app/src/custom/res/drawable-hdpi/bg_connecting.png | Bin 0 -> 137369 bytes .../custom/res/drawable-hdpi/bg_disconnected.png | Bin 0 -> 116565 bytes app/src/custom/res/drawable-xhdpi/bg_connected.png | Bin 0 -> 85060 bytes .../custom/res/drawable-xhdpi/bg_connecting.png | Bin 0 -> 230677 bytes .../custom/res/drawable-xhdpi/bg_disconnected.png | Bin 0 -> 164266 bytes .../custom/res/drawable-xxhdpi/bg_connected.png | Bin 0 -> 136989 bytes .../custom/res/drawable-xxhdpi/bg_connecting.png | Bin 0 -> 422556 bytes .../custom/res/drawable-xxhdpi/bg_disconnected.png | Bin 0 -> 258953 bytes app/src/custom/res/drawable/bg_connected.png | Bin 0 -> 39210 bytes app/src/custom/res/drawable/bg_connected.xml | 13 --- .../custom/res/drawable/bg_connected_effect.xml | 25 ------ app/src/custom/res/drawable/bg_connecting.png | Bin 0 -> 68160 bytes app/src/custom/res/drawable/bg_connecting.xml | 13 --- .../custom/res/drawable/bg_connecting_effect.xml | 44 ---------- app/src/custom/res/drawable/bg_disconnected.png | Bin 0 -> 71570 bytes app/src/custom/res/drawable/bg_disconnected.xml | 15 ---- .../custom/res/drawable/bg_disconnected_effect.xml | 45 ----------- app/src/custom/res/drawable/ic_motd.png | Bin 0 -> 34639 bytes app/src/custom/res/drawable/ic_motd.xml | 18 ----- app/src/custom/res/drawable/ravens.xml | 39 --------- .../custom/res/drawable/rotate_progress_image.png | Bin 0 -> 161 bytes .../custom/res/drawable/rotate_progress_image.xml | 14 ---- app/src/custom/res/drawable/state_connected.png | Bin 0 -> 48758 bytes app/src/custom/res/drawable/state_connected.xml | 27 ------- app/src/custom/res/drawable/state_connecting.png | Bin 0 -> 111663 bytes app/src/custom/res/drawable/state_connecting.xml | 15 ---- app/src/custom/res/drawable/state_disconnected.xml | 23 ++---- .../state_transition_connected_disconnected.xml | 89 --------------------- 42 files changed, 380 insertions(+), 374 deletions(-) create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_connected.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_connected_effect.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_connecting.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_connecting_effect.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_disconnected.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/bg_disconnected_effect.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/ic_motd.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/ravens.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/rotate_progress_image.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/state_connected.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/state_connecting.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/state_disconnected.xml create mode 100644 app/src/custom/res/drawable-anydpi-v24/state_transition_connected_disconnected.xml create mode 100644 app/src/custom/res/drawable-hdpi/bg_connected.png create mode 100644 app/src/custom/res/drawable-hdpi/bg_connecting.png create mode 100644 app/src/custom/res/drawable-hdpi/bg_disconnected.png create mode 100644 app/src/custom/res/drawable-xhdpi/bg_connected.png create mode 100644 app/src/custom/res/drawable-xhdpi/bg_connecting.png create mode 100644 app/src/custom/res/drawable-xhdpi/bg_disconnected.png create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connected.png create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_connecting.png create mode 100644 app/src/custom/res/drawable-xxhdpi/bg_disconnected.png create mode 100644 app/src/custom/res/drawable/bg_connected.png delete mode 100644 app/src/custom/res/drawable/bg_connected.xml delete mode 100644 app/src/custom/res/drawable/bg_connected_effect.xml create mode 100644 app/src/custom/res/drawable/bg_connecting.png delete mode 100644 app/src/custom/res/drawable/bg_connecting.xml delete mode 100644 app/src/custom/res/drawable/bg_connecting_effect.xml create mode 100644 app/src/custom/res/drawable/bg_disconnected.png delete mode 100644 app/src/custom/res/drawable/bg_disconnected.xml delete mode 100644 app/src/custom/res/drawable/bg_disconnected_effect.xml create mode 100644 app/src/custom/res/drawable/ic_motd.png delete mode 100644 app/src/custom/res/drawable/ic_motd.xml delete mode 100644 app/src/custom/res/drawable/ravens.xml create mode 100644 app/src/custom/res/drawable/rotate_progress_image.png delete mode 100644 app/src/custom/res/drawable/rotate_progress_image.xml create mode 100644 app/src/custom/res/drawable/state_connected.png delete mode 100644 app/src/custom/res/drawable/state_connected.xml create mode 100644 app/src/custom/res/drawable/state_connecting.png delete mode 100644 app/src/custom/res/drawable/state_connecting.xml delete mode 100644 app/src/custom/res/drawable/state_transition_connected_disconnected.xml (limited to 'app/src/custom') diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_connected.xml b/app/src/custom/res/drawable-anydpi-v24/bg_connected.xml new file mode 100644 index 00000000..f851203d --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/bg_connected.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_connected_effect.xml b/app/src/custom/res/drawable-anydpi-v24/bg_connected_effect.xml new file mode 100644 index 00000000..75e79573 --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/bg_connected_effect.xml @@ -0,0 +1,25 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_connecting.xml b/app/src/custom/res/drawable-anydpi-v24/bg_connecting.xml new file mode 100644 index 00000000..8482d30e --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/bg_connecting.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_connecting_effect.xml b/app/src/custom/res/drawable-anydpi-v24/bg_connecting_effect.xml new file mode 100644 index 00000000..fd462a54 --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/bg_connecting_effect.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_disconnected.xml b/app/src/custom/res/drawable-anydpi-v24/bg_disconnected.xml new file mode 100644 index 00000000..bfc3c1d1 --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/bg_disconnected.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/bg_disconnected_effect.xml b/app/src/custom/res/drawable-anydpi-v24/bg_disconnected_effect.xml new file mode 100644 index 00000000..d19c2f7f --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/bg_disconnected_effect.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/ic_motd.xml b/app/src/custom/res/drawable-anydpi-v24/ic_motd.xml new file mode 100644 index 00000000..85c9e58a --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/ic_motd.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/ravens.xml b/app/src/custom/res/drawable-anydpi-v24/ravens.xml new file mode 100644 index 00000000..788aef84 --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/ravens.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/rotate_progress_image.xml b/app/src/custom/res/drawable-anydpi-v24/rotate_progress_image.xml new file mode 100644 index 00000000..f84f9034 --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/rotate_progress_image.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/state_connected.xml b/app/src/custom/res/drawable-anydpi-v24/state_connected.xml new file mode 100644 index 00000000..e0a9005f --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/state_connected.xml @@ -0,0 +1,27 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml b/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml new file mode 100644 index 00000000..267ba791 --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/state_disconnected.xml b/app/src/custom/res/drawable-anydpi-v24/state_disconnected.xml new file mode 100644 index 00000000..7c49a537 --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/state_disconnected.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/state_transition_connected_disconnected.xml b/app/src/custom/res/drawable-anydpi-v24/state_transition_connected_disconnected.xml new file mode 100644 index 00000000..0496e729 --- /dev/null +++ b/app/src/custom/res/drawable-anydpi-v24/state_transition_connected_disconnected.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/custom/res/drawable-hdpi/bg_connected.png b/app/src/custom/res/drawable-hdpi/bg_connected.png new file mode 100644 index 00000000..aa29fd90 Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_connected.png differ diff --git a/app/src/custom/res/drawable-hdpi/bg_connecting.png b/app/src/custom/res/drawable-hdpi/bg_connecting.png new file mode 100644 index 00000000..49620c2c Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_connecting.png differ diff --git a/app/src/custom/res/drawable-hdpi/bg_disconnected.png b/app/src/custom/res/drawable-hdpi/bg_disconnected.png new file mode 100644 index 00000000..35180222 Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/bg_disconnected.png differ diff --git a/app/src/custom/res/drawable-xhdpi/bg_connected.png b/app/src/custom/res/drawable-xhdpi/bg_connected.png new file mode 100644 index 00000000..f9588d56 Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_connected.png differ diff --git a/app/src/custom/res/drawable-xhdpi/bg_connecting.png b/app/src/custom/res/drawable-xhdpi/bg_connecting.png new file mode 100644 index 00000000..294e4708 Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_connecting.png differ diff --git a/app/src/custom/res/drawable-xhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png new file mode 100644 index 00000000..d18bc78e Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/bg_disconnected.png differ diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connected.png b/app/src/custom/res/drawable-xxhdpi/bg_connected.png new file mode 100644 index 00000000..14c58b03 Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_connected.png differ diff --git a/app/src/custom/res/drawable-xxhdpi/bg_connecting.png b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png new file mode 100644 index 00000000..062e84c4 Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_connecting.png differ diff --git a/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png new file mode 100644 index 00000000..cd014703 Binary files /dev/null and b/app/src/custom/res/drawable-xxhdpi/bg_disconnected.png differ diff --git a/app/src/custom/res/drawable/bg_connected.png b/app/src/custom/res/drawable/bg_connected.png new file mode 100644 index 00000000..78a09cae Binary files /dev/null and b/app/src/custom/res/drawable/bg_connected.png differ diff --git a/app/src/custom/res/drawable/bg_connected.xml b/app/src/custom/res/drawable/bg_connected.xml deleted file mode 100644 index f851203d..00000000 --- a/app/src/custom/res/drawable/bg_connected.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_connected_effect.xml b/app/src/custom/res/drawable/bg_connected_effect.xml deleted file mode 100644 index 75e79573..00000000 --- a/app/src/custom/res/drawable/bg_connected_effect.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_connecting.png b/app/src/custom/res/drawable/bg_connecting.png new file mode 100644 index 00000000..d85ddd4b Binary files /dev/null and b/app/src/custom/res/drawable/bg_connecting.png differ diff --git a/app/src/custom/res/drawable/bg_connecting.xml b/app/src/custom/res/drawable/bg_connecting.xml deleted file mode 100644 index 8482d30e..00000000 --- a/app/src/custom/res/drawable/bg_connecting.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_connecting_effect.xml b/app/src/custom/res/drawable/bg_connecting_effect.xml deleted file mode 100644 index fd462a54..00000000 --- a/app/src/custom/res/drawable/bg_connecting_effect.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_disconnected.png b/app/src/custom/res/drawable/bg_disconnected.png new file mode 100644 index 00000000..029c5d5a Binary files /dev/null and b/app/src/custom/res/drawable/bg_disconnected.png differ diff --git a/app/src/custom/res/drawable/bg_disconnected.xml b/app/src/custom/res/drawable/bg_disconnected.xml deleted file mode 100644 index bfc3c1d1..00000000 --- a/app/src/custom/res/drawable/bg_disconnected.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/bg_disconnected_effect.xml b/app/src/custom/res/drawable/bg_disconnected_effect.xml deleted file mode 100644 index d19c2f7f..00000000 --- a/app/src/custom/res/drawable/bg_disconnected_effect.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/ic_motd.png b/app/src/custom/res/drawable/ic_motd.png new file mode 100644 index 00000000..5d2efea4 Binary files /dev/null and b/app/src/custom/res/drawable/ic_motd.png differ diff --git a/app/src/custom/res/drawable/ic_motd.xml b/app/src/custom/res/drawable/ic_motd.xml deleted file mode 100644 index 85c9e58a..00000000 --- a/app/src/custom/res/drawable/ic_motd.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/ravens.xml b/app/src/custom/res/drawable/ravens.xml deleted file mode 100644 index 788aef84..00000000 --- a/app/src/custom/res/drawable/ravens.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/rotate_progress_image.png b/app/src/custom/res/drawable/rotate_progress_image.png new file mode 100644 index 00000000..ca160d00 Binary files /dev/null and b/app/src/custom/res/drawable/rotate_progress_image.png differ diff --git a/app/src/custom/res/drawable/rotate_progress_image.xml b/app/src/custom/res/drawable/rotate_progress_image.xml deleted file mode 100644 index f84f9034..00000000 --- a/app/src/custom/res/drawable/rotate_progress_image.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/state_connected.png b/app/src/custom/res/drawable/state_connected.png new file mode 100644 index 00000000..0fbb82f2 Binary files /dev/null and b/app/src/custom/res/drawable/state_connected.png differ diff --git a/app/src/custom/res/drawable/state_connected.xml b/app/src/custom/res/drawable/state_connected.xml deleted file mode 100644 index e0a9005f..00000000 --- a/app/src/custom/res/drawable/state_connected.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/state_connecting.png b/app/src/custom/res/drawable/state_connecting.png new file mode 100644 index 00000000..7d78587e Binary files /dev/null and b/app/src/custom/res/drawable/state_connecting.png differ diff --git a/app/src/custom/res/drawable/state_connecting.xml b/app/src/custom/res/drawable/state_connecting.xml deleted file mode 100644 index 267ba791..00000000 --- a/app/src/custom/res/drawable/state_connecting.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/custom/res/drawable/state_disconnected.xml b/app/src/custom/res/drawable/state_disconnected.xml index 7c49a537..ee11473d 100644 --- a/app/src/custom/res/drawable/state_disconnected.xml +++ b/app/src/custom/res/drawable/state_disconnected.xml @@ -1,17 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/src/custom/res/drawable/state_transition_connected_disconnected.xml b/app/src/custom/res/drawable/state_transition_connected_disconnected.xml deleted file mode 100644 index 0496e729..00000000 --- a/app/src/custom/res/drawable/state_transition_connected_disconnected.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 16d41d3df2c2405c9f716675841c53c41fbf8400 Mon Sep 17 00:00:00 2001 From: cyberta Date: Tue, 6 Dec 2022 04:07:50 +0100 Subject: repeat connecting animation, fade out before restarting --- app/src/custom/res/animator/alpha4.xml | 10 ++++++++++ app/src/custom/res/drawable-anydpi-v24/ravens.xml | 8 +++++--- app/src/custom/res/drawable-anydpi-v24/state_connecting.xml | 3 +++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 app/src/custom/res/animator/alpha4.xml (limited to 'app/src/custom') diff --git a/app/src/custom/res/animator/alpha4.xml b/app/src/custom/res/animator/alpha4.xml new file mode 100644 index 00000000..75dc9c78 --- /dev/null +++ b/app/src/custom/res/animator/alpha4.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/custom/res/drawable-anydpi-v24/ravens.xml b/app/src/custom/res/drawable-anydpi-v24/ravens.xml index 788aef84..a4c3023d 100644 --- a/app/src/custom/res/drawable-anydpi-v24/ravens.xml +++ b/app/src/custom/res/drawable-anydpi-v24/ravens.xml @@ -2,6 +2,8 @@ android:viewportWidth="342" android:viewportHeight="206" android:width="342dp" + android:name="ravens" + android:alpha="1" android:height="206dp"> + android:fillColor="#00000000" /> + android:fillColor="#00000000" /> + android:fillColor="#00000000" /> \ No newline at end of file diff --git a/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml b/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml index 267ba791..77207966 100644 --- a/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml +++ b/app/src/custom/res/drawable-anydpi-v24/state_connecting.xml @@ -2,6 +2,9 @@ + -- cgit v1.2.3