diff --git a/resources/images/badges/beginner.png b/resources/images/badges/beginner.png index e0b6e71..f8d2a40 100644 Binary files a/resources/images/badges/beginner.png and b/resources/images/badges/beginner.png differ diff --git a/screens/custom_widgets/circle_icon_button.kv b/screens/custom_widgets/circle_icon_button.kv index 336347a..ffc6d1f 100644 --- a/screens/custom_widgets/circle_icon_button.kv +++ b/screens/custom_widgets/circle_icon_button.kv @@ -1,9 +1,18 @@ #:kivy 2.2.1 +#:set OUTLINE_RECTANGLE 6 <-CircleIconButton>: fit_mode: "cover" # the image will be cropped at the right spot + canvas.before: + Color: + rgba: (0,0,0,1) + RoundedRectangle: + pos: (self.pos[0]-OUTLINE_RECTANGLE//2, self.pos[1]-OUTLINE_RECTANGLE//2) + size: (self.size[0]+OUTLINE_RECTANGLE, self.size[1]+OUTLINE_RECTANGLE) + radius: [100] + canvas: Color: rgba: self.color @@ -22,4 +31,4 @@ pos: self.pos size: self.size radius: [100] - StencilPop \ No newline at end of file + StencilPop diff --git a/screens/profile.kv b/screens/profile.kv index 1c259ce..9e65ff3 100644 --- a/screens/profile.kv +++ b/screens/profile.kv @@ -28,8 +28,8 @@ # Badge for the status CircleIconButton: source: PATH_BADGES + root.user_status + ".png" - pos_hint: {"center_x":0.25, "center_y":0.75} - size_hint: (0.2, None) + pos_hint: {"center_x":0.2, "center_y":0.75} + size_hint: (0.25, None) height: self.width disable_button: True @@ -38,8 +38,8 @@ text: root.user_status font_name: PATH_TITLE_FONT font_size: 20 * root.font_ratio - pos_hint: {"center_x":0.7, "center_y":0.8} - size_hint: (0.4, 0.1) + pos_hint: {"x":0.4, "center_y":0.825} + size_hint: (0.25, 0.1) text_size: self.size outline_width: TITLE_OUTLINE_WIDTH outline_color: TITLE_OUTLINE_COLOR @@ -49,18 +49,18 @@ text: root.user_level font_name: PATH_TITLE_FONT font_size: 20 * root.font_ratio - pos_hint: {"center_x":0.7, "center_y":0.75} - size_hint: (0.4, 0.1) + pos_hint: {"x":0.675, "center_y":0.825} + size_hint: (0.25, 0.1) text_size: self.size outline_width: TITLE_OUTLINE_WIDTH outline_color: TITLE_OUTLINE_COLOR color: TEXT_FONT_COLOR - halign: "left" + halign: "right" # Experience counter ExperienceCounter: - size_hint: (0.4, 0.07) - pos_hint: {"center_x":0.25, "center_y":0.6} + size_hint: (0.525, 0.07) + pos_hint: {"x":0.4, "center_y":0.72} font_ratio: root.font_ratio experience_left: 10 percentage_experience: 0.7 @@ -68,7 +68,7 @@ # Coins counter CoinsCounter: - size_hint: (0.45, 0.07) - pos_hint: {"center_x":0.725, "center_y":0.6} + size_hint: (0.6, 0.07) + pos_hint: {"center_x":0.5, "center_y":0.61} font_ratio: root.font_ratio coins_count: root.coins_count diff --git a/screens/profile.py b/screens/profile.py index 8105776..dfb27b2 100644 --- a/screens/profile.py +++ b/screens/profile.py @@ -37,7 +37,7 @@ class ProfileScreen(ImprovedScreen): Class to manage the screen that contains the profile information. """ - user_status = StringProperty() + user_status = StringProperty(USER_DATA.user_profile["status"]) user_level = StringProperty() coins_count = NumericProperty() theme_colors = StringProperty()