Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@T-Dynamos
T-Dynamos committed Apr 12, 2024
1 parent 9ecb636 commit e0c7a72
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 89 deletions.
3 changes: 3 additions & 0 deletions kivymd/uix/transition/transition.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,11 +341,14 @@ class MDSharedAxisTransistion(TransitionBase):
def on_progress(self, progress):
progress = AnimationTransition.out_cubic(progress)
const = (1 if self.opposite else -1) * self.slide_distance * 2
opp_axis = "y" if self.transition_axis == "x" else "x"
if progress < 0.5:
setattr(self.screen_out, self.transition_axis, const * progress)
setattr(self.screen_out, opp_axis, 0)
self.screen_out.opacity = 1 - (2 * progress)
self.screen_in.opacity = 0
else:
self.screen_in.opacity = (2 * progress) - 1
setattr(self.screen_in, self.transition_axis, -const * (1 - progress))
setattr(self.screen_in, opp_axis, 0)
self.screen_out.opacity = 0
237 changes: 148 additions & 89 deletions main.py
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
from kivy.lang import Builder
import os
import kivymd
from kivymd.app import MDApp
from kivy.uix.screenmanager import ScreenManager
from kivymd.uix.screen import MDScreen
from kivymd.uix.transition import MDSharedAxisTransistion
from examples.common_app import CommonApp

