Skip to content

ADFA-4553 (slice 2b): remove the tunnel/SOCKS layout, strings and colors #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luisguzman-adfa merged 1 commit into from
Jul 4, 2026
Merged

ADFA-4553 (slice 2b): remove the tunnel/SOCKS layout, strings and colors #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 0 additions & 128 deletions controller/app/src/main/res/layout/fragment_usage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,60 +74,8 @@
android:textStyle="bold" />
</LinearLayout>

<LinearLayout
android:id="@+id/dash_tunnel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:background="?android:attr/selectableItemBackground"
android:padding="12dp"
android:visibility="gone">

<View
android:id="@+id/led_tunnel"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginEnd="8dp"
android:background="@drawable/led_on_green" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tunnel"
android:textColor="@color/dash_text_primary"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>

<Button
android:id="@+id/control"
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_marginHorizontal="12dp"
android:text="@string/control_enable"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="@color/text_on_accent"
android:background="@drawable/rounded_button"
android:backgroundTint="@color/btn_vpn_off"
android:textAllCaps="false"
android:visibility="gone" />

<TextView
android:id="@+id/control_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:text="@string/vpn_description"
android:textSize="13sp"
android:gravity="center"
android:textColor="?android:attr/textColorSecondary"
android:layout_marginTop="8dp"
android:layout_marginBottom="12dp"
android:visibility="gone" />

<Button
android:id="@+id/btnBrowseContent"
android:layout_width="match_parent"
Expand Down Expand Up @@ -216,39 +164,6 @@
android:textColor="@color/text_on_accent"
android:textAllCaps="false" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/socks_addr"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"
android:visibility="gone" />

<EditText
android:id="@+id/socks_addr"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"
android:visibility="gone" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/socks_port"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"
android:visibility="gone" />

<EditText
android:id="@+id/socks_port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:inputType="number"
android:textColor="?android:attr/textColorPrimary"
android:visibility="gone" />

<TextView
android:id="@+id/adv_config_label"
android:layout_width="match_parent"
Expand All @@ -268,49 +183,6 @@
android:layout_height="wrap_content"
android:visibility="gone">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/socks_udp_addr"
android:textColor="?android:attr/textColorSecondary"
android:textSize="11sp" />

<EditText
android:id="@+id/socks_udp_addr"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/socks_user"
android:textColor="?android:attr/textColorSecondary"
android:textSize="11sp" />

<EditText
android:id="@+id/socks_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/socks_pass"
android:textColor="?android:attr/textColorSecondary"
android:textSize="11sp" />

<EditText
android:id="@+id/socks_pass"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:inputType="textPassword"
android:textColor="?android:attr/textColorPrimary" />

<CheckBox
android:id="@+id/udp_in_tcp"
android:layout_width="wrap_content"
Expand Down
11 changes: 0 additions & 11 deletions controller/app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
<string name="system_ready">Sistema listo...\n</string>

<string name="hotspot">Hotspot</string>
<string name="tunnel">Túnel</string>
<string name="wifi">Wi-Fi</string>

<string name="qr_error_no_network">Active Wi-Fi o Hotspot para compartir contenido a través de la red.</string>
Expand All @@ -99,26 +98,16 @@
<string name="qr_title_hotspot">Red Hotspot</string>
<string name="qr_title_wifi">Red Wi-Fi</string>

<string name="control_disable">Desactivar Safe Pocket Web</string>
<string name="control_enable">Activar Safe Pocket Web</string>

<string name="global">Global</string>
<string name="ipv4">IPv4</string>
<string name="ipv6">IPv6</string>
<string name="maintenance_mode">Modo Mantenimiento</string>
<string name="maintenance_warning_msg">Desactive Safe Pocket Web para poder modificar configuraciones.</string>
<string name="remote_dns">DNS Remoto</string>
<string name="socks_addr">Dirección Socks:</string>
<string name="socks_pass">Contraseña Socks:</string>
<string name="socks_port">Puerto Socks:</string>
<string name="socks_udp_addr">Dirección UDP Socks:</string>
<string name="socks_user">Usuario Socks:</string>
<string name="udp_in_tcp">Relé UDP sobre TCP</string>

<string name="user_initiated_conn">Conexión iniciada por el usuario</string>
<string name="vpn_description">Habilite URLs amigables. Bloquee las amenazas.</string>
<string name="vpn_starting">Iniciando VPN...</string>
<string name="vpn_stopping">Deteniendo VPN...</string>

<string name="watchdog_channel_desc">Asegura que los servicios permanezcan activos cuando la pantalla está apagada.</string>
<string name="watchdog_channel_name">Servicio K2Go Watchdog</string>
Expand Down
11 changes: 0 additions & 11 deletions controller/app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
<string name="system_ready">Système prêt...\n</string>

<string name="hotspot">Point d\'accès</string>
<string name="tunnel">Tunnel</string>
<string name="wifi">Wi-Fi</string>

