diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable/action_history.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/layout-xlarge/configuration_wizard_activity.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout-xlarge/provider_detail_fragment.xml | 32 | ||||
| -rw-r--r-- | app/src/main/res/layout/a_login.xml | 45 | ||||
| -rw-r--r-- | app/src/main/res/layout/a_signup.xml | 45 | ||||
| -rw-r--r-- | app/src/main/res/layout/configuration_wizard_activity.xml | 40 | ||||
| -rw-r--r-- | app/src/main/res/layout/loading_screen.xml | 41 | ||||
| -rw-r--r-- | app/src/main/res/layout/provider_credentials_login.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout/provider_detail_fragment.xml | 65 | ||||
| -rw-r--r-- | app/src/main/res/layout/provider_header.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/values-v21/styles.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values-v21/themes.xml | 24 | ||||
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values/themes.xml | 8 |
16 files changed, 226 insertions, 126 deletions
diff --git a/app/src/main/res/drawable/action_history.xml b/app/src/main/res/drawable/action_history.xml new file mode 100644 index 00000000..97c7c6dc --- /dev/null +++ b/app/src/main/res/drawable/action_history.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" +android:width="24dp" +android:height="24dp" +android:viewportWidth="24.0" +android:viewportHeight="24.0"> +<path + android:fillColor="#FF000000" + android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/> +</vector>
\ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml index 50bb5d0b..f82377cb 100644 --- a/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml +++ b/app/src/main/res/layout-xlarge/configuration_wizard_activity.xml @@ -3,7 +3,8 @@ android:id="@+id/configuration_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ConfigurationWizard" > + tools:context=".ConfigurationWizard" + style="@style/BitmaskActivity" > <ListView android:id="@+id/provider_list" 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 860f99d9..31538f9f 100644 --- a/app/src/main/res/layout-xlarge/provider_detail_fragment.xml +++ b/app/src/main/res/layout-xlarge/provider_detail_fragment.xml @@ -2,40 +2,22 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" > + android:orientation="vertical" + style="@style/BitmaskActivity" > - <TextView - android:id="@+id/provider_detail_domain" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" - android:layout_marginTop="16dp" - android:textSize="32sp" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textStyle="bold" /> + <include layout="@layout/loading_screen" /> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@+id/provider_detail_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" - android:layout_marginBottom="4dp" android:textSize="24sp" - android:textStyle="italic" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@+id/provider_detail_description" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" - android:layout_marginBottom="4dp" android:textSize="18sp" android:textStyle="normal" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -43,6 +25,8 @@ <ListView android:id="@+id/provider_detail_options" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/standard_margin" + /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/a_login.xml b/app/src/main/res/layout/a_login.xml index 5ecb807c..5b33ec16 100644 --- a/app/src/main/res/layout/a_login.xml +++ b/app/src/main/res/layout/a_login.xml @@ -1,29 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + style="@style/BitmaskActivity"> - <include - layout="@layout/provider_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <include layout="@layout/loading_screen" /> - <include layout="@layout/provider_credentials_login" + <LinearLayout + android:id="@+id/content" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="match_parent" + android:orientation="vertical"> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <include + layout="@layout/provider_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <include layout="@layout/provider_credentials_login" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> - <Button - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/login_button" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> - </RelativeLayout> + <android.support.v7.widget.AppCompatButton + android:id="@+id/button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/login_button" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"/> + </RelativeLayout> + </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/a_signup.xml b/app/src/main/res/layout/a_signup.xml index edcaea45..b0c8dc47 100644 --- a/app/src/main/res/layout/a_signup.xml +++ b/app/src/main/res/layout/a_signup.xml @@ -1,29 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + style="@style/BitmaskActivity"> - <include - layout="@layout/provider_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <include layout="@layout/loading_screen" /> - <include layout="@layout/provider_credentials_signup" + <LinearLayout + android:id="@+id/content" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="match_parent" + android:orientation="vertical"> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <include + layout="@layout/provider_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <include layout="@layout/provider_credentials_signup" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> - <Button - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/login_button" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> - </RelativeLayout> + <android.support.v7.widget.AppCompatButton + android:id="@+id/button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/login_button" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"/> + </RelativeLayout> + </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/configuration_wizard_activity.xml b/app/src/main/res/layout/configuration_wizard_activity.xml index 71cd5314..25da8612 100644 --- a/app/src/main/res/layout/configuration_wizard_activity.xml +++ b/app/src/main/res/layout/configuration_wizard_activity.xml @@ -3,29 +3,27 @@ android:id="@+id/configuration_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ConfigurationWizard" > + tools:context=".ConfigurationWizard" + style="@style/BitmaskActivity" > - <ListView - android:id="@+id/provider_list" + <include layout="@layout/loading_screen" /> + + <LinearLayout + android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:drawSelectorOnTop="false" /> + android:orientation="vertical"> + + <include layout="@layout/provider_header" /> + + <ListView + android:id="@+id/provider_list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:drawSelectorOnTop="false" + android:layout_marginTop="@dimen/standard_margin" + /> + + </LinearLayout> - <ProgressBar - android:id="@+id/progressbar_configuration_wizard" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:max="3" /> - - <TextView - android:id="@+id/progressbar_description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fadingEdge="horizontal" - android:singleLine="true" - android:text="@string/configuring_provider" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_centerHorizontal="true" - android:textColor="@android:color/holo_blue_bright" /> </RelativeLayout> diff --git a/app/src/main/res/layout/loading_screen.xml b/app/src/main/res/layout/loading_screen.xml new file mode 100644 index 00000000..f4c7eb95 --- /dev/null +++ b/app/src/main/res/layout/loading_screen.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/loading_screen" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:visibility="gone"> + + <android.support.v7.widget.AppCompatImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + app:tint="@color/colorPrimary" + app:srcCompat="@drawable/action_history" + android:layout_marginTop="@dimen/loading_screen_icon_vertical_margin" + android:layout_marginBottom="@dimen/loading_screen_icon_vertical_margin" + /> + + <android.support.v7.widget.AppCompatTextView + android:id="@+id/progressbar_description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fadingEdge="horizontal" + android:singleLine="true" + android:text="@string/configuring_provider" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" + android:layout_marginTop="@dimen/standard_margin" + android:layout_marginBottom="@dimen/standard_margin" + /> + + <ProgressBar + android:id="@+id/progressbar" + style="@style/Widget.AppCompat.ProgressBar.Horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:indeterminate="true" + android:layout_marginTop="@dimen/standard_margin" + /> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/provider_credentials_login.xml b/app/src/main/res/layout/provider_credentials_login.xml index 9c52b9b5..915ac231 100644 --- a/app/src/main/res/layout/provider_credentials_login.xml +++ b/app/src/main/res/layout/provider_credentials_login.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <merge xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" > + xmlns:app="http://schemas.android.com/apk/res-auto"> <android.support.design.widget.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/auth_username" - app:errorEnabled="true"> + app:errorEnabled="true" + android:layout_marginTop="@dimen/standard_margin" + > <android.support.design.widget.TextInputEditText android:id="@+id/provider_credentials_username" diff --git a/app/src/main/res/layout/provider_detail_fragment.xml b/app/src/main/res/layout/provider_detail_fragment.xml index 3db32b2c..e4ee1cca 100644 --- a/app/src/main/res/layout/provider_detail_fragment.xml +++ b/app/src/main/res/layout/provider_detail_fragment.xml @@ -1,46 +1,41 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/provider_detail_fragment" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" > + android:orientation="vertical" + style="@style/BitmaskActivity" > - <TextView - android:id="@+id/provider_detail_domain" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" - android:layout_marginTop="16dp" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textStyle="bold" /> + <include layout="@layout/loading_screen" /> - <TextView - android:id="@+id/provider_detail_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" - android:layout_marginBottom="4dp" - android:textStyle="italic" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <LinearLayout + android:id="@+id/content" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <TextView - android:id="@+id/provider_detail_description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" - android:layout_marginBottom="4dp" - android:textStyle="normal" - android:textAppearance="?android:attr/textAppearanceSmall" /> + <include + layout="@layout/provider_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> - <ListView - android:id="@+id/provider_detail_options" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <android.support.v7.widget.AppCompatTextView + android:id="@+id/provider_detail_description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="normal" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_marginTop="@dimen/standard_margin" + android:layout_marginBottom="@dimen/standard_margin" + /> + + <ListView + android:id="@+id/provider_detail_options" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/standard_margin" + android:drawSelectorOnTop="false"/> + </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/provider_header.xml b/app/src/main/res/layout/provider_header.xml index 89cbd7b2..8a757181 100644 --- a/app/src/main/res/layout/provider_header.xml +++ b/app/src/main/res/layout/provider_header.xml @@ -2,16 +2,21 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" > - <ImageView + <android.support.v7.widget.AppCompatImageView android:id="@+id/provider_header_logo" - android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_width="@dimen/round_button_diameter" + android:layout_height="@dimen/round_button_diameter" + android:adjustViewBounds="true" app:srcCompat="@drawable/mask" /> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@+id/provider_header_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="" /> + android:text="" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" + android:layout_marginTop="@dimen/standard_margin" + android:layout_marginBottom="@dimen/standard_margin" + /> </merge> diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index fa27ebe8..b42c7554 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -26,4 +26,9 @@ <item name="android:colorAccent">@color/accent</item> </style> + <style name="BitmaskButton" parent="android:Widget.Button"> + <item name="android:textAllCaps">true</item> + <item name="android:backgroundTint">@color/colorPrimaryDark</item> + </style> + </resources> diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml new file mode 100644 index 00000000..ac62b94c --- /dev/null +++ b/app/src/main/res/values-v21/themes.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar"> + <item name="colorPrimary">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + + <item name="textColorError">@color/colorError</item> + + <!-- progressBar color --> + <item name="colorAccent">@color/colorPrimary</item> + + <!-- button and controls --> + <item name="android:buttonStyle">@style/BitmaskButton</item> + <item name="android:colorButtonNormal">@color/colorPrimaryDark</item> + <item name="android:colorControlHighlight">@color/colorPrimaryDark</item> + </style> + + <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> + <item name="android:colorPrimary">@color/colorPrimary</item> + <item name="android:colorPrimaryDark">@color/colorPrimary</item> + <item name="android:windowBackground">@drawable/splash_page</item> + </style> + +</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 3e06cbe2..a6afc8bc 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -6,6 +6,7 @@ <resources> <dimen name="paddingItemsSidebarLog">20dp</dimen> <dimen name="stdpadding">8dp</dimen> + <dimen name="standard_margin">8dp</dimen> <bool name="logSildersAlwaysVisible">false</bool> <dimen name="diameter">48dp</dimen> @@ -21,8 +22,11 @@ <dimen name="activity_margin">16dp</dimen> <dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen> + <dimen name="list_view_margin_top">24dp</dimen> <!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp: https://developer.android.com/design/patterns/navigation-drawer.html --> <dimen name="navigation_drawer_width">300dp</dimen> + + <dimen name="loading_screen_icon_vertical_margin">16dp</dimen> </resources>
\ 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 9536d96e..3b278091 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -42,8 +42,11 @@ <string name="error_no_such_algorithm_exception_user_message">Encryption algorithm not found. Please upgrade Android!</string> <string name="signup_or_login_button">Sign Up/Log In</string> <string name="login_button">Log In</string> + <string name="login_to_profile">Log in to profile</string> <string name="logout_button">Log Out</string> <string name="signup_button">Sign Up</string> + <string name="create_profile">Create profile</string> + <string name="setup_provider">Set up provider</string> <string name="setup_error_title">Configuration Error</string> <string name="setup_error_configure_button">Configure</string> <string name="setup_error_close_button">Exit</string> @@ -75,6 +78,8 @@ <string name="didnt_log_out_user_status">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.</string> <string name="not_logged_in_user_status">have not logged in.</string> <string name="logging_in_user_status">is logging in.</string> + <string name="logging_in">Logging in</string> + <string name="signing_up">Signing up</string> <string name="logging_out_user_status">is logging out.</string> <string name="signingup_message">is being registered.</string> <string name="vpn.button.turn.on">Turn on</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b4e81bc4..3b1150ea 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -62,6 +62,9 @@ <style name="BitmaskButton" parent="android:Widget.Button"> <item name="android:textAllCaps">true</item> - <item name="android:color">@color/colorPrimary</item> + </style> + + <style name="BitmaskActivity"> + <item name="android:padding">@dimen/activity_margin</item> </style> </resources>
\ 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 76cfd866..70bc3e16 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -3,10 +3,16 @@ <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimary</item> + <item name="textColorError">@color/colorError</item> - <item name="android:buttonStyle">@style/BitmaskButton</item> + <!-- progressBar color --> + <item name="colorAccent">@color/colorPrimary</item> + <!-- button and controls --> + <item name="android:buttonStyle">@style/BitmaskButton</item> + <item name="colorButtonNormal">@color/colorPrimaryDark</item> + <item name="colorControlHighlight">@color/colorPrimaryDark</item> </style> <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> |