Merge pull request #55 from jaicis/kivyfixes

removed payment method Screen
This commit is contained in:
navjotcis 2020-03-18 18:32:36 +05:30 committed by GitHub
commit a5f85455c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 74 deletions

View File

@ -47,7 +47,7 @@
size: self.size size: self.size
size: dp(app.window_size[0] - 2*self.parent.parent.padding[0]) - 10 , 1 size: dp(app.window_size[0] - 2*self.parent.parent.padding[0]) - 10 , 1
height: dp(40) height: dp(40)
on_press: root.get_available_credits(self) on_press: root.get_free_credits(self)
MDLabel: MDLabel:
font_style: 'H6' font_style: 'H6'
text: 'Get Free Credits' text: 'Get Free Credits'
@ -93,7 +93,6 @@
size: self.size size: self.size
size: dp(app.window_size[0] - 2*self.parent.parent.padding[0]) - 10 , 1 size: dp(app.window_size[0] - 2*self.parent.parent.padding[0]) - 10 , 1
height: dp(40) height: dp(40)
on_press: app.root.ids.scr_mngr.current = 'pay-options'
on_press: root.move_to_pay_option(py2.text) on_press: root.move_to_pay_option(py2.text)
MDLabel: MDLabel:
font_style: 'H6' font_style: 'H6'
@ -140,7 +139,6 @@
size: self.size size: self.size
size: dp(app.window_size[0] - 2*self.parent.parent.padding[0]) - 10 , 1 size: dp(app.window_size[0] - 2*self.parent.parent.padding[0]) - 10 , 1
height: dp(40) height: dp(40)
on_press: app.root.ids.scr_mngr.current = 'pay-options'
on_press: root.move_to_pay_option(py3.text) on_press: root.move_to_pay_option(py3.text)
MDLabel: MDLabel:
font_style: 'H6' font_style: 'H6'

View File

@ -1,57 +0,0 @@
<PaymentMethods>:
name: 'pay-options'
ScrollView:
do_scroll_x: False
BoxLayout:
# canvas.before:
# Color:
# rgba: .5,.5,.5,.5
# Rectangle:
# pos: self.pos
# size: self.size
orientation: 'vertical'
padding: [self.width/4, 20, self.width/4, 20]
size_hint_y: None
spacing: 20
height: self.minimum_height
# GridLayout:
# cols: 1
# rows: 3
# size_hint_y: None
# # height: self.minimum_height
# # padding: dp(10), dp(10)
# spacing: dp(10)
SmartTileWithLabel:
# size_hint_y: None
size_hint: (None, None)
# pos_hint: {'x': .5, 'y': .5}
height: 180
width: 400
id: tile_2
mipmap: True
source: './images/paymode/download.png'
# text: "[size=12]Paypal[/size]"
on_press: root.redirect_on_web(self)
font_style: 'Subtitle1'
SmartTileWithLabel:
# size_hint_y: None
size_hint: (None, None)
height: 180
width: 400
id: tile_2
mipmap: True
# text: "[size=12]Crypto wallet[/size]"
font_style: 'Subtitle1'
source: './images/paymode/bitcoin-logo.jpg'
on_press: root.redirect_on_web(self)
SmartTileWithLabel:
# size_hint_y: None
size_hint: (None, None)
height: 180
width: 400
id: tile_2
mipmap: True
# text: "[size=12]Googgle in app[/size]"
font_style: 'Subtitle1'
source: './images/paymode/111.webp'
on_press: root.redirect_on_web(self)

View File

@ -259,8 +259,6 @@ NavigationLayout:
id:sc19 id:sc19
Archieve: Archieve:
id:sc20 id:sc20
PaymentMethods:
id:sc21
MDNavigationDrawer: MDNavigationDrawer:
id: nav_drawer id: nav_drawer

View File

@ -73,8 +73,7 @@ KVFILES = [
'settings', 'popup', 'allmails', 'draft', 'settings', 'popup', 'allmails', 'draft',
'maildetail', 'common_widgets', 'addressbook', 'maildetail', 'common_widgets', 'addressbook',
'myaddress', 'composer', 'payment', 'sent', 'myaddress', 'composer', 'payment', 'sent',
'network', 'login', 'credits', 'trash', 'inbox', 'network', 'login', 'credits', 'trash', 'inbox'
'payment_method'
] ]
@ -878,7 +877,7 @@ class MyTextInput(TextInput):
class Payment(Screen): class Payment(Screen):
"""Payment module""" """Payment module"""
def get_available_credits(self, instance): def get_free_credits(self, instance):
"""Get the available credits""" """Get the available credits"""
# pylint: disable=no-self-use # pylint: disable=no-self-use
state.availabe_credit = instance.parent.children[1].text state.availabe_credit = instance.parent.children[1].text
@ -894,7 +893,7 @@ class Payment(Screen):
def move_to_pay_option(self, amount): # pylint: disable=no-self-use def move_to_pay_option(self, amount): # pylint: disable=no-self-use
"""Option move to pay""" """Option move to pay"""
state.kivyapp.set_toolbar_for_QrCode() pass
class Credits(Screen): class Credits(Screen):
@ -2997,11 +2996,3 @@ class ToAddrBoxlayout(BoxLayout):
def set_toAddress(self, to_addr): def set_toAddress(self, to_addr):
"""This method is use to set to address""" """This method is use to set to address"""
self.to_addr = to_addr self.to_addr = to_addr
class PaymentMethods(Screen):
"""PaymentMethods Screen show widgets of page"""
def redirect_on_web(self, instance):
"""Redirect on web"""
pass