<string name="qr_error_no_network">Activez le Wi-Fi ou le Point d\'accès pour partager du contenu sur le réseau.</string>
Expand All @@ -104,26 +103,16 @@
<string name="qr_title_hotspot">Réseau du Point d\'accès</string>
<string name="qr_title_wifi">Réseau Wi-Fi</string>

<string name="control_disable">Désactiver Safe Pocket Web</string>
<string name="control_enable">Activer Safe Pocket Web</string>

<string name="global">Global</string>
<string name="ipv4">IPv4</string>
<string name="ipv6">IPv6</string>
<string name="maintenance_mode">Mode de maintenance</string>
<string name="maintenance_warning_msg">Désactivez Safe Pocket Web pour pouvoir modifier les paramètres.</string>
<string name="remote_dns">DNS distant</string>
<string name="socks_addr">Adresse Socks :</string>
<string name="socks_pass">Mot de passe Socks :</string>
<string name="socks_port">Port Socks :</string>
<string name="socks_udp_addr">Adresse UDP Socks :</string>
<string name="socks_user">Utilisateur Socks :</string>
<string name="udp_in_tcp">Relais UDP sur TCP</string>

<string name="user_initiated_conn">Connexion initiée par l\'utilisateur</string>
<string name="vpn_description">Activez des URL conviviales. Bloquez les menaces.</string>
<string name="vpn_starting">Démarrage du VPN...</string>
<string name="vpn_stopping">Arrêt du VPN...</string>

<string name="watchdog_channel_desc">Garantit que les services restent actifs lorsque l\'écran est éteint.</string>
<string name="watchdog_channel_name">Service K2Go Watchdog</string>
Expand Down
11 changes: 0 additions & 11 deletions controller/app/src/main/res/values-hi/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
<string name="system_ready">सिस्टम तैयार...\n</string>

<string name="hotspot">हॉटस्पॉट</string>
<string name="tunnel">टनल</string>
<string name="wifi">Wi-Fi</string>

<string name="qr_error_no_network">नेटवर्क पर सामग्री साझा करने के लिए Wi-Fi या हॉटस्पॉट सक्षम करें।</string>
Expand All @@ -104,26 +103,16 @@
<string name="qr_title_hotspot">हॉटस्पॉट नेटवर्क</string>
<string name="qr_title_wifi">Wi-Fi नेटवर्क</string>

<string name="control_disable">Safe Pocket Web अक्षम करें</string>
<string name="control_enable">Safe Pocket Web सक्षम करें</string>

<string name="global">ग्लोबल</string>
<string name="ipv4">IPv4</string>
<string name="ipv6">IPv6</string>
<string name="maintenance_mode">रखरखाव मोड</string>
<string name="maintenance_warning_msg">सेटिंग्स को संशोधित करने के लिए Safe Pocket Web अक्षम करें।</string>
<string name="remote_dns">रिमोट DNS</string>
<string name="socks_addr">Socks पता:</string>
<string name="socks_pass">Socks पासवर्ड:</string>
<string name="socks_port">Socks पोर्ट:</string>
<string name="socks_udp_addr">Socks UDP पता:</string>
<string name="socks_user">Socks उपयोगकर्ता:</string>
<string name="udp_in_tcp">TCP पर UDP रिले</string>

<string name="user_initiated_conn">उपयोगकर्ता द्वारा आरंभ किया गया कनेक्शन</string>
<string name="vpn_description">अनुकूल URL सक्षम करें। खतरों को ब्लॉक करें।</string>
<string name="vpn_starting">VPN शुरू हो रहा है...</string>
<string name="vpn_stopping">VPN बंद हो रहा है...</string>

<string name="watchdog_channel_desc">यह सुनिश्चित करता है कि स्क्रीन बंद होने पर सेवाएं सक्रिय रहें।</string>
<string name="watchdog_channel_name">K2Go वॉचडॉग सेवा</string>
Expand Down
11 changes: 0 additions & 11 deletions controller/app/src/main/res/values-pt/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
<string name="system_ready">Sistema pronto...\n</string>

<string name="hotspot">Hotspot</string>
<string name="tunnel">Túnel</string>
<string name="wifi">Wi-Fi</string>

<string name="qr_error_no_network">Ative o Wi-Fi ou Hotspot para compartilhar conteúdo pela rede.</string>
Expand All @@ -104,26 +103,16 @@
<string name="qr_title_hotspot">Rede Hotspot</string>
<string name="qr_title_wifi">Rede Wi-Fi</string>

<string name="control_disable">Desativar Safe Pocket Web</string>
<string name="control_enable">Ativar Safe Pocket Web</string>

<string name="global">Global</string>
<string name="ipv4">IPv4</string>
<string name="ipv6">IPv6</string>
<string name="maintenance_mode">Modo de Manutenção</string>
<string name="maintenance_warning_msg">Desative o Safe Pocket Web para poder modificar as configurações.</string>
<string name="remote_dns">DNS Remoto</string>
<string name="socks_addr">Endereço Socks:</string>
<string name="socks_pass">Senha Socks:</string>
<string name="socks_port">Porta Socks:</string>
<string name="socks_udp_addr">Endereço UDP Socks:</string>
<string name="socks_user">Usuário Socks:</string>
<string name="udp_in_tcp">Relé UDP sobre TCP</string>

