diff options
| author | Aleksandr Granin <aleksandr@mullvad.net> | 2021-03-01 14:55:08 +0100 |
|---|---|---|
| committer | Aleksandr Granin <aleksandr@mullvad.net> | 2021-03-12 14:57:41 +0100 |
| commit | fa8cb1e8461be82416d0f4d9c48dcbb22938fd8b (patch) | |
| tree | ef1ca691b54291a7e13252874911131bafba62d9 /android/src/main/res/values | |
| parent | 1db49ed3e79d82697f7e3490249ef2cce463c2be (diff) | |
| download | mullvadvpn-fa8cb1e8461be82416d0f4d9c48dcbb22938fd8b.tar.xz mullvadvpn-fa8cb1e8461be82416d0f4d9c48dcbb22938fd8b.zip | |
Create list item view and layouts. Defie text and list item styles
Diffstat (limited to 'android/src/main/res/values')
| -rw-r--r-- | android/src/main/res/values/attrs.xml | 4 | ||||
| -rw-r--r-- | android/src/main/res/values/dimensions.xml | 2 | ||||
| -rw-r--r-- | android/src/main/res/values/styles.xml | 53 |
3 files changed, 59 insertions, 0 deletions
diff --git a/android/src/main/res/values/attrs.xml b/android/src/main/res/values/attrs.xml index 21db41e41c..8eefb1c173 100644 --- a/android/src/main/res/values/attrs.xml +++ b/android/src/main/res/values/attrs.xml @@ -55,4 +55,8 @@ <attr name="withToken" format="boolean" /> </declare-styleable> + <attr name="actionListItemViewStyle" + type="reference" /> + <attr name="applicationListItemViewStyle" + type="reference" /> </resources> diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index 0f0bd9ad43..ac8e3c5843 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -42,6 +42,8 @@ <dimen name="button_separation">18dp</dimen> <dimen name="screen_vertical_margin">22dp</dimen> <dimen name="app_list_item_icon_size">35dp</dimen> + <dimen name="progress_size">60dp</dimen> + <dimen name="icon_size">24dp</dimen> <!-- Switch Dimens--> <dimen name="switch_width">46dp</dimen> <dimen name="switch_height">30dp</dimen> diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml index d85ee24363..2a2734505a 100644 --- a/android/src/main/res/values/styles.xml +++ b/android/src/main/res/values/styles.xml @@ -6,6 +6,8 @@ <item name="android:statusBarColor">@color/blue</item> <item name="android:windowBackground">@color/blue</item> <item name="switchStyle">@style/AppTheme.Switch</item> + <item name="actionListItemViewStyle">@style/ListItem.Action</item> + <item name="applicationListItemViewStyle">@style/ListItem.Action.Application</item> </style> <style name="InputText" parent="Widget.AppCompat.EditText"> @@ -56,6 +58,57 @@ parent="SettingsHeader"> <item name="android:textSize">@dimen/text_medium</item> </style> + <style name="TextAppearance.Mullvad" + parent="TextAppearance.AppCompat" /> + <style name="TextAppearance.Mullvad.Title1"> + <item name="android:textColor">@color/white</item> + <item name="android:textSize">@dimen/text_medium_plus</item> + </style> + <style name="TextAppearance.Mullvad.Title2"> + <item name="android:textColor">@color/white</item> + <item name="android:textSize">@dimen/text_medium</item> + </style> + <style name="TextAppearance.Mullvad.Small"> + <item name="android:textColor">@color/white60</item> + <item name="android:textSize">@dimen/text_small</item> + </style> + <style name="ListItem"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + </style> + <style name="ListItem.DividerGroup"> + <item name="android:layout_height">@dimen/vertical_space</item> + </style> + <style name="ListItem.PlainText"> + <item name="android:focusable">false</item> + <item name="android:clickable">false</item> + <item name="android:paddingTop">5dp</item> + </style> + <style name="ListItem.Action"> + <item name="android:height">@dimen/cell_height</item> + <item name="android:layout_height">@dimen/cell_height</item> + <item name="android:background">@drawable/cell_button_background</item> + <item name="android:clickable">true</item> + <item name="android:focusable">true</item> + </style> + <style name="ListItem.Action.Application"> + <item name="android:background">@drawable/app_list_item_background</item> + </style> + <style name="ListItem.Action.Double"> + <item name="android:clickable">false</item> + <item name="android:focusable">false</item> + </style> + <style name="TextAppearance.Mullvad.CollapsingToolbar"> + <item name="android:textColor">@color/white</item> + </style> + <style name="TextAppearance.Mullvad.CollapsingToolbar.Expanded"> + <item name="android:textSize">30sp</item> + <item name="android:textStyle">bold</item> + </style> + <style name="TextAppearance.Mullvad.CollapsingToolbar.Collapsed"> + <item name="android:textSize">20sp</item> + <item name="android:textStyle">bold</item> + </style> <!-- Switch Style --> <style name="AppTheme.Switch"> <item name="android:layout_width">@dimen/switch_width</item> |
