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/drawable-hdpi/splash_background.png | Bin 0 -> 66619 bytes .../main/res/drawable-land-hdpi/splash_background.png | Bin 0 -> 68637 bytes .../main/res/drawable-land-ldpi/splash_background.png | Bin 0 -> 43127 bytes .../main/res/drawable-land-mdpi/splash_background.png | Bin 0 -> 33924 bytes .../res/drawable-land-xxxhdpi/splash_background.png | Bin 0 -> 182692 bytes app/src/main/res/drawable-ldpi/mask.png | Bin 0 -> 8743 bytes app/src/main/res/drawable-ldpi/splash_background.png | Bin 0 -> 41839 bytes app/src/main/res/drawable-mdpi/mask.png | Bin 0 -> 6324 bytes app/src/main/res/drawable-mdpi/splash_background.png | Bin 0 -> 32718 bytes app/src/main/res/drawable-xxxhdpi/mask.png | Bin 0 -> 43251 bytes .../main/res/drawable-xxxhdpi/splash_background.png | Bin 0 -> 187062 bytes app/src/main/res/drawable/splash_page.xml | 10 ++++++++++ app/src/main/res/values/attrs.xml | 8 -------- app/src/main/res/values/colors.xml | 5 +++++ app/src/main/res/values/themes.xml | 12 ++++++++++++ 15 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/splash_background.png create mode 100644 app/src/main/res/drawable-land-hdpi/splash_background.png create mode 100644 app/src/main/res/drawable-land-ldpi/splash_background.png create mode 100644 app/src/main/res/drawable-land-mdpi/splash_background.png create mode 100644 app/src/main/res/drawable-land-xxxhdpi/splash_background.png create mode 100644 app/src/main/res/drawable-ldpi/mask.png create mode 100644 app/src/main/res/drawable-ldpi/splash_background.png create mode 100644 app/src/main/res/drawable-mdpi/mask.png create mode 100644 app/src/main/res/drawable-mdpi/splash_background.png create mode 100644 app/src/main/res/drawable-xxxhdpi/mask.png create mode 100644 app/src/main/res/drawable-xxxhdpi/splash_background.png create mode 100644 app/src/main/res/drawable/splash_page.xml 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') diff --git a/app/src/main/res/drawable-hdpi/splash_background.png b/app/src/main/res/drawable-hdpi/splash_background.png new file mode 100644 index 00000000..11dfd005 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/splash_background.png differ diff --git a/app/src/main/res/drawable-land-hdpi/splash_background.png b/app/src/main/res/drawable-land-hdpi/splash_background.png new file mode 100644 index 00000000..c2e123ce Binary files /dev/null and b/app/src/main/res/drawable-land-hdpi/splash_background.png differ diff --git a/app/src/main/res/drawable-land-ldpi/splash_background.png b/app/src/main/res/drawable-land-ldpi/splash_background.png new file mode 100644 index 00000000..29f9e7cb Binary files /dev/null and b/app/src/main/res/drawable-land-ldpi/splash_background.png differ diff --git a/app/src/main/res/drawable-land-mdpi/splash_background.png b/app/src/main/res/drawable-land-mdpi/splash_background.png new file mode 100644 index 00000000..bf43f632 Binary files /dev/null and b/app/src/main/res/drawable-land-mdpi/splash_background.png differ diff --git a/app/src/main/res/drawable-land-xxxhdpi/splash_background.png b/app/src/main/res/drawable-land-xxxhdpi/splash_background.png new file mode 100644 index 00000000..12a9e8a8 Binary files /dev/null and b/app/src/main/res/drawable-land-xxxhdpi/splash_background.png differ diff --git a/app/src/main/res/drawable-ldpi/mask.png b/app/src/main/res/drawable-ldpi/mask.png new file mode 100644 index 00000000..4e22d99f Binary files /dev/null and b/app/src/main/res/drawable-ldpi/mask.png differ diff --git a/app/src/main/res/drawable-ldpi/splash_background.png b/app/src/main/res/drawable-ldpi/splash_background.png new file mode 100644 index 00000000..eaae5efb Binary files /dev/null and b/app/src/main/res/drawable-ldpi/splash_background.png differ diff --git a/app/src/main/res/drawable-mdpi/mask.png b/app/src/main/res/drawable-mdpi/mask.png new file mode 100644 index 00000000..e53cb15c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/mask.png differ diff --git a/app/src/main/res/drawable-mdpi/splash_background.png b/app/src/main/res/drawable-mdpi/splash_background.png new file mode 100644 index 00000000..4df57929 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/splash_background.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/mask.png b/app/src/main/res/drawable-xxxhdpi/mask.png new file mode 100644 index 00000000..4297d90c Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/mask.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/splash_background.png b/app/src/main/res/drawable-xxxhdpi/splash_background.png new file mode 100644 index 00000000..4ad0e2c3 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/splash_background.png differ diff --git a/app/src/main/res/drawable/splash_page.xml b/app/src/main/res/drawable/splash_page.xml new file mode 100644 index 00000000..1d8a6bf6 --- /dev/null +++ b/app/src/main/res/drawable/splash_page.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file 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') 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/drawable-hdpi/drawer_shadow.9.png | Bin 0 -> 161 bytes app/src/main/res/drawable-hdpi/ic_drawer.png | Bin 0 -> 2829 bytes app/src/main/res/drawable-mdpi/drawer_shadow.9.png | Bin 0 -> 142 bytes app/src/main/res/drawable-mdpi/ic_drawer.png | Bin 0 -> 2820 bytes .../main/res/drawable-xhdpi/drawer_shadow.9.png | Bin 0 -> 174 bytes app/src/main/res/drawable-xhdpi/ic_drawer.png | Bin 0 -> 2836 bytes .../main/res/drawable-xxhdpi/drawer_shadow.9.png | Bin 0 -> 208 bytes app/src/main/res/drawable-xxhdpi/ic_drawer.png | Bin 0 -> 202 bytes app/src/main/res/layout/activity_main.xml | 42 +++++++++++++++++++++ app/src/main/res/layout/drawer_main.xml | 22 +++++++++++ app/src/main/res/layout/fragment_main.xml | 16 ++++++++ app/src/main/res/menu/main.xml | 13 +++++++ app/src/main/res/values-w820dp/dimens.xml | 6 +++ app/src/main/res/values/dimens.xml | 10 ++++- app/src/main/res/values/strings.xml | 14 ++++++- app/src/main/res/values/themes.xml | 2 +- 16 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/drawer_shadow.9.png create mode 100644 app/src/main/res/drawable-hdpi/ic_drawer.png create mode 100644 app/src/main/res/drawable-mdpi/drawer_shadow.9.png create mode 100644 app/src/main/res/drawable-mdpi/ic_drawer.png create mode 100644 app/src/main/res/drawable-xhdpi/drawer_shadow.9.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_drawer.png create mode 100644 app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_drawer.png create mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/layout/drawer_main.xml create mode 100644 app/src/main/res/layout/fragment_main.xml create mode 100644 app/src/main/res/menu/main.xml create mode 100644 app/src/main/res/values-w820dp/dimens.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png new file mode 100644 index 00000000..236bff55 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png new file mode 100644 index 00000000..c59f601c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_drawer.png differ diff --git a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png new file mode 100644 index 00000000..ffe3a28d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png new file mode 100644 index 00000000..1ed2c56e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_drawer.png differ diff --git a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png new file mode 100644 index 00000000..fabe9d96 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png new file mode 100644 index 00000000..a5fa74de Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_drawer.png differ diff --git a/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png new file mode 100644 index 00000000..b91e9d7f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/app/src/main/res/drawable-xxhdpi/ic_drawer.png new file mode 100644 index 00000000..9c4685d6 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_drawer.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..28c23503 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml new file mode 100644 index 00000000..9327d03f --- /dev/null +++ b/app/src/main/res/layout/drawer_main.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml new file mode 100644 index 00000000..31dbd11e --- /dev/null +++ b/app/src/main/res/layout/fragment_main.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml new file mode 100644 index 00000000..56f43959 --- /dev/null +++ b/app/src/main/res/menu/main.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 00000000..63fc8164 --- /dev/null +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + 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 41d8aeef77d93db93dd508045f1d05228480067a Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 12 Dec 2017 15:39:12 +0100 Subject: Use VectorDrawable instead of Images --- .../main/res/drawable-hdpi/splash_background.png | Bin 66619 -> 0 bytes .../res/drawable-land-hdpi/splash_background.png | Bin 68637 -> 0 bytes .../res/drawable-land-ldpi/splash_background.png | Bin 43127 -> 0 bytes .../res/drawable-land-mdpi/splash_background.png | Bin 33924 -> 0 bytes .../drawable-land-xxxhdpi/splash_background.png | Bin 182692 -> 0 bytes .../main/res/drawable-ldpi/splash_background.png | Bin 41839 -> 0 bytes .../main/res/drawable-mdpi/splash_background.png | Bin 32718 -> 0 bytes .../res/drawable-xxxhdpi/splash_background.png | Bin 187062 -> 0 bytes app/src/main/res/drawable/ic_colorsquare.xml | 52 +++++++++++++++++++++ app/src/main/res/drawable/splash_page.xml | 3 +- 10 files changed, 54 insertions(+), 1 deletion(-) delete mode 100644 app/src/main/res/drawable-hdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-land-hdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-land-ldpi/splash_background.png delete mode 100644 app/src/main/res/drawable-land-mdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-land-xxxhdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-ldpi/splash_background.png delete mode 100644 app/src/main/res/drawable-mdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/splash_background.png create mode 100644 app/src/main/res/drawable/ic_colorsquare.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/drawable-hdpi/splash_background.png b/app/src/main/res/drawable-hdpi/splash_background.png deleted file mode 100644 index 11dfd005..00000000 Binary files a/app/src/main/res/drawable-hdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-land-hdpi/splash_background.png b/app/src/main/res/drawable-land-hdpi/splash_background.png deleted file mode 100644 index c2e123ce..00000000 Binary files a/app/src/main/res/drawable-land-hdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-land-ldpi/splash_background.png b/app/src/main/res/drawable-land-ldpi/splash_background.png deleted file mode 100644 index 29f9e7cb..00000000 Binary files a/app/src/main/res/drawable-land-ldpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-land-mdpi/splash_background.png b/app/src/main/res/drawable-land-mdpi/splash_background.png deleted file mode 100644 index bf43f632..00000000 Binary files a/app/src/main/res/drawable-land-mdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-land-xxxhdpi/splash_background.png b/app/src/main/res/drawable-land-xxxhdpi/splash_background.png deleted file mode 100644 index 12a9e8a8..00000000 Binary files a/app/src/main/res/drawable-land-xxxhdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/splash_background.png b/app/src/main/res/drawable-ldpi/splash_background.png deleted file mode 100644 index eaae5efb..00000000 Binary files a/app/src/main/res/drawable-ldpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/splash_background.png b/app/src/main/res/drawable-mdpi/splash_background.png deleted file mode 100644 index 4df57929..00000000 Binary files a/app/src/main/res/drawable-mdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/splash_background.png b/app/src/main/res/drawable-xxxhdpi/splash_background.png deleted file mode 100644 index 4ad0e2c3..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_colorsquare.xml b/app/src/main/res/drawable/ic_colorsquare.xml new file mode 100644 index 00000000..4b60e9dc --- /dev/null +++ b/app/src/main/res/drawable/ic_colorsquare.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/splash_page.xml b/app/src/main/res/drawable/splash_page.xml index 1d8a6bf6..0a083c7e 100644 --- a/app/src/main/res/drawable/splash_page.xml +++ b/app/src/main/res/drawable/splash_page.xml @@ -1,7 +1,8 @@ - + -- 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/layout/drawer_main.xml | 5 +++-- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/dimens.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml index 9327d03f..b2254d2a 100644 --- a/app/src/main/res/layout/drawer_main.xml +++ b/app/src/main/res/layout/drawer_main.xml @@ -3,17 +3,18 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" + android:background="@color/colorBackground" tools:context="se.leap.bitmaskclient.NavigationDrawerFragment"> 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 1312c0dab26508f41246ea925176709fffeb465c Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 12 Dec 2017 20:23:11 +0100 Subject: make downward compatible --- app/src/main/res/layout/drawer_main.xml | 37 ++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml index b2254d2a..e1f7b15c 100644 --- a/app/src/main/res/layout/drawer_main.xml +++ b/app/src/main/res/layout/drawer_main.xml @@ -1,23 +1,40 @@ - + android:layout_height="wrap_content"> - + + + + + + + + android:layout_height="match_parent" /> - \ 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/layout-sw600dp-port/f_log.xml | 45 ++++++++++++++++ app/src/main/res/layout-sw600dp/f_log.xml | 34 ++++++++++++ app/src/main/res/layout-v21/f_log.xml | 37 +++++++++++++ app/src/main/res/layout/drawer_main.xml | 20 +++++-- app/src/main/res/layout/f_log_sliders.xml | 73 ++++++++++++++++++++++++++ app/src/main/res/menu/f_log.xml | 39 ++++++++++++++ app/src/main/res/values/strings.xml | 4 +- 7 files changed, 246 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/layout-sw600dp-port/f_log.xml create mode 100644 app/src/main/res/layout-sw600dp/f_log.xml create mode 100644 app/src/main/res/layout-v21/f_log.xml create mode 100644 app/src/main/res/layout/f_log_sliders.xml create mode 100644 app/src/main/res/menu/f_log.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-sw600dp-port/f_log.xml b/app/src/main/res/layout-sw600dp-port/f_log.xml new file mode 100644 index 00000000..7a4b60fe --- /dev/null +++ b/app/src/main/res/layout-sw600dp-port/f_log.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/f_log.xml b/app/src/main/res/layout-sw600dp/f_log.xml new file mode 100644 index 00000000..26f63df4 --- /dev/null +++ b/app/src/main/res/layout-sw600dp/f_log.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-v21/f_log.xml b/app/src/main/res/layout-v21/f_log.xml new file mode 100644 index 00000000..41c72d99 --- /dev/null +++ b/app/src/main/res/layout-v21/f_log.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml index e1f7b15c..a2bda8b6 100644 --- a/app/src/main/res/layout/drawer_main.xml +++ b/app/src/main/res/layout/drawer_main.xml @@ -17,7 +17,7 @@ android:layout_height="match_parent" android:adjustViewBounds="false" android:cropToPadding="false" - android:scaleType="fitStart" + android:scaleType="fitXY" app:srcCompat="@drawable/ic_colorsquare" /> - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/f_log_sliders.xml b/app/src/main/res/layout/f_log_sliders.xml new file mode 100644 index 00000000..4196e243 --- /dev/null +++ b/app/src/main/res/layout/f_log_sliders.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/f_log.xml b/app/src/main/res/menu/f_log.xml new file mode 100644 index 00000000..5e0af56c --- /dev/null +++ b/app/src/main/res/menu/f_log.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + 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') 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 d1d34f0bf995f48dac7781711656b8cb8e387707 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 19 Dec 2017 16:08:49 +0100 Subject: move log fragment layout --- app/src/main/res/layout-sw600dp-port/f_log.xml | 34 +---------------------- app/src/main/res/layout-sw600dp/f_log.xml | 3 +-- app/src/main/res/layout-v21/f_log.xml | 37 -------------------------- app/src/main/res/menu/f_log.xml | 8 ------ 4 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 app/src/main/res/layout-v21/f_log.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-sw600dp-port/f_log.xml b/app/src/main/res/layout-sw600dp-port/f_log.xml index 7a4b60fe..500461b7 100644 --- a/app/src/main/res/layout-sw600dp-port/f_log.xml +++ b/app/src/main/res/layout-sw600dp-port/f_log.xml @@ -8,38 +8,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - tools:context=".LogWindow"> - - - - - - - - - - - - - - + android:orientation="vertical" > \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/f_log.xml b/app/src/main/res/layout-sw600dp/f_log.xml index 26f63df4..9ad30208 100644 --- a/app/src/main/res/layout-sw600dp/f_log.xml +++ b/app/src/main/res/layout-sw600dp/f_log.xml @@ -9,8 +9,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:padding="20dp" - tools:context=".LogWindow"> + android:padding="20dp" > - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/f_log.xml b/app/src/main/res/menu/f_log.xml index 5e0af56c..d30b13cb 100644 --- a/app/src/main/res/menu/f_log.xml +++ b/app/src/main/res/menu/f_log.xml @@ -28,12 +28,4 @@ android:title="@string/send_logfile" android:titleCondensed="@string/send"/> - - -- 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/layout/f_log.xml | 37 +++++++++++++++++++++++++++++++++++++ app/src/main/res/values/strings.xml | 3 +-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/layout/f_log.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/f_log.xml b/app/src/main/res/layout/f_log.xml new file mode 100644 index 00000000..41c72d99 --- /dev/null +++ b/app/src/main/res/layout/f_log.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + \ 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 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 bd99fc61a2e8217c41b70c6f2ff0df87e7008ea0 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Mon, 8 Jan 2018 15:49:34 +0100 Subject: seperate accountList and settingsList in drawer --- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/drawer_main.xml | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 28c23503..de06efc7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -33,7 +33,7 @@ the container. --> + tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"> - + android:layout_height="wrap_content" /> - + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_alignParentBottom="true" /> - + \ No newline at end of file -- 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-es/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 192fb5a7..11fe31a1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -31,7 +31,7 @@ Por favor, introduce tu usuario contraseña Mensaje al usuario - Acerca de Bitmask" + Acerca de Bitmask" Inténtalo de nuevo: error en el servidor. Usuario o contraseña incorrectos. Al menos 8 caracteres. 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/layout-xlarge/provider_detail_fragment.xml | 5 +++++ app/src/main/res/layout/provider_detail_fragment.xml | 5 +++++ app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-xlarge/provider_detail_fragment.xml b/app/src/main/res/layout-xlarge/provider_detail_fragment.xml index 4abbaa17..860f99d9 100644 --- a/app/src/main/res/layout-xlarge/provider_detail_fragment.xml +++ b/app/src/main/res/layout-xlarge/provider_detail_fragment.xml @@ -40,4 +40,9 @@ android:textStyle="normal" android:textAppearance="?android:attr/textAppearanceSmall" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/provider_detail_fragment.xml b/app/src/main/res/layout/provider_detail_fragment.xml index 3b35bae7..3db32b2c 100644 --- a/app/src/main/res/layout/provider_detail_fragment.xml +++ b/app/src/main/res/layout/provider_detail_fragment.xml @@ -38,4 +38,9 @@ android:textStyle="normal" android:textAppearance="?android:attr/textAppearanceSmall" /> + + \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 11fe31a1..6355ce62 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -25,7 +25,7 @@ Dominio El dominio está bien formado Dominio no válido - Detalles del proveedor + Detalles del proveedor Utilizar sin registrarse usuario Por favor, introduce tu usuario 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/layout/a_login.xml | 29 +++++++++++++++++ app/src/main/res/layout/a_signup.xml | 29 +++++++++++++++++ .../main/res/layout/provider_credentials_login.xml | 36 ++++++++++++++++++++++ .../res/layout/provider_credentials_signup.xml | 24 +++++++++++++++ app/src/main/res/layout/provider_header.xml | 17 ++++++++++ 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 ++++- 9 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/layout/a_login.xml create mode 100644 app/src/main/res/layout/a_signup.xml create mode 100644 app/src/main/res/layout/provider_credentials_login.xml create mode 100644 app/src/main/res/layout/provider_credentials_signup.xml create mode 100644 app/src/main/res/layout/provider_header.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/a_login.xml b/app/src/main/res/layout/a_login.xml new file mode 100644 index 00000000..5ecb807c --- /dev/null +++ b/app/src/main/res/layout/a_login.xml @@ -0,0 +1,29 @@ + + + + + + + + + +