Skip to content

Commit e07b6aa

Browse files
luisguzman-adfaluisguzman-adfa
authored
Merge pull request #138 from appdevforall/feat/ADFA-4553-remove-tunnel-resources
ADFA-4553 (slice 2b): remove the tunnel/SOCKS layout, strings and colors
2 parents c66c01c + e634fb7 commit e07b6aa

8 files changed

Lines changed: 0 additions & 198 deletions

File tree

‎controller/app/src/main/res/layout/fragment_usage.xml‎

Lines changed: 0 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -74,60 +74,8 @@
7474
android:textStyle="bold" />
7575
</LinearLayout>
7676

77-
<LinearLayout
78-
android:id="@+id/dash_tunnel"
79-
android:layout_width="0dp"
80-
android:layout_height="wrap_content"
81-
android:layout_weight="1"
82-
android:gravity="center"
83-
android:orientation="horizontal"
84-
android:background="?android:attr/selectableItemBackground"
85-
android:padding="12dp"
86-
android:visibility="gone">
87-
88-
<View
89-
android:id="@+id/led_tunnel"
90-
android:layout_width="10dp"
91-
android:layout_height="10dp"
92-
android:layout_marginEnd="8dp"
93-
android:background="@drawable/led_on_green" />
94-
95-
<TextView
96-
android:layout_width="wrap_content"
97-
android:layout_height="wrap_content"
98-
android:text="@string/tunnel"
99-
android:textColor="@color/dash_text_primary"
100-
android:textStyle="bold" />
101-
</LinearLayout>
10277
</LinearLayout>
10378

104-
<Button
105-
android:id="@+id/control"
106-
android:layout_width="match_parent"
107-
android:layout_height="90dp"
108-
android:layout_marginHorizontal="12dp"
109-
android:text="@string/control_enable"
110-
android:textSize="20sp"
111-
android:textStyle="bold"
112-
android:textColor="@color/text_on_accent"
113-
android:background="@drawable/rounded_button"
114-
android:backgroundTint="@color/btn_vpn_off"
115-
android:textAllCaps="false"
116-
android:visibility="gone" />
117-
118-
<TextView
119-
android:id="@+id/control_description"
120-
android:layout_width="match_parent"
121-
android:layout_height="wrap_content"
122-
android:layout_marginHorizontal="12dp"
123-
android:text="@string/vpn_description"
124-
android:textSize="13sp"
125-
android:gravity="center"
126-
android:textColor="?android:attr/textColorSecondary"
127-
android:layout_marginTop="8dp"
128-
android:layout_marginBottom="12dp"
129-
android:visibility="gone" />
130-
13179
<Button
13280
android:id="@+id/btnBrowseContent"
13381
android:layout_width="match_parent"
@@ -216,39 +164,6 @@
216164
android:textColor="@color/text_on_accent"
217165
android:textAllCaps="false" />
218166

219-
<TextView
220-
android:layout_width="wrap_content"
221-
android:layout_height="wrap_content"
222-
android:text="@string/socks_addr"
223-
android:textColor="?android:attr/textColorSecondary"
224-
android:textSize="12sp"
225-
android:visibility="gone" />
226-
227-
<EditText
228-
android:id="@+id/socks_addr"
229-
android:layout_width="match_parent"
230-
android:layout_height="wrap_content"
231-
android:singleLine="true"
232-
android:textColor="?android:attr/textColorPrimary"
233-
android:visibility="gone" />
234-
235-
<TextView
236-
android:layout_width="wrap_content"
237-
android:layout_height="wrap_content"
238-
android:text="@string/socks_port"
239-
android:textColor="?android:attr/textColorSecondary"
240-
android:textSize="12sp"
241-
android:visibility="gone" />
242-
243-
<EditText
244-
android:id="@+id/socks_port"
245-
android:layout_width="match_parent"
246-
android:layout_height="wrap_content"
247-
android:singleLine="true"
248-
android:inputType="number"
249-
android:textColor="?android:attr/textColorPrimary"
250-
android:visibility="gone" />
251-
252167
<TextView
253168
android:id="@+id/adv_config_label"
254169
android:layout_width="match_parent"
@@ -268,49 +183,6 @@
268183
android:layout_height="wrap_content"
269184
android:visibility="gone">
270185

