From 38796aeb892379b8c2b7e4e1d7af00c4c050e8dc Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Thu, 23 Nov 2017 11:34:52 +0100 Subject: Add Splash StartActivity * added Splash StartActivity to handle updates and initialization * created global Constants * renamed EIP Constants --- app/src/main/res/values/attrs.xml | 8 -------- app/src/main/res/values/colors.xml | 5 +++++ app/src/main/res/values/themes.xml | 12 ++++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 app/src/main/res/values/attrs.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/themes.xml (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml deleted file mode 100644 index cb503b86..00000000 --- a/app/src/main/res/values/attrs.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..9f5d8813 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #8080b0 + #555575 + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 00000000..80607409 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,12 @@ + + + + + -- cgit v1.2.3 From 9aff13ef2a00fd4fec4756aafac7a033298035b3 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Thu, 7 Dec 2017 13:37:57 +0100 Subject: update production --- app/src/main/res/values/colors.xml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9f5d8813..1818312e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,5 +1,23 @@ - #8080b0 - #555575 + #b39ddb + #ac97d2 + + #ef9a9a + #f48fb1 + #ce93d8 + #b39ddb + #9fa8da + #90caf9 + #81d4fa + #80deea + #80cbc4 + #a5d6a7 + #c5e1a5 + #e6ee9c + #fff59d + #ffe082 + #ffcc80 + #ffab91 + -- cgit v1.2.3 From d835a9b8f38acf1970acc18ce2030f7d5f7377dd Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 28 Nov 2017 01:51:19 +0100 Subject: base for sidebar --- app/src/main/res/values/dimens.xml | 10 ++++++++-- app/src/main/res/values/strings.xml | 14 +++++++++++++- app/src/main/res/values/themes.xml | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index f8fafecd..c92860be 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,5 +1,4 @@ - - @@ -17,4 +16,11 @@ 56dp 16dp 16dp + + 16dp + 16dp + + + 240dp \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 04e83a18..762655b2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,7 +30,7 @@ password User message About Bitmask - Try again: server math error. + Try again: server math error. Incorrect username or password. It should have at least 8 characters. Try again: Client HTTP error @@ -77,4 +77,16 @@ Turn on Turn off Bitmask Log + MainActivity + + Section 1 + Section 2 + Section 3 + + Open navigation drawer + Close navigation drawer + + Example action + + Settings diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 80607409..a64779e5 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ - -- cgit v1.2.3 From 9a35f971f917ef4141923d50deb25fa0d2f9b7dd Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 12 Dec 2017 16:17:03 +0100 Subject: set background --- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/dimens.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1818312e..49415189 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,6 +2,7 @@ #b39ddb #ac97d2 + #fffafafa #ef9a9a #f48fb1 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index c92860be..b9a3890f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -22,5 +22,5 @@ - 240dp + 300dp \ No newline at end of file -- cgit v1.2.3 From 08ec840de9657085d9a0baaab54f6b33e16a12d0 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Thu, 14 Dec 2017 21:21:22 +0100 Subject: add LogFragment --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 762655b2..6d63c619 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -77,9 +77,9 @@ Turn on Turn off Bitmask Log - MainActivity + Bitmask - Section 1 + Log Section 2 Section 3 -- cgit v1.2.3 From f10380f7d8bc85d8127328a9d9c092bc109bb340 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Thu, 14 Dec 2017 21:41:46 +0100 Subject: add missing files --- app/src/main/res/values/themes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 80607409..a64779e5 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ - -- cgit v1.2.3 From 4f7200c55032d17c9bdbdb30cfd83dc757c63fe7 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 19 Dec 2017 17:37:57 +0100 Subject: adjust Fragments --- app/src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c82fad35..c854948c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -81,8 +81,7 @@ Bitmask Log - Section 2 - Section 3 + VPN Open navigation drawer Close navigation drawer -- cgit v1.2.3 From 245982bdb6fda879827ab3c89617b8dd591fb7f4 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Mon, 8 Jan 2018 16:11:23 +0100 Subject: AboutActivity to AboutFragment --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c854948c..38e47f1d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -29,7 +29,7 @@ Please enter your username password User message - About Bitmask + About Bitmask Try again: server math error. Incorrect username or password. It should have at least 8 characters. -- cgit v1.2.3 From 3addd20598f7fee2d41a24d64b375a2f63874457 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 9 Jan 2018 14:02:57 +0100 Subject: create ProviderDetail Activity --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 38e47f1d..22736245 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,7 +23,7 @@ Domain name It seems your URL is well formed It seems your URL is not well formed - Provider details + Provider details Use anonymously username Please enter your username -- cgit v1.2.3 From 8806e6ae477e0b20806851f5f8f3c0141a63ad9d Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 9 Jan 2018 19:54:57 +0100 Subject: create LoginActivity and SignUpActivity --- app/src/main/res/values/colors.xml | 2 ++ app/src/main/res/values/strings.xml | 3 +++ app/src/main/res/values/styles.xml | 5 +++++ app/src/main/res/values/themes.xml | 8 +++++++- 4 files changed, 17 insertions(+), 1 deletion(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 49415189..a8a63e4b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,6 +3,8 @@ #b39ddb #ac97d2 #fffafafa + #ef9a9a + #a5d6a7 #ef9a9a #f48fb1 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 22736245..134d67ab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,7 +27,10 @@ Use anonymously username Please enter your username + Please enter your password password + Passwords match + Passwords do not match User message About Bitmask Try again: server math error. diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4cdf2c00..b4e81bc4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -59,4 +59,9 @@ true @null + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index a64779e5..76cfd866 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,12 +1,18 @@ - + + -- cgit v1.2.3 From d9d7e4edefb4ea4337e891125ab569db6a4424a5 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Sat, 13 Jan 2018 17:29:19 +0100 Subject: add padding to f_log --- app/src/main/res/values/dimens.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index b9a3890f..3e06cbe2 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -16,7 +16,9 @@ 56dp 16dp 16dp + + 16dp 16dp 16dp -- cgit v1.2.3 From 2a354dced3aae7aa5e0ce516bcc3e4589642a587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 16 Jan 2018 09:45:44 +0100 Subject: Spelling: Marked nouns, whitespace, upgrade, : Bigversal --- app/src/main/res/values/strings.xml | 42 +++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5b9aabef..e05e0afd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,26 +3,26 @@ Retry Source code available at https://0xacab.org/leap/bitmask_android - Tracker available at https://0xacab.org/leap/bitmask_android/issues - Translations welcome and appreciated. See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/ + Issue tracker available at https://0xacab.org/leap/bitmask_android/issues + Translations welcome and appreciated. See our Transifex project at https://www.transifex.com/projects/p/bitmask-android/ Switch provider info Show connection details Routes: %s - Routes IPv6: %s - The username must not be empty. - Got certificate \'%s\' from Keystore + IPv6 routes: %s + The username can not be empty. + Got certificate \'%s\' from keystore Provider: No provider configured Status unknown. - VPN Encrypted Internet Access + Encrypted VPN Internet Access Select a service provider Add new Provider Add a new service provider Save Domain name - It seems your URL is well formed - It seems your URL is not well formed + The URL is valid + Malformed URL Provider details Use anonymously username @@ -32,14 +32,14 @@ Passwords match Passwords do not match User message - About Bitmask - Try again: server math error. + About + Try again: Server math error. Incorrect username or password. - It should have at least 8 characters. + It must be at least 8 characters long. Try again: Client HTTP error Try again: I/O error Try again: Bad response from the server - Encryption algorithm not found. Please update your OS! + Encryption algorithm not found. Please upgrade Android! Sign Up/Log In Log In Log Out @@ -48,31 +48,31 @@ Configure Exit There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch. - Server is unreachable, please try again. - Security error, update the app or choose another provider. + The server is unreachable, please try again. + Security error, upgrade the app or choose another provider. It doesn\'t seem to be a Bitmask provider. This is not a trusted Bitmask provider. - Service is down. + The service is down. Configuring provider Your anon cert was not downloaded Downloading VPN certificate Updating VPN certificate - "Riseup users: You need to create a separate account to use the VPN service" - Authentication succeeded. + "Riseup users will need to create a separate account to use the VPN service" + Authenticated. Authentication failed. Registration failed. Initiating connection Cancel connection? There is a connection attempt in progress. Do you wish to cancel it? In order to avoid leaking your personal information, please close your browser and start a private window after disconnecting the Encrypted VPN Internet Access. Thanks. - "Not running! Connection not secure!" + "Not running! Insecure connection!" Connection Secure. It seems there is a problem with the provider. Please try another provider, or contact yours. Anonymous is logged in. logged out. - didn\'t log out. Try later, it may be a problem in the network or in the provider. If the problem persists, then wipe Bitmask data from the Android settings + didn\'t log out. Try later, it may be a problem in the network or with the provider. Should it persist, wipe the Bitmask data from the Android settings. have not logged in. is logging in. is logging out. @@ -82,15 +82,11 @@ Stop blocking Bitmask Log Bitmask - Log VPN - Open navigation drawer Close navigation drawer - Example action - Settings Bitmask blocks all outgoing internet traffic. Failed to establish blocking VPN. -- cgit v1.2.3 From 58f13c43e70cad2429c9fa10efbc0b6756798800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Wed, 17 Jan 2018 09:26:39 +0100 Subject: =?UTF-8?q?reverted=20can=20=E2=86=92=20must?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e05e0afd..9536d96e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,7 +10,7 @@ Show connection details Routes: %s IPv6 routes: %s - The username can not be empty. + The username must not be empty. Got certificate \'%s\' from keystore Provider: No provider configured -- cgit v1.2.3