KV = """
<Check@MDCheckbox>:
group: 'group'
size_hint: None, 1
width:self.height
<SettingsItem@ButtonBehavior+BoxLayout>:
icon:"wifi"
text:"Network & Internet"
subtext:"Network settings"
size_hint_y:None
height:dp(70)
padding:dp(10)
spacing:dp(10)
on_release:
app.root.get_screen("battery").ids.main_icon.icon = self.icon
app.root.get_screen("battery").ids.main_text.text = self.text
app.root.transition.opposite = False
app.root.current = "battery"
MDIconButton:
style: "tonal"
size_hint:None, 1
Expand All @@ -20,105 +34,150 @@
BoxLayout:
orientation:"vertical"
MDLabel:
text:root.text
font_style:"Title"
role:"medium"
MDLabel:
text:root.subtext
font_style:"Label"
role:"large"
theme_text_color:"Custom"
text_color:app.theme_cls.surfaceContainerLowestColor[:-1] + [0.5]
<SettingsScreen@MDScreen>:
name:"main"
md_bg_color:app.theme_cls.surfaceContainerHighColor
MDScrollView:
MDBoxLayout:
padding:[dp(10), 0]
adaptive_height:True
orientation:"vertical"
BoxLayout:
size_hint_y:None
height:dp(70)
padding:[0, dp(10)]
MDIconButton:
size_hint:None, None
size:[dp(50)] * 2
on_release: app.open_menu(self)
icon: "menu"
Widget:
MDIconButton:
size_hint:None, None
size:[dp(50)] * 2
on_release: app.open_menu(self)
icon: "magnify"
MDIconButton:
size_hint:None, None
size:[dp(50)] * 2
on_release: app.open_menu(self)
icon: "dots-vertical"
MDLabel:
text:"Settings"
halign:"center"
theme_font_size:"Custom"
font_size:"30sp"
style:"bold"
size_hint_y:None
height:dp(70)
MDBoxLayout:
md_bg_color:app.theme_cls.surfaceContainerLowColor
padding:[dp(10), 0]
radius:[self.height / 2]*4
size_hint_y:None
height:dp(50)
BoxLayout:
size_hint_y:None
height:dp(20)
MDBoxLayout:
md_bg_color:app.theme_cls.surfaceContainerColor
radius:[dp(25)] * 4
adaptive_height:True
orientation:"vertical"
SettingsItem:
icon:"wifi"
on_release:
app.root.transition.opposite = False
app.root.current = "battery"
SettingsItem:
icon:"battery-90"
on_release:
app.root.transition.opposite = False
app.root.current = "battery"
SettingsItem:
icon:"battery-full"
on_release:
app.root.transition.opposite = False
app.root.current = "battery"
SettingsItem:
icon:"battery-full"
on_release:
app.root.transition.opposite = False
app.root.current = "battery"
<BatteryScreen@MDScreen>:
name:"battery"
md_bg_color:app.theme_cls.backgroundColor
BoxLayout:
md_bg_color:app.theme_cls.surfaceContainerLowColor
MDBoxLayout:
padding:[dp(10), 0]
orientation:"vertical"
BoxLayout:
size_hint_y:None
height:dp(70)
padding:[0, dp(10)]
MDIconButton:
size_hint:None, None
size:[dp(50)] * 2
on_release: app.open_menu(self)
icon: "menu"
Widget:
MDIconButton:
size_hint:None, None
size:[dp(50)] * 2
on_release: app.open_menu(self)
icon: "magnify"
MDIconButton:
size_hint:None, None
size:[dp(50)] * 2
on_release: app.open_menu(self)
icon: "dots-vertical"
MDLabel:
text:"Battery"
text:"Settings"
halign:"center"
theme_font_size:"Custom"
font_size:"30sp"
style:"bold"
size_hint_y:None
height:dp(100)
MDButton:
style: "filled"
on_release:
app.root.transition.opposite = True
app.root.current = "main"
MDButtonText:
text: "Filled"
height:dp(70)
MDBoxLayout:
md_bg_color:app.theme_cls.surfaceContainerHighColor
padding:[dp(10), 0]
radius:[self.height / 2]*4
size_hint_y:None
height:dp(60)
padding:[dp(10), dp(10)]
spacing:dp(10)
MDIconButton:
size_hint_y:1
icon:"magnify"
size_hint_x:None
width:self.height
MDLabel:
text:"Search in settings"
font_style:"Body"
role:"large"
theme_text_color:"Custom"
text_color:app.theme_cls.surfaceContainerLowestColor[:-1] + [0.5]
Image:
size_hint_y:1
source:app.image_path
size_hint_x:None
width:self.height
BoxLayout:
size_hint_y:None
height:dp(20)
MDBoxLayout:
md_bg_color:app.theme_cls.surfaceContainerHighColor
radius:[dp(25)] * 4
size_hint_y:None
height:self.minimum_height
orientation:"vertical"
SettingsItem:
icon:"wifi"
SettingsItem:
icon:"battery-90"
text:"Battery & Power"
subtext:"42% - About 14hr left"
SettingsItem:
icon:"palette-outline"
text:"Wallpaper & Style"
subtext:"Colors, theme style"
SettingsItem:
icon:"android"
text:"System Info"
subtext:"About system"
BoxLayout:
size_hint_y:None
height:dp(70)
padding:[(self.width - dp(50)*6), dp(25)]
spacing:dp(10)
Check:
active:True
on_active:
setattr(app.transition, "transition_axis", "x") if self.active else app
MDLabel:
size_hint_x:None
width:dp(50)
text:"X"
Check:
on_active:
setattr(app.transition, "transition_axis", "y") if self.active else app
MDLabel:
size_hint_x:None
width:dp(50)
text:"Y"
Check:
MDLabel:
size_hint_x:None
width:dp(50)
text:"Z"
Widget:
<BatteryScreen@MDScreen>:
name:"battery"
md_bg_color:app.theme_cls.surfaceContainerLowColor
MDLabel:
id:main_text
text:"Battery"
halign:"center"
theme_font_size:"Custom"
font_size:"30sp"
style:"bold"
size_hint_y:None
height:dp(100)
pos_hint:{"center_y":0.8}
MDIconButton:
id:main_icon
icon:"wifi"
style:"tonal"
pos_hint:{"center_y":0.7, "center_x":0.5}
MDButton:
pos_hint:{"center_x":0.5, "center_y":0.5}
style: "filled"
on_release:
app.root.transition.opposite = True
app.root.current = "main"
MDButtonText:
text: "Go Back"
ScreenManager:
transition:app.transition
Expand All @@ -134,7 +193,7 @@


class ExampleApp(MDApp, CommonApp):

image_path = os.path.join(kivymd.__path__[0], "images", "logo", "kivymd-icon-256.png")
def build(self):
self.transition = MDSharedAxisTransistion()
return Builder.load_string(KV)
Expand Down

0 comments on commit e0c7a72

Please sign in to comment.