271-
<TextView
272-
android:layout_width="wrap_content"
273-
android:layout_height="wrap_content"
274-
android:text="@string/socks_udp_addr"
275-
android:textColor="?android:attr/textColorSecondary"
276-
android:textSize="11sp" />
277-
278-
<EditText
279-
android:id="@+id/socks_udp_addr"
280-
android:layout_width="match_parent"
281-
android:layout_height="wrap_content"
282-
android:singleLine="true"
283-
android:textColor="?android:attr/textColorPrimary" />
284-
285-
<TextView
286-
android:layout_width="wrap_content"
287-
android:layout_height="wrap_content"
288-
android:text="@string/socks_user"
289-
android:textColor="?android:attr/textColorSecondary"
290-
android:textSize="11sp" />
291-
292-
<EditText
293-
android:id="@+id/socks_user"
294-
android:layout_width="match_parent"
295-
android:layout_height="wrap_content"
296-
android:singleLine="true"
297-
android:textColor="?android:attr/textColorPrimary" />
298-
299-
<TextView
300-
android:layout_width="wrap_content"
301-
android:layout_height="wrap_content"
302-
android:text="@string/socks_pass"
303-
android:textColor="?android:attr/textColorSecondary"
304-
android:textSize="11sp" />
305-
306-
<EditText
307-
android:id="@+id/socks_pass"
308-
android:layout_width="match_parent"
309-
android:layout_height="wrap_content"
310-
android:singleLine="true"
311-
android:inputType="textPassword"
312-
android:textColor="?android:attr/textColorPrimary" />
313-
314186
<CheckBox
315187
android:id="@+id/udp_in_tcp"
316188
android:layout_width="wrap_content"

‎controller/app/src/main/res/values-es/strings.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
<string name="system_ready">Sistema listo...\n</string>
9191

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

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

102-
<string name="control_disable">Desactivar Safe Pocket Web</string>
103-
<string name="control_enable">Activar Safe Pocket Web</string>
104101

105102
<string name="global">Global</string>
106103
<string name="ipv4">IPv4</string>
107104
<string name="ipv6">IPv6</string>
108105
<string name="maintenance_mode">Modo Mantenimiento</string>
109106
<string name="maintenance_warning_msg">Desactive Safe Pocket Web para poder modificar configuraciones.</string>
110107
<string name="remote_dns">DNS Remoto</string>
111-
<string name="socks_addr">Dirección Socks:</string>
112-
<string name="socks_pass">Contraseña Socks:</string>
113-
<string name="socks_port">Puerto Socks:</string>
114-
<string name="socks_udp_addr">Dirección UDP Socks:</string>
115-
<string name="socks_user">Usuario Socks:</string>
116108
<string name="udp_in_tcp">Relé UDP sobre TCP</string>
117109

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

123112
<string name="watchdog_channel_desc">Asegura que los servicios permanezcan activos cuando la pantalla está apagada.</string>
124113
<string name="watchdog_channel_name">Servicio K2Go Watchdog</string>

‎controller/app/src/main/res/values-fr/strings.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<string name="system_ready">Système prêt...\n</string>
9696

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

101100
<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>
@@ -104,26 +103,16 @@
104103
<string name="qr_title_hotspot">Réseau du Point d\'accès</string>
105104
<string name="qr_title_wifi">Réseau Wi-Fi</string>
106105

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

110107
<string name="global">Global</string>
111108
<string name="ipv4">IPv4</string>
112109
<string name="ipv6">IPv6</string>
113110
<string name="maintenance_mode">Mode de maintenance</string>
114111
<string name="maintenance_warning_msg">Désactivez Safe Pocket Web pour pouvoir modifier les paramètres.</string>
115112
<string name="remote_dns">DNS distant</string>
116-
<string name="socks_addr">Adresse Socks :</string>
117-
<string name="socks_pass">Mot de passe Socks :</string>
118-
<string name="socks_port">Port Socks :</string>
119-
<string name="socks_udp_addr">Adresse UDP Socks :</string>
120-
<string name="socks_user">Utilisateur Socks :</string>
121113
<string name="udp_in_tcp">Relais UDP sur TCP</string>
122114

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