<string name="user_initiated_conn">Conexão iniciada pelo usuário</string>
<string name="vpn_description">Ative URLs amigáveis. Bloqueie as ameaças.</string>
<string name="vpn_starting">Iniciando VPN...</string>
<string name="vpn_stopping">Parando VPN...</string>

<string name="watchdog_channel_desc">Garante que os serviços permaneçam ativos quando a tela estiver desligada.</string>
<string name="watchdog_channel_name">Serviço K2Go Watchdog</string>
Expand Down
11 changes: 0 additions & 11 deletions controller/app/src/main/res/values-ru-rRU/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
<string name="system_ready">Система готова...\n</string>

<string name="hotspot">Точка доступа</string>
<string name="tunnel">Туннель</string>
<string name="wifi">Wi-Fi</string>

<string name="qr_error_no_network">Включите Wi-Fi или Точку доступа, чтобы поделиться контентом по сети.</string>
Expand All @@ -104,26 +103,16 @@
<string name="qr_title_hotspot">Сеть Точки доступа</string>
<string name="qr_title_wifi">Сеть Wi-Fi</string>

<string name="control_disable">Отключить Safe Pocket Web</string>
<string name="control_enable">Включить Safe Pocket Web</string>

<string name="global">Глобально</string>
<string name="ipv4">IPv4</string>
<string name="ipv6">IPv6</string>
<string name="maintenance_mode">Режим обслуживания</string>
<string name="maintenance_warning_msg">Отключите Safe Pocket Web для изменения настроек.</string>
<string name="remote_dns">Удаленный DNS</string>
<string name="socks_addr">Адрес Socks:</string>
<string name="socks_pass">Пароль Socks:</string>
<string name="socks_port">Порт Socks:</string>
<string name="socks_udp_addr">UDP адрес Socks:</string>
<string name="socks_user">Пользователь Socks:</string>
<string name="udp_in_tcp">UDP-ретрансляция через TCP</string>

<string name="user_initiated_conn">Соединение инициировано пользователем</string>
<string name="vpn_description">Включить безопасные URL. Блокировать угрозы.</string>
<string name="vpn_starting">Запуск VPN...</string>
<string name="vpn_stopping">Остановка VPN...</string>

<string name="watchdog_channel_desc">Гарантирует, что службы остаются активными при выключенном экране.</string>
<string name="watchdog_channel_name">Служба K2Go Watchdog</string>
Expand Down
4 changes: 0 additions & 4 deletions controller/app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@
<color name="black">#000000</color>
<color name="background_dark">#121212</color>

<color name="btn_vpn_on">#C62828</color>
<color name="btn_vpn_off">#2E7D32</color>
<color name="btn_explore_ready">#F57C00</color>
<color name="btn_explore_disabled">#B0B0B0</color>
<color name="btn_vpn_on_dim">#EF9A9A</color>
<color name="btn_vpn_off_dim">#A5D6A7</color>

<color name="section_header_bg">#333333</color>
<color name="section_body_bg_light">#F5F5F5</color>
Expand Down
11 changes: 0 additions & 11 deletions controller/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
<string name="system_ready">System ready...\n</string>

<string name="hotspot">Hotspot</string>
<string name="tunnel">Tunnel</string>
<string name="wifi">Wi-Fi</string>

<string name="qr_error_no_network">Enable Wi-Fi or Hotspot to share content over the network.</string>
Expand All @@ -106,8 +105,6 @@
<string name="qr_title_wifi">Wi-Fi Network</string>


<string name="control_disable">Disable Safe Pocket Web</string>
<string name="control_enable">Enable Safe Pocket Web</string>

<string name="setup_dns">Setup DNS</string>
<string name="network_advanced_label">Advanced settings</string>
Expand All @@ -122,17 +119,9 @@
<string name="maintenance_mode">Maintenance Mode</string>
<string name="maintenance_warning_msg">Disable Safe Pocket Web in order to modify</string>
<string name="remote_dns">Remote DNS</string>
<string name="socks_addr">Socks Address:</string>
<string name="socks_pass">Socks Password:</string>
<string name="socks_port">Socks Port:</string>
<string name="socks_udp_addr">Socks UDP Address:</string>
<string name="socks_user">Socks Username:</string>
<string name="udp_in_tcp">UDP relay over TCP</string>

<string name="user_initiated_conn">User initiated connection</string>
<string name="vpn_description">Enable friendly URLs. Lock out the threats.</string>
<string name="vpn_starting">VPN Starting...</string>
<string name="vpn_stopping">VPN Stopping...</string>


<string name="watchdog_channel_desc">Ensures services remain active when screen is off.</string>
Expand Down