128117
<string name="watchdog_channel_desc">Garantit que les services restent actifs lorsque l\'écran est éteint.</string>
129118
<string name="watchdog_channel_name">Service K2Go Watchdog</string>

‎controller/app/src/main/res/values-hi/strings.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<string name="system_ready">सिस्टम तैयार...\n</string>
9696

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

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

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

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

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

128117
<string name="watchdog_channel_desc">यह सुनिश्चित करता है कि स्क्रीन बंद होने पर सेवाएं सक्रिय रहें।</string>
129118
<string name="watchdog_channel_name">K2Go वॉचडॉग सेवा</string>

‎controller/app/src/main/res/values-pt/strings.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<string name="system_ready">Sistema pronto...\n</string>
9696

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

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

107-
<string name="control_disable">Desativar Safe Pocket Web</string>
108-
<string name="control_enable">Ativar Safe Pocket Web</string>
109106

110107
<string name="global">Global</string>
111108
<string name="ipv4">IPv4</string>
112109
<string name="ipv6">IPv6</string>
113110
<string name="maintenance_mode">Modo de Manutenção</string>
114111
<string name="maintenance_warning_msg">Desative o Safe Pocket Web para poder modificar as configurações.</string>
115112
<string name="remote_dns">DNS Remoto</string>
116-
<string name="socks_addr">Endereço Socks:</string>
117-
<string name="socks_pass">Senha Socks:</string>
118-
<string name="socks_port">Porta Socks:</string>
119-
<string name="socks_udp_addr">Endereço UDP Socks:</string>
120-
<string name="socks_user">Usuário Socks:</string>
121113
<string name="udp_in_tcp">Relé UDP sobre TCP</string>
122114

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

128117
<string name="watchdog_channel_desc">Garante que os serviços permaneçam ativos quando a tela estiver desligada.</string>
129118
<string name="watchdog_channel_name">Serviço K2Go Watchdog</string>

‎controller/app/src/main/res/values-ru-rRU/strings.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<string name="system_ready">Система готова...\n</string>
9696

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

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

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

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

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

128117
<string name="watchdog_channel_desc">Гарантирует, что службы остаются активными при выключенном экране.</string>
129118
<string name="watchdog_channel_name">Служба K2Go Watchdog</string>

‎controller/app/src/main/res/values/colors.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
<color name="black">#000000</color>
99
<color name="background_dark">#121212</color>
1010

11-
<color name="btn_vpn_on">#C62828</color>
12-
<color name="btn_vpn_off">#2E7D32</color>
1311
<color name="btn_explore_ready">#F57C00</color>
1412
<color name="btn_explore_disabled">#B0B0B0</color>
15-
<color name="btn_vpn_on_dim">#EF9A9A</color>
16-
<color name="btn_vpn_off_dim">#A5D6A7</color>
1713

1814
<color name="section_header_bg">#333333</color>
1915
<color name="section_body_bg_light">#F5F5F5</color>

‎controller/app/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
<string name="system_ready">System ready...\n</string>
9797

9898
<string name="hotspot">Hotspot</string>
99-
<string name="tunnel">Tunnel</string>
10099
<string name="wifi">Wi-Fi</string>
101100

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

108107

109-
<string name="control_disable">Disable Safe Pocket Web</string>
110-
<string name="control_enable">Enable Safe Pocket Web</string>
111108

112109
<string name="setup_dns">Setup DNS</string>
113110
<string name="network_advanced_label">Advanced settings</string>
@@ -122,17 +119,9 @@
122119
<string name="maintenance_mode">Maintenance Mode</string>
123120
<string name="maintenance_warning_msg">Disable Safe Pocket Web in order to modify</string>
124121
<string name="remote_dns">Remote DNS</string>
125-
<string name="socks_addr">Socks Address:</string>
126-
<string name="socks_pass">Socks Password:</string>
127-
<string name="socks_port">Socks Port:</string>
128-
<string name="socks_udp_addr">Socks UDP Address:</string>
129-
<string name="socks_user">Socks Username:</string>
130122
<string name="udp_in_tcp">UDP relay over TCP</string>
131123

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

137126

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

0 commit comments

Comments
 (0)